Getting the Binary

"; - } - } - - public String renderError(ErrorResponse error) - { - String html =3D error.toHTML(); - StringBuilder builder =3D new StringBuilder(html + 50); - builder.append("

").append(html).append("

"= ); - return builder.toString(); - } -} Copied: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/t= est/controller/SimpleFragmentRenderer.java (from rev 9777, modules/portlet/= trunk/test/src/main/java/org/jboss/portal/portlet/test/controller2/SimpleFr= agmentRenderer.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= controller/SimpleFragmentRenderer.java (rev 0) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= controller/SimpleFragmentRenderer.java 2008-02-05 15:46:21 UTC (rev 9778) @@ -0,0 +1,69 @@ +/*************************************************************************= ***** + * 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.controller; + +import org.jboss.portal.portlet.invocation.response.ErrorResponse; +import org.jboss.portal.portlet.invocation.response.FragmentResponse; + +/** + * @author Chris Laprun + * @version $Revision: 9748 $ + */ +public class SimpleFragmentRenderer implements FragmentRenderer +{ + public String renderPortlet(FragmentResponse fragment) + { + + if (fragment.getType() !=3D FragmentResponse.TYPE_EMPTY) + { + String frag; + + // + if (fragment.getType() =3D=3D FragmentResponse.TYPE_BYTES) + { + frag =3D fragment.getBytes().toString(); + } + else + { + frag =3D fragment.getChars().toString(); + } + + StringBuilder builder =3D new StringBuilder(frag.length() + 50); + builder.append("

").append(frag).append("=

"); + return builder.toString(); + } + else + { + return "

"; + } + } + + public String renderError(ErrorResponse error) + { + String html =3D error.toHTML(); + StringBuilder builder =3D new StringBuilder(html + 50); + builder.append("

").append(html).append("

"= ); + return builder.toString(); + } +} Deleted: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/= test/controller/TestInstanceContext.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= controller2/TestInstanceContext.java 2008-02-05 15:13:09 UTC (rev 9775) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= controller/TestInstanceContext.java 2008-02-05 15:46:21 UTC (rev 9778) @@ -1,102 +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.portlet.test.controller2; - -import org.jboss.portal.portlet.state.AccessMode; -import org.jboss.portal.portlet.PortletContext; -import org.jboss.portal.portlet.StateEvent; -import org.jboss.portal.portlet.spi.InstanceContext; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; - -/** - * @author Julien Viet - * @version $Revision: 1.1 $ - */ -public class TestInstanceContext implements InstanceContext -{ - - /** . */ - private HttpServletRequest req; - - /** . */ - private boolean modifiable; - - /** . */ - private PortletContext target; - - /** . */ - private boolean useClone; - - /** . */ - private String id; - - public TestInstanceContext( - HttpServletRequest req, - PortletContext portletContext, - boolean modifiable) - { - String id =3D portletContext.getId(); - PortletContext target =3D portletContext; - boolean useClone =3D false; - HttpSession session =3D req.getSession(false); - if (session !=3D null) - { - PortletContext clone =3D (PortletContext)session.getAttribute("cl= one." + id); - if (clone !=3D null) - { - target =3D clone; - useClone =3D true; - } - } - - // - this.req =3D req; - this.useClone =3D useClone; - this.target =3D target; - this.id =3D id; - this.modifiable =3D modifiable; - } - - public PortletContext getTarget() - { - return target; - } - - public String getId() - { - return id; - } - - public AccessMode getAccessMode() - { - return modifiable ? (useClone ? AccessMode.READ_WRITE : AccessMode.C= LONE_BEFORE_WRITE) : AccessMode.READ_ONLY; - } - - public void onStateEvent(StateEvent event) - { - target =3D event.getPortletContext(); - req.getSession().setAttribute("clone." + id, target); - } -} Copied: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/t= est/controller/TestInstanceContext.java (from rev 9777, modules/portlet/tru= nk/test/src/main/java/org/jboss/portal/portlet/test/controller2/TestInstanc= eContext.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= controller/TestInstanceContext.java (rev 0) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= controller/TestInstanceContext.java 2008-02-05 15:46:21 UTC (rev 9778) @@ -0,0 +1,102 @@ +/*************************************************************************= ***** + * 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.portlet.test.controller; + +import org.jboss.portal.portlet.state.AccessMode; +import org.jboss.portal.portlet.PortletContext; +import org.jboss.portal.portlet.StateEvent; +import org.jboss.portal.portlet.spi.InstanceContext; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; + +/** + * @author Julien Viet + * @version $Revision: 1.1 $ + */ +public class TestInstanceContext implements InstanceContext +{ + + /** . */ + private HttpServletRequest req; + + /** . */ + private boolean modifiable; + + /** . */ + private PortletContext target; + + /** . */ + private boolean useClone; + + /** . */ + private String id; + + public TestInstanceContext( + HttpServletRequest req, + PortletContext portletContext, + boolean modifiable) + { + String id =3D portletContext.getId(); + PortletContext target =3D portletContext; + boolean useClone =3D false; + HttpSession session =3D req.getSession(false); + if (session !=3D null) + { + PortletContext clone =3D (PortletContext)session.getAttribute("cl= one." + id); + if (clone !=3D null) + { + target =3D clone; + useClone =3D true; + } + } + + // + this.req =3D req; + this.useClone =3D useClone; + this.target =3D target; + this.id =3D id; + this.modifiable =3D modifiable; + } + + public PortletContext getTarget() + { + return target; + } + + public String getId() + { + return id; + } + + public AccessMode getAccessMode() + { + return modifiable ? (useClone ? AccessMode.READ_WRITE : AccessMode.C= LONE_BEFORE_WRITE) : AccessMode.READ_ONLY; + } + + public void onStateEvent(StateEvent event) + { + target =3D event.getPortletContext(); + req.getSession().setAttribute("clone." + id, target); + } +} Deleted: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/= test/controller/TestPortalContext.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= controller2/TestPortalContext.java 2008-02-05 15:13:09 UTC (rev 9775) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= controller/TestPortalContext.java 2008-02-05 15:46:21 UTC (rev 9778) @@ -1,40 +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.portlet.test.controller2; - -import org.jboss.portal.portlet.impl.spi.AbstractPortalContext; - -import java.util.Map; -import java.util.Collections; - -/** - * @author Julien Viet - * @version $Revision: 630 $ - */ -public class TestPortalContext extends AbstractPortalContext -{ - public TestPortalContext() - { - super(Collections.singletonMap("javax.portlet.markup.head.element.su= pport", "true")); - } -} Copied: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/t= est/controller/TestPortalContext.java (from rev 9777, modules/portlet/trunk= /test/src/main/java/org/jboss/portal/portlet/test/controller2/TestPortalCon= text.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= controller/TestPortalContext.java (rev 0) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= controller/TestPortalContext.java 2008-02-05 15:46:21 UTC (rev 9778) @@ -0,0 +1,39 @@ +/*************************************************************************= ***** + * 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.portlet.test.controller; + +import org.jboss.portal.portlet.impl.spi.AbstractPortalContext; + +import java.util.Collections; + +/** + * @author Julien Viet + * @version $Revision: 630 $ + */ +public class TestPortalContext extends AbstractPortalContext +{ + public TestPortalContext() + { + super(Collections.singletonMap("javax.portlet.markup.head.element.su= pport", "true")); + } +} Deleted: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/= test/controller/TestPortletInvocationContext.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= controller2/TestPortletInvocationContext.java 2008-02-05 15:13:09 UTC (rev = 9775) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= controller/TestPortletInvocationContext.java 2008-02-05 15:46:21 UTC (rev 9= 778) @@ -1,97 +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.portlet.test.controller2; - -import org.jboss.portal.portlet.ContainerURL; -import org.jboss.portal.portlet.test.controller.PageNavigationalState; -import org.jboss.portal.portlet.test.controller2.PortletURLRenderer; -import org.jboss.portal.portlet.invocation.PortletInvocation; -import org.jboss.portal.portlet.impl.spi.AbstractPortletInvocationContext; -import org.jboss.portal.common.util.MarkupInfo; -import org.jboss.portal.common.invocation.resolver.PrincipalAttributeResol= ver; -import org.jboss.portal.common.invocation.resolver.MapAttributeResolver; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -/** - * @author Julien Viet - * @version $Revision: 1.1 $ - */ -public class TestPortletInvocationContext extends AbstractPortletInvocatio= nContext -{ - - /** . */ - private final PortletURLRenderer urlRenderer; - - /** . */ - private final String windowId; - - /** . */ - private final PageNavigationalState pageState; - - /** . */ - private final HttpServletRequest clientRequest; - - /** . */ - private final HttpServletResponse clientResponse; - - public TestPortletInvocationContext( - HttpServletRequest clientRequest, - HttpServletResponse clientResponse, - String windowId, - PageNavigationalState pageState, - MarkupInfo markupInfo) - { - super(markupInfo); - - // - this.clientRequest =3D clientRequest; - this.clientResponse =3D clientResponse; - this.windowId =3D windowId; - this.pageState =3D pageState; - this.urlRenderer =3D new PortletURLRenderer(pageState, windowId, cli= entRequest, clientResponse); - - // - addResolver(PortletInvocation.PRINCIPAL_SCOPE, new PrincipalAttribut= eResolver(clientRequest)); - addResolver(PortletInvocation.INVOCATION_SCOPE, new MapAttributeReso= lver()); - addResolver(PortletInvocation.REQUEST_PROPERTIES_SCOPE, new MapAttri= buteResolver()); - addResolver(PortletInvocation.RESPONSE_PROPERTIES_SCOPE, new MapAttr= ibuteResolver()); - addResolver(PortletInvocation.REQUEST_SCOPE, new MapAttributeResolve= r()); - } - - public HttpServletRequest getClientRequest() throws IllegalStateExcepti= on - { - return clientRequest; - } - - public HttpServletResponse getClientResponse() throws IllegalStateExcep= tion - { - return clientResponse; - } - - public String renderURL(ContainerURL containerURL, Boolean wantSecure, = Boolean wantAuthenticated, boolean relative) - { - return urlRenderer.renderURL(containerURL, wantSecure, wantAuthentic= ated, relative); - } -} Copied: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/t= est/controller/TestPortletInvocationContext.java (from rev 9777, modules/po= rtlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller2/Te= stPortletInvocationContext.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= controller/TestPortletInvocationContext.java (rev 0) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= controller/TestPortletInvocationContext.java 2008-02-05 15:46:21 UTC (rev 9= 778) @@ -0,0 +1,97 @@ +/*************************************************************************= ***** + * 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.portlet.test.controller; + +import org.jboss.portal.portlet.ContainerURL; +import org.jboss.portal.portlet.controller.PageNavigationalState; +import org.jboss.portal.portlet.test.controller.PortletURLRenderer; +import org.jboss.portal.portlet.invocation.PortletInvocation; +import org.jboss.portal.portlet.impl.spi.AbstractPortletInvocationContext; +import org.jboss.portal.common.util.MarkupInfo; +import org.jboss.portal.common.invocation.resolver.PrincipalAttributeResol= ver; +import org.jboss.portal.common.invocation.resolver.MapAttributeResolver; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +/** + * @author Julien Viet + * @version $Revision: 1.1 $ + */ +public class TestPortletInvocationContext extends AbstractPortletInvocatio= nContext +{ + + /** . */ + private final PortletURLRenderer urlRenderer; + + /** . */ + private final String windowId; + + /** . */ + private final PageNavigationalState pageState; + + /** . */ + private final HttpServletRequest clientRequest; + + /** . */ + private final HttpServletResponse clientResponse; + + public TestPortletInvocationContext( + HttpServletRequest clientRequest, + HttpServletResponse clientResponse, + String windowId, + PageNavigationalState pageState, + MarkupInfo markupInfo) + { + super(markupInfo); + + // + this.clientRequest =3D clientRequest; + this.clientResponse =3D clientResponse; + this.windowId =3D windowId; + this.pageState =3D pageState; + this.urlRenderer =3D new PortletURLRenderer(pageState, windowId, cli= entRequest, clientResponse); + + // + addResolver(PortletInvocation.PRINCIPAL_SCOPE, new PrincipalAttribut= eResolver(clientRequest)); + addResolver(PortletInvocation.INVOCATION_SCOPE, new MapAttributeReso= lver()); + addResolver(PortletInvocation.REQUEST_PROPERTIES_SCOPE, new MapAttri= buteResolver()); + addResolver(PortletInvocation.RESPONSE_PROPERTIES_SCOPE, new MapAttr= ibuteResolver()); + addResolver(PortletInvocation.REQUEST_SCOPE, new MapAttributeResolve= r()); + } + + public HttpServletRequest getClientRequest() throws IllegalStateExcepti= on + { + return clientRequest; + } + + public HttpServletResponse getClientResponse() throws IllegalStateExcep= tion + { + return clientResponse; + } + + public String renderURL(ContainerURL containerURL, Boolean wantSecure, = Boolean wantAuthenticated, boolean relative) + { + return urlRenderer.renderURL(containerURL, wantSecure, wantAuthentic= ated, relative); + } +} Deleted: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/= test/controller/TestPortletInvoker.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= controller2/TestPortletInvoker.java 2008-02-05 15:13:09 UTC (rev 9775) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= controller/TestPortletInvoker.java 2008-02-05 15:46:21 UTC (rev 9778) @@ -1,158 +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.portlet.test.controller2; - -import org.jboss.portal.portlet.PortletInvoker; -import org.jboss.portal.portlet.PortletInvokerException; -import org.jboss.portal.portlet.Portlet; -import org.jboss.portal.portlet.PortletContext; -import org.jboss.portal.portlet.state.PropertyMap; -import org.jboss.portal.portlet.state.PropertyChange; -import org.jboss.portal.portlet.state.DestroyCloneFailure; -import org.jboss.portal.portlet.invocation.PortletInvocation; -import org.jboss.portal.portlet.invocation.response.PortletInvocationRespo= nse; -import org.jboss.portal.common.invocation.InterceptorStackFactory; -import org.jboss.portal.common.invocation.InvocationHandler; -import org.jboss.portal.common.invocation.Invocation; -import org.jboss.portal.common.invocation.InvocationException; - -import java.util.Set; -import java.util.List; - -/** - * A simple consumer. - * - * @author Julien Viet - * @version $Revision: 6712 $ - */ -public class TestPortletInvoker implements PortletInvoker -{ - - /** . */ - private InterceptorStackFactory stackFactory; - - /** . */ - private PortletInvoker producer; - - /** . */ - private InvocationHandler handler =3D new InvocationHandler() - { - public Object invoke(Invocation invocation) throws Exception, Invoca= tionException - { - PortletInvocation portletInvocation =3D (PortletInvocation)invoca= tion; - try - { - portletInvocation.setHandler(null); - return producer.invoke(portletInvocation); - } - finally - { - portletInvocation.setHandler(this); - } - } - }; - - public InterceptorStackFactory getStackFactory() - { - return stackFactory; - } - - public void setStackFactory(InterceptorStackFactory stackFactory) - { - this.stackFactory =3D stackFactory; - } - - public PortletInvoker getProducer() - { - return producer; - } - - public void setProducer(PortletInvoker producer) - { - this.producer =3D producer; - } - - public Set getPortlets() throws PortletInvokerException - { - return producer.getPortlets(); - } - - public Portlet getPortlet(PortletContext portletContext) throws Illegal= ArgumentException, PortletInvokerException - { - return producer.getPortlet(portletContext); - } - - public PortletInvocationResponse invoke(PortletInvocation invocation) t= hrows PortletInvokerException - { - InvocationHandler prevHandler =3D invocation.getHandler(); - try - { - invocation.setHandler(handler); - return (PortletInvocationResponse)invocation.invoke(stackFactory.= getInterceptorStack()); - } - catch (Exception e) - { - if (e instanceof PortletInvokerException) - { - throw(PortletInvokerException)e; - } - else if (e instanceof RuntimeException) - { - throw(RuntimeException)e; - } - else - { - throw new PortletInvokerException(e); - } - } - finally - { - invocation.setHandler(prevHandler); - } - } - - public PortletContext createClone(PortletContext portletContext) throws= IllegalArgumentException, PortletInvokerException, UnsupportedOperationExc= eption - { - throw new UnsupportedOperationException(); - } - - public List destroyClones(List por= tletContexts) throws IllegalArgumentException, PortletInvokerException, Uns= upportedOperationException - { - throw new UnsupportedOperationException(); - } - - public PropertyMap getProperties(PortletContext portletContext, Set key= s) throws IllegalArgumentException, PortletInvokerException, UnsupportedOpe= rationException - { - throw new UnsupportedOperationException(); - } - - public PropertyMap getProperties(PortletContext portletContext) throws = IllegalArgumentException, PortletInvokerException, UnsupportedOperationExce= ption - { - throw new UnsupportedOperationException(); - } - - public PortletContext setProperties(PortletContext portletContext, Prop= ertyChange[] changes) throws IllegalArgumentException, PortletInvokerExcept= ion, UnsupportedOperationException - { - throw new UnsupportedOperationException(); - } -} Copied: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/t= est/controller/TestPortletInvoker.java (from rev 9777, modules/portlet/trun= k/test/src/main/java/org/jboss/portal/portlet/test/controller2/TestPortletI= nvoker.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= controller/TestPortletInvoker.java (rev 0) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= controller/TestPortletInvoker.java 2008-02-05 15:46:21 UTC (rev 9778) @@ -0,0 +1,158 @@ +/*************************************************************************= ***** + * 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.portlet.test.controller; + +import org.jboss.portal.portlet.PortletInvoker; +import org.jboss.portal.portlet.PortletInvokerException; +import org.jboss.portal.portlet.Portlet; +import org.jboss.portal.portlet.PortletContext; +import org.jboss.portal.portlet.state.PropertyMap; +import org.jboss.portal.portlet.state.PropertyChange; +import org.jboss.portal.portlet.state.DestroyCloneFailure; +import org.jboss.portal.portlet.invocation.PortletInvocation; +import org.jboss.portal.portlet.invocation.response.PortletInvocationRespo= nse; +import org.jboss.portal.common.invocation.InterceptorStackFactory; +import org.jboss.portal.common.invocation.InvocationHandler; +import org.jboss.portal.common.invocation.Invocation; +import org.jboss.portal.common.invocation.InvocationException; + +import java.util.Set; +import java.util.List; + +/** + * A simple consumer. + * + * @author Julien Viet + * @version $Revision: 6712 $ + */ +public class TestPortletInvoker implements PortletInvoker +{ + + /** . */ + private InterceptorStackFactory stackFactory; + + /** . */ + private PortletInvoker producer; + + /** . */ + private InvocationHandler handler =3D new InvocationHandler() + { + public Object invoke(Invocation invocation) throws Exception, Invoca= tionException + { + PortletInvocation portletInvocation =3D (PortletInvocation)invoca= tion; + try + { + portletInvocation.setHandler(null); + return producer.invoke(portletInvocation); + } + finally + { + portletInvocation.setHandler(this); + } + } + }; + + public InterceptorStackFactory getStackFactory() + { + return stackFactory; + } + + public void setStackFactory(InterceptorStackFactory stackFactory) + { + this.stackFactory =3D stackFactory; + } + + public PortletInvoker getProducer() + { + return producer; + } + + public void setProducer(PortletInvoker producer) + { + this.producer =3D producer; + } + + public Set getPortlets() throws PortletInvokerException + { + return producer.getPortlets(); + } + + public Portlet getPortlet(PortletContext portletContext) throws Illegal= ArgumentException, PortletInvokerException + { + return producer.getPortlet(portletContext); + } + + public PortletInvocationResponse invoke(PortletInvocation invocation) t= hrows PortletInvokerException + { + InvocationHandler prevHandler =3D invocation.getHandler(); + try + { + invocation.setHandler(handler); + return (PortletInvocationResponse)invocation.invoke(stackFactory.= getInterceptorStack()); + } + catch (Exception e) + { + if (e instanceof PortletInvokerException) + { + throw(PortletInvokerException)e; + } + else if (e instanceof RuntimeException) + { + throw(RuntimeException)e; + } + else + { + throw new PortletInvokerException(e); + } + } + finally + { + invocation.setHandler(prevHandler); + } + } + + public PortletContext createClone(PortletContext portletContext) throws= IllegalArgumentException, PortletInvokerException, UnsupportedOperationExc= eption + { + throw new UnsupportedOperationException(); + } + + public List destroyClones(List por= tletContexts) throws IllegalArgumentException, PortletInvokerException, Uns= upportedOperationException + { + throw new UnsupportedOperationException(); + } + + public PropertyMap getProperties(PortletContext portletContext, Set key= s) throws IllegalArgumentException, PortletInvokerException, UnsupportedOpe= rationException + { + throw new UnsupportedOperationException(); + } + + public PropertyMap getProperties(PortletContext portletContext) throws = IllegalArgumentException, PortletInvokerException, UnsupportedOperationExce= ption + { + throw new UnsupportedOperationException(); + } + + public PortletContext setProperties(PortletContext portletContext, Prop= ertyChange[] changes) throws IllegalArgumentException, PortletInvokerExcept= ion, UnsupportedOperationException + { + throw new UnsupportedOperationException(); + } +} Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/= SimplePortalServlet.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/Simple= PortalServlet.java 2008-02-05 15:38:52 UTC (rev 9777) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/Simple= PortalServlet.java 2008-02-05 15:46:21 UTC (rev 9778) @@ -26,10 +26,10 @@ import org.jboss.portal.portlet.controller.PageNavigationalState; import org.jboss.portal.portlet.controller.PortletController; import org.jboss.portal.portlet.controller.response.ControllerResponse; -import org.jboss.portal.portlet.test.controller2.Renderer; -import org.jboss.portal.portlet.test.controller2.ControllerResponseRendere= rFactory; -import org.jboss.portal.portlet.test.controller2.PortletControllerContextI= mpl; -import org.jboss.portal.portlet.test.controller2.PageRenderer; +import org.jboss.portal.portlet.test.controller.Renderer; +import org.jboss.portal.portlet.test.controller.ControllerResponseRenderer= Factory; +import org.jboss.portal.portlet.test.controller.PortletControllerContextIm= pl; +import org.jboss.portal.portlet.test.controller.PageRenderer; = import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; Modified: modules/portlet/trunk/test/src/test/resources/portlet-test-war/WE= B-INF/jboss-beans.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/test/resources/portlet-test-war/WEB-INF/= jboss-beans.xml 2008-02-05 15:38:52 UTC (rev 9777) +++ modules/portlet/trunk/test/src/test/resources/portlet-test-war/WEB-INF/= jboss-beans.xml 2008-02-05 15:46:21 UTC (rev 9778) @@ -70,7 +70,7 @@ = - + Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/W= EB-INF/jboss-beans.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF= /jboss-beans.xml 2008-02-05 15:38:52 UTC (rev 9777) +++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF= /jboss-beans.xml 2008-02-05 15:46:21 UTC (rev 9778) @@ -58,7 +58,7 @@ = - + --===============1385300744351619543==-- From portal-commits at lists.jboss.org Tue Feb 5 11:07:25 2008 Content-Type: multipart/mixed; boundary="===============8872456565770108931==" MIME-Version: 1.0 From: portal-commits at lists.jboss.org To: portal-commits at lists.jboss.org Subject: [portal-commits] JBoss Portal SVN: r9779 - modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller. Date: Tue, 05 Feb 2008 11:07:25 -0500 Message-ID: --===============8872456565770108931== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: julien(a)jboss.com Date: 2008-02-05 11:07:25 -0500 (Tue, 05 Feb 2008) New Revision: 9779 Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contro= ller/PortletController.java Log: added a few todos Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet= /controller/PortletController.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/PortletController.java 2008-02-05 15:46:21 UTC (rev 9778) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/PortletController.java 2008-02-05 16:07:25 UTC (rev 9779) @@ -34,6 +34,15 @@ * The portlet controller which handles the page state management and the = interactions between * the action phase and the event phase. It really only does that and not = more. * + * 1/ introduce EventRequest so the portal can send events directly to a p= ortlet + * + * 2/ make the event controller return a decision for a given event. Toda= y it just returns a list + * of events to process. An event can be handled in various manners by th= e controller: + * - produce new events (what exists today) + * - make it a portal event which delivers the event to the portal + * + * 3/ delegate public render parameter wiring to the context + * * @author Julien Viet * @version $Revision: 1.1 $ */ --===============8872456565770108931==-- From portal-commits at lists.jboss.org Tue Feb 5 12:17:28 2008 Content-Type: multipart/mixed; boundary="===============4356270173936299713==" MIME-Version: 1.0 From: portal-commits at lists.jboss.org To: portal-commits at lists.jboss.org Subject: [portal-commits] JBoss Portal SVN: r9780 - in modules/portlet/trunk/test/src/main/java/org/jboss/portal: portlet/controller/impl and 8 other directories. Date: Tue, 05 Feb 2008 12:17:28 -0500 Message-ID: --===============4356270173936299713== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: julien(a)jboss.com Date: 2008-02-05 12:17:28 -0500 (Tue, 05 Feb 2008) New Revision: 9780 Added: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contro= ller/impl/ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contro= ller/impl/event/ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contro= ller/impl/event/EventControllerContextImpl.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contro= ller/impl/state/ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contro= ller/impl/state/MutablePageNavigationalState.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contro= ller/impl/state/PageNavigationalStateImpl.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contro= ller/impl/state/StateControllerContextImpl.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contro= ller/state/ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contro= ller/state/PageNavigationalState.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contro= ller/state/StateControllerContext.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contro= ller/state/WindowNavigationalState.java Removed: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contro= ller/PageNavigationalState.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contro= ller/WindowNavigationalState.java Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contro= ller/PortletControllerContext.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contro= ller/PortletRequestHandler.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contro= ller/PortletResourceRequestHandler.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contro= ller/request/PageScopedFullPortletResourceRequest.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contro= ller/request/PortletActionRequest.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contro= ller/request/PortletRenderRequest.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contro= ller/request/PortletRequest.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contro= ller/request/PortletScopedPortletResourceRequest.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contro= ller/response/PageUpdateResponse.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/P= ortalServlet.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/c= ontroller/PageRenderer.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/c= ontroller/PortletControllerContextImpl.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/c= ontroller/PortletURLRenderer.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/c= ontroller/TestPortletInvocationContext.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/SimpleP= ortalServlet.java Log: - introduce state controller context class Deleted: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/= controller/PageNavigationalState.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/PageNavigationalState.java 2008-02-05 16:07:25 UTC (rev 9779) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/PageNavigationalState.java 2008-02-05 17:17:28 UTC (rev 9780) @@ -1,115 +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.portlet.controller; - -import org.jboss.portal.common.util.ParameterMap; -import org.jboss.portal.portlet.info.ParameterInfo; -import org.jboss.portal.portlet.info.PortletInfo; - -import javax.xml.namespace.QName; -import java.util.Map; -import java.util.HashMap; -import java.util.zip.GZIPOutputStream; -import java.util.zip.GZIPInputStream; -import java.io.Serializable; -import java.io.ObjectOutputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.ByteArrayInputStream; -import java.io.ObjectInputStream; - -/** - * @author Julien Viet - * @version $Revision: 1.1 $ - */ -public class PageNavigationalState implements Serializable -{ - - /** . */ - protected final Map windows; - - /** . */ - protected final Map page; - - public PageNavigationalState() - { - this.windows =3D new HashMap(); - this.page =3D new HashMap(); - } - - public PageNavigationalState(PageNavigationalState original) - { - this.windows =3D new HashMap(origin= al.windows); - this.page =3D new HashMap(original.page); - } - - public WindowNavigationalState getWindowNavigationalState(String window= Id) - { - return windows.get(windowId); - } - - public ParameterMap getPublicNavigationalState(PortletInfo portlet) - { - ParameterMap publicNavigationalState =3D null; - for (ParameterInfo parameterInfo : portlet.getNavigation().getPublic= Parameters()) - { - String[] parameterValue =3D page.get(parameterInfo.getName()); - - // - if (parameterValue !=3D null) - { - String parameterId =3D parameterInfo.getId(); - - // Lazy create - if (publicNavigationalState =3D=3D null) - { - publicNavigationalState =3D new ParameterMap(); - } - - // We clone the value here so we keep the internal state not p= otentially changed - publicNavigationalState.put(parameterId, parameterValue.clone(= )); - } - } - - // - return publicNavigationalState; - } - - public static byte[] serialize(PageNavigationalState object) throws IOE= xception - { - ByteArrayOutputStream baos =3D new ByteArrayOutputStream(); - GZIPOutputStream zos =3D new GZIPOutputStream(baos); - ObjectOutputStream oos =3D new ObjectOutputStream(zos); - oos.writeObject(object); - oos.close(); - return baos.toByteArray(); - } - - public static PageNavigationalState unserialize(byte[] bytes) throws IO= Exception, ClassNotFoundException - { - ByteArrayInputStream bais =3D new ByteArrayInputStream(bytes); - GZIPInputStream zis =3D new GZIPInputStream(bais); - ObjectInputStream ois =3D new ObjectInputStream(zis); - return (PageNavigationalState)ois.readObject(); - } -} Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet= /controller/PortletControllerContext.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/PortletControllerContext.java 2008-02-05 16:07:25 UTC (rev 9779) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/PortletControllerContext.java 2008-02-05 17:17:28 UTC (rev 9780) @@ -30,6 +30,8 @@ import org.jboss.portal.portlet.invocation.ResourceInvocation; import org.jboss.portal.portlet.invocation.response.PortletInvocationRespo= nse; import org.jboss.portal.portlet.controller.event.EventControllerContext; +import org.jboss.portal.portlet.controller.state.PageNavigationalState; +import org.jboss.portal.portlet.controller.state.StateControllerContext; = import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; @@ -64,4 +66,6 @@ = EventControllerContext getEventControllerContext(); = + StateControllerContext getStateControllerContext(); + } Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet= /controller/PortletRequestHandler.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/PortletRequestHandler.java 2008-02-05 16:07:25 UTC (rev 9779) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/PortletRequestHandler.java 2008-02-05 17:17:28 UTC (rev 9780) @@ -28,6 +28,9 @@ import org.jboss.portal.portlet.controller.response.ControllerResponse; import org.jboss.portal.portlet.controller.response.PageUpdateResponse; import org.jboss.portal.portlet.controller.response.PortletResponse; +import org.jboss.portal.portlet.controller.state.PageNavigationalState; +import org.jboss.portal.portlet.controller.state.WindowNavigationalState; +import org.jboss.portal.portlet.controller.state.StateControllerContext; = import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; @@ -64,10 +67,20 @@ { PortletControllerContext context =3D portletRequest.getControllerCon= text(); = + StateControllerContext stateContext =3D context.getStateControllerCo= ntext(); + // The page navigational state we will operate on during the request // Either we have nothing in the request so we create a new one // Or we have one but we copy it as we should not modify the input s= tate provided - MutablePageNavigationalState pageState =3D portletRequest.getPageSta= te() =3D=3D null ? new MutablePageNavigationalState() : new MutablePageNavi= gationalState(portletRequest.getPageState()); + PageNavigationalState pageState =3D portletRequest.getPageState(); + if (pageState =3D=3D null) + { + pageState =3D stateContext.createPageState(); + } + else + { + pageState =3D stateContext.clonePageState(pageState); + } = // ResponseProperties requestProperties =3D new ResponseProperties(); @@ -244,8 +257,11 @@ return context.invoke(event.getWindowId(), requestCookies, eventInvo= cation); } = - private void updateNavigationalState(PortletControllerContext context, = String windowId, - UpdateNavigationalStateResponse up= date, MutablePageNavigationalState pageState) + private void updateNavigationalState( + PortletControllerContext context, + String windowId, + UpdateNavigationalStateResponse update, = + PageNavigationalState pageState) throws PortletInvokerException { PortletInfo portlet =3D context.getPortletInfo(windowId); Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet= /controller/PortletResourceRequestHandler.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/PortletResourceRequestHandler.java 2008-02-05 16:07:25 UTC (rev 9779) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/PortletResourceRequestHandler.java 2008-02-05 17:17:28 UTC (rev 9780) @@ -39,6 +39,7 @@ import org.jboss.portal.portlet.controller.request.PortletScopedPortletRes= ourceRequest; import org.jboss.portal.portlet.controller.response.ControllerResponse; import org.jboss.portal.portlet.controller.response.ResourceResponse; +import org.jboss.portal.portlet.controller.state.PageNavigationalState; = import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; Deleted: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/= controller/WindowNavigationalState.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/WindowNavigationalState.java 2008-02-05 16:07:25 UTC (rev 9779) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/WindowNavigationalState.java 2008-02-05 17:17:28 UTC (rev 9780) @@ -1,75 +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.portlet.controller; - -import org.jboss.portal.Mode; -import org.jboss.portal.WindowState; -import org.jboss.portal.portlet.StateString; - -import java.io.Serializable; - -/** - * @author Julien Viet - * @version $Revision: 1.1 $ - */ -public class WindowNavigationalState implements Serializable -{ - - /** . */ - private final StateString portletNavigationalState; - - /** . */ - private final Mode mode; - - /** . */ - private final WindowState windowState; - - public WindowNavigationalState() - { - this.portletNavigationalState =3D null; - this.mode =3D Mode.VIEW; - this.windowState =3D WindowState.NORMAL; - } - - public WindowNavigationalState(StateString portletNavigationalState, Mo= de mode, WindowState windowState) - { - this.portletNavigationalState =3D portletNavigationalState; - this.mode =3D mode; - this.windowState =3D windowState; - } - - public StateString getPortletNavigationalState() - { - return portletNavigationalState; - } - - public Mode getMode() - { - return mode; - } - - public WindowState getWindowState() - { - return windowState; - } -} Copied: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/c= ontroller/impl/event/EventControllerContextImpl.java (from rev 9779, module= s/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/even= t/EventControllerContextImpl.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/impl/event/EventControllerContextImpl.java (r= ev 0) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/impl/event/EventControllerContextImpl.java 2008-02-05 17:17:28 UTC (r= ev 9780) @@ -0,0 +1,75 @@ +/*************************************************************************= ***** + * 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.portlet.controller.impl.event; + +import org.jboss.portal.portlet.PortletInvoker; +import org.jboss.portal.portlet.Portlet; +import org.jboss.portal.portlet.PortletInvokerException; +import org.jboss.portal.portlet.controller.event.EventControllerContext; +import org.jboss.portal.portlet.controller.event.Event; +import org.jboss.portal.portlet.info.PortletInfo; + +import java.util.List; +import java.util.Collections; +import java.util.ArrayList; + +/** + * @author Julien Viet + * @version $Revision: 630 $ + */ +public class EventControllerContextImpl implements EventControllerContext +{ + + /** . */ + private PortletInvoker invoker; + + public EventControllerContextImpl(PortletInvoker invoker) + { + this.invoker =3D invoker; + } + + public List getConsumedEvents(Event producedEvent) + { + try + { + ArrayList consumedEvents =3D new ArrayList(); + for (Portlet portlet : invoker.getPortlets()) + { + PortletInfo portletInfo =3D portlet.getInfo(); + if (portletInfo.getEventing().getConsumedEvents().containsKey(= producedEvent.getName())) + { + Event consumedEvent =3D new Event(producedEvent.getName(), = producedEvent.getPayload(), portlet.getContext().getId()); + consumedEvents.add(consumedEvent); + } + } + return consumedEvents; + } + catch (PortletInvokerException e) + { + System.out.println("e =3D " + e); + + // + return Collections.emptyList(); + } + } +} Copied: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/c= ontroller/impl/state/MutablePageNavigationalState.java (from rev 9779, modu= les/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller/Mu= tablePageNavigationalState.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/impl/state/MutablePageNavigationalState.java = (rev 0) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/impl/state/MutablePageNavigationalState.java 2008-02-05 17:17:28 UTC = (rev 9780) @@ -0,0 +1,60 @@ +/*************************************************************************= ***** + * 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.portlet.controller.impl.state; + +import org.jboss.portal.portlet.controller.state.WindowNavigationalState; + +import javax.xml.namespace.QName; + +/** + * @author Julien Viet + * @version $Revision: 1.1 $ + */ +class MutablePageNavigationalState extends PageNavigationalStateImpl +{ + + public MutablePageNavigationalState() + { + } + + public MutablePageNavigationalState(PageNavigationalStateImpl original) + { + super(original); + } + + public void setWindowNavigationalState(String windowId, WindowNavigatio= nalState windowNS) + { + windows.put(windowId, windowNS); + } + + public void setPublicNavigationalState(QName name, String[] value) + { + // We clone the value in order to keep the state not mutated by a si= de effect + page.put(name, value.clone()); + } + + public void removePublicNavigationalState(QName name) + { + page.remove(name); + } +} \ No newline at end of file Added: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/co= ntroller/impl/state/PageNavigationalStateImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/impl/state/PageNavigationalStateImpl.java (re= v 0) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/impl/state/PageNavigationalStateImpl.java 2008-02-05 17:17:28 UTC (re= v 9780) @@ -0,0 +1,115 @@ +/*************************************************************************= ***** + * 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.portlet.controller.impl.state; + +import org.jboss.portal.common.util.ParameterMap; +import org.jboss.portal.portlet.info.ParameterInfo; +import org.jboss.portal.portlet.info.PortletInfo; +import org.jboss.portal.portlet.controller.state.PageNavigationalState; +import org.jboss.portal.portlet.controller.state.WindowNavigationalState; + +import javax.xml.namespace.QName; +import java.util.Map; +import java.util.HashMap; +import java.util.zip.GZIPOutputStream; +import java.util.zip.GZIPInputStream; +import java.io.Serializable; +import java.io.ObjectOutputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.ByteArrayInputStream; +import java.io.ObjectInputStream; + +/** + * @author Julien Viet + * @version $Revision: 1.1 $ + */ +class PageNavigationalStateImpl implements PageNavigationalState, Serializ= able +{ + + /** . */ + protected final Map windows; + + /** . */ + protected final Map page; + + public PageNavigationalStateImpl() + { + this.windows =3D new HashMap(); + this.page =3D new HashMap(); + } + + public PageNavigationalStateImpl(PageNavigationalStateImpl original) + { + this.windows =3D new HashMap(origin= al.windows); + this.page =3D new HashMap(original.page); + } + + public WindowNavigationalState getWindowNavigationalState(String window= Id) + { + return windows.get(windowId); + } + + public ParameterMap getPublicNavigationalState(PortletInfo portlet) + { + ParameterMap publicNavigationalState =3D null; + for (ParameterInfo parameterInfo : portlet.getNavigation().getPublic= Parameters()) + { + String[] parameterValue =3D page.get(parameterInfo.getName()); + + // + if (parameterValue !=3D null) + { + String parameterId =3D parameterInfo.getId(); + + // Lazy create + if (publicNavigationalState =3D=3D null) + { + publicNavigationalState =3D new ParameterMap(); + } + + // We clone the value here so we keep the internal state not p= otentially changed + publicNavigationalState.put(parameterId, parameterValue.clone(= )); + } + } + + // + return publicNavigationalState; + } + + public void setWindowNavigationalState(String windowId, WindowNavigatio= nalState windowNS) throws UnsupportedOperationException + { + throw new UnsupportedOperationException(); + } + + public void setPublicNavigationalState(QName name, String[] value) thro= ws UnsupportedOperationException + { + throw new UnsupportedOperationException(); + } + + public void removePublicNavigationalState(QName name) throws Unsupporte= dOperationException + { + throw new UnsupportedOperationException(); + } + +} \ No newline at end of file Added: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/co= ntroller/impl/state/StateControllerContextImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/impl/state/StateControllerContextImpl.java (r= ev 0) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/impl/state/StateControllerContextImpl.java 2008-02-05 17:17:28 UTC (r= ev 9780) @@ -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.jboss.portal.portlet.controller.impl.state; + +import org.jboss.portal.portlet.controller.state.StateControllerContext; +import org.jboss.portal.portlet.controller.state.PageNavigationalState; + +import java.io.IOException; +import java.io.ByteArrayOutputStream; +import java.io.ObjectOutputStream; +import java.io.ByteArrayInputStream; +import java.io.ObjectInputStream; +import java.util.zip.GZIPOutputStream; +import java.util.zip.GZIPInputStream; + +/** + * @author Julien Viet + * @version $Revision: 630 $ + */ +public class StateControllerContextImpl implements StateControllerContext +{ + + public PageNavigationalState clonePageState(PageNavigationalState pageS= tate) + { + return new MutablePageNavigationalState((PageNavigationalStateImpl)p= ageState); + } + + public PageNavigationalState createPageState() + { + return new MutablePageNavigationalState(); + } + + public static byte[] serialize(PageNavigationalState object) throws IOE= xception + { + ByteArrayOutputStream baos =3D new ByteArrayOutputStream(); + GZIPOutputStream zos =3D new GZIPOutputStream(baos); + ObjectOutputStream oos =3D new ObjectOutputStream(zos); + oos.writeObject(object); + oos.close(); + return baos.toByteArray(); + } + + public static PageNavigationalState unserialize(byte[] bytes) throws IO= Exception, ClassNotFoundException + { + ByteArrayInputStream bais =3D new ByteArrayInputStream(bytes); + GZIPInputStream zis =3D new GZIPInputStream(bais); + ObjectInputStream ois =3D new ObjectInputStream(zis); + return (PageNavigationalState)ois.readObject(); + } +} Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet= /controller/request/PageScopedFullPortletResourceRequest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/request/PageScopedFullPortletResourceRequest.java 2008-02-05 16:07:25= UTC (rev 9779) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/request/PageScopedFullPortletResourceRequest.java 2008-02-05 17:17:28= UTC (rev 9780) @@ -23,8 +23,8 @@ package org.jboss.portal.portlet.controller.request; = import org.jboss.portal.portlet.StateString; -import org.jboss.portal.portlet.controller.WindowNavigationalState; -import org.jboss.portal.portlet.controller.PageNavigationalState; +import org.jboss.portal.portlet.controller.state.WindowNavigationalState; +import org.jboss.portal.portlet.controller.state.PageNavigationalState; import org.jboss.portal.portlet.controller.PortletControllerContext; import org.jboss.portal.common.util.ParameterMap; = Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet= /controller/request/PortletActionRequest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/request/PortletActionRequest.java 2008-02-05 16:07:25 UTC (rev 9779) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/request/PortletActionRequest.java 2008-02-05 17:17:28 UTC (rev 9780) @@ -23,9 +23,9 @@ package org.jboss.portal.portlet.controller.request; = import org.jboss.portal.portlet.StateString; -import org.jboss.portal.portlet.controller.WindowNavigationalState; +import org.jboss.portal.portlet.controller.state.WindowNavigationalState; import org.jboss.portal.portlet.controller.PortletControllerContext; -import org.jboss.portal.portlet.controller.PageNavigationalState; +import org.jboss.portal.portlet.controller.state.PageNavigationalState; import org.jboss.portal.common.util.ParameterMap; = /** Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet= /controller/request/PortletRenderRequest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/request/PortletRenderRequest.java 2008-02-05 16:07:25 UTC (rev 9779) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/request/PortletRenderRequest.java 2008-02-05 17:17:28 UTC (rev 9780) @@ -22,9 +22,9 @@ *************************************************************************= *****/ package org.jboss.portal.portlet.controller.request; = -import org.jboss.portal.portlet.controller.WindowNavigationalState; +import org.jboss.portal.portlet.controller.state.WindowNavigationalState; import org.jboss.portal.portlet.controller.PortletControllerContext; -import org.jboss.portal.portlet.controller.PageNavigationalState; +import org.jboss.portal.portlet.controller.state.PageNavigationalState; = import java.util.Map; = Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet= /controller/request/PortletRequest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/request/PortletRequest.java 2008-02-05 16:07:25 UTC (rev 9779) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/request/PortletRequest.java 2008-02-05 17:17:28 UTC (rev 9780) @@ -22,8 +22,8 @@ *************************************************************************= *****/ package org.jboss.portal.portlet.controller.request; = -import org.jboss.portal.portlet.controller.WindowNavigationalState; -import org.jboss.portal.portlet.controller.PageNavigationalState; +import org.jboss.portal.portlet.controller.state.WindowNavigationalState; +import org.jboss.portal.portlet.controller.state.PageNavigationalState; import org.jboss.portal.portlet.controller.PortletControllerContext; = /** Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet= /controller/request/PortletScopedPortletResourceRequest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/request/PortletScopedPortletResourceRequest.java 2008-02-05 16:07:25 = UTC (rev 9779) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/request/PortletScopedPortletResourceRequest.java 2008-02-05 17:17:28 = UTC (rev 9780) @@ -22,7 +22,7 @@ *************************************************************************= *****/ package org.jboss.portal.portlet.controller.request; = -import org.jboss.portal.portlet.controller.WindowNavigationalState; +import org.jboss.portal.portlet.controller.state.WindowNavigationalState; import org.jboss.portal.portlet.controller.PortletControllerContext; import org.jboss.portal.portlet.StateString; import org.jboss.portal.common.util.ParameterMap; Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet= /controller/response/PageUpdateResponse.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/response/PageUpdateResponse.java 2008-02-05 16:07:25 UTC (rev 9779) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/response/PageUpdateResponse.java 2008-02-05 17:17:28 UTC (rev 9780) @@ -24,7 +24,7 @@ = import org.jboss.portal.portlet.invocation.response.ResponseProperties; import org.jboss.portal.portlet.invocation.response.UpdateNavigationalStat= eResponse; -import org.jboss.portal.portlet.controller.PageNavigationalState; +import org.jboss.portal.portlet.controller.state.PageNavigationalState; = /** * @author Julien Viet Copied: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/c= ontroller/state/PageNavigationalState.java (from rev 9779, modules/portlet/= trunk/test/src/main/java/org/jboss/portal/portlet/controller/PageNavigation= alState.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/state/PageNavigationalState.java (rev 0) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/state/PageNavigationalState.java 2008-02-05 17:17:28 UTC (rev 9780) @@ -0,0 +1,46 @@ +/*************************************************************************= ***** + * 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.portlet.controller.state; + +import org.jboss.portal.common.util.ParameterMap; +import org.jboss.portal.portlet.info.PortletInfo; + +import javax.xml.namespace.QName; + +/** + * @author Julien Viet + * @version $Revision: 1.1 $ + */ +public interface PageNavigationalState +{ + + WindowNavigationalState getWindowNavigationalState(String windowId); + + ParameterMap getPublicNavigationalState(PortletInfo portlet); + + void setWindowNavigationalState(String windowId, WindowNavigationalStat= e windowNS) throws UnsupportedOperationException; + + void setPublicNavigationalState(QName name, String[] value) throws Unsu= pportedOperationException; + + void removePublicNavigationalState(QName name) throws UnsupportedOperat= ionException; +} Added: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/co= ntroller/state/StateControllerContext.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/state/StateControllerContext.java (rev 0) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/state/StateControllerContext.java 2008-02-05 17:17:28 UTC (rev 9780) @@ -0,0 +1,36 @@ +/*************************************************************************= ***** + * 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.portlet.controller.state; + +/** + * @author Julien Viet + * @version $Revision: 630 $ + */ +public interface StateControllerContext +{ + + PageNavigationalState clonePageState(PageNavigationalState pageState); + + PageNavigationalState createPageState(); + +} Copied: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/c= ontroller/state/WindowNavigationalState.java (from rev 9779, modules/portle= t/trunk/test/src/main/java/org/jboss/portal/portlet/controller/WindowNaviga= tionalState.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/state/WindowNavigationalState.java (rev 0) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/state/WindowNavigationalState.java 2008-02-05 17:17:28 UTC (rev 9780) @@ -0,0 +1,75 @@ +/*************************************************************************= ***** + * 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.portlet.controller.state; + +import org.jboss.portal.Mode; +import org.jboss.portal.WindowState; +import org.jboss.portal.portlet.StateString; + +import java.io.Serializable; + +/** + * @author Julien Viet + * @version $Revision: 1.1 $ + */ +public class WindowNavigationalState implements Serializable +{ + + /** . */ + private final StateString portletNavigationalState; + + /** . */ + private final Mode mode; + + /** . */ + private final WindowState windowState; + + public WindowNavigationalState() + { + this.portletNavigationalState =3D null; + this.mode =3D Mode.VIEW; + this.windowState =3D WindowState.NORMAL; + } + + public WindowNavigationalState(StateString portletNavigationalState, Mo= de mode, WindowState windowState) + { + this.portletNavigationalState =3D portletNavigationalState; + this.mode =3D mode; + this.windowState =3D windowState; + } + + public StateString getPortletNavigationalState() + { + return portletNavigationalState; + } + + public Mode getMode() + { + return mode; + } + + public WindowState getWindowState() + { + return windowState; + } +} Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet= /test/PortalServlet.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= PortalServlet.java 2008-02-05 16:07:25 UTC (rev 9779) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= PortalServlet.java 2008-02-05 17:17:28 UTC (rev 9780) @@ -25,7 +25,7 @@ import org.jboss.portal.portlet.controller.response.ControllerResponse; import org.jboss.portal.portlet.controller.PortletController; import org.jboss.portal.portlet.test.controller.PortletControllerContextIm= pl; -import org.jboss.portal.portlet.controller.PageNavigationalState; +import org.jboss.portal.portlet.controller.state.PageNavigationalState; import org.jboss.portal.portlet.test.controller.ControllerResponseRenderer= Factory; import org.jboss.portal.portlet.test.controller.Renderer; import org.jboss.portal.portlet.test.controller.PageRenderer; @@ -88,7 +88,7 @@ } else { - PageRenderer renderer =3D new PageRenderer(new ResponseProperties= (), new PageNavigationalState()); + PageRenderer renderer =3D new PageRenderer(new ResponseProperties= (), context.getStateControllerContext().createPageState()); = // renderer.render(context); Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet= /test/controller/PageRenderer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= controller/PageRenderer.java 2008-02-05 16:07:25 UTC (rev 9779) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= controller/PageRenderer.java 2008-02-05 17:17:28 UTC (rev 9780) @@ -42,8 +42,8 @@ import org.jboss.portal.portlet.invocation.response.FragmentResponse; import org.jboss.portal.portlet.invocation.response.PortletInvocationRespo= nse; import org.jboss.portal.portlet.invocation.response.ResponseProperties; -import org.jboss.portal.portlet.controller.WindowNavigationalState; -import org.jboss.portal.portlet.controller.PageNavigationalState; +import org.jboss.portal.portlet.controller.state.WindowNavigationalState; +import org.jboss.portal.portlet.controller.state.PageNavigationalState; import org.jboss.portal.portlet.controller.PortletControllerContext; import org.w3c.dom.Element; = Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet= /test/controller/PortletControllerContextImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= controller/PortletControllerContextImpl.java 2008-02-05 16:07:25 UTC (rev 9= 779) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= controller/PortletControllerContextImpl.java 2008-02-05 17:17:28 UTC (rev 9= 780) @@ -51,13 +51,13 @@ import org.jboss.portal.portlet.invocation.ResourceInvocation; import org.jboss.portal.portlet.invocation.response.PortletInvocationRespo= nse; import org.jboss.portal.portlet.test.StringCodec; -import org.jboss.portal.portlet.test.controller.TestInstanceContext; -import org.jboss.portal.portlet.test.controller.TestPortalContext; -import org.jboss.portal.portlet.test.controller.TestPortletInvocationConte= xt; import static org.jboss.portal.portlet.test.URLParameterConstants.*; -import org.jboss.portal.portlet.controller.WindowNavigationalState; +import org.jboss.portal.portlet.controller.state.WindowNavigationalState; import org.jboss.portal.portlet.controller.PortletControllerContext; -import org.jboss.portal.portlet.controller.PageNavigationalState; +import org.jboss.portal.portlet.controller.impl.state.StateControllerConte= xtImpl; +import org.jboss.portal.portlet.controller.impl.event.EventControllerConte= xtImpl; +import org.jboss.portal.portlet.controller.state.PageNavigationalState; +import org.jboss.portal.portlet.controller.state.StateControllerContext; import org.jboss.portal.portlet.controller.request.PortletRenderRequest; import org.jboss.portal.portlet.controller.request.ControllerRequest; import org.jboss.portal.portlet.controller.request.PortletScopedPortletRes= ourceRequest; @@ -65,7 +65,6 @@ import org.jboss.portal.portlet.controller.request.PageScopedFullPortletRe= sourceRequest; import org.jboss.portal.portlet.controller.request.PortletActionRequest; import org.jboss.portal.portlet.controller.event.EventControllerContext; -import org.jboss.portal.portlet.controller.event.EventControllerContextImp= l; import org.jboss.portal.web.Body; import org.jboss.portal.web.IllegalRequestException; import org.jboss.portal.web.WebRequest; @@ -113,6 +112,9 @@ /** . */ private final EventControllerContext eventControllerContext; = + /** . */ + private final StateControllerContext stateControllerContext; + public PortletControllerContextImpl( HttpServletRequest req, HttpServletResponse resp, @@ -142,7 +144,7 @@ if (context !=3D null) { byte[] bytes =3D Tools.fromHexString(context); - pageState =3D PageNavigationalState.unserialize(bytes); + pageState =3D StateControllerContextImpl.unserialize(bytes); } = // @@ -263,6 +265,7 @@ this.servletContext =3D servletContext; this.invoker =3D invoker; this.eventControllerContext =3D new EventControllerContextImpl(invok= er); + this.stateControllerContext =3D new StateControllerContextImpl(); } = public ControllerRequest getRequest() @@ -310,6 +313,11 @@ return eventControllerContext; } = + public StateControllerContext getStateControllerContext() + { + return stateControllerContext; + } + public String renderURL(String windowId, PageNavigationalState pageStat= e, ContainerURL containerURL, Boolean wantSecure, Boolean wantAuthenticated= , boolean relative) { PortletURLRenderer renderer =3D new PortletURLRenderer(pageState, wi= ndowId, req, resp); Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet= /test/controller/PortletURLRenderer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= controller/PortletURLRenderer.java 2008-02-05 16:07:25 UTC (rev 9779) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= controller/PortletURLRenderer.java 2008-02-05 17:17:28 UTC (rev 9780) @@ -34,7 +34,8 @@ import org.jboss.portal.portlet.StateString; import org.jboss.portal.portlet.cache.CacheLevel; import static org.jboss.portal.portlet.test.URLParameterConstants.*; -import org.jboss.portal.portlet.controller.PageNavigationalState; +import org.jboss.portal.portlet.controller.state.PageNavigationalState; +import org.jboss.portal.portlet.controller.impl.state.StateControllerConte= xtImpl; import org.jboss.portal.portlet.test.StringCodec; = import javax.servlet.http.HttpServletRequest; @@ -113,7 +114,7 @@ String pageState; try { - byte[] bytes =3D PageNavigationalState.serialize(pageNS); + byte[] bytes =3D StateControllerContextImpl.serialize(pageNS); pageState =3D Tools.toHexString(bytes); } catch (IOException e) Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet= /test/controller/TestPortletInvocationContext.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= controller/TestPortletInvocationContext.java 2008-02-05 16:07:25 UTC (rev 9= 779) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= controller/TestPortletInvocationContext.java 2008-02-05 17:17:28 UTC (rev 9= 780) @@ -23,7 +23,7 @@ package org.jboss.portal.portlet.test.controller; = import org.jboss.portal.portlet.ContainerURL; -import org.jboss.portal.portlet.controller.PageNavigationalState; +import org.jboss.portal.portlet.controller.state.PageNavigationalState; import org.jboss.portal.portlet.test.controller.PortletURLRenderer; import org.jboss.portal.portlet.invocation.PortletInvocation; import org.jboss.portal.portlet.impl.spi.AbstractPortletInvocationContext; Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/= SimplePortalServlet.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/Simple= PortalServlet.java 2008-02-05 16:07:25 UTC (rev 9779) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/Simple= PortalServlet.java 2008-02-05 17:17:28 UTC (rev 9780) @@ -23,7 +23,6 @@ package org.jboss.portal.simple; = import org.jboss.portal.portlet.invocation.response.ResponseProperties; -import org.jboss.portal.portlet.controller.PageNavigationalState; import org.jboss.portal.portlet.controller.PortletController; import org.jboss.portal.portlet.controller.response.ControllerResponse; import org.jboss.portal.portlet.test.controller.Renderer; @@ -88,7 +87,7 @@ } else { - PageRenderer renderer =3D new PageRenderer(new ResponseProperties= (), new PageNavigationalState()); + PageRenderer renderer =3D new PageRenderer(new ResponseProperties= (), context.getStateControllerContext().createPageState()); = // renderer.render(context); --===============4356270173936299713==-- From portal-commits at lists.jboss.org Tue Feb 5 12:52:30 2008 Content-Type: multipart/mixed; boundary="===============8697208062368157694==" MIME-Version: 1.0 From: portal-commits at lists.jboss.org To: portal-commits at lists.jboss.org Subject: [portal-commits] JBoss Portal SVN: r9781 - in modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet: controller/event and 3 other directories. Date: Tue, 05 Feb 2008 12:52:29 -0500 Message-ID: --===============8697208062368157694== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: julien(a)jboss.com Date: 2008-02-05 12:52:29 -0500 (Tue, 05 Feb 2008) New Revision: 9781 Removed: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contro= ller/MutablePageNavigationalState.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contro= ller/event/EventControllerContextImpl.java Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contro= ller/PortletRequestHandler.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contro= ller/PortletResourceRequestHandler.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contro= ller/impl/state/MutablePageNavigationalState.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contro= ller/impl/state/PageNavigationalStateImpl.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contro= ller/impl/state/StateControllerContextImpl.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contro= ller/state/PageNavigationalState.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/c= ontroller/PageRenderer.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/c= ontroller/PortletControllerContextImpl.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/c= ontroller/PortletURLRenderer.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/c= ontroller/TestPortletInvocationContext.java Log: use window id in PageNavigationalState instead of "Portlet" for the public = render parameter retrieval Deleted: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/= controller/MutablePageNavigationalState.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/MutablePageNavigationalState.java 2008-02-05 17:17:28 UTC (rev 9780) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/MutablePageNavigationalState.java 2008-02-05 17:52:29 UTC (rev 9781) @@ -1,60 +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.portlet.controller; - -import org.jboss.portal.portlet.controller.WindowNavigationalState; - -import javax.xml.namespace.QName; - -/** - * @author Julien Viet - * @version $Revision: 1.1 $ - */ -public class MutablePageNavigationalState extends PageNavigationalState -{ - - public MutablePageNavigationalState() - { - } - - public MutablePageNavigationalState(PageNavigationalState original) - { - super(original); - } - - public void setWindowNavigationalState(String windowId, WindowNavigatio= nalState windowNS) - { - windows.put(windowId, windowNS); - } - - public void setPublicNavigationalState(QName name, String[] value) - { - // We clone the value in order to keep the state not mutated by a si= de effect - page.put(name, value.clone()); - } - - public void removePublicNavigationalState(QName name) - { - page.remove(name); - } -} \ No newline at end of file Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet= /controller/PortletRequestHandler.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/PortletRequestHandler.java 2008-02-05 17:17:28 UTC (rev 9780) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/PortletRequestHandler.java 2008-02-05 17:52:29 UTC (rev 9781) @@ -206,7 +206,7 @@ } = // - ParameterMap publicNS =3D pageState.getPublicNavigationalState(po= rtlet); + ParameterMap publicNS =3D pageState.getPublicNavigationalState(po= rtletRequest.getWindowId()); PortletInvocationContext portletInvocationContext =3D context.cre= atePortletInvocationContext(portletRequest.getWindowId(), pageState); ActionInvocation actionInvocation =3D new ActionInvocation(portle= tInvocationContext); = @@ -239,7 +239,7 @@ } = // - ParameterMap publicNS =3D pageState.getPublicNavigationalState(portl= et); + ParameterMap publicNS =3D pageState.getPublicNavigationalState(event= .getWindowId()); = // PortletInvocationContext portletInvocationContext =3D context.create= PortletInvocationContext(event.getWindowId(), pageState); Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet= /controller/PortletResourceRequestHandler.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/PortletResourceRequestHandler.java 2008-02-05 17:17:28 UTC (rev 9780) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/PortletResourceRequestHandler.java 2008-02-05 17:52:29 UTC (rev 9781) @@ -95,7 +95,7 @@ // if (pageState !=3D null) { - publicNS =3D pageState.getPublicNavigationalState(portlet); + publicNS =3D pageState.getPublicNavigationalState(portletRe= sourceRequest.getWindowId()); } } else Deleted: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/= controller/event/EventControllerContextImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/event/EventControllerContextImpl.java 2008-02-05 17:17:28 UTC (rev 97= 80) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/event/EventControllerContextImpl.java 2008-02-05 17:52:29 UTC (rev 97= 81) @@ -1,73 +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.portlet.controller.event; - -import org.jboss.portal.portlet.PortletInvoker; -import org.jboss.portal.portlet.Portlet; -import org.jboss.portal.portlet.PortletInvokerException; -import org.jboss.portal.portlet.info.PortletInfo; - -import java.util.List; -import java.util.Collections; -import java.util.ArrayList; - -/** - * @author Julien Viet - * @version $Revision: 630 $ - */ -public class EventControllerContextImpl implements EventControllerContext -{ - - /** . */ - private PortletInvoker invoker; - - public EventControllerContextImpl(PortletInvoker invoker) - { - this.invoker =3D invoker; - } - - public List getConsumedEvents(Event producedEvent) - { - try - { - ArrayList consumedEvents =3D new ArrayList(); - for (Portlet portlet : invoker.getPortlets()) - { - PortletInfo portletInfo =3D portlet.getInfo(); - if (portletInfo.getEventing().getConsumedEvents().containsKey(= producedEvent.getName())) - { - Event consumedEvent =3D new Event(producedEvent.getName(), = producedEvent.getPayload(), portlet.getContext().getId()); - consumedEvents.add(consumedEvent); - } - } - return consumedEvents; - } - catch (PortletInvokerException e) - { - System.out.println("e =3D " + e); - - // - return Collections.emptyList(); - } - } -} Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet= /controller/impl/state/MutablePageNavigationalState.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/impl/state/MutablePageNavigationalState.java 2008-02-05 17:17:28 UTC = (rev 9780) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/impl/state/MutablePageNavigationalState.java 2008-02-05 17:52:29 UTC = (rev 9781) @@ -33,8 +33,9 @@ class MutablePageNavigationalState extends PageNavigationalStateImpl { = - public MutablePageNavigationalState() + MutablePageNavigationalState(StateControllerContextImpl context) { + super(context); } = public MutablePageNavigationalState(PageNavigationalStateImpl original) Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet= /controller/impl/state/PageNavigationalStateImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/impl/state/PageNavigationalStateImpl.java 2008-02-05 17:17:28 UTC (re= v 9780) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/impl/state/PageNavigationalStateImpl.java 2008-02-05 17:52:29 UTC (re= v 9781) @@ -27,18 +27,12 @@ import org.jboss.portal.portlet.info.PortletInfo; import org.jboss.portal.portlet.controller.state.PageNavigationalState; import org.jboss.portal.portlet.controller.state.WindowNavigationalState; +import org.jboss.portal.portlet.PortletInvokerException; = import javax.xml.namespace.QName; import java.util.Map; import java.util.HashMap; -import java.util.zip.GZIPOutputStream; -import java.util.zip.GZIPInputStream; import java.io.Serializable; -import java.io.ObjectOutputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.ByteArrayInputStream; -import java.io.ObjectInputStream; = /** * @author Julien Viet @@ -47,20 +41,25 @@ class PageNavigationalStateImpl implements PageNavigationalState, Serializ= able { = + /** We don't save it. */ + protected transient StateControllerContextImpl context; + /** . */ protected final Map windows; = /** . */ protected final Map page; = - public PageNavigationalStateImpl() + public PageNavigationalStateImpl(StateControllerContextImpl context) { + this.context =3D context; this.windows =3D new HashMap(); this.page =3D new HashMap(); } = public PageNavigationalStateImpl(PageNavigationalStateImpl original) { + this.context =3D original.context; this.windows =3D new HashMap(origin= al.windows); this.page =3D new HashMap(original.page); } @@ -70,28 +69,36 @@ return windows.get(windowId); } = - public ParameterMap getPublicNavigationalState(PortletInfo portlet) + public ParameterMap getPublicNavigationalState(String windowId) { ParameterMap publicNavigationalState =3D null; - for (ParameterInfo parameterInfo : portlet.getNavigation().getPublic= Parameters()) + try { - String[] parameterValue =3D page.get(parameterInfo.getName()); - - // - if (parameterValue !=3D null) + PortletInfo info =3D context.portletControllerContext.getPortletI= nfo(windowId); + for (ParameterInfo parameterInfo : info.getNavigation().getPublic= Parameters()) { - String parameterId =3D parameterInfo.getId(); + String[] parameterValue =3D page.get(parameterInfo.getName()); = - // Lazy create - if (publicNavigationalState =3D=3D null) + // + if (parameterValue !=3D null) { - publicNavigationalState =3D new ParameterMap(); + String parameterId =3D parameterInfo.getId(); + + // Lazy create + if (publicNavigationalState =3D=3D null) + { + publicNavigationalState =3D new ParameterMap(); + } + + // We clone the value here so we keep the internal state no= t potentially changed + publicNavigationalState.put(parameterId, parameterValue.clo= ne()); } - - // We clone the value here so we keep the internal state not p= otentially changed - publicNavigationalState.put(parameterId, parameterValue.clone(= )); } } + catch (PortletInvokerException e) + { + e.printStackTrace(); + } = // return publicNavigationalState; Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet= /controller/impl/state/StateControllerContextImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/impl/state/StateControllerContextImpl.java 2008-02-05 17:17:28 UTC (r= ev 9780) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/impl/state/StateControllerContextImpl.java 2008-02-05 17:52:29 UTC (r= ev 9781) @@ -24,6 +24,7 @@ = import org.jboss.portal.portlet.controller.state.StateControllerContext; import org.jboss.portal.portlet.controller.state.PageNavigationalState; +import org.jboss.portal.portlet.controller.PortletControllerContext; = import java.io.IOException; import java.io.ByteArrayOutputStream; @@ -40,6 +41,14 @@ public class StateControllerContextImpl implements StateControllerContext { = + /** . */ + protected final PortletControllerContext portletControllerContext; + + public StateControllerContextImpl(PortletControllerContext portletContr= ollerContext) + { + this.portletControllerContext =3D portletControllerContext; + } + public PageNavigationalState clonePageState(PageNavigationalState pageS= tate) { return new MutablePageNavigationalState((PageNavigationalStateImpl)p= ageState); @@ -47,10 +56,10 @@ = public PageNavigationalState createPageState() { - return new MutablePageNavigationalState(); + return new MutablePageNavigationalState(this); } = - public static byte[] serialize(PageNavigationalState object) throws IOE= xception + public byte[] serialize(PageNavigationalState object) throws IOException { ByteArrayOutputStream baos =3D new ByteArrayOutputStream(); GZIPOutputStream zos =3D new GZIPOutputStream(baos); @@ -60,11 +69,13 @@ return baos.toByteArray(); } = - public static PageNavigationalState unserialize(byte[] bytes) throws IO= Exception, ClassNotFoundException + public PageNavigationalState unserialize(byte[] bytes) throws IOExcepti= on, ClassNotFoundException { ByteArrayInputStream bais =3D new ByteArrayInputStream(bytes); GZIPInputStream zis =3D new GZIPInputStream(bais); ObjectInputStream ois =3D new ObjectInputStream(zis); - return (PageNavigationalState)ois.readObject(); + PageNavigationalStateImpl state =3D (PageNavigationalStateImpl)ois.r= eadObject(); + state.context =3D this; + return state; } } Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet= /controller/state/PageNavigationalState.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/state/PageNavigationalState.java 2008-02-05 17:17:28 UTC (rev 9780) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/state/PageNavigationalState.java 2008-02-05 17:52:29 UTC (rev 9781) @@ -36,7 +36,7 @@ = WindowNavigationalState getWindowNavigationalState(String windowId); = - ParameterMap getPublicNavigationalState(PortletInfo portlet); + ParameterMap getPublicNavigationalState(String windowId); = void setWindowNavigationalState(String windowId, WindowNavigationalStat= e windowNS) throws UnsupportedOperationException; = Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet= /test/controller/PageRenderer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= controller/PageRenderer.java 2008-02-05 17:17:28 UTC (rev 9780) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= controller/PageRenderer.java 2008-02-05 17:52:29 UTC (rev 9781) @@ -169,7 +169,7 @@ } = // - ParameterMap publicNS =3D pageState.getPublicNavigationalState= (portlet.getInfo()); + ParameterMap publicNS =3D pageState.getPublicNavigationalState= (portlet.getContext().getId()); = RenderInvocation render =3D createRenderInvocation(context, pr= operties, pageState, portlet, windowNS, mode, windowState, portletNS, publi= cNS); = Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet= /test/controller/PortletControllerContextImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= controller/PortletControllerContextImpl.java 2008-02-05 17:17:28 UTC (rev 9= 780) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= controller/PortletControllerContextImpl.java 2008-02-05 17:52:29 UTC (rev 9= 781) @@ -113,7 +113,7 @@ private final EventControllerContext eventControllerContext; = /** . */ - private final StateControllerContext stateControllerContext; + private final StateControllerContextImpl stateControllerContext; = public PortletControllerContextImpl( HttpServletRequest req, @@ -123,6 +123,9 @@ { PortletInvoker invoker =3D (PortletInvoker)servletContext.getAttribu= te("ConsumerPortletInvoker"); = + // + StateControllerContextImpl tmp =3D new StateControllerContextImpl(th= is); + // The nav state provided with the request PageNavigationalState pageState =3D null; = @@ -144,7 +147,7 @@ if (context !=3D null) { byte[] bytes =3D Tools.fromHexString(context); - pageState =3D StateControllerContextImpl.unserialize(bytes); + pageState =3D tmp.unserialize(bytes); } = // @@ -265,7 +268,7 @@ this.servletContext =3D servletContext; this.invoker =3D invoker; this.eventControllerContext =3D new EventControllerContextImpl(invok= er); - this.stateControllerContext =3D new StateControllerContextImpl(); + this.stateControllerContext =3D tmp; } = public ControllerRequest getRequest() @@ -320,7 +323,7 @@ = public String renderURL(String windowId, PageNavigationalState pageStat= e, ContainerURL containerURL, Boolean wantSecure, Boolean wantAuthenticated= , boolean relative) { - PortletURLRenderer renderer =3D new PortletURLRenderer(pageState, wi= ndowId, req, resp); + PortletURLRenderer renderer =3D new PortletURLRenderer(stateControll= erContext, pageState, windowId, req, resp); = // return renderer.renderURL(containerURL, wantSecure, wantAuthenticate= d, relative); @@ -385,6 +388,6 @@ = public PortletInvocationContext createPortletInvocationContext(String w= indowId, PageNavigationalState pageState) { - return new TestPortletInvocationContext(req, resp, windowId, pageSta= te, MARKUP_INFO); + return new TestPortletInvocationContext(stateControllerContext, req,= resp, windowId, pageState, MARKUP_INFO); } } Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet= /test/controller/PortletURLRenderer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= controller/PortletURLRenderer.java 2008-02-05 17:17:28 UTC (rev 9780) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= controller/PortletURLRenderer.java 2008-02-05 17:52:29 UTC (rev 9781) @@ -52,6 +52,9 @@ { = /** . */ + final StateControllerContextImpl stateContext; + + /** . */ final String windowId; = /** . */ @@ -64,11 +67,13 @@ final PageNavigationalState pageNS; = public PortletURLRenderer( + StateControllerContextImpl stateContext, = PageNavigationalState pageNS, String windowId, HttpServletRequest clientReq, HttpServletResponse clientResp) { + this.stateContext =3D stateContext; this.pageNS =3D pageNS; this.windowId =3D windowId; this.clientReq =3D clientReq; @@ -114,7 +119,7 @@ String pageState; try { - byte[] bytes =3D StateControllerContextImpl.serialize(pageNS); + byte[] bytes =3D stateContext.serialize(pageNS); pageState =3D Tools.toHexString(bytes); } catch (IOException e) Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet= /test/controller/TestPortletInvocationContext.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= controller/TestPortletInvocationContext.java 2008-02-05 17:17:28 UTC (rev 9= 780) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= controller/TestPortletInvocationContext.java 2008-02-05 17:52:29 UTC (rev 9= 781) @@ -24,6 +24,7 @@ = import org.jboss.portal.portlet.ContainerURL; import org.jboss.portal.portlet.controller.state.PageNavigationalState; +import org.jboss.portal.portlet.controller.impl.state.StateControllerConte= xtImpl; import org.jboss.portal.portlet.test.controller.PortletURLRenderer; import org.jboss.portal.portlet.invocation.PortletInvocation; import org.jboss.portal.portlet.impl.spi.AbstractPortletInvocationContext; @@ -42,6 +43,9 @@ { = /** . */ + private final StateControllerContextImpl stateContext; + + /** . */ private final PortletURLRenderer urlRenderer; = /** . */ @@ -57,6 +61,7 @@ private final HttpServletResponse clientResponse; = public TestPortletInvocationContext( + StateControllerContextImpl stateContext, HttpServletRequest clientRequest, HttpServletResponse clientResponse, String windowId, @@ -66,11 +71,12 @@ super(markupInfo); = // + this.stateContext =3D stateContext; this.clientRequest =3D clientRequest; this.clientResponse =3D clientResponse; this.windowId =3D windowId; this.pageState =3D pageState; - this.urlRenderer =3D new PortletURLRenderer(pageState, windowId, cli= entRequest, clientResponse); + this.urlRenderer =3D new PortletURLRenderer(stateContext, pageState,= windowId, clientRequest, clientResponse); = // addResolver(PortletInvocation.PRINCIPAL_SCOPE, new PrincipalAttribut= eResolver(clientRequest)); --===============8697208062368157694==-- From portal-commits at lists.jboss.org Tue Feb 5 13:14:57 2008 Content-Type: multipart/mixed; boundary="===============1485491594212967629==" MIME-Version: 1.0 From: portal-commits at lists.jboss.org To: portal-commits at lists.jboss.org Subject: [portal-commits] JBoss Portal SVN: r9782 - in modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller: impl/state and 1 other directories. Date: Tue, 05 Feb 2008 13:14:57 -0500 Message-ID: --===============1485491594212967629== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: julien(a)jboss.com Date: 2008-02-05 13:14:56 -0500 (Tue, 05 Feb 2008) New Revision: 9782 Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contro= ller/PortletRequestHandler.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contro= ller/impl/state/MutablePageNavigationalState.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contro= ller/impl/state/PageNavigationalStateImpl.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contro= ller/state/PageNavigationalState.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contro= ller/state/StateControllerContext.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contro= ller/state/WindowNavigationalState.java Log: - now delegates the update of public nav state of a window to the context b= ecause it can have several interpretations/implementations Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet= /controller/PortletRequestHandler.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/PortletRequestHandler.java 2008-02-05 17:52:29 UTC (rev 9781) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/PortletRequestHandler.java 2008-02-05 18:14:56 UTC (rev 9782) @@ -10,8 +10,6 @@ import org.jboss.portal.portlet.PortletInvokerException; import org.jboss.portal.portlet.StateString; import org.jboss.portal.portlet.spi.PortletInvocationContext; -import org.jboss.portal.portlet.info.NavigationInfo; -import org.jboss.portal.portlet.info.ParameterInfo; import org.jboss.portal.portlet.info.PortletInfo; import org.jboss.portal.portlet.invocation.ActionInvocation; import org.jboss.portal.portlet.invocation.EventInvocation; @@ -35,7 +33,6 @@ import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.xml.namespace.QName; import java.io.IOException; import java.util.LinkedList; import java.util.List; @@ -298,27 +295,7 @@ Map publicNS =3D update.getPublicNavigationalState= Updates(); if (publicNS !=3D null) { - NavigationInfo navigationInfo =3D portlet.getNavigation(); - for (Map.Entry entry : publicNS.entrySet()) - { - String id =3D entry.getKey(); - ParameterInfo parameterInfo =3D navigationInfo.getPublicParame= ter(id); - - // - if (parameterInfo !=3D null) - { - QName name =3D parameterInfo.getName(); - String[] value =3D entry.getValue(); - if (value.length > 0) - { - pageState.setPublicNavigationalState(name, value); - } - else - { - pageState.removePublicNavigationalState(name); - } - } - } + pageState.setPublicNavigationalState(windowId, publicNS); } } } Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet= /controller/impl/state/MutablePageNavigationalState.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/impl/state/MutablePageNavigationalState.java 2008-02-05 17:52:29 UTC = (rev 9781) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/impl/state/MutablePageNavigationalState.java 2008-02-05 18:14:56 UTC = (rev 9782) @@ -23,8 +23,13 @@ package org.jboss.portal.portlet.controller.impl.state; = import org.jboss.portal.portlet.controller.state.WindowNavigationalState; +import org.jboss.portal.portlet.info.NavigationInfo; +import org.jboss.portal.portlet.info.ParameterInfo; +import org.jboss.portal.portlet.info.PortletInfo; +import org.jboss.portal.portlet.PortletInvokerException; = import javax.xml.namespace.QName; +import java.util.Map; = /** * @author Julien Viet @@ -43,11 +48,47 @@ super(original); } = - public void setWindowNavigationalState(String windowId, WindowNavigatio= nalState windowNS) + public void setWindowNavigationalState(String windowId, WindowNavigatio= nalState windowState) { - windows.put(windowId, windowNS); + windows.put(windowId, windowState); } = + public void setPublicNavigationalState(String windowId, Map update) + { + try + { + PortletInfo info =3D context.portletControllerContext.getPortletI= nfo(windowId); + + NavigationInfo navigationInfo =3D info.getNavigation(); + for (Map.Entry entry : update.entrySet()) + { + String id =3D entry.getKey(); + + // + ParameterInfo parameterInfo =3D navigationInfo.getPublicParame= ter(id); + + // + if (parameterInfo !=3D null) + { + QName name =3D parameterInfo.getName(); + String[] value =3D entry.getValue(); + if (value.length > 0) + { + setPublicNavigationalState(name, value); + } + else + { + removePublicNavigationalState(name); + } + } + } + } + catch (PortletInvokerException e) + { + e.printStackTrace(); + } + } + public void setPublicNavigationalState(QName name, String[] value) { // We clone the value in order to keep the state not mutated by a si= de effect Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet= /controller/impl/state/PageNavigationalStateImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/impl/state/PageNavigationalStateImpl.java 2008-02-05 17:52:29 UTC (re= v 9781) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/impl/state/PageNavigationalStateImpl.java 2008-02-05 18:14:56 UTC (re= v 9782) @@ -104,11 +104,16 @@ return publicNavigationalState; } = - public void setWindowNavigationalState(String windowId, WindowNavigatio= nalState windowNS) throws UnsupportedOperationException + public void setWindowNavigationalState(String windowId, WindowNavigatio= nalState windowState) throws UnsupportedOperationException { throw new UnsupportedOperationException(); } = + public void setPublicNavigationalState(String windowId, Map update) + { + throw new UnsupportedOperationException(); + } + public void setPublicNavigationalState(QName name, String[] value) thro= ws UnsupportedOperationException { throw new UnsupportedOperationException(); Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet= /controller/state/PageNavigationalState.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/state/PageNavigationalState.java 2008-02-05 17:52:29 UTC (rev 9781) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/state/PageNavigationalState.java 2008-02-05 18:14:56 UTC (rev 9782) @@ -23,24 +23,55 @@ package org.jboss.portal.portlet.controller.state; = import org.jboss.portal.common.util.ParameterMap; -import org.jboss.portal.portlet.info.PortletInfo; = -import javax.xml.namespace.QName; +import java.util.Map; = /** + * Defines the page navigational state that the controller needs. + * * @author Julien Viet * @version $Revision: 1.1 $ */ public interface PageNavigationalState { = + /** + * Returns the navigational state of a window or null if it does not ex= ist. + * + * @param windowId the window + * @return the window navigational state + */ WindowNavigationalState getWindowNavigationalState(String windowId); = + /** + * Update the navigational state of a window. + * + * @param windowId the window id + * @param windowState the window state + * @throws UnsupportedOperationException if the page state is read only + */ + void setWindowNavigationalState(String windowId, WindowNavigationalStat= e windowState) throws UnsupportedOperationException; + + /** + * Obtain the public navigational state of a window. The interpretation= of what should + * be retrieved is left up to the implementor. An example of implementa= tion would use the mapping + * between qnames and name provided by the referenced portlet info. + * + * @param windowId the window id + * @return the public navigational state + */ ParameterMap getPublicNavigationalState(String windowId); = - void setWindowNavigationalState(String windowId, WindowNavigationalStat= e windowNS) throws UnsupportedOperationException; - - void setPublicNavigationalState(QName name, String[] value) throws Unsu= pportedOperationException; - - void removePublicNavigationalState(QName name) throws UnsupportedOperat= ionException; + /** + * Update the public navigational state of a window. The interpretation= of what should be updated + * is left up to the implementor. An example of implementation would us= e the mapping + * between qname and name provided by the referenced portlet info. + * + * The update argument values with a length of zero should be treated a= s removals. + * + * @param windowId the window id + * @param update the updates + * @throws UnsupportedOperationException if the page state is read only + */ + void setPublicNavigationalState(String windowId, Map = update) throws UnsupportedOperationException; } Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet= /controller/state/StateControllerContext.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/state/StateControllerContext.java 2008-02-05 17:52:29 UTC (rev 9781) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/state/StateControllerContext.java 2008-02-05 18:14:56 UTC (rev 9782) @@ -23,14 +23,27 @@ package org.jboss.portal.portlet.controller.state; = /** + * The context used by the controller to manage state. + * * @author Julien Viet * @version $Revision: 630 $ */ public interface StateControllerContext { = + /** + * Clone an existing page state object. + * + * @param pageState the page state to clone + * @return the page state clone + */ PageNavigationalState clonePageState(PageNavigationalState pageState); = + /** + * Create a new page state object. + * + * @return the new page state + */ PageNavigationalState createPageState(); = } Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet= /controller/state/WindowNavigationalState.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/state/WindowNavigationalState.java 2008-02-05 17:52:29 UTC (rev 9781) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/state/WindowNavigationalState.java 2008-02-05 18:14:56 UTC (rev 9782) @@ -29,6 +29,8 @@ import java.io.Serializable; = /** + * The navigational state of a window that contains the portlet navigation= al state, the mode and window state. + * * @author Julien Viet * @version $Revision: 1.1 $ */ --===============1485491594212967629==-- From portal-commits at lists.jboss.org Tue Feb 5 13:17:47 2008 Content-Type: multipart/mixed; boundary="===============5061199952487462210==" MIME-Version: 1.0 From: portal-commits at lists.jboss.org To: portal-commits at lists.jboss.org Subject: [portal-commits] JBoss Portal SVN: r9783 - modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller. Date: Tue, 05 Feb 2008 13:17:46 -0500 Message-ID: --===============5061199952487462210== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: julien(a)jboss.com Date: 2008-02-05 13:17:46 -0500 (Tue, 05 Feb 2008) New Revision: 9783 Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contro= ller/PortletRequestHandler.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contro= ller/PortletResourceRequestHandler.java Log: remove a bit of non used code Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet= /controller/PortletRequestHandler.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/PortletRequestHandler.java 2008-02-05 18:14:56 UTC (rev 9782) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/PortletRequestHandler.java 2008-02-05 18:17:46 UTC (rev 9783) @@ -10,7 +10,6 @@ import org.jboss.portal.portlet.PortletInvokerException; import org.jboss.portal.portlet.StateString; import org.jboss.portal.portlet.spi.PortletInvocationContext; -import org.jboss.portal.portlet.info.PortletInfo; import org.jboss.portal.portlet.invocation.ActionInvocation; import org.jboss.portal.portlet.invocation.EventInvocation; import org.jboss.portal.portlet.invocation.response.ErrorResponse; @@ -31,8 +30,6 @@ import org.jboss.portal.portlet.controller.state.StateControllerContext; = import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.LinkedList; import java.util.List; @@ -162,9 +159,6 @@ PortletInvocationResponse invoke(PortletRequest portletRequest) throws = PortletInvokerException { PortletControllerContext context =3D portletRequest.getControllerCon= text(); - PortletInfo portlet =3D context.getPortletInfo(portletRequest.getWin= dowId()); - HttpServletRequest req =3D context.getClientRequest(); - HttpServletResponse resp =3D context.getClientResponse(); = // if (portletRequest instanceof PortletRenderRequest) @@ -224,9 +218,6 @@ PageNavigationalState pa= geState, List requestCookies) throws PortletInvokerException { - PortletInfo portlet =3D context.getPortletInfo(event.getWindowId()); - HttpServletRequest req =3D context.getClientRequest(); - HttpServletResponse resp =3D context.getClientResponse(); WindowNavigationalState windowNS =3D pageState.getWindowNavigational= State(event.getWindowId()); = // @@ -261,9 +252,6 @@ PageNavigationalState pageState) throws PortletInvokerException { - PortletInfo portlet =3D context.getPortletInfo(windowId); - - // WindowNavigationalState windowNS =3D pageState.getWindowNavigational= State(windowId); = // Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet= /controller/PortletResourceRequestHandler.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/PortletResourceRequestHandler.java 2008-02-05 18:14:56 UTC (rev 9782) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/PortletResourceRequestHandler.java 2008-02-05 18:17:46 UTC (rev 9783) @@ -29,7 +29,6 @@ import org.jboss.portal.portlet.PortletInvokerException; import org.jboss.portal.portlet.StateString; import org.jboss.portal.portlet.spi.PortletInvocationContext; -import org.jboss.portal.portlet.info.PortletInfo; import org.jboss.portal.portlet.cache.CacheLevel; import org.jboss.portal.portlet.invocation.ResourceInvocation; import org.jboss.portal.portlet.invocation.response.PortletInvocationRespo= nse; @@ -41,8 +40,6 @@ import org.jboss.portal.portlet.controller.response.ResourceResponse; import org.jboss.portal.portlet.controller.state.PageNavigationalState; = -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import java.io.IOException; = /** @@ -73,9 +70,6 @@ CacheLevel cacheability; = PortletControllerContext context =3D portletResourceRequest.getContr= ollerContext(); - PortletInfo portlet =3D context.getPortletInfo(portletResourceReques= t.getWindowId()); - HttpServletRequest req =3D context.getClientRequest(); - HttpServletResponse resp =3D context.getClientResponse(); = // if (portletResourceRequest instanceof PortletScopedPortletResourceRe= quest) --===============5061199952487462210==-- From portal-commits at lists.jboss.org Tue Feb 5 13:18:57 2008 Content-Type: multipart/mixed; boundary="===============4510084317471289558==" MIME-Version: 1.0 From: portal-commits at lists.jboss.org To: portal-commits at lists.jboss.org Subject: [portal-commits] JBoss Portal SVN: r9784 - modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/controller. Date: Tue, 05 Feb 2008 13:18:56 -0500 Message-ID: --===============4510084317471289558== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: julien(a)jboss.com Date: 2008-02-05 13:18:56 -0500 (Tue, 05 Feb 2008) New Revision: 9784 Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contro= ller/PortletController.java Log: removed a done todo Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet= /controller/PortletController.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/PortletController.java 2008-02-05 18:17:46 UTC (rev 9783) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/PortletController.java 2008-02-05 18:18:56 UTC (rev 9784) @@ -41,8 +41,6 @@ * - produce new events (what exists today) * - make it a portal event which delivers the event to the portal * - * 3/ delegate public render parameter wiring to the context - * * @author Julien Viet * @version $Revision: 1.1 $ */ --===============4510084317471289558==-- From portal-commits at lists.jboss.org Tue Feb 5 16:10:46 2008 Content-Type: multipart/mixed; boundary="===============3862077992483343216==" MIME-Version: 1.0 From: portal-commits at lists.jboss.org To: portal-commits at lists.jboss.org Subject: [portal-commits] JBoss Portal SVN: r9785 - modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller. Date: Tue, 05 Feb 2008 16:10:46 -0500 Message-ID: --===============3862077992483343216== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: chris.laprun(a)jboss.com Date: 2008-02-05 16:10:46 -0500 (Tue, 05 Feb 2008) New Revision: 9785 Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/c= ontroller/SimpleFragmentRenderer.java Log: - Fixed incorrect implementation of renderError Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet= /test/controller/SimpleFragmentRenderer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= controller/SimpleFragmentRenderer.java 2008-02-05 18:18:56 UTC (rev 9784) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= controller/SimpleFragmentRenderer.java 2008-02-05 21:10:46 UTC (rev 9785) @@ -62,7 +62,7 @@ public String renderError(ErrorResponse error) { String html =3D error.toHTML(); - StringBuilder builder =3D new StringBuilder(html + 50); + StringBuilder builder =3D new StringBuilder(html.length() + 50); builder.append("

").append(html).append("

"= ); return builder.toString(); } --===============3862077992483343216==-- From portal-commits at lists.jboss.org Tue Feb 5 16:52:39 2008 Content-Type: multipart/mixed; boundary="===============4406566152794816775==" MIME-Version: 1.0 From: portal-commits at lists.jboss.org To: portal-commits at lists.jboss.org Subject: [portal-commits] JBoss Portal SVN: r9786 - in modules/portlet/trunk/test/src: test and 5 other directories. Date: Tue, 05 Feb 2008 16:52:39 -0500 Message-ID: --===============4406566152794816775== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: chris.laprun(a)jboss.com Date: 2008-02-05 16:52:39 -0500 (Tue, 05 Feb 2008) New Revision: 9786 Added: modules/portlet/trunk/test/src/test/resources/google-map-portlet-war/ modules/portlet/trunk/test/src/test/resources/google-map-portlet-war/WEB= -INF/ modules/portlet/trunk/test/src/test/resources/google-map-portlet-war/WEB= -INF/portlet.xml modules/portlet/trunk/test/src/test/resources/google-map-portlet-war/WEB= -INF/web.xml modules/portlet/trunk/test/src/test/resources/google-weather-portlet-war/ modules/portlet/trunk/test/src/test/resources/google-weather-portlet-war= /WEB-INF/ modules/portlet/trunk/test/src/test/resources/google-weather-portlet-war= /WEB-INF/portlet.xml modules/portlet/trunk/test/src/test/resources/google-weather-portlet-war= /WEB-INF/web.xml Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/samples= /GoogleClippingPortlet.java modules/portlet/trunk/test/src/test/build.xml Log: - Define use of public render parameters in demo portlets. - Package demo portlets. Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/= samples/GoogleClippingPortlet.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/sample= s/GoogleClippingPortlet.java 2008-02-05 21:10:46 UTC (rev 9785) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/sample= s/GoogleClippingPortlet.java 2008-02-05 21:52:39 UTC (rev 9786) @@ -50,18 +50,14 @@ { protected static final String A =3D "Zip Code:
\n" + - " \n" + + " \n" + "
\n" + " \n" + " \n" + Modified: modules/portlet/trunk/test/src/test/build.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/test/build.xml 2008-02-05 21:10:46 UTC (= rev 9785) +++ modules/portlet/trunk/test/src/test/build.xml 2008-02-05 21:52:39 UTC (= rev 9786) @@ -127,7 +127,7 @@ - + @@ -202,7 +202,7 @@ = = - +

@@ -460,13 +460,13 @@ = = - + - - - + + + = @@ -579,10 +579,10 @@ = = - - - - + + + + = --> - + = @@ -687,7 +687,6 @@ = - = @@ -749,10 +748,25 @@ = = + = - + + + + + + + + = + + + + + + + + + \ No newline at end of file Added: modules/portlet/trunk/test/src/test/resources/google-map-portlet-war= /WEB-INF/portlet.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/test/resources/google-map-portlet-war/WE= B-INF/portlet.xml (rev 0) +++ modules/portlet/trunk/test/src/test/resources/google-map-portlet-war/WE= B-INF/portlet.xml 2008-02-05 21:52:39 UTC (rev 9786) @@ -0,0 +1,43 @@ + + + + + GoogleMap + org.jboss.portal.simple.samples.GoogleClippingPortlet= + + text/html + + g:zipcode + + + + zipcode + g:zipcode + + + + Added: modules/portlet/trunk/test/src/test/resources/google-map-portlet-war= /WEB-INF/web.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/test/resources/google-map-portlet-war/WE= B-INF/web.xml (rev 0) +++ modules/portlet/trunk/test/src/test/resources/google-map-portlet-war/WE= B-INF/web.xml 2008-02-05 21:52:39 UTC (rev 9786) @@ -0,0 +1,27 @@ + + + + + Added: modules/portlet/trunk/test/src/test/resources/google-weather-portlet= -war/WEB-INF/portlet.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/test/resources/google-weather-portlet-wa= r/WEB-INF/portlet.xml (rev 0) +++ modules/portlet/trunk/test/src/test/resources/google-weather-portlet-wa= r/WEB-INF/portlet.xml 2008-02-05 21:52:39 UTC (rev 9786) @@ -0,0 +1,43 @@ + + + + + GoogleWeather + org.jboss.portal.simple.samples.GoogleWeatherClipping= Portlet + + text/html + + g:zipcode + + + + zipcode + g:zipcode + + + + Added: modules/portlet/trunk/test/src/test/resources/google-weather-portlet= -war/WEB-INF/web.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/test/resources/google-weather-portlet-wa= r/WEB-INF/web.xml (rev 0) +++ modules/portlet/trunk/test/src/test/resources/google-weather-portlet-wa= r/WEB-INF/web.xml 2008-02-05 21:52:39 UTC (rev 9786) @@ -0,0 +1,28 @@ + + + + + + --===============4406566152794816775==-- From portal-commits at lists.jboss.org Tue Feb 5 16:59:47 2008 Content-Type: multipart/mixed; boundary="===============6689395982175598487==" MIME-Version: 1.0 From: portal-commits at lists.jboss.org To: portal-commits at lists.jboss.org Subject: [portal-commits] JBoss Portal SVN: r9787 - in modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet: controller/event and 10 other directories. Date: Tue, 05 Feb 2008 16:59:47 -0500 Message-ID: --===============6689395982175598487== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: chris.laprun(a)jboss.com Date: 2008-02-05 16:59:46 -0500 (Tue, 05 Feb 2008) New Revision: 9787 Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contro= ller/PortletController.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contro= ller/PortletControllerContext.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contro= ller/PortletRequestHandler.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contro= ller/RequestHandler.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contro= ller/event/Event.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contro= ller/event/EventControllerContext.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contro= ller/impl/event/EventControllerContextImpl.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contro= ller/impl/state/MutablePageNavigationalState.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contro= ller/impl/state/PageNavigationalStateImpl.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contro= ller/impl/state/StateControllerContextImpl.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contro= ller/request/ContainerRequest.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contro= ller/request/ControllerRequest.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contro= ller/request/FullScopedCacheablePortletResourceRequest.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contro= ller/request/PageScopedFullPortletResourceRequest.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contro= ller/request/PortletActionRequest.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contro= ller/request/PortletRenderRequest.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contro= ller/request/PortletRequest.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contro= ller/request/PortletResourceRequest.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contro= ller/request/PortletScopedPortletResourceRequest.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contro= ller/response/PageUpdateResponse.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contro= ller/response/PortletResponse.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contro= ller/state/PageNavigationalState.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contro= ller/state/StateControllerContext.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contro= ller/state/WindowNavigationalState.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/I= nterceptorStackFactoryImpl.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/P= ortalServlet.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/P= ortletApplicationDeployer.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/P= ortletApplicationDeployment.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/P= ortletUtilsTestCase.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/S= tringCodec.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/S= tringCodecTestCase.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/U= RLParameterConstants.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/c= ontroller/AbstractMarkupRenderer.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/c= ontroller/ControllerResponseRendererFactory.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/c= ontroller/ErrorResponseRenderer.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/c= ontroller/PortletControllerContextImpl.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/c= ontroller/PortletURLRenderer.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/c= ontroller/RedirectResponseRenderer.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/c= ontroller/Renderer.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/c= ontroller/ResourceRenderer.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/c= ontroller/TestInstanceContext.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/c= ontroller/TestPortalContext.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/c= ontroller/TestPortletInvocationContext.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/c= ontroller/TestPortletInvoker.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/m= etadata/factory/LocalizedStringBuilder.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/m= etadata/factory/PortletApplicationModelFactory.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/m= etadata/impl/AnnotationPortletApplication10MetaData.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/m= etadata/impl/AnnotationPortletApplication20MetaData.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/m= etadata/impl/PortletApplicationMetaDataException.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/m= etadata/impl/ValueTrimmingFilter.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/u= rl/CodecBuilder.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/u= rl/ParameterDecoder.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/u= rl/ParameterEncoder.java Log: - Update copyright... Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet= /controller/PortletController.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/PortletController.java 2008-02-05 21:52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/PortletController.java 2008-02-05 21:59:46 UTC (rev 9787) @@ -20,6 +20,7 @@ * 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.controller; = import org.jboss.portal.portlet.PortletInvokerException; @@ -31,16 +32,15 @@ import java.io.IOException; = /** - * The portlet controller which handles the page state management and the = interactions between - * the action phase and the event phase. It really only does that and not = more. - * + * The portlet controller which handles the page state management and the = interactions between the action phase and the + * event phase. It really only does that and not more. + *

* 1/ introduce EventRequest so the portal can send events directly to a p= ortlet + *

+ * 2/ make the event controller return a decision for a given event. Today= it just returns a list of events to process. + * An event can be handled in various manners by the controller: - produce= new events (what exists today) - make it a + * portal event which delivers the event to the portal * - * 2/ make the event controller return a decision for a given event. Toda= y it just returns a list - * of events to process. An event can be handled in various manners by th= e controller: - * - produce new events (what exists today) - * - make it a portal event which delivers the event to the portal - * * @author Julien Viet * @version $Revision: 1.1 $ */ Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet= /controller/PortletControllerContext.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/PortletControllerContext.java 2008-02-05 21:52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/PortletControllerContext.java 2008-02-05 21:59:46 UTC (rev 9787) @@ -1,6 +1,6 @@ /*************************************************************************= ***** * JBoss, a division of Red Hat = * - * Copyright 2006, Red Hat Middleware, LLC, and individual = * + * 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. = * @@ -23,20 +23,20 @@ package org.jboss.portal.portlet.controller; = import org.jboss.portal.portlet.PortletInvokerException; -import org.jboss.portal.portlet.spi.PortletInvocationContext; +import org.jboss.portal.portlet.controller.event.EventControllerContext; +import org.jboss.portal.portlet.controller.state.PageNavigationalState; +import org.jboss.portal.portlet.controller.state.StateControllerContext; import org.jboss.portal.portlet.info.PortletInfo; import org.jboss.portal.portlet.invocation.ActionInvocation; import org.jboss.portal.portlet.invocation.EventInvocation; import org.jboss.portal.portlet.invocation.ResourceInvocation; import org.jboss.portal.portlet.invocation.response.PortletInvocationRespo= nse; -import org.jboss.portal.portlet.controller.event.EventControllerContext; -import org.jboss.portal.portlet.controller.state.PageNavigationalState; -import org.jboss.portal.portlet.controller.state.StateControllerContext; +import org.jboss.portal.portlet.spi.PortletInvocationContext; = import javax.servlet.ServletContext; +import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.Cookie; import java.util.List; = /** Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet= /controller/PortletRequestHandler.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/PortletRequestHandler.java 2008-02-05 21:52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/PortletRequestHandler.java 2008-02-05 21:59:46 UTC (rev 9787) @@ -1,6 +1,25 @@ -/* - * Copyright (c) 2008, Your Corporation. All Rights Reserved. - */ +/*************************************************************************= ***** + * 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.controller; = @@ -9,13 +28,6 @@ import org.jboss.portal.common.util.ParameterMap; import org.jboss.portal.portlet.PortletInvokerException; import org.jboss.portal.portlet.StateString; -import org.jboss.portal.portlet.spi.PortletInvocationContext; -import org.jboss.portal.portlet.invocation.ActionInvocation; -import org.jboss.portal.portlet.invocation.EventInvocation; -import org.jboss.portal.portlet.invocation.response.ErrorResponse; -import org.jboss.portal.portlet.invocation.response.PortletInvocationRespo= nse; -import org.jboss.portal.portlet.invocation.response.ResponseProperties; -import org.jboss.portal.portlet.invocation.response.UpdateNavigationalStat= eResponse; import org.jboss.portal.portlet.controller.event.Event; import org.jboss.portal.portlet.controller.event.EventControllerContext; import org.jboss.portal.portlet.controller.request.ControllerRequest; @@ -26,8 +38,15 @@ import org.jboss.portal.portlet.controller.response.PageUpdateResponse; import org.jboss.portal.portlet.controller.response.PortletResponse; import org.jboss.portal.portlet.controller.state.PageNavigationalState; +import org.jboss.portal.portlet.controller.state.StateControllerContext; import org.jboss.portal.portlet.controller.state.WindowNavigationalState; -import org.jboss.portal.portlet.controller.state.StateControllerContext; +import org.jboss.portal.portlet.invocation.ActionInvocation; +import org.jboss.portal.portlet.invocation.EventInvocation; +import org.jboss.portal.portlet.invocation.response.ErrorResponse; +import org.jboss.portal.portlet.invocation.response.PortletInvocationRespo= nse; +import org.jboss.portal.portlet.invocation.response.ResponseProperties; +import org.jboss.portal.portlet.invocation.response.UpdateNavigationalStat= eResponse; +import org.jboss.portal.portlet.spi.PortletInvocationContext; = import javax.servlet.http.Cookie; import java.io.IOException; @@ -248,7 +267,7 @@ private void updateNavigationalState( PortletControllerContext context, String windowId, - UpdateNavigationalStateResponse update, = + UpdateNavigationalStateResponse update, PageNavigationalState pageState) throws PortletInvokerException { Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet= /controller/RequestHandler.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/RequestHandler.java 2008-02-05 21:52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/RequestHandler.java 2008-02-05 21:59:46 UTC (rev 9787) @@ -1,6 +1,25 @@ -/* - * Copyright (c) 2008, Your Corporation. All Rights Reserved. - */ +/*************************************************************************= ***** + * 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.controller; = Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet= /controller/event/Event.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/event/Event.java 2008-02-05 21:52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/event/Event.java 2008-02-05 21:59:46 UTC (rev 9787) @@ -1,6 +1,6 @@ /*************************************************************************= ***** * JBoss, a division of Red Hat = * - * Copyright 2006, Red Hat Middleware, LLC, and individual = * + * 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. = * Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet= /controller/event/EventControllerContext.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/event/EventControllerContext.java 2008-02-05 21:52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/event/EventControllerContext.java 2008-02-05 21:59:46 UTC (rev 9787) @@ -1,6 +1,6 @@ /*************************************************************************= ***** * JBoss, a division of Red Hat = * - * Copyright 2006, Red Hat Middleware, LLC, and individual = * + * 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. = * @@ -37,6 +37,6 @@ * @param producedEvent the produced event * @return the list of event to be consumed */ - List getConsumedEvents(Event producedEvent); = + List getConsumedEvents(Event producedEvent); = } Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet= /controller/impl/event/EventControllerContextImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/impl/event/EventControllerContextImpl.java 2008-02-05 21:52:39 UTC (r= ev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/impl/event/EventControllerContextImpl.java 2008-02-05 21:59:46 UTC (r= ev 9787) @@ -1,6 +1,6 @@ /*************************************************************************= ***** * JBoss, a division of Red Hat = * - * Copyright 2006, Red Hat Middleware, LLC, and individual = * + * 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. = * @@ -22,16 +22,16 @@ *************************************************************************= *****/ package org.jboss.portal.portlet.controller.impl.event; = +import org.jboss.portal.portlet.Portlet; import org.jboss.portal.portlet.PortletInvoker; -import org.jboss.portal.portlet.Portlet; import org.jboss.portal.portlet.PortletInvokerException; +import org.jboss.portal.portlet.controller.event.Event; import org.jboss.portal.portlet.controller.event.EventControllerContext; -import org.jboss.portal.portlet.controller.event.Event; import org.jboss.portal.portlet.info.PortletInfo; = +import java.util.ArrayList; +import java.util.Collections; import java.util.List; -import java.util.Collections; -import java.util.ArrayList; = /** * @author Julien Viet Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet= /controller/impl/state/MutablePageNavigationalState.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/impl/state/MutablePageNavigationalState.java 2008-02-05 21:52:39 UTC = (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/impl/state/MutablePageNavigationalState.java 2008-02-05 21:59:46 UTC = (rev 9787) @@ -1,6 +1,6 @@ /*************************************************************************= ***** * JBoss, a division of Red Hat = * - * Copyright 2006, Red Hat Middleware, LLC, and individual = * + * 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. = * @@ -22,11 +22,11 @@ *************************************************************************= *****/ package org.jboss.portal.portlet.controller.impl.state; = +import org.jboss.portal.portlet.PortletInvokerException; import org.jboss.portal.portlet.controller.state.WindowNavigationalState; import org.jboss.portal.portlet.info.NavigationInfo; import org.jboss.portal.portlet.info.ParameterInfo; import org.jboss.portal.portlet.info.PortletInfo; -import org.jboss.portal.portlet.PortletInvokerException; = import javax.xml.namespace.QName; import java.util.Map; Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet= /controller/impl/state/PageNavigationalStateImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/impl/state/PageNavigationalStateImpl.java 2008-02-05 21:52:39 UTC (re= v 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/impl/state/PageNavigationalStateImpl.java 2008-02-05 21:59:46 UTC (re= v 9787) @@ -1,6 +1,6 @@ /*************************************************************************= ***** * JBoss, a division of Red Hat = * - * Copyright 2006, Red Hat Middleware, LLC, and individual = * + * 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. = * @@ -23,16 +23,16 @@ package org.jboss.portal.portlet.controller.impl.state; = import org.jboss.portal.common.util.ParameterMap; +import org.jboss.portal.portlet.PortletInvokerException; +import org.jboss.portal.portlet.controller.state.PageNavigationalState; +import org.jboss.portal.portlet.controller.state.WindowNavigationalState; import org.jboss.portal.portlet.info.ParameterInfo; import org.jboss.portal.portlet.info.PortletInfo; -import org.jboss.portal.portlet.controller.state.PageNavigationalState; -import org.jboss.portal.portlet.controller.state.WindowNavigationalState; -import org.jboss.portal.portlet.PortletInvokerException; = import javax.xml.namespace.QName; +import java.io.Serializable; +import java.util.HashMap; import java.util.Map; -import java.util.HashMap; -import java.io.Serializable; = /** * @author Julien Viet Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet= /controller/impl/state/StateControllerContextImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/impl/state/StateControllerContextImpl.java 2008-02-05 21:52:39 UTC (r= ev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/impl/state/StateControllerContextImpl.java 2008-02-05 21:59:46 UTC (r= ev 9787) @@ -1,6 +1,6 @@ /*************************************************************************= ***** * JBoss, a division of Red Hat = * - * Copyright 2006, Red Hat Middleware, LLC, and individual = * + * 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. = * @@ -22,17 +22,17 @@ *************************************************************************= *****/ package org.jboss.portal.portlet.controller.impl.state; = +import org.jboss.portal.portlet.controller.PortletControllerContext; +import org.jboss.portal.portlet.controller.state.PageNavigationalState; import org.jboss.portal.portlet.controller.state.StateControllerContext; -import org.jboss.portal.portlet.controller.state.PageNavigationalState; -import org.jboss.portal.portlet.controller.PortletControllerContext; = +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; import java.io.IOException; -import java.io.ByteArrayOutputStream; +import java.io.ObjectInputStream; import java.io.ObjectOutputStream; -import java.io.ByteArrayInputStream; -import java.io.ObjectInputStream; +import java.util.zip.GZIPInputStream; import java.util.zip.GZIPOutputStream; -import java.util.zip.GZIPInputStream; = /** * @author Julien Viet Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet= /controller/request/ContainerRequest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/request/ContainerRequest.java 2008-02-05 21:52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/request/ContainerRequest.java 2008-02-05 21:59:46 UTC (rev 9787) @@ -1,6 +1,6 @@ /*************************************************************************= ***** * JBoss, a division of Red Hat = * - * Copyright 2006, Red Hat Middleware, LLC, and individual = * + * 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. = * Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet= /controller/request/ControllerRequest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/request/ControllerRequest.java 2008-02-05 21:52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/request/ControllerRequest.java 2008-02-05 21:59:46 UTC (rev 9787) @@ -1,6 +1,6 @@ /*************************************************************************= ***** * JBoss, a division of Red Hat = * - * Copyright 2006, Red Hat Middleware, LLC, and individual = * + * 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. = * Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet= /controller/request/FullScopedCacheablePortletResourceRequest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/request/FullScopedCacheablePortletResourceRequest.java 2008-02-05 21:= 52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/request/FullScopedCacheablePortletResourceRequest.java 2008-02-05 21:= 59:46 UTC (rev 9787) @@ -1,6 +1,6 @@ /*************************************************************************= ***** * JBoss, a division of Red Hat = * - * Copyright 2006, Red Hat Middleware, LLC, and individual = * + * 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. = * @@ -22,9 +22,9 @@ *************************************************************************= *****/ package org.jboss.portal.portlet.controller.request; = +import org.jboss.portal.common.util.ParameterMap; import org.jboss.portal.portlet.StateString; import org.jboss.portal.portlet.controller.PortletControllerContext; -import org.jboss.portal.common.util.ParameterMap; = /** * @author Julien Viet Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet= /controller/request/PageScopedFullPortletResourceRequest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/request/PageScopedFullPortletResourceRequest.java 2008-02-05 21:52:39= UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/request/PageScopedFullPortletResourceRequest.java 2008-02-05 21:59:46= UTC (rev 9787) @@ -1,6 +1,6 @@ /*************************************************************************= ***** * JBoss, a division of Red Hat = * - * Copyright 2006, Red Hat Middleware, LLC, and individual = * + * 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. = * @@ -22,11 +22,11 @@ *************************************************************************= *****/ package org.jboss.portal.portlet.controller.request; = +import org.jboss.portal.common.util.ParameterMap; import org.jboss.portal.portlet.StateString; +import org.jboss.portal.portlet.controller.PortletControllerContext; +import org.jboss.portal.portlet.controller.state.PageNavigationalState; import org.jboss.portal.portlet.controller.state.WindowNavigationalState; -import org.jboss.portal.portlet.controller.state.PageNavigationalState; -import org.jboss.portal.portlet.controller.PortletControllerContext; -import org.jboss.portal.common.util.ParameterMap; = /** * @author Julien Viet Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet= /controller/request/PortletActionRequest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/request/PortletActionRequest.java 2008-02-05 21:52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/request/PortletActionRequest.java 2008-02-05 21:59:46 UTC (rev 9787) @@ -1,6 +1,6 @@ /*************************************************************************= ***** * JBoss, a division of Red Hat = * - * Copyright 2006, Red Hat Middleware, LLC, and individual = * + * 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. = * @@ -22,11 +22,11 @@ *************************************************************************= *****/ package org.jboss.portal.portlet.controller.request; = +import org.jboss.portal.common.util.ParameterMap; import org.jboss.portal.portlet.StateString; -import org.jboss.portal.portlet.controller.state.WindowNavigationalState; import org.jboss.portal.portlet.controller.PortletControllerContext; import org.jboss.portal.portlet.controller.state.PageNavigationalState; -import org.jboss.portal.common.util.ParameterMap; +import org.jboss.portal.portlet.controller.state.WindowNavigationalState; = /** * @author Julien Viet Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet= /controller/request/PortletRenderRequest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/request/PortletRenderRequest.java 2008-02-05 21:52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/request/PortletRenderRequest.java 2008-02-05 21:59:46 UTC (rev 9787) @@ -1,6 +1,6 @@ /*************************************************************************= ***** * JBoss, a division of Red Hat = * - * Copyright 2006, Red Hat Middleware, LLC, and individual = * + * 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. = * @@ -22,9 +22,9 @@ *************************************************************************= *****/ package org.jboss.portal.portlet.controller.request; = -import org.jboss.portal.portlet.controller.state.WindowNavigationalState; import org.jboss.portal.portlet.controller.PortletControllerContext; import org.jboss.portal.portlet.controller.state.PageNavigationalState; +import org.jboss.portal.portlet.controller.state.WindowNavigationalState; = import java.util.Map; = Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet= /controller/request/PortletRequest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/request/PortletRequest.java 2008-02-05 21:52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/request/PortletRequest.java 2008-02-05 21:59:46 UTC (rev 9787) @@ -1,6 +1,6 @@ /*************************************************************************= ***** * JBoss, a division of Red Hat = * - * Copyright 2006, Red Hat Middleware, LLC, and individual = * + * 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. = * @@ -22,9 +22,9 @@ *************************************************************************= *****/ package org.jboss.portal.portlet.controller.request; = +import org.jboss.portal.portlet.controller.PortletControllerContext; +import org.jboss.portal.portlet.controller.state.PageNavigationalState; import org.jboss.portal.portlet.controller.state.WindowNavigationalState; -import org.jboss.portal.portlet.controller.state.PageNavigationalState; -import org.jboss.portal.portlet.controller.PortletControllerContext; = /** * @author Julien Viet Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet= /controller/request/PortletResourceRequest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/request/PortletResourceRequest.java 2008-02-05 21:52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/request/PortletResourceRequest.java 2008-02-05 21:59:46 UTC (rev 9787) @@ -1,6 +1,6 @@ /*************************************************************************= ***** * JBoss, a division of Red Hat = * - * Copyright 2006, Red Hat Middleware, LLC, and individual = * + * 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. = * @@ -22,13 +22,13 @@ *************************************************************************= *****/ package org.jboss.portal.portlet.controller.request; = +import org.jboss.portal.common.util.ParameterMap; +import org.jboss.portal.portlet.StateString; import org.jboss.portal.portlet.cache.CacheLevel; -import org.jboss.portal.portlet.StateString; import org.jboss.portal.portlet.controller.PortletControllerContext; -import org.jboss.portal.common.util.ParameterMap; = +import java.util.HashMap; import java.util.Map; -import java.util.HashMap; = /** * @author Julien Viet Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet= /controller/request/PortletScopedPortletResourceRequest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/request/PortletScopedPortletResourceRequest.java 2008-02-05 21:52:39 = UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/request/PortletScopedPortletResourceRequest.java 2008-02-05 21:59:46 = UTC (rev 9787) @@ -1,6 +1,6 @@ /*************************************************************************= ***** * JBoss, a division of Red Hat = * - * Copyright 2006, Red Hat Middleware, LLC, and individual = * + * 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. = * @@ -22,10 +22,10 @@ *************************************************************************= *****/ package org.jboss.portal.portlet.controller.request; = +import org.jboss.portal.common.util.ParameterMap; +import org.jboss.portal.portlet.StateString; +import org.jboss.portal.portlet.controller.PortletControllerContext; import org.jboss.portal.portlet.controller.state.WindowNavigationalState; -import org.jboss.portal.portlet.controller.PortletControllerContext; -import org.jboss.portal.portlet.StateString; -import org.jboss.portal.common.util.ParameterMap; = /** * @author Julien Viet Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet= /controller/response/PageUpdateResponse.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/response/PageUpdateResponse.java 2008-02-05 21:52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/response/PageUpdateResponse.java 2008-02-05 21:59:46 UTC (rev 9787) @@ -1,6 +1,6 @@ /*************************************************************************= ***** * JBoss, a division of Red Hat = * - * Copyright 2006, Red Hat Middleware, LLC, and individual = * + * 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. = * @@ -22,9 +22,9 @@ *************************************************************************= *****/ package org.jboss.portal.portlet.controller.response; = +import org.jboss.portal.portlet.controller.state.PageNavigationalState; import org.jboss.portal.portlet.invocation.response.ResponseProperties; import org.jboss.portal.portlet.invocation.response.UpdateNavigationalStat= eResponse; -import org.jboss.portal.portlet.controller.state.PageNavigationalState; = /** * @author Julien Viet Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet= /controller/response/PortletResponse.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/response/PortletResponse.java 2008-02-05 21:52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/response/PortletResponse.java 2008-02-05 21:59:46 UTC (rev 9787) @@ -1,6 +1,6 @@ /*************************************************************************= ***** * JBoss, a division of Red Hat = * - * Copyright 2006, Red Hat Middleware, LLC, and individual = * + * 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. = * Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet= /controller/state/PageNavigationalState.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/state/PageNavigationalState.java 2008-02-05 21:52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/state/PageNavigationalState.java 2008-02-05 21:59:46 UTC (rev 9787) @@ -1,6 +1,6 @@ /*************************************************************************= ***** * JBoss, a division of Red Hat = * - * Copyright 2006, Red Hat Middleware, LLC, and individual = * + * 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. = * @@ -46,16 +46,16 @@ /** * Update the navigational state of a window. * - * @param windowId the window id + * @param windowId the window id * @param windowState the window state * @throws UnsupportedOperationException if the page state is read only */ void setWindowNavigationalState(String windowId, WindowNavigationalStat= e windowState) throws UnsupportedOperationException; = /** - * Obtain the public navigational state of a window. The interpretation= of what should - * be retrieved is left up to the implementor. An example of implementa= tion would use the mapping - * between qnames and name provided by the referenced portlet info. + * Obtain the public navigational state of a window. The interpretation= of what should be retrieved is left up to the + * implementor. An example of implementation would use the mapping betw= een qnames and name provided by the referenced + * portlet info. * * @param windowId the window id * @return the public navigational state @@ -63,14 +63,14 @@ ParameterMap getPublicNavigationalState(String windowId); = /** - * Update the public navigational state of a window. The interpretation= of what should be updated - * is left up to the implementor. An example of implementation would us= e the mapping - * between qname and name provided by the referenced portlet info. - * + * Update the public navigational state of a window. The interpretation= of what should be updated is left up to the + * implementor. An example of implementation would use the mapping betw= een qname and name provided by the referenced + * portlet info. + *

* The update argument values with a length of zero should be treated a= s removals. * * @param windowId the window id - * @param update the updates + * @param update the updates * @throws UnsupportedOperationException if the page state is read only */ void setPublicNavigationalState(String windowId, Map = update) throws UnsupportedOperationException; Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet= /controller/state/StateControllerContext.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/state/StateControllerContext.java 2008-02-05 21:52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/state/StateControllerContext.java 2008-02-05 21:59:46 UTC (rev 9787) @@ -1,6 +1,6 @@ /*************************************************************************= ***** * JBoss, a division of Red Hat = * - * Copyright 2006, Red Hat Middleware, LLC, and individual = * + * 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. = * Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet= /controller/state/WindowNavigationalState.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/state/WindowNavigationalState.java 2008-02-05 21:52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr= oller/state/WindowNavigationalState.java 2008-02-05 21:59:46 UTC (rev 9787) @@ -1,6 +1,6 @@ /*************************************************************************= ***** * JBoss, a division of Red Hat = * - * Copyright 2006, Red Hat Middleware, LLC, and individual = * + * 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. = * Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet= /test/InterceptorStackFactoryImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= InterceptorStackFactoryImpl.java 2008-02-05 21:52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= InterceptorStackFactoryImpl.java 2008-02-05 21:59:46 UTC (rev 9787) @@ -1,6 +1,6 @@ /*************************************************************************= ***** * JBoss, a division of Red Hat = * - * Copyright 2006, Red Hat Middleware, LLC, and individual = * + * 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. = * @@ -22,8 +22,8 @@ *************************************************************************= *****/ package org.jboss.portal.portlet.test; = +import org.jboss.portal.common.invocation.Interceptor; import org.jboss.portal.common.invocation.InterceptorStack; -import org.jboss.portal.common.invocation.Interceptor; import org.jboss.portal.common.invocation.InterceptorStackFactory; = /** Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet= /test/PortalServlet.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= PortalServlet.java 2008-02-05 21:52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= PortalServlet.java 2008-02-05 21:59:46 UTC (rev 9787) @@ -1,6 +1,6 @@ /*************************************************************************= ***** * JBoss, a division of Red Hat = * - * Copyright 2006, Red Hat Middleware, LLC, and individual = * + * 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. = * @@ -22,14 +22,13 @@ *************************************************************************= *****/ package org.jboss.portal.portlet.test; = -import org.jboss.portal.portlet.controller.response.ControllerResponse; import org.jboss.portal.portlet.controller.PortletController; -import org.jboss.portal.portlet.test.controller.PortletControllerContextIm= pl; -import org.jboss.portal.portlet.controller.state.PageNavigationalState; +import org.jboss.portal.portlet.controller.response.ControllerResponse; +import org.jboss.portal.portlet.invocation.response.ResponseProperties; import org.jboss.portal.portlet.test.controller.ControllerResponseRenderer= Factory; -import org.jboss.portal.portlet.test.controller.Renderer; import org.jboss.portal.portlet.test.controller.PageRenderer; -import org.jboss.portal.portlet.invocation.response.ResponseProperties; +import org.jboss.portal.portlet.test.controller.PortletControllerContextIm= pl; +import org.jboss.portal.portlet.test.controller.Renderer; = import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; @@ -81,7 +80,7 @@ ControllerResponse response =3D controller.process(context.getReq= uest()); = // - Renderer renderer =3D ControllerResponseRendererFactory.getRende= rer(response); + Renderer renderer =3D ControllerResponseRendererFactory.getRender= er(response); = // renderer.render(context); @@ -89,7 +88,7 @@ else { PageRenderer renderer =3D new PageRenderer(new ResponseProperties= (), context.getStateControllerContext().createPageState()); - = + // renderer.render(context); } Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet= /test/PortletApplicationDeployer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= PortletApplicationDeployer.java 2008-02-05 21:52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= PortletApplicationDeployer.java 2008-02-05 21:59:46 UTC (rev 9787) @@ -1,6 +1,6 @@ /*************************************************************************= ***** * JBoss, a division of Red Hat = * - * Copyright 2006, Red Hat Middleware, LLC, and individual = * + * 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. = * Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet= /test/PortletApplicationDeployment.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= PortletApplicationDeployment.java 2008-02-05 21:52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= PortletApplicationDeployment.java 2008-02-05 21:59:46 UTC (rev 9787) @@ -1,6 +1,6 @@ /*************************************************************************= ***** * JBoss, a division of Red Hat = * - * Copyright 2006, Red Hat Middleware, LLC, and individual = * + * 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. = * @@ -22,42 +22,42 @@ *************************************************************************= *****/ package org.jboss.portal.portlet.test; = +import org.apache.log4j.Logger; +import org.jboss.beans.metadata.plugins.AbstractBeanMetaData; +import org.jboss.beans.metadata.plugins.AbstractConstructorMetaData; +import org.jboss.beans.metadata.plugins.AbstractDependencyValueMetaData; +import org.jboss.beans.metadata.plugins.AbstractInstallMetaData; +import org.jboss.beans.metadata.plugins.AbstractLifecycleMetaData; +import org.jboss.beans.metadata.plugins.AbstractParameterMetaData; +import org.jboss.beans.metadata.plugins.AbstractPropertyMetaData; +import org.jboss.beans.metadata.plugins.ThisValueMetaData; +import org.jboss.beans.metadata.spi.InstallMetaData; +import org.jboss.beans.metadata.spi.ParameterMetaData; +import org.jboss.beans.metadata.spi.PropertyMetaData; +import org.jboss.dependency.spi.ControllerState; +import org.jboss.kernel.Kernel; +import org.jboss.kernel.spi.dependency.KernelController; +import org.jboss.kernel.spi.dependency.KernelControllerContext; +import org.jboss.portal.common.NotYetImplemented; +import org.jboss.portal.common.util.Tools; import org.jboss.portal.portlet.container.PortletApplicationContext; +import org.jboss.portal.portlet.impl.info.ContainerInfoBuilder; +import org.jboss.portal.portlet.impl.info.ContainerInfoBuilderContext; +import org.jboss.portal.portlet.impl.info.ContainerPortletApplicationInfo; +import org.jboss.portal.portlet.impl.info.ContainerPortletInfo; +import org.jboss.portal.portlet.impl.jsr168.ContainerInfoBuilderContextImp= l; import org.jboss.portal.portlet.impl.jsr168.PortletApplicationImpl; import org.jboss.portal.portlet.impl.jsr168.PortletContainerImpl; -import org.jboss.portal.portlet.impl.jsr168.ContainerInfoBuilderContextImp= l; import org.jboss.portal.portlet.impl.jsr168.spi.PortletAPIFactory; import org.jboss.portal.portlet.impl.metadata.PortletApplication10MetaData; -import org.jboss.portal.portlet.impl.info.ContainerPortletInfo; -import org.jboss.portal.portlet.impl.info.ContainerInfoBuilder; -import org.jboss.portal.portlet.impl.info.ContainerInfoBuilderContext; -import org.jboss.portal.portlet.impl.info.ContainerPortletApplicationInfo; import org.jboss.portal.portlet.metadata.JBossApplicationMetaData; import org.jboss.portal.web.WebApp; -import org.jboss.portal.common.util.Tools; -import org.jboss.portal.common.NotYetImplemented; -import org.jboss.kernel.Kernel; -import org.jboss.kernel.spi.dependency.KernelController; -import org.jboss.kernel.spi.dependency.KernelControllerContext; -import org.jboss.beans.metadata.plugins.AbstractDependencyValueMetaData; -import org.jboss.beans.metadata.plugins.AbstractBeanMetaData; -import org.jboss.beans.metadata.plugins.AbstractConstructorMetaData; -import org.jboss.beans.metadata.plugins.AbstractParameterMetaData; -import org.jboss.beans.metadata.plugins.AbstractLifecycleMetaData; -import org.jboss.beans.metadata.plugins.AbstractPropertyMetaData; -import org.jboss.beans.metadata.plugins.AbstractInstallMetaData; -import org.jboss.beans.metadata.plugins.ThisValueMetaData; -import org.jboss.beans.metadata.spi.PropertyMetaData; -import org.jboss.beans.metadata.spi.ParameterMetaData; -import org.jboss.beans.metadata.spi.InstallMetaData; -import org.jboss.dependency.spi.ControllerState; -import org.apache.log4j.Logger; = import javax.servlet.ServletContext; -import java.util.List; import java.util.ArrayList; import java.util.Collections; import java.util.LinkedHashMap; +import java.util.List; = /** * @author Julien Viet @@ -100,7 +100,7 @@ = void start() { - = + log.debug("Starting installation"); = // @@ -190,7 +190,7 @@ } catch (Throwable throwable) { - log.debug("Installation of bean " + beanName + " produced an = error", throwable); + log.debug("Installation of bean " + beanName + " produced an e= rror", throwable); } } = Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet= /test/PortletUtilsTestCase.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= PortletUtilsTestCase.java 2008-02-05 21:52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= PortletUtilsTestCase.java 2008-02-05 21:59:46 UTC (rev 9787) @@ -1,21 +1,44 @@ +/*************************************************************************= ***** + * 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; = import org.jboss.portal.portlet.impl.jsr168.PortletUtils; +import static org.jboss.unit.api.Assert.assertEquals; = -import static org.jboss.unit.api.Assert.*; +public class PortletUtilsTestCase +{ = -public class PortletUtilsTestCase { + public void testgenerateNamespaceFrom() + { + String name =3D "_09azAZ$"; + assertEquals(PortletUtils.PREFIX + name + PortletUtils.SUFFIX, Portl= etUtils.generateNamespaceFrom(name)); = - public void testgenerateNamespaceFrom() - { - String name =3D "_09azAZ$"; - assertEquals(PortletUtils.PREFIX + name + PortletUtils.SUFFIX, PortletUt= ils.generateNamespaceFrom(name)); + name =3D "_"; + assertEquals(PortletUtils.PREFIX + "_" + PortletUtils.SUFFIX, Portle= tUtils.generateNamespaceFrom(name)); = - name =3D "_"; - assertEquals(PortletUtils.PREFIX + "_" + PortletUtils.SUFFIX, PortletUti= ls.generateNamespaceFrom(name)); + name =3D "_=C3=A9"; + assertEquals(PortletUtils.PREFIX + "__e9" + PortletUtils.SUFFIX, Por= tletUtils.generateNamespaceFrom(name)); + } = - name =3D "_=C3=A9"; - assertEquals(PortletUtils.PREFIX + "__e9" + PortletUtils.SUFFIX, Portlet= Utils.generateNamespaceFrom(name)); - } - = } Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet= /test/StringCodec.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= StringCodec.java 2008-02-05 21:52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= StringCodec.java 2008-02-05 21:59:46 UTC (rev 9787) @@ -1,6 +1,6 @@ /*************************************************************************= ***** * JBoss, a division of Red Hat = * - * Copyright 2006, Red Hat Middleware, LLC, and individual = * + * 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. = * @@ -22,14 +22,8 @@ *************************************************************************= *****/ package org.jboss.portal.portlet.test; = -import java.io.OutputStreamWriter; -import java.io.OutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.UnsupportedEncodingException; import java.io.ByteArrayOutputStream; -import java.nio.charset.Charset; -import java.nio.charset.CharsetEncoder; +import java.io.UnsupportedEncodingException; = /** * @author Julien Viet @@ -47,7 +41,7 @@ { StringBuffer buffer =3D new StringBuffer(); char[] tmp =3D new char[1]; - for (int i =3D 0;i < decodedValue.length();i++) + for (int i =3D 0; i < decodedValue.length(); i++) { char c =3D decodedValue.charAt(i); if (Character.isLetterOrDigit(c)) @@ -77,7 +71,7 @@ try { ByteArrayOutputStream baos =3D new ByteArrayOutputStream(encodedV= alue.length()); - for (int i =3D 0;i < encodedValue.length();i++) + for (int i =3D 0; i < encodedValue.length(); i++) { char c =3D encodedValue.charAt(i); if (Character.isLetterOrDigit(c)) @@ -109,5 +103,4 @@ } = = - } Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet= /test/StringCodecTestCase.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= StringCodecTestCase.java 2008-02-05 21:52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= StringCodecTestCase.java 2008-02-05 21:59:46 UTC (rev 9787) @@ -1,6 +1,6 @@ /*************************************************************************= ***** * JBoss, a division of Red Hat = * - * Copyright 2006, Red Hat Middleware, LLC, and individual = * + * 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. = * @@ -22,10 +22,9 @@ *************************************************************************= *****/ package org.jboss.portal.portlet.test; = +import static org.jboss.unit.api.Assert.assertEquals; import org.jboss.unit.api.pojo.annotations.Test; = -import static org.jboss.unit.api.Assert.*; - /** * @author Julien Viet * @version $Revision: 1.1 $ @@ -58,7 +57,7 @@ assertEquals("/", StringCodec.decode(StringCodec.encode("/"))); assertEquals("@", StringCodec.decode(StringCodec.encode("@"))); assertEquals(Character.toString(EURO_CHAR), StringCodec.decode(Strin= gCodec.encode(Character.toString(EURO_CHAR)))); - assertEquals("A" + EURO_CHAR +"B(a)C", StringCodec.decode(StringCode= c.encode("A" + EURO_CHAR + "B(a)C"))); + assertEquals("A" + EURO_CHAR + "B(a)C", StringCodec.decode(StringCod= ec.encode("A" + EURO_CHAR + "B(a)C"))); } = } Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet= /test/URLParameterConstants.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= URLParameterConstants.java 2008-02-05 21:52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= URLParameterConstants.java 2008-02-05 21:59:46 UTC (rev 9787) @@ -1,6 +1,6 @@ /*************************************************************************= ***** * JBoss, a division of Red Hat = * - * Copyright 2006, Red Hat Middleware, LLC, and individual = * + * 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. = * @@ -39,64 +39,40 @@ */ public static final String LIFECYCLE_TYPE =3D "type"; = - /** - * The portlet mode. - */ + /** The portlet mode. */ public static final String MODE =3D "mode"; = - /** - * The window state. - */ + /** The window state. */ public static final String WINDOW_STATE =3D "windowstate"; = - /** - * The portlet navigational state for any type of lifecycle. - */ + /** The portlet navigational state for any type of lifecycle. */ public static final String NAVIGATIONAL_STATE =3D "navigationalstate"; = - /** - * The portlet resource state for lifecycle of type RENDER_LIFECY= CLE. - */ + /** The portlet resource state for lifecycle of type RENDER_LIFEC= YCLE. */ public static final String RESOURCE_STATE =3D "resourcestate"; = - /** - * The portlet interaction state for lifecycle of type ACTION_LIF= ECYCLE. - */ + /** The portlet interaction state for lifecycle of type ACTION_LI= FECYCLE. */ public static final String INTERACTION_STATE =3D "interactionstate"; = - /** - * The page state for any kind of lifecycle. - */ + /** The page state for any kind of lifecycle. */ public static final String PAGE_STATE =3D "pagestate"; = - /** - * The public navigational state changes of a portlet for lifecycle of = type RENDER_LIFECYCLE. - */ + /** The public navigational state changes of a portlet for lifecycle of= type RENDER_LIFECYCLE. */ public static final String PUBLIC_NAVIGATIONAL_STATE_CHANGES =3D "publi= cnavigationalstatechanges"; = - /** - * The resource id for lifecycle of type RESOURCE_LIFECYCLE. - */ + /** The resource id for lifecycle of type RESOURCE_LIFECYCLE. */ public static final String RESOURCE_ID =3D "resourceid"; = - /** - * The resource cacheability for lifecycle of type RENDER_LIFECYC= LE. - */ + /** The resource cacheability for lifecycle of type RENDER_LIFECY= CLE. */ public static final String RESOURCE_CACHEABILITY =3D "resourcecacheabil= ity"; = - /** - * Denotes an action lifecycle operation. - */ + /** Denotes an action lifecycle operation. */ public static final String ACTION_LIFECYCLE =3D "action"; = - /** - * Denotes a render lifecycle operation. - */ + /** Denotes a render lifecycle operation. */ public static final String RENDER_LIFECYCLE =3D "render"; = - /** - * Denotes a resource lifecycle operation. - */ + /** Denotes a resource lifecycle operation. */ public static final String RESOURCE_LIFECYCLE =3D "resource"; = } Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet= /test/controller/AbstractMarkupRenderer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= controller/AbstractMarkupRenderer.java 2008-02-05 21:52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= controller/AbstractMarkupRenderer.java 2008-02-05 21:59:46 UTC (rev 9787) @@ -1,6 +1,6 @@ /*************************************************************************= ***** * JBoss, a division of Red Hat = * - * Copyright 2006, Red Hat Middleware, LLC, and individual = * + * 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. = * @@ -20,14 +20,15 @@ * 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.controller; = +import org.jboss.portal.common.util.MultiValuedPropertyMap; +import org.jboss.portal.portlet.controller.PortletControllerContext; import org.jboss.portal.portlet.invocation.response.ResponseProperties; -import org.jboss.portal.portlet.controller.PortletControllerContext; -import org.jboss.portal.common.util.MultiValuedPropertyMap; = +import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.Cookie; import java.io.IOException; import java.util.List; = Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet= /test/controller/ControllerResponseRendererFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= controller/ControllerResponseRendererFactory.java 2008-02-05 21:52:39 UTC (= rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= controller/ControllerResponseRendererFactory.java 2008-02-05 21:59:46 UTC (= rev 9787) @@ -1,6 +1,6 @@ /*************************************************************************= ***** * JBoss, a division of Red Hat = * - * Copyright 2006, Red Hat Middleware, LLC, and individual = * + * 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. = * @@ -20,16 +20,17 @@ * 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.controller; = import org.jboss.portal.portlet.controller.response.ControllerResponse; import org.jboss.portal.portlet.controller.response.PageUpdateResponse; +import org.jboss.portal.portlet.controller.response.PortletResponse; import org.jboss.portal.portlet.controller.response.ResourceResponse; -import org.jboss.portal.portlet.controller.response.PortletResponse; -import org.jboss.portal.portlet.invocation.response.PortletInvocationRespo= nse; -import org.jboss.portal.portlet.invocation.response.HTTPRedirectionRespons= e; import org.jboss.portal.portlet.invocation.response.ErrorResponse; import org.jboss.portal.portlet.invocation.response.FragmentResponse; +import org.jboss.portal.portlet.invocation.response.HTTPRedirectionRespons= e; +import org.jboss.portal.portlet.invocation.response.PortletInvocationRespo= nse; = /** * @author Julien Viet Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet= /test/controller/ErrorResponseRenderer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= controller/ErrorResponseRenderer.java 2008-02-05 21:52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= controller/ErrorResponseRenderer.java 2008-02-05 21:59:46 UTC (rev 9787) @@ -1,6 +1,6 @@ /*************************************************************************= ***** * JBoss, a division of Red Hat = * - * Copyright 2006, Red Hat Middleware, LLC, and individual = * + * 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. = * @@ -20,11 +20,12 @@ * 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.controller; = +import org.apache.log4j.Logger; import org.jboss.portal.portlet.controller.PortletControllerContext; import org.jboss.portal.portlet.invocation.response.ErrorResponse; -import org.apache.log4j.Logger; = import java.io.IOException; = Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet= /test/controller/PortletControllerContextImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= controller/PortletControllerContextImpl.java 2008-02-05 21:52:39 UTC (rev 9= 786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= controller/PortletControllerContextImpl.java 2008-02-05 21:59:46 UTC (rev 9= 787) @@ -1,6 +1,6 @@ /*************************************************************************= ***** * JBoss, a division of Red Hat = * - * Copyright 2006, Red Hat Middleware, LLC, and individual = * + * 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. = * @@ -20,63 +20,64 @@ * 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.controller; = import org.jboss.portal.Mode; import org.jboss.portal.WindowState; import org.jboss.portal.common.io.IOTools; +import org.jboss.portal.common.util.MarkupInfo; +import org.jboss.portal.common.util.MediaType; import org.jboss.portal.common.util.ParameterMap; import org.jboss.portal.common.util.Tools; -import org.jboss.portal.common.util.MarkupInfo; -import org.jboss.portal.common.util.MediaType; +import org.jboss.portal.portlet.ContainerURL; import org.jboss.portal.portlet.ParametersStateString; import org.jboss.portal.portlet.Portlet; import org.jboss.portal.portlet.PortletContext; import org.jboss.portal.portlet.PortletInvoker; import org.jboss.portal.portlet.PortletInvokerException; import org.jboss.portal.portlet.StateString; -import org.jboss.portal.portlet.ContainerURL; -import org.jboss.portal.portlet.spi.PortletInvocationContext; -import org.jboss.portal.portlet.info.PortletInfo; +import org.jboss.portal.portlet.cache.CacheLevel; +import org.jboss.portal.portlet.controller.PortletControllerContext; +import org.jboss.portal.portlet.controller.event.EventControllerContext; +import org.jboss.portal.portlet.controller.impl.event.EventControllerConte= xtImpl; +import org.jboss.portal.portlet.controller.impl.state.StateControllerConte= xtImpl; +import org.jboss.portal.portlet.controller.request.ControllerRequest; +import org.jboss.portal.portlet.controller.request.FullScopedCacheablePort= letResourceRequest; +import org.jboss.portal.portlet.controller.request.PageScopedFullPortletRe= sourceRequest; +import org.jboss.portal.portlet.controller.request.PortletActionRequest; +import org.jboss.portal.portlet.controller.request.PortletRenderRequest; +import org.jboss.portal.portlet.controller.request.PortletScopedPortletRes= ourceRequest; +import org.jboss.portal.portlet.controller.state.PageNavigationalState; +import org.jboss.portal.portlet.controller.state.StateControllerContext; +import org.jboss.portal.portlet.controller.state.WindowNavigationalState; import org.jboss.portal.portlet.impl.spi.AbstractClientContext; +import org.jboss.portal.portlet.impl.spi.AbstractRequestContext; +import org.jboss.portal.portlet.impl.spi.AbstractSecurityContext; import org.jboss.portal.portlet.impl.spi.AbstractServerContext; import org.jboss.portal.portlet.impl.spi.AbstractUserContext; import org.jboss.portal.portlet.impl.spi.AbstractWindowContext; -import org.jboss.portal.portlet.impl.spi.AbstractSecurityContext; -import org.jboss.portal.portlet.impl.spi.AbstractRequestContext; -import org.jboss.portal.portlet.cache.CacheLevel; -import org.jboss.portal.portlet.invocation.PortletInvocation; +import org.jboss.portal.portlet.info.PortletInfo; import org.jboss.portal.portlet.invocation.ActionInvocation; import org.jboss.portal.portlet.invocation.EventInvocation; +import org.jboss.portal.portlet.invocation.PortletInvocation; import org.jboss.portal.portlet.invocation.ResourceInvocation; import org.jboss.portal.portlet.invocation.response.PortletInvocationRespo= nse; +import org.jboss.portal.portlet.spi.PortletInvocationContext; import org.jboss.portal.portlet.test.StringCodec; import static org.jboss.portal.portlet.test.URLParameterConstants.*; -import org.jboss.portal.portlet.controller.state.WindowNavigationalState; -import org.jboss.portal.portlet.controller.PortletControllerContext; -import org.jboss.portal.portlet.controller.impl.state.StateControllerConte= xtImpl; -import org.jboss.portal.portlet.controller.impl.event.EventControllerConte= xtImpl; -import org.jboss.portal.portlet.controller.state.PageNavigationalState; -import org.jboss.portal.portlet.controller.state.StateControllerContext; -import org.jboss.portal.portlet.controller.request.PortletRenderRequest; -import org.jboss.portal.portlet.controller.request.ControllerRequest; -import org.jboss.portal.portlet.controller.request.PortletScopedPortletRes= ourceRequest; -import org.jboss.portal.portlet.controller.request.FullScopedCacheablePort= letResourceRequest; -import org.jboss.portal.portlet.controller.request.PageScopedFullPortletRe= sourceRequest; -import org.jboss.portal.portlet.controller.request.PortletActionRequest; -import org.jboss.portal.portlet.controller.event.EventControllerContext; import org.jboss.portal.web.Body; import org.jboss.portal.web.IllegalRequestException; import org.jboss.portal.web.WebRequest; = import javax.servlet.ServletContext; +import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.Cookie; import java.io.IOException; import java.util.Collection; +import java.util.List; import java.util.Map; -import java.util.List; = /** * @author Julien Viet @@ -332,7 +333,7 @@ public PortletInvocationResponse invoke(String windowId, ActionInvocati= on actionInvocation) throws PortletInvokerException { = - Portlet portlet =3D_getPortlet(windowId); + Portlet portlet =3D _getPortlet(windowId); = TestInstanceContext instanceContext =3D new TestInstanceContext(req,= portlet.getContext(), true); = @@ -382,7 +383,7 @@ resourceInvocation.setSecurityContext(new AbstractSecurityContext(re= q)); resourceInvocation.setRequestContext(new AbstractRequestContext(req)= ); resourceInvocation.setTarget(instanceContext.getTarget()); - = + return invoke(resourceInvocation); } = Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet= /test/controller/PortletURLRenderer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= controller/PortletURLRenderer.java 2008-02-05 21:52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= controller/PortletURLRenderer.java 2008-02-05 21:59:46 UTC (rev 9787) @@ -1,6 +1,6 @@ /*************************************************************************= ***** * JBoss, a division of Red Hat = * - * Copyright 2006, Red Hat Middleware, LLC, and individual = * + * 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. = * @@ -20,6 +20,7 @@ * 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.controller; = import org.jboss.portal.common.io.IOTools; @@ -33,10 +34,10 @@ import org.jboss.portal.portlet.ResourceURL; import org.jboss.portal.portlet.StateString; import org.jboss.portal.portlet.cache.CacheLevel; -import static org.jboss.portal.portlet.test.URLParameterConstants.*; +import org.jboss.portal.portlet.controller.impl.state.StateControllerConte= xtImpl; import org.jboss.portal.portlet.controller.state.PageNavigationalState; -import org.jboss.portal.portlet.controller.impl.state.StateControllerConte= xtImpl; import org.jboss.portal.portlet.test.StringCodec; +import static org.jboss.portal.portlet.test.URLParameterConstants.*; = import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -67,7 +68,7 @@ final PageNavigationalState pageNS; = public PortletURLRenderer( - StateControllerContextImpl stateContext, = + StateControllerContextImpl stateContext, PageNavigationalState pageNS, String windowId, HttpServletRequest clientReq, Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet= /test/controller/RedirectResponseRenderer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= controller/RedirectResponseRenderer.java 2008-02-05 21:52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= controller/RedirectResponseRenderer.java 2008-02-05 21:59:46 UTC (rev 9787) @@ -1,6 +1,6 @@ /*************************************************************************= ***** * JBoss, a division of Red Hat = * - * Copyright 2006, Red Hat Middleware, LLC, and individual = * + * 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. = * @@ -20,6 +20,7 @@ * 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.controller; = import org.jboss.portal.portlet.controller.PortletControllerContext; Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet= /test/controller/Renderer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= controller/Renderer.java 2008-02-05 21:52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= controller/Renderer.java 2008-02-05 21:59:46 UTC (rev 9787) @@ -1,6 +1,6 @@ /*************************************************************************= ***** * JBoss, a division of Red Hat = * - * Copyright 2006, Red Hat Middleware, LLC, and individual = * + * 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. = * @@ -20,6 +20,7 @@ * 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.controller; = import org.jboss.portal.portlet.controller.PortletControllerContext; Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet= /test/controller/ResourceRenderer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= controller/ResourceRenderer.java 2008-02-05 21:52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= controller/ResourceRenderer.java 2008-02-05 21:59:46 UTC (rev 9787) @@ -1,6 +1,6 @@ /*************************************************************************= ***** * JBoss, a division of Red Hat = * - * Copyright 2006, Red Hat Middleware, LLC, and individual = * + * 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. = * @@ -20,13 +20,14 @@ * 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.controller; = +import org.jboss.portal.common.io.IOTools; import org.jboss.portal.portlet.invocation.response.FragmentResponse; -import org.jboss.portal.common.io.IOTools; = +import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponse; -import javax.servlet.ServletOutputStream; import java.io.IOException; import java.io.Writer; = Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet= /test/controller/TestInstanceContext.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= controller/TestInstanceContext.java 2008-02-05 21:52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= controller/TestInstanceContext.java 2008-02-05 21:59:46 UTC (rev 9787) @@ -1,6 +1,6 @@ /*************************************************************************= ***** * JBoss, a division of Red Hat = * - * Copyright 2006, Red Hat Middleware, LLC, and individual = * + * 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. = * @@ -20,12 +20,13 @@ * 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.controller; = -import org.jboss.portal.portlet.state.AccessMode; import org.jboss.portal.portlet.PortletContext; import org.jboss.portal.portlet.StateEvent; import org.jboss.portal.portlet.spi.InstanceContext; +import org.jboss.portal.portlet.state.AccessMode; = import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet= /test/controller/TestPortalContext.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= controller/TestPortalContext.java 2008-02-05 21:52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= controller/TestPortalContext.java 2008-02-05 21:59:46 UTC (rev 9787) @@ -1,6 +1,6 @@ /*************************************************************************= ***** * JBoss, a division of Red Hat = * - * Copyright 2006, Red Hat Middleware, LLC, and individual = * + * 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. = * @@ -20,6 +20,7 @@ * 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.controller; = import org.jboss.portal.portlet.impl.spi.AbstractPortalContext; Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet= /test/controller/TestPortletInvocationContext.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= controller/TestPortletInvocationContext.java 2008-02-05 21:52:39 UTC (rev 9= 786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= controller/TestPortletInvocationContext.java 2008-02-05 21:59:46 UTC (rev 9= 787) @@ -1,6 +1,6 @@ /*************************************************************************= ***** * JBoss, a division of Red Hat = * - * Copyright 2006, Red Hat Middleware, LLC, and individual = * + * 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. = * @@ -20,17 +20,17 @@ * 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.controller; = +import org.jboss.portal.common.invocation.resolver.MapAttributeResolver; +import org.jboss.portal.common.invocation.resolver.PrincipalAttributeResol= ver; +import org.jboss.portal.common.util.MarkupInfo; import org.jboss.portal.portlet.ContainerURL; +import org.jboss.portal.portlet.controller.impl.state.StateControllerConte= xtImpl; import org.jboss.portal.portlet.controller.state.PageNavigationalState; -import org.jboss.portal.portlet.controller.impl.state.StateControllerConte= xtImpl; -import org.jboss.portal.portlet.test.controller.PortletURLRenderer; +import org.jboss.portal.portlet.impl.spi.AbstractPortletInvocationContext; import org.jboss.portal.portlet.invocation.PortletInvocation; -import org.jboss.portal.portlet.impl.spi.AbstractPortletInvocationContext; -import org.jboss.portal.common.util.MarkupInfo; -import org.jboss.portal.common.invocation.resolver.PrincipalAttributeResol= ver; -import org.jboss.portal.common.invocation.resolver.MapAttributeResolver; = import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet= /test/controller/TestPortletInvoker.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= controller/TestPortletInvoker.java 2008-02-05 21:52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= controller/TestPortletInvoker.java 2008-02-05 21:59:46 UTC (rev 9787) @@ -1,6 +1,6 @@ /*************************************************************************= ***** * JBoss, a division of Red Hat = * - * Copyright 2006, Red Hat Middleware, LLC, and individual = * + * 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. = * @@ -20,24 +20,25 @@ * 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.controller; = +import org.jboss.portal.common.invocation.InterceptorStackFactory; +import org.jboss.portal.common.invocation.Invocation; +import org.jboss.portal.common.invocation.InvocationException; +import org.jboss.portal.common.invocation.InvocationHandler; +import org.jboss.portal.portlet.Portlet; +import org.jboss.portal.portlet.PortletContext; import org.jboss.portal.portlet.PortletInvoker; import org.jboss.portal.portlet.PortletInvokerException; -import org.jboss.portal.portlet.Portlet; -import org.jboss.portal.portlet.PortletContext; -import org.jboss.portal.portlet.state.PropertyMap; -import org.jboss.portal.portlet.state.PropertyChange; -import org.jboss.portal.portlet.state.DestroyCloneFailure; import org.jboss.portal.portlet.invocation.PortletInvocation; import org.jboss.portal.portlet.invocation.response.PortletInvocationRespo= nse; -import org.jboss.portal.common.invocation.InterceptorStackFactory; -import org.jboss.portal.common.invocation.InvocationHandler; -import org.jboss.portal.common.invocation.Invocation; -import org.jboss.portal.common.invocation.InvocationException; +import org.jboss.portal.portlet.state.DestroyCloneFailure; +import org.jboss.portal.portlet.state.PropertyChange; +import org.jboss.portal.portlet.state.PropertyMap; = +import java.util.List; import java.util.Set; -import java.util.List; = /** * A simple consumer. @@ -114,11 +115,11 @@ { if (e instanceof PortletInvokerException) { - throw(PortletInvokerException)e; + throw (PortletInvokerException)e; } else if (e instanceof RuntimeException) { - throw(RuntimeException)e; + throw (RuntimeException)e; } else { Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet= /test/metadata/factory/LocalizedStringBuilder.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= metadata/factory/LocalizedStringBuilder.java 2008-02-05 21:52:39 UTC (rev 9= 786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= metadata/factory/LocalizedStringBuilder.java 2008-02-05 21:59:46 UTC (rev 9= 787) @@ -1,6 +1,6 @@ /*************************************************************************= ***** * JBoss, a division of Red Hat = * - * Copyright 2006, Red Hat Middleware, LLC, and individual = * + * 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. = * @@ -20,18 +20,19 @@ * 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.metadata.factory; = +import org.apache.log4j.Logger; +import org.jboss.portal.common.i18n.LocalizedString; +import org.jboss.portal.portlet.impl.metadata.adapter.LocalizedStringAdapt= er; +import org.jboss.portal.portlet.impl.metadata.common.LocalizedDescriptionM= etaData; + import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; = -import org.apache.log4j.Logger; -import org.jboss.portal.common.i18n.LocalizedString; -import org.jboss.portal.portlet.impl.metadata.adapter.LocalizedStringAdapt= er; -import org.jboss.portal.portlet.impl.metadata.common.LocalizedDescriptionM= etaData; - /** * @author Emanuel Muckenhuber * @version $Revision$ Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet= /test/metadata/factory/PortletApplicationModelFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= metadata/factory/PortletApplicationModelFactory.java 2008-02-05 21:52:39 UT= C (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= metadata/factory/PortletApplicationModelFactory.java 2008-02-05 21:59:46 UT= C (rev 9787) @@ -1,6 +1,6 @@ /*************************************************************************= ***** * JBoss, a division of Red Hat = * - * Copyright 2006, Red Hat Middleware, LLC, and individual = * + * 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. = * @@ -20,11 +20,9 @@ * 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.metadata.factory; = -import java.net.URI; -import java.net.URISyntaxException; - import org.apache.log4j.Logger; import org.jboss.portal.Mode; import org.jboss.portal.WindowState; @@ -34,12 +32,12 @@ import org.jboss.portal.portlet.impl.metadata.CustomPortletModeMetaData; import org.jboss.portal.portlet.impl.metadata.CustomWindowStateMetaData; import org.jboss.portal.portlet.impl.metadata.ListenerMetaData; +import org.jboss.portal.portlet.impl.metadata.PortletApplication10MetaData; import org.jboss.portal.portlet.impl.metadata.PortletApplication20MetaData; +import static org.jboss.portal.portlet.impl.metadata.PortletMetaDataConsta= nts.DEFAULT_LOCALE; +import static org.jboss.portal.portlet.impl.metadata.PortletMetaDataConsta= nts.PORTLET_JSR_286_NS; import org.jboss.portal.portlet.impl.metadata.PublicRenderParameterMetaDat= a; import org.jboss.portal.portlet.impl.metadata.UserAttributeMetaData; -import org.jboss.portal.portlet.test.metadata.impl.AnnotationPortletApplic= ation10MetaData; -import org.jboss.portal.portlet.test.metadata.impl.AnnotationPortletApplic= ation20MetaData; -import org.jboss.portal.portlet.impl.metadata.PortletApplication10MetaData; import org.jboss.portal.portlet.impl.metadata.common.ContainerRuntimeMetaD= ata; import org.jboss.portal.portlet.impl.metadata.common.DescribableMetaData; import org.jboss.portal.portlet.impl.metadata.common.InitParamMetaData; @@ -61,11 +59,14 @@ import org.jboss.portal.portlet.impl.metadata.security.PortletCollectionMe= taData; import org.jboss.portal.portlet.impl.metadata.security.SecurityConstraintM= etaData; import org.jboss.portal.portlet.impl.metadata.security.UserDataConstraintM= etaData; +import org.jboss.portal.portlet.test.metadata.impl.AnnotationPortletApplic= ation10MetaData; +import org.jboss.portal.portlet.test.metadata.impl.AnnotationPortletApplic= ation20MetaData; import org.jboss.xb.binding.GenericObjectModelFactory; import org.jboss.xb.binding.UnmarshallingContext; import org.xml.sax.Attributes; = -import static org.jboss.portal.portlet.impl.metadata.PortletMetaDataConsta= nts.*; +import java.net.URI; +import java.net.URISyntaxException; = /** * @author Emanuel Muckenhuber @@ -91,8 +92,8 @@ = // portlet-app 2.0 or 1.0 PortletApplication10MetaData md =3D PORTLET_JSR_286_NS.equals(nsURI) - ? new AnnotationPortletApplication20MetaData() - : new AnnotationPortletApplication10MetaData(); + ? new AnnotationPortletApplication20MetaData() + : new AnnotationPortletApplication10MetaData(); = // Set portlet-app id md.setId(id); @@ -302,7 +303,7 @@ = if (child instanceof DescribableMetaData) { - DescribableMetaData md =3D (DescribableMetaData) child; + DescribableMetaData md =3D (DescribableMetaData)child; LocalizedString d =3D this.descriptions.getLocalizedString(md); md.setDescription(d); } @@ -310,33 +311,33 @@ // portlet app if (parent instanceof PortletApplication10MetaData) { - PortletApplication10MetaData md =3D (PortletApplication10MetaData= ) parent; + PortletApplication10MetaData md =3D (PortletApplication10MetaData= )parent; // add portlet if (child instanceof PortletMetaData) { - PortletMetaData portlet =3D (PortletMetaData) child; + PortletMetaData portlet =3D (PortletMetaData)child; portlet.setDisplayName(this.displayNames.getLocalizedString(po= rtlet)); md.addPortlet(portlet); } // add custom-portlet-mode else if (child instanceof CustomPortletModeMetaData) { - md.addCustomPortletMode((CustomPortletModeMetaData) child); + md.addCustomPortletMode((CustomPortletModeMetaData)child); } // add custom window state else if (child instanceof CustomWindowStateMetaData) { - md.addCustomWindowState((CustomWindowStateMetaData) child); + md.addCustomWindowState((CustomWindowStateMetaData)child); } // add user-attribute else if (child instanceof UserAttributeMetaData) { - md.addUserAttribute((UserAttributeMetaData) child); + md.addUserAttribute((UserAttributeMetaData)child); } // add security-constraint else if (child instanceof SecurityConstraintMetaData) { - SecurityConstraintMetaData security =3D (SecurityConstraintMet= aData) child; + SecurityConstraintMetaData security =3D (SecurityConstraintMet= aData)child; // display-name security.setDisplayName(this.displayNames.getLocalizedString(s= ecurity)); md.addSecurityConstraint(security); @@ -346,38 +347,38 @@ // portlet-app 2.0 if (parent instanceof PortletApplication20MetaData) { - PortletApplication20MetaData md =3D (PortletApplication20MetaData= ) parent; + PortletApplication20MetaData md =3D (PortletApplication20MetaData= )parent; // add public-render-parameter if (child instanceof PublicRenderParameterMetaData) { - md.addPublicRenderParameter((PublicRenderParameterMetaData) ch= ild); + md.addPublicRenderParameter((PublicRenderParameterMetaData)chi= ld); } // add event-defintion else if (child instanceof EventDefinitionMetaData) { - md.addEventDefinition((EventDefinitionMetaData) child); + md.addEventDefinition((EventDefinitionMetaData)child); } // add filter else if (child instanceof FilterMetaData) { - FilterMetaData filter =3D (FilterMetaData) child; + FilterMetaData filter =3D (FilterMetaData)child; filter.setDisplayName(this.displayNames.getLocalizedString(fil= ter)); md.addFilter(filter); } // add filter-mapping else if (child instanceof FilterMappingMetaData) { - md.addFilterMapping((FilterMappingMetaData) child); + md.addFilterMapping((FilterMappingMetaData)child); } // add container-runtime-option else if (child instanceof ContainerRuntimeMetaData) { - md.addContainerRuntime((ContainerRuntimeMetaData) child); + md.addContainerRuntime((ContainerRuntimeMetaData)child); } // add listener else if (child instanceof ListenerMetaData) { - ListenerMetaData listener =3D (ListenerMetaData) child; + ListenerMetaData listener =3D (ListenerMetaData)child; listener.setDisplayName(this.displayNames.getLocalizedString(l= istener)); md.addListener(listener); } @@ -386,104 +387,104 @@ // portlet if (parent instanceof PortletMetaData) { - PortletMetaData md =3D (PortletMetaData) parent; + PortletMetaData md =3D (PortletMetaData)parent; // init-param if (child instanceof InitParamMetaData) { - md.addInitParam((InitParamMetaData) child); + md.addInitParam((InitParamMetaData)child); } // supports else if (child instanceof SupportsMetaData) { - md.addSupport((SupportsMetaData) child); + md.addSupport((SupportsMetaData)child); } // supported-locale else if (child instanceof SupportedLocaleMetaData) { - md.addSupportedLocale((SupportedLocaleMetaData) child); + md.addSupportedLocale((SupportedLocaleMetaData)child); } // portlet-info else if (child instanceof PortletInfoMetaData) { - md.setPortletInfo((PortletInfoMetaData) child); + md.setPortletInfo((PortletInfoMetaData)child); } // portlet-preferences else if (child instanceof PortletPreferencesMetaData) { - md.setPortletPreferences((PortletPreferencesMetaData) child); + md.setPortletPreferences((PortletPreferencesMetaData)child); } // security-role-ref else if (child instanceof SecurityRoleRefMetaData) { - md.addSecurityRoleRef((SecurityRoleRefMetaData) child); + md.addSecurityRoleRef((SecurityRoleRefMetaData)child); } // supported-events else if (child instanceof EventDefinitionReferenceMetaData) { if ("supported-processing-event".equals(localName)) { - md.addSupportedProcessingEvent((EventDefinitionReferenceMet= aData) child); + md.addSupportedProcessingEvent((EventDefinitionReferenceMet= aData)child); } else if ("supported-publishing-event".equals(localName)) { - md.addSupportedPublishingEvent((EventDefinitionReferenceMet= aData) child); + md.addSupportedPublishingEvent((EventDefinitionReferenceMet= aData)child); } } // container-runtime-option else if (child instanceof ContainerRuntimeMetaData) { - md.addContainerRuntime((ContainerRuntimeMetaData) child); + md.addContainerRuntime((ContainerRuntimeMetaData)child); } } = // adding user-data-constraint and portlet-name(s) to security-const= raint if (parent instanceof SecurityConstraintMetaData) { - SecurityConstraintMetaData md =3D (SecurityConstraintMetaData) pa= rent; + SecurityConstraintMetaData md =3D (SecurityConstraintMetaData)par= ent; // add user-data-constraint if (child instanceof UserDataConstraintMetaData) { - md.setUserDataConstraint((UserDataConstraintMetaData) child); + md.setUserDataConstraint((UserDataConstraintMetaData)child); } // add portlet-collection else if (child instanceof PortletCollectionMetaData) { - md.setPortletList((PortletCollectionMetaData) child); + md.setPortletList((PortletCollectionMetaData)child); } } = // filter if (parent instanceof FilterMetaData) { - FilterMetaData md =3D (FilterMetaData) parent; + FilterMetaData md =3D (FilterMetaData)parent; // add init-param if (child instanceof InitParamMetaData) { - md.addInitParam((InitParamMetaData) child); + md.addInitParam((InitParamMetaData)child); } } = // add portlet-mode and window-state if (parent instanceof SupportsMetaData) { - SupportsMetaData md =3D (SupportsMetaData) parent; + SupportsMetaData md =3D (SupportsMetaData)parent; if (child instanceof PortletModeMetaData) { - md.addPortletMode((PortletModeMetaData) child); + md.addPortletMode((PortletModeMetaData)child); } else if (child instanceof WindowStateMetaData) { - md.addWindowState((WindowStateMetaData) child); + md.addWindowState((WindowStateMetaData)child); } } = // add preference if (parent instanceof PortletPreferencesMetaData) { - PortletPreferencesMetaData md =3D (PortletPreferencesMetaData) pa= rent; + PortletPreferencesMetaData md =3D (PortletPreferencesMetaData)par= ent; if (child instanceof PortletPreferenceMetaData) { - md.addPortletPreference((PortletPreferenceMetaData) child); + md.addPortletPreference((PortletPreferenceMetaData)child); } } } @@ -494,7 +495,7 @@ // JSR 286 portlet-app attributes - default-namespace and resource-b= undle. if (object instanceof PortletApplication20MetaData) { - PortletApplication20MetaData md =3D (PortletApplication20MetaData= ) object; + PortletApplication20MetaData md =3D (PortletApplication20MetaData= )object; if ("resource-bundle".equals(localName)) { md.setResourceBundle(value); @@ -515,7 +516,7 @@ // portlet if (object instanceof PortletMetaData) { - PortletMetaData md =3D (PortletMetaData) object; + PortletMetaData md =3D (PortletMetaData)object; if ("portlet-name".equals(localName)) { md.setPortletName(value); @@ -544,7 +545,7 @@ = if (object instanceof LocalizedDescriptionMetaData) { - LocalizedDescriptionMetaData localized =3D (LocalizedDescriptionM= etaData) object; + LocalizedDescriptionMetaData localized =3D (LocalizedDescriptionM= etaData)object; if ("description".equals(localName)) { localized.setDescription(value); @@ -558,7 +559,7 @@ // init-param if (object instanceof InitParamMetaData) { - InitParamMetaData md =3D (InitParamMetaData) object; + InitParamMetaData md =3D (InitParamMetaData)object; if ("name".equals(localName)) { md.setName(value); @@ -572,7 +573,7 @@ // supports if (object instanceof SupportsMetaData) { - SupportsMetaData md =3D (SupportsMetaData) object; + SupportsMetaData md =3D (SupportsMetaData)object; if ("mime-type".equals(localName)) { md.setMimeType(value); @@ -582,7 +583,7 @@ // supports --- portlet-mode if (object instanceof PortletModeMetaData) { - PortletModeMetaData md =3D (PortletModeMetaData) object; + PortletModeMetaData md =3D (PortletModeMetaData)object; if ("portlet-mode".equals(localName)) { md.setPortletMode(Mode.create(value)); @@ -592,7 +593,7 @@ // supports --- window-state if (object instanceof WindowStateMetaData) { - WindowStateMetaData md =3D (WindowStateMetaData) object; + WindowStateMetaData md =3D (WindowStateMetaData)object; if ("window-state".equals(localName)) { md.setWindowState(WindowState.create(value)); @@ -602,7 +603,7 @@ // supported-locale if (object instanceof SupportedLocaleMetaData) { - SupportedLocaleMetaData md =3D (SupportedLocaleMetaData) object; + SupportedLocaleMetaData md =3D (SupportedLocaleMetaData)object; if ("supported-locale".equals(localName)) { md.setLocale(value); @@ -612,7 +613,7 @@ // portlet-info if (object instanceof PortletInfoMetaData) { - PortletInfoMetaData md =3D (PortletInfoMetaData) object; + PortletInfoMetaData md =3D (PortletInfoMetaData)object; if ("title".equals(localName)) { md.setTitle(value); @@ -630,7 +631,7 @@ // portlet-preferences if (object instanceof PortletPreferencesMetaData) { - PortletPreferencesMetaData md =3D (PortletPreferencesMetaData) ob= ject; + PortletPreferencesMetaData md =3D (PortletPreferencesMetaData)obj= ect; if ("preferences-validator".equals(localName)) { md.setPreferenceValidator(value); @@ -640,7 +641,7 @@ // preference if (object instanceof PortletPreferenceMetaData) { - PortletPreferenceMetaData md =3D (PortletPreferenceMetaData) obje= ct; + PortletPreferenceMetaData md =3D (PortletPreferenceMetaData)objec= t; if ("name".equals(localName)) { md.setName(value); @@ -658,7 +659,7 @@ // security-role-ref if (object instanceof SecurityRoleRefMetaData) { - SecurityRoleRefMetaData md =3D (SecurityRoleRefMetaData) object; + SecurityRoleRefMetaData md =3D (SecurityRoleRefMetaData)object; if ("role-name".equals(localName)) { md.setRoleName(value); @@ -672,7 +673,7 @@ // supported events if (object instanceof EventDefinitionReferenceMetaData) { - EventDefinitionReferenceMetaData md =3D (EventDefinitionReference= MetaData) object; + EventDefinitionReferenceMetaData md =3D (EventDefinitionReference= MetaData)object; if ("qname".equals(localName)) { md.setQname(nav.resolveQName(value)); @@ -686,7 +687,7 @@ // custom-portlet-mode if (object instanceof CustomPortletModeMetaData) { - CustomPortletModeMetaData mode =3D (CustomPortletModeMetaData) ob= ject; + CustomPortletModeMetaData mode =3D (CustomPortletModeMetaData)obj= ect; if ("portlet-mode".equals(localName)) { mode.setPortletMode(value); @@ -700,7 +701,7 @@ // custom-window-state if (object instanceof CustomWindowStateMetaData) { - CustomWindowStateMetaData md =3D (CustomWindowStateMetaData) obje= ct; + CustomWindowStateMetaData md =3D (CustomWindowStateMetaData)objec= t; if ("window-state".equals(localName)) { md.setWindowState(value); @@ -710,7 +711,7 @@ // user-attribute if (object instanceof UserAttributeMetaData) { - UserAttributeMetaData md =3D (UserAttributeMetaData) object; + UserAttributeMetaData md =3D (UserAttributeMetaData)object; if ("name".equals(localName)) { md.setName(value); @@ -720,7 +721,7 @@ // user-data-constraint if (object instanceof UserDataConstraintMetaData) { - UserDataConstraintMetaData md =3D (UserDataConstraintMetaData) ob= ject; + UserDataConstraintMetaData md =3D (UserDataConstraintMetaData)obj= ect; if ("transport-guarantee".equals(localName)) { md.setTransportQuarantee(TransportGuarantee.valueOf(value)); @@ -730,7 +731,7 @@ // portlet-collection in security-constraint if (object instanceof PortletCollectionMetaData) { - PortletCollectionMetaData md =3D (PortletCollectionMetaData) obje= ct; + PortletCollectionMetaData md =3D (PortletCollectionMetaData)objec= t; if ("portlet-name".equals(localName)) { md.addPortletname(value); @@ -740,7 +741,7 @@ // filter if (object instanceof FilterMetaData && PORTLET_JSR_286_NS.equals(ns= URI)) { - FilterMetaData md =3D (FilterMetaData) object; + FilterMetaData md =3D (FilterMetaData)object; if ("filter-class".equals(localName)) { md.setFilterClass(value); @@ -751,12 +752,12 @@ } else if ("lifecycle".equals(localName)) { - String lifeCycle =3D value.substring(0 , value.length() - "_PH= ASE".length()); + String lifeCycle =3D value.substring(0, value.length() - "_PHA= SE".length()); try { md.addLifecycle(LifeCyclePhase.valueOf(lifeCycle)); } - catch(IllegalArgumentException e) + catch (IllegalArgumentException e) { throw new IllegalArgumentException("Invalid value for lifec= ycle. Valid values are [RENDER_PHASE, RESOURCE_PHASE, ACTION_PHASE, EVENT_P= HASE]"); } @@ -766,7 +767,7 @@ // filter-mapping if (object instanceof FilterMappingMetaData && PORTLET_JSR_286_NS.eq= uals(nsURI)) { - FilterMappingMetaData md =3D (FilterMappingMetaData) object; + FilterMappingMetaData md =3D (FilterMappingMetaData)object; if ("filter-name".equals(localName)) { md.setName(value); @@ -780,7 +781,7 @@ // event-defintion if (object instanceof EventDefinitionMetaData && PORTLET_JSR_286_NS.= equals(nsURI)) { - EventDefinitionMetaData md =3D (EventDefinitionMetaData) object; + EventDefinitionMetaData md =3D (EventDefinitionMetaData)object; if ("name".equals(localName)) { md.setName(value); @@ -802,7 +803,7 @@ // public-render-parameter if (object instanceof PublicRenderParameterMetaData && PORTLET_JSR_2= 86_NS.equals(nsURI)) { - PublicRenderParameterMetaData md =3D (PublicRenderParameterMetaDa= ta) object; + PublicRenderParameterMetaData md =3D (PublicRenderParameterMetaDa= ta)object; if ("identifier".equals(localName)) { md.setIdentifier(value); @@ -824,7 +825,7 @@ // container-runtime-option if (object instanceof ContainerRuntimeMetaData && PORTLET_JSR_286_NS= .equals(nsURI)) { - ContainerRuntimeMetaData md =3D (ContainerRuntimeMetaData) object; + ContainerRuntimeMetaData md =3D (ContainerRuntimeMetaData)object; if ("name".equals(localName)) { md.setName(value); @@ -838,7 +839,7 @@ // listener if (object instanceof ListenerMetaData && PORTLET_JSR_286_NS.equals(= nsURI)) { - ListenerMetaData md =3D (ListenerMetaData) object; + ListenerMetaData md =3D (ListenerMetaData)object; if ("listener-class".equals(localName)) { md.setListenerClass(value); Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet= /test/metadata/impl/AnnotationPortletApplication10MetaData.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= metadata/impl/AnnotationPortletApplication10MetaData.java 2008-02-05 21:52:= 39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= metadata/impl/AnnotationPortletApplication10MetaData.java 2008-02-05 21:59:= 46 UTC (rev 9787) @@ -1,6 +1,6 @@ /*************************************************************************= ***** * JBoss, a division of Red Hat = * - * Copyright 2006, Red Hat Middleware, LLC, and individual = * + * 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. = * @@ -20,17 +20,18 @@ * 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.metadata.impl; = +import org.jboss.portal.portlet.impl.metadata.PortletApplication10MetaData; +import org.jboss.portal.portlet.impl.metadata.PortletMetaDataConstants; +import org.jboss.xb.annotations.JBossXmlSchema; + +import javax.xml.bind.annotation.XmlNs; import javax.xml.bind.annotation.XmlNsForm; -import javax.xml.bind.annotation.XmlNs; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; = -import org.jboss.xb.annotations.JBossXmlSchema; -import org.jboss.portal.portlet.impl.metadata.PortletMetaDataConstants; -import org.jboss.portal.portlet.impl.metadata.PortletApplication10MetaData; - /** * @author Emanuel Muckenhuber * @version $Revision$ @@ -38,9 +39,9 @@ @XmlRootElement(name =3D "portlet-app") @XmlType(name =3D "portlet-appType") @JBossXmlSchema(xmlns =3D {@XmlNs(namespaceURI =3D PortletMetaDataConstant= s.PORTLET_JSR_168_NS, prefix =3D "portlet")}, - ignoreUnresolvedFieldOrClass =3D false, - namespace =3D PortletMetaDataConstants.PORTLET_JSR_168_NS, - elementFormDefault =3D XmlNsForm.QUALIFIED) + ignoreUnresolvedFieldOrClass =3D false, + namespace =3D PortletMetaDataConstants.PORTLET_JSR_168_NS, + elementFormDefault =3D XmlNsForm.QUALIFIED) public class AnnotationPortletApplication10MetaData extends PortletApplica= tion10MetaData { } \ No newline at end of file Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet= /test/metadata/impl/AnnotationPortletApplication20MetaData.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= metadata/impl/AnnotationPortletApplication20MetaData.java 2008-02-05 21:52:= 39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= metadata/impl/AnnotationPortletApplication20MetaData.java 2008-02-05 21:59:= 46 UTC (rev 9787) @@ -1,6 +1,6 @@ /*************************************************************************= ***** * JBoss, a division of Red Hat = * - * Copyright 2006, Red Hat Middleware, LLC, and individual = * + * 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. = * @@ -20,17 +20,18 @@ * 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.metadata.impl; = +import org.jboss.portal.portlet.impl.metadata.PortletApplication20MetaData; +import org.jboss.portal.portlet.impl.metadata.PortletMetaDataConstants; +import org.jboss.xb.annotations.JBossXmlSchema; + import javax.xml.bind.annotation.XmlNs; import javax.xml.bind.annotation.XmlNsForm; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; = -import org.jboss.xb.annotations.JBossXmlSchema; -import org.jboss.portal.portlet.impl.metadata.PortletMetaDataConstants; -import org.jboss.portal.portlet.impl.metadata.PortletApplication20MetaData; - /** * @author Emanuel Muckenhuber * @version $Revision$ @@ -39,9 +40,9 @@ @XmlRootElement(name =3D "portlet-app") @XmlType(name =3D "portlet-appType") @JBossXmlSchema(xmlns =3D {@XmlNs(namespaceURI =3D PortletMetaDataConstant= s.PORTLET_JSR_286_NS, prefix =3D "portlet")}, - ignoreUnresolvedFieldOrClass =3D false, - namespace =3D PortletMetaDataConstants.PORTLET_JSR_286_NS, - elementFormDefault =3D XmlNsForm.QUALIFIED) + ignoreUnresolvedFieldOrClass =3D false, + namespace =3D PortletMetaDataConstants.PORTLET_JSR_286_NS, + elementFormDefault =3D XmlNsForm.QUALIFIED) public class AnnotationPortletApplication20MetaData extends PortletApplica= tion20MetaData { } \ No newline at end of file Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet= /test/metadata/impl/PortletApplicationMetaDataException.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= metadata/impl/PortletApplicationMetaDataException.java 2008-02-05 21:52:39 = UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= metadata/impl/PortletApplicationMetaDataException.java 2008-02-05 21:59:46 = UTC (rev 9787) @@ -1,6 +1,6 @@ /*************************************************************************= ***** * JBoss, a division of Red Hat = * - * Copyright 2006, Red Hat Middleware, LLC, and individual = * + * 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. = * @@ -20,6 +20,7 @@ * 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.metadata.impl; = /** Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet= /test/metadata/impl/ValueTrimmingFilter.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= metadata/impl/ValueTrimmingFilter.java 2008-02-05 21:52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= metadata/impl/ValueTrimmingFilter.java 2008-02-05 21:59:46 UTC (rev 9787) @@ -1,6 +1,6 @@ /*************************************************************************= ***** * JBoss, a division of Red Hat = * - * Copyright 2006, Red Hat Middleware, LLC, and individual = * + * 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. = * @@ -20,6 +20,7 @@ * 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.metadata.impl; = import org.jboss.xb.binding.GenericObjectModelFactory; Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet= /test/url/CodecBuilder.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= url/CodecBuilder.java 2008-02-05 21:52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= url/CodecBuilder.java 2008-02-05 21:59:46 UTC (rev 9787) @@ -1,6 +1,6 @@ /*************************************************************************= ***** * JBoss, a division of Red Hat = * - * Copyright 2006, Red Hat Middleware, LLC, and individual = * + * 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. = * @@ -22,7 +22,6 @@ *************************************************************************= *****/ package org.jboss.portal.portlet.test.url; = -import java.util.LinkedHashSet; import java.util.ArrayList; = /** Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet= /test/url/ParameterDecoder.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= url/ParameterDecoder.java 2008-02-05 21:52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= url/ParameterDecoder.java 2008-02-05 21:59:46 UTC (rev 9787) @@ -1,6 +1,6 @@ /*************************************************************************= ***** * JBoss, a division of Red Hat = * - * Copyright 2006, Red Hat Middleware, LLC, and individual = * + * 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. = * @@ -89,7 +89,7 @@ } = // - for (int i =3D builder.metaParameterNames.size() - 1;reservedParamet= er > 0;) + for (int i =3D builder.metaParameterNames.size() - 1; reservedParame= ter > 0;) { if (i < 0) { @@ -132,7 +132,7 @@ } = // - for (Iterator i =3D parameters.entrySet().iterator();i.hasNext();) + for (Iterator i =3D parameters.entrySet().iterator(); i.hasNext();) { Map.Entry entry =3D (Map.Entry)i.next(); String parameterName =3D (String)entry.getKey(); Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet= /test/url/ParameterEncoder.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= url/ParameterEncoder.java 2008-02-05 21:52:39 UTC (rev 9786) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= url/ParameterEncoder.java 2008-02-05 21:59:46 UTC (rev 9787) @@ -1,6 +1,6 @@ /*************************************************************************= ***** * JBoss, a division of Red Hat = * - * Copyright 2006, Red Hat Middleware, LLC, and individual = * + * 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. = * --===============6689395982175598487==-- From portal-commits at lists.jboss.org Tue Feb 5 18:52:20 2008 Content-Type: multipart/mixed; boundary="===============1914274981733212382==" MIME-Version: 1.0 From: portal-commits at lists.jboss.org To: portal-commits at lists.jboss.org Subject: [portal-commits] JBoss Portal SVN: r9788 - in modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet: impl/jsr168 and 2 other directories. Date: Tue, 05 Feb 2008 18:52:19 -0500 Message-ID: --===============1914274981733212382== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: julien(a)jboss.com Date: 2008-02-05 18:52:19 -0500 (Tue, 05 Feb 2008) New Revision: 9788 Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/imp= l/info/ContainerInfoBuilder.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/imp= l/info/ContainerInfoBuilderContext.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/imp= l/info/ContainerPortletInfo.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/imp= l/jsr168/ContainerInfoBuilderContextImpl.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/inf= o/PortletInfo.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/sup= port/info/PortletInfoSupport.java Log: add name/applicationName on portlet info which expose portlet name and appl= ication name (context path name more or less). Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/port= let/impl/info/ContainerInfoBuilder.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im= pl/info/ContainerInfoBuilder.java 2008-02-05 21:59:46 UTC (rev 9787) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im= pl/info/ContainerInfoBuilder.java 2008-02-05 23:52:19 UTC (rev 9788) @@ -587,6 +587,7 @@ containerNavigation, filters, portletMD.getPortletName(), + context.getApplicationName(), portletMD.getPortletClass(), initParameters, false, @@ -604,6 +605,7 @@ containerCache, containerSession, portletMD.getPortletName(), + context.getApplicationName(), portletMD.getPortletClass(), Collections.unmodifiableMap(initParameters), false, Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/port= let/impl/info/ContainerInfoBuilderContext.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im= pl/info/ContainerInfoBuilderContext.java 2008-02-05 21:59:46 UTC (rev 9787) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im= pl/info/ContainerInfoBuilderContext.java 2008-02-05 23:52:19 UTC (rev 9788) @@ -33,6 +33,8 @@ public interface ContainerInfoBuilderContext { = + String getApplicationName(); + ResourceBundleManager getBundleManager(); = ResourceBundleManager getBundleManager(PortletMetaData portletMD); Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/port= let/impl/info/ContainerPortletInfo.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im= pl/info/ContainerPortletInfo.java 2008-02-05 21:59:46 UTC (rev 9787) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im= pl/info/ContainerPortletInfo.java 2008-02-05 23:52:19 UTC (rev 9788) @@ -65,6 +65,9 @@ private final String name; = /** . */ + private final String applicationName; + + /** . */ private final String className; = /** . */ @@ -94,6 +97,7 @@ ContainerSessionInfo session, String name, String className, + String applicationName, Map initParameters, Boolean remotable, ResourceBundleManager bundleManager) @@ -108,6 +112,7 @@ this.navigation =3D new ContainerNavigationInfo(); this.filterRefs =3D Collections.emptyList(); this.name =3D name; + this.applicationName =3D applicationName; this.className =3D className; this.initParameters =3D initParameters; this.remotable =3D remotable; @@ -126,6 +131,7 @@ ContainerNavigationInfo navigation, List filterRefs, String name, + String applicationName, String className, Map initParameters, Boolean remotable, @@ -142,6 +148,7 @@ this.navigation =3D navigation; this.filterRefs =3D filterRefs; this.name =3D name; + this.applicationName =3D applicationName; this.className =3D className; this.initParameters =3D initParameters; this.remotable =3D remotable; @@ -154,6 +161,11 @@ return name; } = + public String getApplicationName() + { + return null; + } + public Map getOptions() { return options; Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/port= let/impl/jsr168/ContainerInfoBuilderContextImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im= pl/jsr168/ContainerInfoBuilderContextImpl.java 2008-02-05 21:59:46 UTC (rev= 9787) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im= pl/jsr168/ContainerInfoBuilderContextImpl.java 2008-02-05 23:52:19 UTC (rev= 9788) @@ -41,20 +41,34 @@ public class ContainerInfoBuilderContextImpl implements ContainerInfoBuild= erContext { = - private PortletApplication10MetaData metaData; + /** . */ + private final PortletApplication10MetaData metaData; = - private WebApp webApp; + /** . */ + private final WebApp webApp; = - private final Map portletBundleMgrs =3D = new HashMap(); + /** . */ + private final Map portletBundleMgrs; = + /** . */ private ResourceBundleManager applicationBundleMgr; = + /** . */ + private final String applicationName; + public ContainerInfoBuilderContextImpl(PortletApplication10MetaData met= aData, WebApp webApp) { this.metaData =3D metaData; this.webApp =3D webApp; + this.portletBundleMgrs =3D new HashMap(); + this.applicationName =3D webApp.getContextPath().substring(1); } = + public String getApplicationName() + { + return applicationName; + } + public ResourceBundleManager getBundleManager() { if (applicationBundleMgr =3D=3D null) Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/port= let/info/PortletInfo.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/in= fo/PortletInfo.java 2008-02-05 21:59:46 UTC (rev 9787) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/in= fo/PortletInfo.java 2008-02-05 23:52:19 UTC (rev 9788) @@ -31,7 +31,22 @@ */ public interface PortletInfo { + /** + * Returns the portlet name. + * + * @return the portlet name + */ + String getName(); + + /** + * Returns the portlet application name. + * + * @return the portlet application name + */ + String getApplicationName(); + + /** * Retrieves the capabilities of supported by the described portlet. * * @return the capabilities of the portlet Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/port= let/support/info/PortletInfoSupport.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/su= pport/info/PortletInfoSupport.java 2008-02-05 21:59:46 UTC (rev 9787) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/su= pport/info/PortletInfoSupport.java 2008-02-05 23:52:19 UTC (rev 9788) @@ -32,6 +32,8 @@ public class PortletInfoSupport implements PortletInfo { = + private String name; + private String applicationName; private Boolean remotable; private PreferencesInfoSupport preferencesSupport =3D new PreferencesIn= foSupport(); private SecurityInfoSupport securitySupport =3D new SecurityInfoSupport= (); @@ -41,6 +43,26 @@ private EventingInfoSupport eventsSupport =3D new EventingInfoSupport(); private NavigationInfoSupport navigationSupport =3D new NavigationInfoS= upport(); = + public String getName() + { + return name; + } + + public void setName(String name) + { + this.name =3D name; + } + + public String getApplicationName() + { + return applicationName; + } + + public void setApplicationName(String applicationName) + { + this.applicationName =3D applicationName; + } + public CapabilitiesInfo getCapabilities() { throw new UnsupportedOperationException("Implement me"); --===============1914274981733212382==-- From portal-commits at lists.jboss.org Tue Feb 5 18:59:17 2008 Content-Type: multipart/mixed; boundary="===============6778176298773477291==" MIME-Version: 1.0 From: portal-commits at lists.jboss.org To: portal-commits at lists.jboss.org Subject: [portal-commits] JBoss Portal SVN: r9789 - modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF. Date: Tue, 05 Feb 2008 18:59:17 -0500 Message-ID: --===============6778176298773477291== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: julien(a)jboss.com Date: 2008-02-05 18:59:16 -0500 (Tue, 05 Feb 2008) New Revision: 9789 Added: modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/= portal.xml Log: add sample file describing portal structure Added: modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-= INF/portal.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF= /portal.xml (rev 0) +++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF= /portal.xml 2008-02-05 23:59:16 UTC (rev 9789) @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + --===============6778176298773477291==-- From portal-commits at lists.jboss.org Tue Feb 5 19:58:13 2008 Content-Type: multipart/mixed; boundary="===============3875498062617845156==" MIME-Version: 1.0 From: portal-commits at lists.jboss.org To: portal-commits at lists.jboss.org Subject: [portal-commits] JBoss Portal SVN: r9790 - docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules. Date: Tue, 05 Feb 2008 19:58:13 -0500 Message-ID: --===============3875498062617845156== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: mmcallis Date: 2008-02-05 19:58:13 -0500 (Tue, 05 Feb 2008) New Revision: 9790 Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/configur= ation.xml Log: revising/adding content to: 3.2. Changing the Context Path Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/c= onfiguration.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/configu= ration.xml 2008-02-05 23:59:16 UTC (rev 9789) +++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/configu= ration.xml 2008-02-06 00:58:13 UTC (rev 9790) @@ -46,43 +46,22 @@ - Changing the context path - By default, the "main" page of JBoss portal will be accessible= at - http://localhost:8080/portal/index.html - . You may want to change that - either to a different name or to - http://localhost:8080/index.html - . - - - By default, Tomcat holds on to the root context '/'. You may need= to either remove - $JBOSS_HOME/server/default/deploy/jboss-web.deployer/ROO= T.war - or add a jboss-web.xml file (declaring another= context-root other than '/') under - ROOT.war/WEB-INF directory for the below chang= es to take effect on restart. - - - /tomcat-root -]]> - - You can accomplish this, with either a deployed jboss-portal.s= ar or before you build from source: - - - - Binary method: - - - Open - - JBOSS_INSTALL_DIRECTORY/server/default/deplo= y/jboss-portal.sar/portal-server.war/WEB-INF/jboss-web.xml - + Changing the Context Path + By default, the main JBoss Portal page is accessible by naviga= ting to http://localhost:8080/portal/index.html. This +can be changed to a different path, for example, +http://localhost:8080/index.html. The context path ca= n be changed when using the deployed jboss-portal.sar/= , or before building from source. To change the context path when using the= JBoss Portal binary package: + + + + + Open the $JBOSS_HOME/server/default/depl= oy/jboss-portal.sar/portal-server.war/WEB-INF/jboss-web.xml file= . If this file does not exist, copy and save the following example: java:jaas/portal /portal - SET_AND_GET + SET SYNC @@ -94,34 +73,72 @@ Edit the - context-root - element to whatever you desire. - /]]> - + <context-root> element with the desired context path: + + + +/testing]]> + + + + Using this example, the JBoss Portal main page would be reached by nav= igating to http://localhost:8080/testing. + - + + To change the context path before building from source: + + + - Source method: - Edit the file - $PORTAL_HOME/build/local.properties - (You can copy the file - $PORTAL_HOME/build/etc/local.properties-example= - and modify it for your - own settings.) and change - portal.web.context-root - to anything you want. - Now clean the project (ant clean) then build JBoss= portal (ant) and redeploy it for the context - path changes to take - effect. For build instructions, please see: - - - - - - + Copy the JBOSS_PORTAL_INSTALLATION_DIRECTORY/build/etc/= local.properties-example and save it as JBOSS_PORTAL_I= NSTALLATION_DIRECTORY/build/local.properties. + + + + + Open the JBOSS_PORTAL_INSTALLATION_DIRECTORY/build/local.pro= perties file and edit the portal.web.context-roo= t section with the desired context path: + + + +# Context root for the portal main servlet +portal.web.context-root=3D/testing + + + + Using this example, the JBoss Portal main page would be reached by nav= igating to http://localhost:8080/testing. + + + + = + + To clean the project, make sure you are connected to the Internet, and= change into the JBOSS_PORTAL_INSTALLATION_DIRECTORY/build/ directory. Run the ant clean command. + + + + + Re-build and re-deploy JBoss Portal. See for build instructions. + + + + + + + + By default, Tomcat holds on to the root context, /. You may need to remove the $JBOSS_HOME/server/default/de= ploy/jboss-web.deployer/ROOT.war/ directory, + or add a jboss-web.xml file, which declares = another + context-root other than /, under the $JBOSS_HOME/server/default/deploy/jboss-web.deployer/ROOT.war/WEB-INF/ directory, for the above changes to take affect. The following is= an example jboss-web.xml file, which changes the cont= ext path to /tomcat-root: + + + + + /tomcat-root +]]> + + + Forcing the DB dialect --===============3875498062617845156==-- From portal-commits at lists.jboss.org Tue Feb 5 20:25:05 2008 Content-Type: multipart/mixed; boundary="===============1316905223436329008==" MIME-Version: 1.0 From: portal-commits at lists.jboss.org To: portal-commits at lists.jboss.org Subject: [portal-commits] JBoss Portal SVN: r9791 - docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules. Date: Tue, 05 Feb 2008 20:25:04 -0500 Message-ID: --===============1316905223436329008== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: mmcallis Date: 2008-02-05 20:25:04 -0500 (Tue, 05 Feb 2008) New Revision: 9791 Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/configur= ation.xml Log: minor corrections Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/c= onfiguration.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/configu= ration.xml 2008-02-06 00:58:13 UTC (rev 9790) +++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/configu= ration.xml 2008-02-06 01:25:04 UTC (rev 9791) @@ -62,7 +62,6 @@ /portal SET - SYNC jdbc/PortalDS @@ -81,24 +80,24 @@ - Using this example, the JBoss Portal main page would be reached by nav= igating to http://localhost:8080/testing. + Using this example, the main JBoss Portal page would be reached by nav= igating to http://localhost:8080/testing. - To change the context path before building from source: + To change the context path when building from source: - Copy the JBOSS_PORTAL_INSTALLATION_DIRECTORY/build/etc/= local.properties-example and save it as JBOSS_PORTAL_I= NSTALLATION_DIRECTORY/build/local.properties. + Change into the directory where the JBoss Portal Source= Code zip file was extracted to, or where the source from SVN wa= s checked out to. Copy the build/etc/local.properties-example file and save it as build/local.properties. - Open the JBOSS_PORTAL_INSTALLATION_DIRECTORY/build/local.pro= perties file and edit the portal.web.context-roo= t section with the desired context path: + Open the build/local.properties file and edit the= portal.web.context-root option with the d= esired context path: @@ -107,13 +106,13 @@ - Using this example, the JBoss Portal main page would be reached by nav= igating to http://localhost:8080/testing. + Using this example, the main JBoss Portal page would be reached by nav= igating to http://localhost:8080/testing. = - To clean the project, make sure you are connected to the Internet, and= change into the JBOSS_PORTAL_INSTALLATION_DIRECTORY/build/ directory. Run the ant clean command. + To clean the project, make sure you are connected to the Internet, and= change into the build/ directory. Run the an= t clean command. @@ -128,7 +127,7 @@ By default, Tomcat holds on to the root context, /. You may need to remove the $JBOSS_HOME/server/default/de= ploy/jboss-web.deployer/ROOT.war/ directory, or add a jboss-web.xml file, which declares = another - context-root other than /, under the $JBOSS_HOME/server/default/deploy/jboss-web.deployer/ROOT.war/WEB-INF/ directory, for the above changes to take affect. The following is= an example jboss-web.xml file, which changes the cont= ext path to /tomcat-root: + context-root other than /, under the $JBOSS_HOME/server/default/deploy/jboss-web.deployer/ROOT.war/WEB-INF/ directory, for the above changes to take affect. The following is= an example jboss-web.xml file, which changes the Tomc= at context path to /tomcat-root: --===============6263033069302550056== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: chris.laprun(a)jboss.com Date: 2008-02-05 21:37:14 -0500 (Tue, 05 Feb 2008) New Revision: 9792 Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/c= ontroller/SimpleFragmentRenderer.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/samples= /GoogleClippingPortlet.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/samples= /GoogleWeatherClippingPortlet.java modules/portlet/trunk/test/src/test/build.xml modules/portlet/trunk/test/src/test/resources/google-map-portlet-war/WEB= -INF/portlet.xml modules/portlet/trunk/test/src/test/resources/google-weather-portlet-war= /WEB-INF/portlet.xml Log: - Fixed sample portlets deployment and code. Should now work with public re= nder parameters. Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet= /test/controller/SimpleFragmentRenderer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= controller/SimpleFragmentRenderer.java 2008-02-06 01:25:04 UTC (rev 9791) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/= controller/SimpleFragmentRenderer.java 2008-02-06 02:37:14 UTC (rev 9792) @@ -50,7 +50,7 @@ } = StringBuilder builder =3D new StringBuilder(frag.length() + 50); - builder.append("

").append(frag).append("=

");
+         builder.append("").append(frag).append("");
          return builder.toString();
       }
       else
@@ -63,7 +63,7 @@
    {
       String html =3D error.toHTML();
       StringBuilder builder =3D new StringBuilder(html.length() + 50);
-      builder.append("").append(html).append(""=
);
+      builder.append("").append(html).append("");
       return builder.toString();
    }
 }

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/=
samples/GoogleClippingPortlet.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/sample=
s/GoogleClippingPortlet.java	2008-02-06 01:25:04 UTC (rev 9791)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/sample=
s/GoogleClippingPortlet.java	2008-02-06 02:37:14 UTC (rev 9792)
@@ -33,6 +33,7 @@
 import javax.portlet.RenderRequest;
 import javax.portlet.RenderResponse;
 import java.io.BufferedInputStream;
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.PrintWriter;
@@ -66,24 +67,10 @@
       URLConnection connection =3D url.openConnection();
       connection.setRequestProperty("User-Agent", "Mozilla/5.0");
 =

-      InputStream in =3D new BufferedInputStream(connection.getInputStream=
());
-      StringBuilder tmp =3D new StringBuilder(8192);
-      byte[] buffer =3D new byte[4096];
-      while (true)
-      {
-         int i =3D in.read(buffer);
-         if (i =3D=3D 0)
-         {
-            continue;
-         }
-         if (i =3D=3D -1)
-         {
-            break;
-         }
-         tmp.append(new String(buffer, "UTF-8"), 0, i);
-      }
+      BufferedInputStream in =3D new BufferedInputStream(connection.getInp=
utStream());
+      String html =3D new String(getBytes(in, 16384), "UTF-8");
+      in.close();
 =

-      String html =3D tmp.toString();
       String beg =3D "";
       String end =3D "";
       int begIndex =3D html.indexOf(beg);
@@ -173,4 +160,26 @@
    {
       return GOOGLE + zip;
    }
+
+   private byte[] getBytes(InputStream in, int bufferSize) throws IOExcept=
ion, IllegalArgumentException
+   {
+      ByteArrayOutputStream out =3D new ByteArrayOutputStream();
+
+      byte[] buffer =3D new byte[bufferSize];
+      while (true)
+      {
+         int i =3D in.read(buffer);
+         if (i =3D=3D 0)
+         {
+            continue;
+         }
+         if (i =3D=3D -1)
+         {
+            break;
+         }
+         out.write(buffer, 0, i);
+      }
+      return out.toByteArray();
+   }
+
 }

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/=
samples/GoogleWeatherClippingPortlet.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/sample=
s/GoogleWeatherClippingPortlet.java	2008-02-06 01:25:04 UTC (rev 9791)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/sample=
s/GoogleWeatherClippingPortlet.java	2008-02-06 02:37:14 UTC (rev 9792)
@@ -30,7 +30,7 @@
 public class GoogleWeatherClippingPortlet extends GoogleClippingPortlet
 {
    private final static String WEATHER_URL =3D "http://www.google.com/sear=
ch?q=3Dweather+";
-   private static final String A_END =3D "";
 =

    protected String getQueryString(String zip)
    {
@@ -49,9 +49,9 @@
       if (begIndex !=3D -1)
       {
          endIndex =3D html.indexOf(A_END, begIndex);
-         tmp =3D tmp.substring(0, begIndex) + html.substring(endIndex);
+         tmp =3D tmp.substring(0, begIndex) + html.substring(endIndex + A_=
END.length());
       }
 =

-      return tmp;
+      return super.postProcessHTML(tmp);
    }
 }

Modified: modules/portlet/trunk/test/src/test/build.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/build.xml	2008-02-06 01:25:04 UTC (=
rev 9791)
+++ modules/portlet/trunk/test/src/test/build.xml	2008-02-06 02:37:14 UTC (=
rev 9792)
@@ -716,13 +716,6 @@
          
          
 =

-         
-         
-            
-            
-         
-
-
          
          
             
@@ -740,9 +733,11 @@
 =

       
          
-            
-            
-            
+            
+            
+            
+            
+            
          
       
 =


Modified: modules/portlet/trunk/test/src/test/resources/google-map-portlet-=
war/WEB-INF/portlet.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/google-map-portlet-war/WE=
B-INF/portlet.xml	2008-02-06 01:25:04 UTC (rev 9791)
+++ modules/portlet/trunk/test/src/test/resources/google-map-portlet-war/WE=
B-INF/portlet.xml	2008-02-06 02:37:14 UTC (rev 9792)
@@ -26,12 +26,27 @@
              xsi:schemaLocation=3D"http://java.sun.com/xml/ns/portlet/port=
let-app_2_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd"
              version=3D"2.0">
    
+      Portlet displaying a location on Google Maps
       GoogleMap
+      Google Map Portlet
       org.jboss.portal.simple.samples.GoogleClippingPortlet=

       
          text/html
+         VIEW
+         EDIT
       
-      g:zipcode
+      
+         Google Map Portlet
+         sample,map,google
+      
+      
+         
+            zipcode
+            94102
+            false
+         
+      
+      zipcode
    
 =

    

Modified: modules/portlet/trunk/test/src/test/resources/google-weather-port=
let-war/WEB-INF/portlet.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/google-weather-portlet-wa=
r/WEB-INF/portlet.xml	2008-02-06 01:25:04 UTC (rev 9791)
+++ modules/portlet/trunk/test/src/test/resources/google-weather-portlet-wa=
r/WEB-INF/portlet.xml	2008-02-06 02:37:14 UTC (rev 9792)
@@ -26,12 +26,27 @@
              xsi:schemaLocation=3D"http://java.sun.com/xml/ns/portlet/port=
let-app_2_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd"
              version=3D"2.0">
    
+      Portlet displaying the weather forecast for the specifi=
ed location
       GoogleWeather
+      Google Weather Portlet
       org.jboss.portal.simple.samples.GoogleWeatherClipping=
Portlet
       
          text/html
+         VIEW
+         EDIT
       
-      g:zipcode
+      
+         Google Weather Portlet
+         sample,weather,google
+      
+      
+         
+            zipcode
+            94102
+            false
+         
+      
+      zipcode
    
 =

    


--===============6263033069302550056==--

From portal-commits at lists.jboss.org Tue Feb  5 21:43:46 2008
Content-Type: multipart/mixed; boundary="===============4103192759060033374=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9793 -
 docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
Date: Tue, 05 Feb 2008 21:43:46 -0500
Message-ID: 

--===============4103192759060033374==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mmcallis
Date: 2008-02-05 21:43:45 -0500 (Tue, 05 Feb 2008)
New Revision: 9793

Modified:
   docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/configur=
ation.xml
Log:
updating/revising, adding another example to:
3.3.1. Database Dialect Settings for JBoss Portal


Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/c=
onfiguration.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/configu=
ration.xml	2008-02-06 02:37:14 UTC (rev 9792)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/configu=
ration.xml	2008-02-06 02:43:45 UTC (rev 9793)
@@ -140,27 +140,40 @@
 
    
    
-      Forcing the DB dialect
-      If you encounter that the Hibernate dialect is not working pro=
perly and would like to
-         override the default behavior, follow the instructions contained =
in this section:
-         Under most common circumstances, the auto-detect feature sh=
ould work fine.
+      Forcing the Database Dialect
+      
+	      This sections describes how to override the Database (DB) dialect s=
ettings. Under most circumstances, the auto-detect feature will work. If th=
e Hibernate dialect is not working correctly, override the default behavior=
 by following the instructions in this section.
       
       
-         DB Dialect settings for Portal
-         You will need to modify all the hibernate.cfg.xml<=
/literal> files in all the Portal modules you
-            intend to use by uncommenting the following line in these file=
s and using the appropriate dialect (see
-            here
-             for a list of supported dialects in Hibernate 3):
-            Database Dialect Settings for JBoss Portal
+	 
+		 All hibernate.cfg.xml files in all JBoss Portal mo=
dules you intend to use need to be modified. The hibernate.cfg.xm=
l files are found in the jboss-portal.sar/module/conf/hibernate/directory/<=
/filename> directory, where module is the module=
 name, and directory is a directory that, depend=
ing on the module, may or may not exist.
+         
+	 
+		 To modify these files to force the DB dialect, un-comment the following=
 line from each hibernate.cfg.xml file in each JBoss P=
ortal module you intend to use:
+	 
+	 
+
 ]]>
-         
-         These files are found in jboss-portal.sar/[module]=
/conf/hibernate/[directory]/hibernate.cfg.xml
-            where [module] is a module name and [directory] is a directory that
-            may or may not be present.
-         
+-->
+]]>
+
+	
+	
+		After un-commenting, the hibernate.cfg.xml will loo=
k as follows:
+	
+	
+
+org.hibernate.dialect.PostgreSQLDialect
+]]>
+
+	
+	
+		Note: these examples are for a PostgreSQL database. If you use another d=
atabase, you will need to modify org.hibernate.dialect.Post=
greSQLDialect to reflect the correct database.
+	
       
       
          DB Dialect settings for the CMS component


--===============4103192759060033374==--

From portal-commits at lists.jboss.org Tue Feb  5 22:23:05 2008
Content-Type: multipart/mixed; boundary="===============5977894525677304168=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9794 -
 docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
Date: Tue, 05 Feb 2008 22:23:05 -0500
Message-ID: 

--===============5977894525677304168==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mmcallis
Date: 2008-02-05 22:23:05 -0500 (Tue, 05 Feb 2008)
New Revision: 9794

Modified:
   docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/configur=
ation.xml
Log:
revising 3.3.2. DB Dialect Settings for the CMS Component


Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/c=
onfiguration.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/configu=
ration.xml	2008-02-06 02:43:45 UTC (rev 9793)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/configu=
ration.xml	2008-02-06 03:23:05 UTC (rev 9794)
@@ -130,11 +130,11 @@
 			      context-root other than /, under the $JBOSS_HOME/server/default/deploy/jboss-web.deployer/ROOT.war/WEB-INF/ directory, for the above changes to take affect. The following is=
 an example jboss-web.xml file, which changes the Tomc=
at context path to /tomcat-root:
 		      
 		      
-
 
    /tomcat-root
-]]>
+]]>
 	
 			       
 
@@ -150,44 +150,47 @@
 		 All hibernate.cfg.xml files in all JBoss Portal mo=
dules you intend to use need to be modified. The hibernate.cfg.xm=
l files are found in the jboss-portal.sar/module/conf/hibernate/directory/<=
/filename> directory, where module is the module=
 name, and directory is a directory that, depend=
ing on the module, may or may not exist.
          
 	 
-		 To modify these files to force the DB dialect, un-comment the following=
 line from each hibernate.cfg.xml file in each JBoss P=
ortal module you intend to use:
+		 To modify these files to force the DB dialect, un-comment the following=
 line from each hibernate.cfg.xml file in each JBoss P=
ortal module you intend to use, so that it looks like the following:
 	 
 	 
 
-
-]]>
-
+]]>
 	
 	
-		After un-commenting, the hibernate.cfg.xml will loo=
k as follows:
+		Note: this example is for a PostgreSQL database. If you use another data=
base, you will need to modify org.hibernate.dialect.Postgre=
SQLDialect to reflect the correct database. For a list of =
supported dialects, refer to the dialects list on the Hibernate website.
 	
-	
+      
+      
+         DB Dialect Settings for the CMS Component
+	 
+		 To modify the DB dialect setting for the JBoss Portal CMS component:
+	 
+	 
+		 
+			 
+				 
+					 Open the jboss-portal.sar/portal-cms.sar/conf/hibernate/cm=
s/hibernate.cfg.xml file.
+				 
+			 
+			 
+				 
+					 Un-comment the following line, so that it looks like the following:
+				 
+				 
 
 org.hibernate.dialect.PostgreSQLDialect
-]]>
-
+]]>
+				
+			
+		
 	
 	
-		Note: these examples are for a PostgreSQL database. If you use another d=
atabase, you will need to modify org.hibernate.dialect.Post=
greSQLDialect to reflect the correct database.
+		Note: this example is for a PostgreSQL database. If you use another data=
base, you will need to modify org.hibernate.dialect.Postgre=
SQLDialect to reflect the correct database. For a list of =
supported dialects, refer to the dialects list on the Hibernate website.
 	
       
-      
-         DB Dialect settings for the CMS component
-         Modify jboss-portal.sar/portal-cms.sar/conf/hibern=
ate/cms/hibernate.cfg.xml by
-            uncommenting the following line in these files and using the a=
ppropriate dialect (see
-            here
-             for a list of supported dialects in Hibernate 3):
-            
-]]>
-         
-      
    
    
       Setting up the email service


--===============5977894525677304168==--

From portal-commits at lists.jboss.org Wed Feb  6 01:11:41 2008
Content-Type: multipart/mixed; boundary="===============2204925966633130080=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9795 -
 docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
Date: Wed, 06 Feb 2008 01:11:37 -0500
Message-ID: 

--===============2204925966633130080==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mmcallis
Date: 2008-02-06 01:11:36 -0500 (Wed, 06 Feb 2008)
New Revision: 9795

Modified:
   docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/configur=
ation.xml
Log:
revising 3.4. Setting up the Email Service


Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/c=
onfiguration.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/configu=
ration.xml	2008-02-06 03:23:05 UTC (rev 9794)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/configu=
ration.xml	2008-02-06 06:11:36 UTC (rev 9795)
@@ -193,52 +193,62 @@
       
    
    
-      Setting up the email service
-      To be able to use the email service (for example to verify use=
r emails when someone subscribes or for CMS
-      workflow notifications) it has to be configured correctly. To config=
ure it, go to
-      jboss-portal.sar/portal-core.sar/META-INF/jboss-service.xml=
.
-      In this file, the mail module is configured like this:
-      
-      
-      jboss:service=3DMail
-      portal:service=3DModule,type=3DIdentityServiceController
-      -1
-      localhost
-      
-      
-      false
-      100000
-      10000
-      java:portal/MailModule
-]]>
-         Here you can specify a different SMTP server than localhost, then=
 precise the SMTP username and SMTP password to
-         use to send emails.
-      For example, to use GMail's SMTP server:
-      
-      
-      jboss:service=3DMail
-      portal:service=3DModule,type=3DIdentityServiceController
-      -1
-      smtp.gmail.com
-      username(a)gmail.com
-      myPassword
-      false
-      100000
-      10000
-      java:portal/MailModule
-]]>
+      Setting up the Email Service
+      
+	      If you have a standard setup and a mail server installed, the email=
 service should work without any extra configuration. Most Linux distributi=
ons have a mail server installed by default. The email service, for example=
, can be used to verify a user's email address when a user subscribes, or f=
or CMS workflow notifications.
       
-      If you have a 'standard' setup and a mail server install=
ed
-      (That's the case on most Linux distribution out of the box), it will=
 work out of the box.
-   
+      
+	      The email service is configured using the $JBOSS_HOME/ser=
ver/default/deploy/jboss-portal.sar/META-INF/jboss-service.xml f=
ile. The following is an example of the section which is used to configure =
the email service:
+      
+      
+
+
+jboss:service=3DMail
+portal:service=3DModule,type=3DIdentityServiceController
+-1
+localhost
+
+
+false
+100000
+10000
+java:portal/MailModule
+]]>
+
+	
+	
+		A different SMTP server (other than localhost) can be configured, along =
with a SMTP username and an SMTP password. The following is an example conf=
iguration that uses the Gmail SMTP server:
+	
+	
+
+
+jboss:service=3DMail
+portal:service=3DModule,type=3DIdentityServiceController
+-1
+smtp.gmail.com
+username(a)gmail.com
+myPassword
+false
+100000
+10000
+java:portal/MailModule
+]]>
+
+	
+	
+		Using this example, replace username(a)gmail.com and myPassword with your correct=
 Gmail username and password.
+	
+
    
       Setting up proxy settings
       There are a couple of scenarios where you will need your proxy=
 to be correctly defined at the JVM


--===============2204925966633130080==--

From portal-commits at lists.jboss.org Wed Feb  6 02:04:43 2008
Content-Type: multipart/mixed; boundary="===============3132436281095329158=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9796 -
 docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
Date: Wed, 06 Feb 2008 02:04:41 -0500
Message-ID: 

--===============3132436281095329158==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mmcallis
Date: 2008-02-06 02:04:41 -0500 (Wed, 06 Feb 2008)
New Revision: 9796

Modified:
   docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/configur=
ation.xml
Log:
rephrasing 3.6. Disabling Dynamic Proxy Un-wrapping


Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/c=
onfiguration.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/configu=
ration.xml	2008-02-06 06:11:36 UTC (rev 9795)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/configu=
ration.xml	2008-02-06 07:04:41 UTC (rev 9796)
@@ -250,7 +250,7 @@
 	
 
    
-      Setting up proxy settings
+      Configuring proxy settings
       There are a couple of scenarios where you will need your proxy=
 to be correctly defined at the JVM
       level so that you can access documents from Internet. It could be to=
 get the thirdparty libraries if you
       decided to build JBoss Portal from the sources, to access RSS feeds =
or weather information in the samples
@@ -261,19 +261,20 @@
       is enough.
    
    
-      Disabling dynamic proxy unwrapping
-         JBoss Portal use the JBoss Microkernel for the service infr=
astructure. The JBoss Microkernel provides
-         injection of services into other services, also known as wiring. =
Unfortunately it is only possible to inject
-         dynamic proxies that talks to the MBeanServer due to the fact the=
 Microkernel is JMX based. The overhead
-         at runtime is minimal since the Microkernel implementation is hig=
hly optimized, however when it is used
-         with Java 5 a noticeable bottleneck appears due to the fact that =
the implementation
-         of the JMX API classes javax.management.* pr=
ovided by the Java Platform performs synchronization. This does
-         not happen under JDK 1.4 since those classes are implemented by J=
Boss MX.
-         JBoss Portal services use a special kind of Model MBean cal=
led JBossServiceModelMBean which allows to
-         unwrap the injected dynamic proxies and replace them by the real =
POJO services. This allows to remove the
-         bottleneck with Java 5 and provide an extra boost of performances=
 on JDK 1.4. By default that feature
-         is enabled but it is possible to disabled it using command line a=
rguments.
-         run.sh -Dportal.kernel.no_proxies=3Dfalse]]>
+      Disabling Dynamic Proxy Un-wrapping
+         JBoss Portal uses the JBoss Microkernel for the service inf=
rastructure. The JBoss Microkernel provides injection of services into othe=
r services, also known as wiring. It is only possible to inject
+         dynamic proxies that talk to the MBeanServer, due to the Microker=
nel being JMX based. The overhead
+         at runtime is minimal since the Microkernel implementation is hig=
hly optimized; however, when it is used
+         with Java 5, a noticeable bottleneck appears due to the fact that=
 the implementation
+         of the JMX API classes, javax.management.*, =
provided by the Java Platform, performs synchronization. This does not occu=
r under JDK 1.4 since those classes are implemented by JBoss MX.
+ 	
+         
+		 JBoss Portal services use a special kind of Model MBean called JBossServiceModelMBean, which allows the un-wrapping of inject=
ed dynamic proxies, and replaces them with real plain old java object (POJO=
) services. This allows the removal of the bottleneck with Java 5, and also=
 provides a performance boost on JDK 1.4. By default this feature is enable=
d, but it is possible to disabled is using the following command:
+	 
+	 
+
+
+
    
 


--===============3132436281095329158==--

From portal-commits at lists.jboss.org Wed Feb  6 02:59:21 2008
Content-Type: multipart/mixed; boundary="===============1008490203286143752=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9797 -
 docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
Date: Wed, 06 Feb 2008 02:55:21 -0500
Message-ID: 

--===============1008490203286143752==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mmcallis
Date: 2008-02-06 02:55:21 -0500 (Wed, 06 Feb 2008)
New Revision: 9797

Modified:
   docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/configur=
ation.xml
Log:
minor corrections to my revision:
3.6. Disabling Dynamic Proxy Un-wrapping


Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/c=
onfiguration.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/configu=
ration.xml	2008-02-06 07:04:41 UTC (rev 9796)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/configu=
ration.xml	2008-02-06 07:55:21 UTC (rev 9797)
@@ -262,19 +262,23 @@
    
    
       Disabling Dynamic Proxy Un-wrapping
-         JBoss Portal uses the JBoss Microkernel for the service inf=
rastructure. The JBoss Microkernel provides injection of services into othe=
r services, also known as wiring. It is only possible to inject
-         dynamic proxies that talk to the MBeanServer, due to the Microker=
nel being JMX based. The overhead
-         at runtime is minimal since the Microkernel implementation is hig=
hly optimized; however, when it is used
-         with Java 5, a noticeable bottleneck appears due to the fact that=
 the implementation
-         of the JMX API classes, javax.management.*, =
provided by the Java Platform, performs synchronization. This does not occu=
r under JDK 1.4 since those classes are implemented by JBoss MX.
+      JBoss Portal uses the JBoss Microkernel for the service infras=
tructure. The JBoss Microkernel provides injection of services into other s=
ervices, otherwise known as wiring. Due to the Microkernel being JMX based,=
 tt is only possible to inject dynamic proxies that talk to the MBeanServer=
. The overhead at runtime is minimal since the Microkernel implementation i=
s highly optimized; however, when it is used with Java 5, a noticeable bott=
leneck appears due to the fact that the implementation of the JMX API class=
es, javax.management.*, provided by the Java Platform,=
 performs synchronization. This does not occur under JDK 1.4 since those cl=
asses are implemented by JBoss MX.
  	
          
-		 JBoss Portal services use a special kind of Model MBean called JBossServiceModelMBean, which allows the un-wrapping of inject=
ed dynamic proxies, and replaces them with real plain old java object (POJO=
) services. This allows the removal of the bottleneck with Java 5, and also=
 provides a performance boost on JDK 1.4. By default this feature is enable=
d, but it is possible to disabled is using the following command:
+		 JBoss Portal services use a special kind of Model MBean called JBossServiceModelMBean, which allows the un-wrapping of inject=
ed dynamic proxies, and replaces them with real plain old java object (POJO=
) services. This allows the removal of the bottleneck with Java 5, and also=
 provides a performance boost on JDK 1.4. By default this feature is enable=
d, but it is possible to disable. To do this on Linux systems, change into =
the $JBOSS_HOME/bin/ directory and run the following c=
ommand:
 	 
 	 
-
+
+./run.sh -Dportal.kernel.no_proxies=3Dfalse
 
 
+
+	On Microsoft Windows systems, run the following command:
+
+
+
+run.bat -Dportal.kernel.no_proxies=3Dfalse
+
+
    
 


--===============1008490203286143752==--

From portal-commits at lists.jboss.org Wed Feb  6 09:10:01 2008
Content-Type: multipart/mixed; boundary="===============3703467594509137225=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9798 -
 modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF.
Date: Wed, 06 Feb 2008 09:10:01 -0500
Message-ID: 

--===============3703467594509137225==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-06 09:10:01 -0500 (Wed, 06 Feb 2008)
New Revision: 9798

Removed:
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/=
portal.xml
Log:
remove portal.xml after all, we'll use a jsp taglib

Deleted: modules/portlet/trunk/test/src/test/resources/simple-portal-war/WE=
B-INF/portal.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF=
/portal.xml	2008-02-06 07:55:21 UTC (rev 9797)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF=
/portal.xml	2008-02-06 14:10:01 UTC (rev 9798)
@@ -1,15 +0,0 @@
-
-
-   
-      
-         
-            
-               
-            
-            
-               
-            
-         
-      
-   
-


--===============3703467594509137225==--

From portal-commits at lists.jboss.org Wed Feb  6 09:28:44 2008
Content-Type: multipart/mixed; boundary="===============1034704858516198166=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9799 -
 modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api.
Date: Wed, 06 Feb 2008 09:28:44 -0500
Message-ID: 

--===============1034704858516198166==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-06 09:28:44 -0500 (Wed, 06 Feb 2008)
New Revision: 9799

Modified:
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/imp=
l/jsr168/api/PortletContextImpl.java
Log:
implement PortletContext container runtime options support

Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/port=
let/impl/jsr168/api/PortletContextImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/jsr168/api/PortletContextImpl.java	2008-02-06 14:10:01 UTC (rev 9798)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/jsr168/api/PortletContextImpl.java	2008-02-06 14:28:44 UTC (rev 9799)
@@ -23,6 +23,7 @@
 package org.jboss.portal.portlet.impl.jsr168.api;
 =

 import org.jboss.portal.common.NotYetImplemented;
+import org.jboss.portal.common.util.Tools;
 import org.jboss.portal.portlet.impl.info.ContainerPortletApplicationInfo;
 =

 import javax.portlet.PortletContext;
@@ -34,6 +35,7 @@
 import java.net.URL;
 import java.util.Enumeration;
 import java.util.Set;
+import java.util.Collections;
 =

 /**
  * @author Julien Viet
@@ -48,6 +50,9 @@
    /** . */
    private ContainerPortletApplicationInfo info;
 =

+   /** . */
+   private final Set supportedOptions =3D Tools.toSet("javax.portl=
et.actionScopedRequestAttributes","javax.portlet.escapeXml");
+
    public PortletContextImpl(ServletContext servletContext)
    {
       this.servletContext =3D servletContext;
@@ -190,6 +195,6 @@
 =

    public Enumeration getContainerRuntimeOptions()
    {
-      throw new NotYetImplemented();
+      return Collections.enumeration(supportedOptions);
    }
 }


--===============1034704858516198166==--

From portal-commits at lists.jboss.org Wed Feb  6 09:33:26 2008
Content-Type: multipart/mixed; boundary="===============3665113968712924573=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9800 -
 modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api.
Date: Wed, 06 Feb 2008 09:33:26 -0500
Message-ID: 

--===============3665113968712924573==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-06 09:33:26 -0500 (Wed, 06 Feb 2008)
New Revision: 9800

Modified:
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/imp=
l/jsr168/api/PortletConfigImpl.java
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/imp=
l/jsr168/api/PortletContextImpl.java
Log:
implement PortletContext container runtime options support

Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/port=
let/impl/jsr168/api/PortletConfigImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/jsr168/api/PortletConfigImpl.java	2008-02-06 14:28:44 UTC (rev 9799)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/jsr168/api/PortletConfigImpl.java	2008-02-06 14:33:26 UTC (rev 9800)
@@ -85,16 +85,27 @@
       }
 =

       //
-      Map containerRuntimeOptions;
-      if (portletInfo.getOptions().size() > 0)
+      ParameterMap tmp =3D null;
+      for (ContainerOptionInfo option : portletInfo.getOptions().values())
       {
-         ParameterMap tmp =3D new ParameterMap(ParameterMap.AccessMode.get=
(true, false));
-         for (ContainerOptionInfo option : portletInfo.getOptions().values=
())
+         String name =3D option.getName();
+         if (PortletContextImpl.SUPPORTED_OPTIONS.contains(name))
          {
-            String name =3D option.getName();
+            if (tmp =3D=3D null)
+            {
+               tmp =3D new ParameterMap(ParameterMap.AccessMode.get(true, =
false));
+            }
+
+            //
             String[] values =3D option.getValues().toArray(new String[opti=
on.getValues().size()]);
             tmp.setValues(name, values);
          }
+      }
+
+      //
+      Map containerRuntimeOptions;
+      if (tmp !=3D null)
+      {
          containerRuntimeOptions =3D Collections.unmodifiableMap(tmp);
       }
       else

Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/port=
let/impl/jsr168/api/PortletContextImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/jsr168/api/PortletContextImpl.java	2008-02-06 14:28:44 UTC (rev 9799)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/jsr168/api/PortletContextImpl.java	2008-02-06 14:33:26 UTC (rev 9800)
@@ -22,7 +22,6 @@
  *************************************************************************=
*****/
 package org.jboss.portal.portlet.impl.jsr168.api;
 =

-import org.jboss.portal.common.NotYetImplemented;
 import org.jboss.portal.common.util.Tools;
 import org.jboss.portal.portlet.impl.info.ContainerPortletApplicationInfo;
 =

@@ -51,7 +50,7 @@
    private ContainerPortletApplicationInfo info;
 =

    /** . */
-   private final Set supportedOptions =3D Tools.toSet("javax.portl=
et.actionScopedRequestAttributes","javax.portlet.escapeXml");
+   public static final Set SUPPORTED_OPTIONS =3D Collections.unmod=
ifiableSet(Tools.toSet("javax.portlet.actionScopedRequestAttributes","javax=
.portlet.escapeXml"));
 =

    public PortletContextImpl(ServletContext servletContext)
    {
@@ -195,6 +194,6 @@
 =

    public Enumeration getContainerRuntimeOptions()
    {
-      return Collections.enumeration(supportedOptions);
+      return Collections.enumeration(SUPPORTED_OPTIONS);
    }
 }


--===============3665113968712924573==--

From portal-commits at lists.jboss.org Wed Feb  6 09:34:18 2008
Content-Type: multipart/mixed; boundary="===============0949539137986230802=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9801 -
 modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api.
Date: Wed, 06 Feb 2008 09:34:17 -0500
Message-ID: 

--===============0949539137986230802==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-06 09:34:17 -0500 (Wed, 06 Feb 2008)
New Revision: 9801

Modified:
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/imp=
l/jsr168/api/PortletContextImpl.java
Log:
update server info in PortletContext

Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/port=
let/impl/jsr168/api/PortletContextImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/jsr168/api/PortletContextImpl.java	2008-02-06 14:33:26 UTC (rev 9800)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/jsr168/api/PortletContextImpl.java	2008-02-06 14:34:17 UTC (rev 9801)
@@ -59,7 +59,7 @@
 =

    public String getServerInfo()
    {
-      return "JBossPortal/" + 1 + "." + 0;
+      return "JBossPortletContainer/" + 2 + "." + 0;
    }
 =

    public PortletRequestDispatcher getRequestDispatcher(String path)


--===============0949539137986230802==--

From portal-commits at lists.jboss.org Wed Feb  6 10:25:42 2008
Content-Type: multipart/mixed; boundary="===============8784705281178220319=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9802 -
 modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info.
Date: Wed, 06 Feb 2008 10:25:41 -0500
Message-ID: 

--===============8784705281178220319==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-06 10:25:41 -0500 (Wed, 06 Feb 2008)
New Revision: 9802

Modified:
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/imp=
l/info/ContainerInfoBuilder.java
Log:
fixed an issue I introduced yesterday

Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/port=
let/impl/info/ContainerInfoBuilder.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/info/ContainerInfoBuilder.java	2008-02-06 14:34:17 UTC (rev 9801)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/info/ContainerInfoBuilder.java	2008-02-06 15:25:41 UTC (rev 9802)
@@ -605,8 +605,8 @@
             containerCache,
             containerSession,
             portletMD.getPortletName(),
+            portletMD.getPortletClass(),
             context.getApplicationName(),
-            portletMD.getPortletClass(),
             Collections.unmodifiableMap(initParameters),
             false,
             context.getBundleManager(portletMD)


--===============8784705281178220319==--

From portal-commits at lists.jboss.org Wed Feb  6 11:10:42 2008
Content-Type: multipart/mixed; boundary="===============8541962681059475414=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9803 - in modules/portlet/trunk:
 portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api and 2 other
 directories.
Date: Wed, 06 Feb 2008 11:10:42 -0500
Message-ID: 

--===============8541962681059475414==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-06 11:10:42 -0500 (Wed, 06 Feb 2008)
New Revision: 9803

Added:
   modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portle=
t/jsr286/ext/dispatcher/AbstractDispatchedSessionTestCase.java
   modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portle=
t/jsr286/ext/dispatcher/ApplicationScopeDispatchedSessionTestCase.java
   modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portle=
t/jsr286/ext/dispatcher/PortletScopeDispatchedSessionTestCase.java
Modified:
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/imp=
l/jsr168/DispatchedHttpServletRequest.java
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/imp=
l/jsr168/api/PortletContextImpl.java
   modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portle=
t/jsr286/ext/dispatcher/ContentTestCase.java
   modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portle=
t/jsr286/ext/dispatcher/DispatchingFilterTestCase.java
   modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portle=
t/jsr286/ext/dispatcher/FiltersTestCase.java
   modules/portlet/trunk/test/src/test/resources/jsr286/ext/dispatcher-war/=
WEB-INF/portlet.xml
Log:
implement and test javax.portlet.servletDefaultSessionScope feature

Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/port=
let/impl/jsr168/DispatchedHttpServletRequest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/jsr168/DispatchedHttpServletRequest.java	2008-02-06 15:25:41 UTC (rev 98=
02)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/jsr168/DispatchedHttpServletRequest.java	2008-02-06 16:10:42 UTC (rev 98=
03)
@@ -32,7 +32,6 @@
 import javax.servlet.ServletContext;
 import javax.servlet.ServletRequest;
 import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 import javax.servlet.http.HttpServletRequestWrapper;
 import javax.portlet.PortletSession;
@@ -42,6 +41,7 @@
 import javax.portlet.ResourceRequest;
 import javax.portlet.EventRequest;
 import javax.portlet.RenderRequest;
+import javax.portlet.PortletConfig;
 import java.security.Principal;
 import java.util.Enumeration;
 import java.util.Locale;
@@ -118,7 +118,7 @@
    private final Map parameters;
 =

    /** . */
-   private final int sessionScope =3D PortletSession.APPLICATION_SCOPE;
+   private final int sessionScope;
 =

    /** . */
    private final LinkedList> containerAttributesStack;
@@ -130,7 +130,7 @@
    private final ServletContext servletContext;
 =

    /** . */
-   private DispatchedHttpSession[] session;
+   private DispatchedHttpSession session;
 =

    public DispatchedHttpServletRequest(
       Dispatch dispatch,
@@ -140,12 +140,22 @@
    {
       super(dreq);
 =

+      PortletConfig config =3D (PortletConfig)dreq.getAttribute(Constants.=
JAVAX_PORTLET_CONFIG);
+      Map options =3D config.getContainerRuntimeOptions(=
);
+      String[] sessionScopeOption =3D options.get("javax.portlet.servletDe=
faultSessionScope");
+      int sessionScope =3D PortletSession.APPLICATION_SCOPE;
+      if (sessionScopeOption !=3D null && sessionScopeOption.length > 0 &&=
 "PORTLET_SCOPE".equals(sessionScopeOption[0]))
+      {
+         sessionScope =3D PortletSession.PORTLET_SCOPE;
+      }
+
       //
       this.dispatchType =3D dispatch.getType();
       this.preq =3D preq;
       this.dreq =3D dreq;
       this.servletContext =3D servletContext;
       this.containerAttributesStack =3D new LinkedList=
>();
+      this.sessionScope =3D sessionScope;
 =

       // Push dispatch
       this.infos =3D pushDispatch(dispatch);
@@ -473,7 +483,7 @@
 =

    public final HttpSession getSession(boolean b)
    {
-      return getSession(b, PortletSession.APPLICATION_SCOPE);
+      return getSession(b, sessionScope);
    }
 =

    public final HttpSession getSession()
@@ -665,19 +675,14 @@
     */
    private HttpSession getSession(boolean create, int scope)
    {
-      if (session =3D=3D null)
-      {
-         session =3D new DispatchedHttpSession[2];
-      }
-
       // Dereference an existing session if necessary
-      if (session[scope] !=3D null && !session[scope].isValid())
+      if (session !=3D null && !session.isValid())
       {
-         session[scope] =3D null;
+         session =3D null;
       }
 =

       // If we have a session here we are sure it is valid and ok to retur=
n it
-      if (session[scope] !=3D null)
+      if (session !=3D null)
       {
          // So we do nothing
       }
@@ -685,7 +690,7 @@
       {
          // For sure we need a session we will obtain a valid one
          PortletSession portletSession =3D preq.getPortletSession();
-         session[scope] =3D new DispatchedHttpSession(this, portletSession=
, scope);
+         session =3D new DispatchedHttpSession(this, portletSession, scope=
);
       }
       else
       {
@@ -695,12 +700,12 @@
          //
          if (portletSession !=3D null)
          {
-            session[scope] =3D new DispatchedHttpSession(this, portletSess=
ion, scope);
+            session =3D new DispatchedHttpSession(this, portletSession, sc=
ope);
          }
       }
 =

       //
-      return session[scope];
+      return session;
    }
 =

    // Subclasses

Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/port=
let/impl/jsr168/api/PortletContextImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/jsr168/api/PortletContextImpl.java	2008-02-06 15:25:41 UTC (rev 9802)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/jsr168/api/PortletContextImpl.java	2008-02-06 16:10:42 UTC (rev 9803)
@@ -50,7 +50,10 @@
    private ContainerPortletApplicationInfo info;
 =

    /** . */
-   public static final Set SUPPORTED_OPTIONS =3D Collections.unmod=
ifiableSet(Tools.toSet("javax.portlet.actionScopedRequestAttributes","javax=
.portlet.escapeXml"));
+   public static final Set SUPPORTED_OPTIONS =3D Collections.unmod=
ifiableSet(Tools.toSet(
+      "javax.portlet.actionScopedRequestAttributes",
+      "javax.portlet.escapeXml",
+      "javax.portlet.servletDefaultSessionScope"));
 =

    public PortletContextImpl(ServletContext servletContext)
    {

Added: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/po=
rtlet/jsr286/ext/dispatcher/AbstractDispatchedSessionTestCase.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portl=
et/jsr286/ext/dispatcher/AbstractDispatchedSessionTestCase.java	           =
             (rev 0)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portl=
et/jsr286/ext/dispatcher/AbstractDispatchedSessionTestCase.java	2008-02-06 =
16:10:42 UTC (rev 9803)
@@ -0,0 +1,153 @@
+/*************************************************************************=
*****
+ * 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.test.portlet.jsr286.ext.dispatcher;
+
+import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.JoinPoint;
+import org.jboss.portal.unit.base.AbstractUniversalTestPortlet;
+import org.jboss.portal.unit.actions.ServletServiceTestAction;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
+import org.jboss.portal.test.portlet.framework.UTP1;
+import org.jboss.portal.test.portlet.framework.UTS1;
+import org.jboss.unit.driver.DriverResponse;
+import org.jboss.unit.driver.response.EndTestResponse;
+import static org.jboss.unit.api.Assert.*;
+import org.jboss.unit.remote.driver.handler.http.response.InvokeGetRespons=
e;
+
+import javax.servlet.Servlet;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+import javax.portlet.PortletException;
+import javax.portlet.RenderResponse;
+import javax.portlet.Portlet;
+import javax.portlet.PortletRequestDispatcher;
+import javax.portlet.RenderRequest;
+import javax.portlet.PortletSession;
+import java.io.IOException;
+
+/**
+ * @author Julien Viet
+ * @version $Revision: 630 $
+ */
+public abstract class AbstractDispatchedSessionTestCase
+{
+   public AbstractDispatchedSessionTestCase(
+      PortletTestCase seq,
+      JoinPoint portletJoinPoint,
+      final int sessionScope)
+   {
+      seq.bindAction(0, portletJoinPoint, new PortletRenderTestAction()
+      {
+         protected DriverResponse run(Portlet portlet, RenderRequest reque=
st, RenderResponse response, PortletTestContext context) throws PortletExce=
ption, IOException
+         {
+            PortletRequestDispatcher dispatcher =3D ((AbstractUniversalTes=
tPortlet)portlet).getPortletContext().getNamedDispatcher("UniversalServletA=
");
+            assertNotNull(dispatcher);
+            dispatcher.include(request, response);
+
+            //
+            PortletSession session =3D request.getPortletSession(false);
+            assertNotNull(session);
+            assertTrue(session.isNew());
+            assertEquals("foo_dispatched_value", session.getAttribute("foo=
", sessionScope));
+
+            //
+            return new InvokeGetResponse(response.createRenderURL().toStri=
ng());
+         }
+      });
+      seq.bindAction(0, UTS1.SERVICE_JOIN_POINT, new ServletServiceTestAct=
ion()
+      {
+         public DriverResponse execute(Servlet servlet, HttpServletRequest=
 request, HttpServletResponse response, PortletTestContext context) throws =
ServletException, IOException
+         {
+            HttpSession session =3D request.getSession(false);
+            assertNull(session);
+
+            //
+            session =3D request.getSession();
+            assertNotNull(session);
+            assertTrue(session.isNew());
+            session.setAttribute("foo", "foo_dispatched_value");
+            assertEquals("foo_dispatched_value", session.getAttribute("foo=
"));
+
+            //
+            return null;
+         }
+      });
+      seq.bindAction(1, portletJoinPoint, new PortletRenderTestAction()
+      {
+         protected DriverResponse run(Portlet portlet, RenderRequest reque=
st, RenderResponse response, PortletTestContext context) throws PortletExce=
ption, IOException
+         {
+            PortletSession session =3D request.getPortletSession(false);
+            assertNotNull(session);
+            assertFalse(session.isNew());
+            assertEquals("foo_dispatched_value", session.getAttribute("foo=
", sessionScope));
+
+            //
+            PortletRequestDispatcher dispatcher =3D ((AbstractUniversalTes=
tPortlet)portlet).getPortletContext().getNamedDispatcher("UniversalServletA=
");
+            assertNotNull(dispatcher);
+            dispatcher.include(request, response);
+
+            //
+            try
+            {
+               session.isNew();
+               fail();
+            }
+            catch (IllegalStateException ignore)
+            {
+            }
+
+            //
+            return new EndTestResponse();
+         }
+      });
+      seq.bindAction(1, UTS1.SERVICE_JOIN_POINT, new ServletServiceTestAct=
ion()
+      {
+         public DriverResponse execute(Servlet servlet, HttpServletRequest=
 request, HttpServletResponse response, PortletTestContext context) throws =
ServletException, IOException
+         {
+            HttpSession session =3D request.getSession(false);
+            assertNotNull(session);
+            assertFalse(session.isNew());
+            assertEquals("foo_dispatched_value", session.getAttribute("foo=
"));
+
+            //
+            session.invalidate();
+
+            try
+            {
+               session.isNew();
+               fail();
+            }
+            catch (IllegalStateException ignore)
+            {
+            }
+
+            //
+            return null;
+         }
+      });
+   }
+}

Added: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/po=
rtlet/jsr286/ext/dispatcher/ApplicationScopeDispatchedSessionTestCase.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portl=
et/jsr286/ext/dispatcher/ApplicationScopeDispatchedSessionTestCase.java	   =
                     (rev 0)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portl=
et/jsr286/ext/dispatcher/ApplicationScopeDispatchedSessionTestCase.java	200=
8-02-06 16:10:42 UTC (rev 9803)
@@ -0,0 +1,43 @@
+/*************************************************************************=
*****
+ * 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.test.portlet.jsr286.ext.dispatcher;
+
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.JoinPoint;
+import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.test.portlet.framework.UTP1;
+
+import javax.portlet.PortletSession;
+
+/**
+ * @author Julien Viet
+ * @version $Revision: 630 $
+ */
+(a)TestCase
+public class ApplicationScopeDispatchedSessionTestCase extends AbstractDis=
patchedSessionTestCase
+{
+   public ApplicationScopeDispatchedSessionTestCase(PortletTestCase seq)
+   {
+      super(seq, UTP1.RENDER_JOIN_POINT, PortletSession.APPLICATION_SCOPE);
+   }
+}

Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test=
/portlet/jsr286/ext/dispatcher/ContentTestCase.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portl=
et/jsr286/ext/dispatcher/ContentTestCase.java	2008-02-06 15:25:41 UTC (rev =
9802)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portl=
et/jsr286/ext/dispatcher/ContentTestCase.java	2008-02-06 16:10:42 UTC (rev =
9803)
@@ -27,6 +27,7 @@
 import org.jboss.portal.unit.annotations.TestCase;
 import org.jboss.portal.unit.actions.PortletRenderTestAction;
 import org.jboss.portal.test.portlet.framework.UTP4;
+import org.jboss.portal.test.portlet.framework.UTP1;
 import org.jboss.unit.driver.DriverResponse;
 import org.jboss.unit.driver.response.EndTestResponse;
 import static org.jboss.unit.api.Assert.*;
@@ -49,7 +50,7 @@
 {
    public ContentTestCase(PortletTestCase seq)
    {
-      seq.bindAction(0, UTP4.RENDER_JOIN_POINT, new PortletRenderTestActio=
n()
+      seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestActio=
n()
       {
          protected DriverResponse run(Portlet portlet, RenderRequest reque=
st, RenderResponse response, PortletTestContext context) throws PortletExce=
ption, IOException
          {
@@ -69,7 +70,7 @@
             return new InvokeGetResponse(response.createRenderURL().toStri=
ng());
          }
       });
-      seq.bindAction(1, UTP4.RENDER_JOIN_POINT, new PortletRenderTestActio=
n()
+      seq.bindAction(1, UTP1.RENDER_JOIN_POINT, new PortletRenderTestActio=
n()
       {
          protected DriverResponse run(Portlet portlet, RenderRequest reque=
st, RenderResponse response, PortletTestContext context) throws PortletExce=
ption, IOException
          {
@@ -95,7 +96,7 @@
             return new InvokeGetResponse(response.createRenderURL().toStri=
ng());
          }
       });
-      seq.bindAction(2, UTP4.RENDER_JOIN_POINT, new PortletRenderTestActio=
n()
+      seq.bindAction(2, UTP1.RENDER_JOIN_POINT, new PortletRenderTestActio=
n()
       {
          protected DriverResponse run(Portlet portlet, RenderRequest reque=
st, RenderResponse response, PortletTestContext context) throws PortletExce=
ption, IOException
          {
@@ -122,7 +123,7 @@
             return new InvokeGetResponse(response.createRenderURL().toStri=
ng());
          }
       });
-      seq.bindAction(3, UTP4.RENDER_JOIN_POINT, new PortletRenderTestActio=
n()
+      seq.bindAction(3, UTP1.RENDER_JOIN_POINT, new PortletRenderTestActio=
n()
       {
          protected DriverResponse run(Portlet portlet, RenderRequest reque=
st, RenderResponse response, PortletTestContext context) throws PortletExce=
ption, IOException
          {
@@ -149,7 +150,7 @@
             return new InvokeGetResponse(response.createRenderURL().toStri=
ng());
          }
       });
-      seq.bindAction(4, UTP4.RENDER_JOIN_POINT, new PortletRenderTestActio=
n()
+      seq.bindAction(4, UTP1.RENDER_JOIN_POINT, new PortletRenderTestActio=
n()
       {
          protected DriverResponse run(Portlet portlet, RenderRequest reque=
st, RenderResponse response, PortletTestContext context) throws PortletExce=
ption, IOException
          {

Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test=
/portlet/jsr286/ext/dispatcher/DispatchingFilterTestCase.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portl=
et/jsr286/ext/dispatcher/DispatchingFilterTestCase.java	2008-02-06 15:25:41=
 UTC (rev 9802)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portl=
et/jsr286/ext/dispatcher/DispatchingFilterTestCase.java	2008-02-06 16:10:42=
 UTC (rev 9803)
@@ -26,6 +26,7 @@
 import org.jboss.portal.unit.PortletTestContext;
 import org.jboss.portal.unit.actions.PortletRenderTestAction;
 import org.jboss.portal.test.portlet.framework.UTP3;
+import org.jboss.portal.test.portlet.framework.UTP1;
 import org.jboss.portal.unit.annotations.TestCase;
 import org.jboss.unit.driver.DriverResponse;
 import org.jboss.unit.driver.response.EndTestResponse;
@@ -47,7 +48,7 @@
 {
    public DispatchingFilterTestCase(PortletTestCase seq)
    {
-      seq.bindAction(0, UTP3.RENDER_JOIN_POINT, new PortletRenderTestActio=
n()
+      seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestActio=
n()
       {
          protected DriverResponse run(Portlet portlet, RenderRequest reque=
st, RenderResponse response, PortletTestContext context) throws IOException=
, PortletException
          {

Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test=
/portlet/jsr286/ext/dispatcher/FiltersTestCase.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portl=
et/jsr286/ext/dispatcher/FiltersTestCase.java	2008-02-06 15:25:41 UTC (rev =
9802)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portl=
et/jsr286/ext/dispatcher/FiltersTestCase.java	2008-02-06 16:10:42 UTC (rev =
9803)
@@ -26,6 +26,7 @@
 import org.jboss.portal.unit.PortletTestContext;
 import org.jboss.portal.unit.actions.PortletRenderTestAction;
 import org.jboss.portal.test.portlet.framework.UTP2;
+import org.jboss.portal.test.portlet.framework.UTP1;
 import org.jboss.portal.common.util.Tools;
 import org.jboss.portal.unit.annotations.TestCase;
 import org.jboss.unit.driver.DriverResponse;
@@ -50,7 +51,7 @@
 {
    public FiltersTestCase(PortletTestCase seq)
    {
-      seq.bindAction(0, UTP2.RENDER_JOIN_POINT, new PortletRenderTestActio=
n()
+      seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestActio=
n()
       {
          protected DriverResponse run(Portlet portlet, RenderRequest reque=
st, RenderResponse response, PortletTestContext context) throws IOException=
, PortletException
          {

Added: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/po=
rtlet/jsr286/ext/dispatcher/PortletScopeDispatchedSessionTestCase.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portl=
et/jsr286/ext/dispatcher/PortletScopeDispatchedSessionTestCase.java	       =
                 (rev 0)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portl=
et/jsr286/ext/dispatcher/PortletScopeDispatchedSessionTestCase.java	2008-02=
-06 16:10:42 UTC (rev 9803)
@@ -0,0 +1,44 @@
+/*************************************************************************=
*****
+ * 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.test.portlet.jsr286.ext.dispatcher;
+
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.JoinPoint;
+import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.test.portlet.framework.UTP1;
+import org.jboss.portal.test.portlet.framework.UTP2;
+
+import javax.portlet.PortletSession;
+
+/**
+ * @author Julien Viet
+ * @version $Revision: 630 $
+ */
+(a)TestCase
+public class PortletScopeDispatchedSessionTestCase extends AbstractDispatc=
hedSessionTestCase
+{
+   public PortletScopeDispatchedSessionTestCase(PortletTestCase seq)
+   {
+      super(seq, UTP2.RENDER_JOIN_POINT, PortletSession.PORTLET_SCOPE);
+   }
+}
\ No newline at end of file

Modified: modules/portlet/trunk/test/src/test/resources/jsr286/ext/dispatch=
er-war/WEB-INF/portlet.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/jsr286/ext/dispatcher-war=
/WEB-INF/portlet.xml	2008-02-06 15:25:41 UTC (rev 9802)
+++ modules/portlet/trunk/test/src/test/resources/jsr286/ext/dispatcher-war=
/WEB-INF/portlet.xml	2008-02-06 16:10:42 UTC (rev 9803)
@@ -22,10 +22,10 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.              =
    ~
   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~=
~~~-->
 =

-
+             xsi:schemaLocation=3D"http://java.sun.com/xml/ns/portlet/port=
let-app_2_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd"
+             version=3D"2.0">
 =

 =

    
@@ -48,28 +48,10 @@
       
          
       
+      
+         javax.portlet.servletDefaultSessionScope
+         PORTLET_SCOPE
+      
    
 =

-   
-      TestUniversalPortletC
-      org.jboss.portal.test.portlet.framework.UTP3
-      
-        text/html
-      
-      
-         
-      
-   
-
-   
-      TestUniversalPortletD
-      org.jboss.portal.test.portlet.framework.UTP4
-      
-        text/html
-      
-      
-         
-      
-   
-
 


--===============8541962681059475414==--

From portal-commits at lists.jboss.org Wed Feb  6 11:52:29 2008
Content-Type: multipart/mixed; boundary="===============7495978176569319967=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9804 - in
 modules/portlet/trunk/test/src:
 main/java/org/jboss/portal/portlet/test/taglib and 2 other directories.
Date: Wed, 06 Feb 2008 11:52:29 -0500
Message-ID: 

--===============7495978176569319967==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-06 11:52:29 -0500 (Wed, 06 Feb 2008)
New Revision: 9804

Added:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/t=
aglib/
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/t=
aglib/PageTag.java
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/=
portal.tld
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/index.jsp
Log:
taglib blah

Added: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/te=
st/taglib/PageTag.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
taglib/PageTag.java	                        (rev 0)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
taglib/PageTag.java	2008-02-06 16:52:29 UTC (rev 9804)
@@ -0,0 +1,50 @@
+/*************************************************************************=
*****
+ * 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.taglib;
+
+import javax.servlet.jsp.tagext.TagSupport;
+import javax.servlet.jsp.tagext.BodyTagSupport;
+import javax.servlet.jsp.JspException;
+
+/**
+ * @author Julien Viet
+ * @version $Revision: 630 $
+ */
+public class PageTag extends BodyTagSupport
+{
+
+   public int doStartTag() throws JspException
+   {
+      System.out.println("START");
+
+
+      return EVAL_BODY_INCLUDE;
+   }
+
+   public int doEndTag() throws JspException
+   {
+      System.out.println("END");
+
+      return EVAL_PAGE;
+   }
+}

Added: modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-=
INF/portal.tld
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF=
/portal.tld	                        (rev 0)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF=
/portal.tld	2008-02-06 16:52:29 UTC (rev 9804)
@@ -0,0 +1,17 @@
+
+
+
+
+   1.0
+   portal
+
+   
+      page
+      org.jboss.portal.portlet.test.taglib.PageTag
+      JSP
+   
+
+

Added: modules/portlet/trunk/test/src/test/resources/simple-portal-war/inde=
x.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/index.j=
sp	                        (rev 0)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/index.j=
sp	2008-02-06 16:52:29 UTC (rev 9804)
@@ -0,0 +1,11 @@
+<%@ page language=3D"java" %>
+<%@ taglib uri=3D"/WEB-INF/portal.tld" prefix=3D"portal" %>
+<%@ taglib uri=3D"http://java.sun.com/portlet" prefix=3D"portlet" %>
+<%@ page isELIgnored=3D"false" %>
+
+
+
+   HELLO!!!
+
+
+


--===============7495978176569319967==--

From portal-commits at lists.jboss.org Wed Feb  6 13:53:08 2008
Content-Type: multipart/mixed; boundary="===============7999126831064611902=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9805 - in
 modules/portlet/trunk/test/src:
 main/java/org/jboss/portal/portlet/test/controller and 6 other directories.
Date: Wed, 06 Feb 2008 13:49:08 -0500
Message-ID: 

--===============7999126831064611902==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-06 13:49:08 -0500 (Wed, 06 Feb 2008)
New Revision: 9805

Added:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/ControllerServlet.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/response/
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/response/BufferingResponse.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/response/BytesChunk.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/response/CharsChunk.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/response/Chunk.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/response/PortletChunk.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/response/ResponseBuffer.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/PortletTag.java
Removed:
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/=
classes/
Modified:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/c=
ontroller/PortletURLRenderer.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/PageTag.java
   modules/portlet/trunk/test/src/test/build.xml
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/=
portal.tld
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/=
web.xml
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/index.jsp
Log:
add support for response buffering

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/controller/PortletURLRenderer.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
controller/PortletURLRenderer.java	2008-02-06 16:52:29 UTC (rev 9804)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
controller/PortletURLRenderer.java	2008-02-06 18:49:08 UTC (rev 9805)
@@ -90,6 +90,7 @@
       buffer.append(':');
       buffer.append(Integer.toString(clientReq.getServerPort()));
       buffer.append(clientReq.getContextPath());
+      buffer.append(clientReq.getServletPath());
       buffer.append('/');
       buffer.append(StringCodec.encode(windowId));
 =


Added: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/te=
st/jsp/ControllerServlet.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/ControllerServlet.java	                        (rev 0)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/ControllerServlet.java	2008-02-06 18:49:08 UTC (rev 9805)
@@ -0,0 +1,87 @@
+/*************************************************************************=
*****
+ * 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.test.jsp.response.ResponseBuffer;
+import org.jboss.portal.portlet.test.jsp.response.Chunk;
+import org.jboss.portal.portlet.test.jsp.response.BytesChunk;
+import org.jboss.portal.portlet.test.jsp.response.CharsChunk;
+import org.jboss.portal.portlet.test.jsp.response.PortletChunk;
+import org.jboss.portal.portlet.test.jsp.response.BufferingResponse;
+
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.ServletException;
+import javax.servlet.RequestDispatcher;
+import java.io.IOException;
+import java.io.PrintWriter;
+
+/**
+ * @author Julien Viet
+ * @version $Revision: 630 $
+ */
+public class ControllerServlet extends HttpServlet
+{
+
+
+   protected void service(HttpServletRequest req, HttpServletResponse resp=
) throws ServletException, IOException
+   {
+      RequestDispatcher dispatcher =3D req.getRequestDispatcher("/index.js=
p");
+
+      //
+      BufferingResponse bufferingResponse =3D new BufferingResponse(resp);
+
+      //
+      dispatcher.include(req, bufferingResponse);
+
+      //
+      ResponseBuffer buffer =3D bufferingResponse.getBuffer();
+      buffer.close();
+
+      //
+      resp.setContentType("text/html");
+      PrintWriter writer =3D resp.getWriter();
+      for (Chunk chunk : buffer.getChunks())
+      {
+         if (chunk instanceof BytesChunk)
+         {
+            BytesChunk bytesChunk =3D (BytesChunk)chunk;
+            writer.write(new String(bytesChunk.getBytes()));
+         }
+         else if (chunk instanceof CharsChunk)
+         {
+            CharsChunk bytesChunk =3D (CharsChunk)chunk;
+            writer.write(bytesChunk.getChars());
+         }
+         else if (chunk instanceof PortletChunk)
+         {
+            PortletChunk portletChunk =3D (PortletChunk)chunk;
+            writer.write("Portlet[" + portletChunk.getPortletName() + "," =
+ portletChunk.getApplicationName() + "]");
+         }
+      }
+
+      //
+      writer.close();
+   }
+}

Added: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/te=
st/jsp/response/BufferingResponse.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/response/BufferingResponse.java	                        (rev 0)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/response/BufferingResponse.java	2008-02-06 18:49:08 UTC (rev 9805)
@@ -0,0 +1,73 @@
+/*************************************************************************=
*****
+ * 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.response;
+
+import org.jboss.portal.portlet.test.jsp.response.ResponseBuffer;
+import org.jboss.portal.portlet.test.jsp.response.Chunk;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletResponseWrapper;
+import javax.servlet.ServletOutputStream;
+import java.io.IOException;
+import java.io.PrintWriter;
+
+/**
+ * @author Julien Viet
+ * @version $Revision: 630 $
+ */
+public class BufferingResponse extends HttpServletResponseWrapper
+{
+
+   /** . */
+   private final ResponseBuffer buffer =3D new ResponseBuffer();
+
+   public BufferingResponse(HttpServletResponse response)
+   {
+      super(response);
+   }
+
+   public ResponseBuffer getBuffer()
+   {
+      return buffer;
+   }
+
+   public ServletOutputStream getOutputStream() throws IOException
+   {
+      return buffer.getOutputStream();
+   }
+
+   public PrintWriter getWriter() throws IOException
+   {
+      return buffer.getWriter();
+   }
+
+   public void close()
+   {
+      buffer.close();
+   }
+
+   public void addChunk(Chunk chunk)
+   {
+      buffer.addChunk(chunk);
+   }
+}

Added: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/te=
st/jsp/response/BytesChunk.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/response/BytesChunk.java	                        (rev 0)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/response/BytesChunk.java	2008-02-06 18:49:08 UTC (rev 9805)
@@ -0,0 +1,44 @@
+/*************************************************************************=
*****
+ * 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.response;
+
+/**
+ * @author Julien Viet
+ * @version $Revision: 630 $
+ */
+public class BytesChunk extends Chunk
+{
+
+   /** . */
+   private final byte[] bytes;
+
+   public BytesChunk(byte[] bytes)
+   {
+      this.bytes =3D bytes;
+   }
+
+   public byte[] getBytes()
+   {
+      return bytes;
+   }
+}

Added: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/te=
st/jsp/response/CharsChunk.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/response/CharsChunk.java	                        (rev 0)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/response/CharsChunk.java	2008-02-06 18:49:08 UTC (rev 9805)
@@ -0,0 +1,44 @@
+/*************************************************************************=
*****
+ * 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.response;
+
+/**
+ * @author Julien Viet
+ * @version $Revision: 630 $
+ */
+public class CharsChunk extends Chunk
+{
+
+   /** . */
+   private final char[] chars;
+
+   public CharsChunk(char[] chars)
+   {
+      this.chars =3D chars;
+   }
+
+   public char[] getChars()
+   {
+      return chars;
+   }
+}

Added: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/te=
st/jsp/response/Chunk.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/response/Chunk.java	                        (rev 0)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/response/Chunk.java	2008-02-06 18:49:08 UTC (rev 9805)
@@ -0,0 +1,34 @@
+/*************************************************************************=
*****
+ * 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.response;
+
+/**
+ * @author Julien Viet
+ * @version $Revision: 630 $
+ */
+public class Chunk
+{
+
+   =

+
+}

Added: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/te=
st/jsp/response/PortletChunk.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/response/PortletChunk.java	                        (rev 0)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/response/PortletChunk.java	2008-02-06 18:49:08 UTC (rev 9805)
@@ -0,0 +1,53 @@
+/*************************************************************************=
*****
+ * 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.response;
+
+/**
+ * @author Julien Viet
+ * @version $Revision: 630 $
+ */
+public class PortletChunk extends Chunk
+{
+
+   /** . */
+   private final String portletName;
+
+   /** . */
+   private final String applicationName;
+
+   public PortletChunk(String portletName, String applicationName)
+   {
+      this.portletName =3D portletName;
+      this.applicationName =3D applicationName;
+   }
+
+   public String getPortletName()
+   {
+      return portletName;
+   }
+
+   public String getApplicationName()
+   {
+      return applicationName;
+   }
+}

Added: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/te=
st/jsp/response/ResponseBuffer.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/response/ResponseBuffer.java	                        (rev 0)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/response/ResponseBuffer.java	2008-02-06 18:49:08 UTC (rev 9805)
@@ -0,0 +1,181 @@
+/*************************************************************************=
*****
+ * 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.response;
+
+import javax.servlet.ServletOutputStream;
+import java.io.IOException;
+import java.io.ByteArrayOutputStream;
+import java.io.StringWriter;
+import java.io.PrintWriter;
+import java.util.LinkedList;
+import java.util.List;
+
+/**
+ * @author Julien Viet
+ * @version $Revision: 630 $
+ */
+public class ResponseBuffer
+{
+
+   /** . */
+   private final List chunks =3D new LinkedList();
+
+   /** . */
+   private ChunkOutputStream chunkOutputStream;
+
+   /** . */
+   private ChunkWriter chunkWriter;
+
+   /** . */
+   private PrintWriter writer;
+
+   public List getChunks()
+   {
+      return chunks;
+   }
+
+   public void close()
+   {
+      try
+      {
+         if (chunkWriter !=3D null)
+         {
+            chunkWriter.close();
+         }
+         else if (chunkOutputStream !=3D null)
+         {
+            chunkOutputStream.close();
+         }
+      }
+      catch (IOException e)
+      {
+         e.printStackTrace();
+      }
+   }
+
+   public ServletOutputStream getOutputStream()
+   {
+      if (chunkOutputStream =3D=3D null)
+      {
+         if (writer !=3D null)
+         {
+            throw new IllegalStateException();
+         }
+
+         //
+         chunkOutputStream =3D new ChunkOutputStream();
+      }
+
+      //
+      return chunkOutputStream;
+   }
+
+   public PrintWriter getWriter()
+   {
+      if (chunkWriter =3D=3D null)
+      {
+         if (chunkOutputStream !=3D null)
+         {
+            throw new IllegalStateException();
+         }
+
+         //
+         chunkWriter =3D new ChunkWriter();
+         writer =3D new PrintWriter(chunkWriter);
+      }
+
+      //
+      return writer;
+   }
+
+   public void addChunk(Chunk chunk)
+   {
+      if (chunkWriter !=3D null)
+      {
+         chunkWriter.writeChunk();
+      }
+      else if (chunkOutputStream !=3D null)
+      {
+         chunkOutputStream.writeChunk();
+      }
+
+      //
+      chunks.add(chunk);
+   }
+
+   private class ChunkWriter extends StringWriter
+   {
+
+      public void writeChunk()
+      {
+         StringBuffer sb =3D getBuffer();
+         if (sb.length() > 0)
+         {
+            char[] chars =3D new char[sb.length()];
+            sb.getChars(0, sb.length(), chars, 0);
+            CharsChunk chunk =3D new CharsChunk(chars);
+            chunks.add(chunk);
+            sb.setLength(0);
+         }
+      }
+
+      public void close() throws IOException
+      {
+         super.close();
+
+         //
+         writeChunk();
+      }
+   }
+
+   private class ChunkOutputStream extends ServletOutputStream
+   {
+
+      /** . */
+      private final ByteArrayOutputStream bytebuffer =3D new ByteArrayOutp=
utStream();
+
+      public void write(int b) throws IOException
+      {
+         bytebuffer.write(b);
+      }
+
+      public void writeChunk()
+      {
+         if (bytebuffer.size() > 0)
+         {
+            byte[] bytes =3D bytebuffer.toByteArray();
+            bytebuffer.reset();
+            BytesChunk chunk =3D new BytesChunk(bytes);
+            chunks.add(chunk);
+         }
+      }
+
+      public void close() throws IOException
+      {
+         super.close();
+
+         //
+         writeChunk();
+      }
+   }
+}

Copied: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/t=
est/jsp/taglib (from rev 9804, modules/portlet/trunk/test/src/main/java/org=
/jboss/portal/portlet/test/taglib)

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/taglib/PageTag.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
taglib/PageTag.java	2008-02-06 16:52:29 UTC (rev 9804)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PageTag.java	2008-02-06 18:49:08 UTC (rev 9805)
@@ -20,9 +20,8 @@
  * 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.taglib;
+package org.jboss.portal.portlet.test.jsp.taglib;
 =

-import javax.servlet.jsp.tagext.TagSupport;
 import javax.servlet.jsp.tagext.BodyTagSupport;
 import javax.servlet.jsp.JspException;
 =


Added: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/te=
st/jsp/taglib/PortletTag.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortletTag.java	                        (rev 0)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortletTag.java	2008-02-06 18:49:08 UTC (rev 9805)
@@ -0,0 +1,73 @@
+/*************************************************************************=
*****
+ * 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.taglib;
+
+import org.jboss.portal.portlet.test.jsp.response.BufferingResponse;
+import org.jboss.portal.portlet.test.jsp.response.PortletChunk;
+
+import javax.servlet.jsp.tagext.SimpleTagSupport;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.PageContext;
+import java.io.IOException;
+
+/**
+ * @author Julien Viet
+ * @version $Revision: 630 $
+ */
+public class PortletTag extends SimpleTagSupport
+{
+
+   /** . */
+   private String name;
+
+   /** . */
+   private String applicationName;
+
+   public String getName()
+   {
+      return name;
+   }
+
+   public void setName(String name)
+   {
+      this.name =3D name;
+   }
+
+   public String getApplicationName()
+   {
+      return applicationName;
+   }
+
+   public void setApplicationName(String applicationName)
+   {
+      this.applicationName =3D applicationName;
+   }
+
+   public void doTag() throws JspException, IOException
+   {
+      PageContext pageCtx =3D (PageContext)getJspContext();
+      pageCtx.getOut().flush();
+      BufferingResponse response =3D (BufferingResponse)pageCtx.getRespons=
e();
+      response.addChunk(new PortletChunk(name, applicationName));
+   }
+}

Modified: modules/portlet/trunk/test/src/test/build.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/build.xml	2008-02-06 16:52:29 UTC (=
rev 9804)
+++ modules/portlet/trunk/test/src/test/build.xml	2008-02-06 18:49:08 UTC (=
rev 9805)
@@ -15,9 +15,6 @@
       
       
 =

-      
-      
-
    
 =

    

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/W=
EB-INF/portal.tld
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF=
/portal.tld	2008-02-06 16:52:29 UTC (rev 9804)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF=
/portal.tld	2008-02-06 18:49:08 UTC (rev 9805)
@@ -10,8 +10,24 @@
 =

    
       page
-      org.jboss.portal.portlet.test.taglib.PageTag
+      org.jboss.portal.portlet.test.jsp.taglib.PageTag
       JSP
    
 =

+   
+      portlet
+      org.jboss.portal.portlet.test.jsp.taglib.PortletTag
+      empty
+      
+         name
+         true
+         java.lang.String
+      
+      
+         applicationName
+         true
+         java.lang.String
+      
+   
+
 

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/W=
EB-INF/web.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF=
/web.xml	2008-02-06 16:52:29 UTC (rev 9804)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF=
/web.xml	2008-02-06 18:49:08 UTC (rev 9805)
@@ -38,8 +38,16 @@
       PortalServlet
       org.jboss.portal.simple.SimplePortalServlet
    
+   
+      ControllerServlet
+      org.jboss.portal.portlet.test.jsp.ControllerServlet
+   
    
       PortalServlet
-      /*
+      /
    
+   
+      ControllerServlet
+      /jsp/*
+   
 

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/i=
ndex.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/index.j=
sp	2008-02-06 16:52:29 UTC (rev 9804)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/index.j=
sp	2008-02-06 18:49:08 UTC (rev 9805)
@@ -5,7 +5,11 @@
 
 
 
-   HELLO!!!
+   BEFORE
+   
+   AFTER
 
 
 


--===============7999126831064611902==--

From portal-commits at lists.jboss.org Wed Feb  6 14:06:10 2008
Content-Type: multipart/mixed; boundary="===============1421916223868970075=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9806 - in modules/portlet/trunk:
 portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/taglib and 9 other
 directories.
Date: Wed, 06 Feb 2008 14:02:10 -0500
Message-ID: 

--===============1421916223868970075==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: bdaw
Date: 2008-02-06 14:02:10 -0500 (Wed, 06 Feb 2008)
New Revision: 9806

Added:
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/imp=
l/jsr286/taglib/ActionURL286Tag.java
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/imp=
l/jsr286/taglib/GenerateURL286Tag.java
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/imp=
l/jsr286/taglib/GenerateURL286TagTEI.java
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/imp=
l/jsr286/taglib/Namespace286Tag.java
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/imp=
l/jsr286/taglib/RenderURL286Tag.java
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/imp=
l/jsr286/taglib/ResourceURL286Tag.java
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/imp=
l/jsr286/taglib/ResourceURL286TagTEI.java
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/imp=
l/jsr286/taglib/URLParameter286Tag.java
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/imp=
l/jsr286/taglib/URLProperty286Tag.java
   modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portle=
t/jsr168/ext/taglib/ActionURLTestCase.java
   modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portle=
t/jsr168/ext/taglib/DefineObjectsTestCase.java
   modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portle=
t/jsr168/ext/taglib/NamespaceTestCase.java
   modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portle=
t/jsr168/ext/taglib/RenderURLTestCase.java
   modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portle=
t/jsr286/tck/taglib/ActionURLTestCase.java
   modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portle=
t/jsr286/tck/taglib/NamespaceTestCase.java
   modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portle=
t/jsr286/tck/taglib/RenderURLTestCase.java
   modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portle=
t/jsr286/tck/taglib/ResourceURLTestCase.java
   modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portle=
t/jsr286/tck/taglib/TaglibTestCase.java
   modules/portlet/trunk/test/src/test/resources/jsr168/ext/taglib-war/acti=
onURL.jsp
   modules/portlet/trunk/test/src/test/resources/jsr168/ext/taglib-war/defi=
neObjects.jsp
   modules/portlet/trunk/test/src/test/resources/jsr168/ext/taglib-war/name=
space.jsp
   modules/portlet/trunk/test/src/test/resources/jsr168/ext/taglib-war/rend=
erURL.jsp
   modules/portlet/trunk/test/src/test/resources/jsr286/tck/taglib-war/acti=
onURL.jsp
   modules/portlet/trunk/test/src/test/resources/jsr286/tck/taglib-war/defi=
neObjects.jsp
   modules/portlet/trunk/test/src/test/resources/jsr286/tck/taglib-war/name=
space.jsp
   modules/portlet/trunk/test/src/test/resources/jsr286/tck/taglib-war/rend=
erURL.jsp
   modules/portlet/trunk/test/src/test/resources/jsr286/tck/taglib-war/reso=
urceURL.jsp
Removed:
   modules/portlet/trunk/test/src/test/resources/jsr286/tck/taglib-war/tagl=
ib.jsp
Modified:
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/imp=
l/jsr168/api/BaseURLImpl.java
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/imp=
l/jsr168/taglib/ActionURLTag.java
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/imp=
l/jsr168/taglib/GenerateURLTag.java
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/imp=
l/jsr168/taglib/RenderURLTag.java
   modules/portlet/trunk/portlet/src/main/resources/org/jboss/portal/portle=
t/portlet_2_0.tld
   modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portle=
t/jsr168/ext/taglib/TaglibTestCase.java
   modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portle=
t/jsr286/tck/taglib/DefineObjectsTestCase.java
   modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/unit/Assert=
ion.java
   modules/portlet/trunk/test/src/test/resources/jsr168/ext/taglib-war/WEB-=
INF/portlet.xml
   modules/portlet/trunk/test/src/test/resources/jsr286/tck/taglib-war/WEB-=
INF/portlet.xml
Log:
- JSR 286 taglib impl

Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/port=
let/impl/jsr168/api/BaseURLImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/jsr168/api/BaseURLImpl.java	2008-02-06 18:49:08 UTC (rev 9805)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/jsr168/api/BaseURLImpl.java	2008-02-06 19:02:10 UTC (rev 9806)
@@ -109,17 +109,35 @@
 =

    public void write(Writer writer, boolean b) throws IOException
    {
-      EntityEncoder.FULL.encode(toString(), new WriterCharWriter(writer));
+      if (b)
+      {
+         EntityEncoder.FULL.encode(toString(), new WriterCharWriter(writer=
));
+      }
+      else
+      {
+         EntityEncoder.BASIC.encode(toString(), new WriterCharWriter(write=
r));  =

+      }
    }
 =

    public void addProperty(String s, String s1)
    {
-      throw new NotYetImplemented();
+      if (s =3D=3D null)
+      {
+         throw new IllegalArgumentException("property name cannot be null"=
);
+      }
+
+      //TODO:
+
    }
 =

    public void setProperty(String s, String s1)
    {
-      throw new NotYetImplemented();
+      if (s =3D=3D null)
+      {
+         throw new IllegalArgumentException("property name cannot be null"=
);
+      }
+
+      //TODO:
    }
 =

    public String toString()

Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/port=
let/impl/jsr168/taglib/ActionURLTag.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/jsr168/taglib/ActionURLTag.java	2008-02-06 18:49:08 UTC (rev 9805)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/jsr168/taglib/ActionURLTag.java	2008-02-06 19:02:10 UTC (rev 9806)
@@ -22,6 +22,9 @@
  *************************************************************************=
*****/
 package org.jboss.portal.portlet.impl.jsr168.taglib;
 =

+import javax.portlet.PortletURL;
+import javax.portlet.BaseURL;
+
 /**
  * The actionURL tag for the JSR 168 Portlet specification.
  * 
@@ -45,4 +48,15 @@
    {
       return typeParameter;
    }
+
+   protected BaseURL generateURL() throws Exception
+   {
+      PortletURL newPortletURL =3D  (PortletURL)super.generateURL();
+
+      setWindowState(newPortletURL);
+
+      setPortletMode(newPortletURL);
+
+      return newPortletURL;
+   }
 }

Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/port=
let/impl/jsr168/taglib/GenerateURLTag.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/jsr168/taglib/GenerateURLTag.java	2008-02-06 18:49:08 UTC (rev 9805)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/jsr168/taglib/GenerateURLTag.java	2008-02-06 19:02:10 UTC (rev 9806)
@@ -22,7 +22,6 @@
  *************************************************************************=
*****/
 package org.jboss.portal.portlet.impl.jsr168.taglib;
 =

-import org.jboss.portal.portlet.impl.jsr168.api.RenderRequestImpl;
 import org.jboss.portal.portlet.impl.jsr168.api.PortletURLImpl;
 import org.jboss.portal.portlet.impl.jsr168.api.PortletRequestImpl;
 =

@@ -32,7 +31,7 @@
 import javax.portlet.PortletURL;
 import javax.portlet.WindowState;
 import javax.portlet.WindowStateException;
-import javax.portlet.RenderRequest;
+import javax.portlet.BaseURL;
 import javax.servlet.jsp.JspException;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -49,7 +48,7 @@
  * @author Sherman Wood
  * @version $Revision: 5448 $
  */
-abstract class GenerateURLTag extends PortletTag
+public abstract class GenerateURLTag extends PortletTag
 {
    private String windowState;
    private String portletMode;
@@ -186,7 +185,7 @@
     *
     * @return The PortelURL to decorate
     */
-   private PortletURL getBasePortletEnvironmentAndURL()
+   protected BaseURL getBasePortletEnvironmentAndURL()
    {
       PortletRequestImpl preq =3D (PortletRequestImpl)getPortletRequest();
 =

@@ -212,7 +211,7 @@
     * @param portletURL
     * @throws WindowStateException
     */
-   private void setWindowState(PortletURL portletURL) throws WindowStateEx=
ception
+   protected void setWindowState(PortletURL portletURL) throws WindowState=
Exception
    {
       if (getWindowState() !=3D null && getWindowState().trim().length() >=
 0)
       {
@@ -227,7 +226,7 @@
     * @param portletURL
     * @throws PortletModeException
     */
-   private void setPortletMode(PortletURL portletURL) throws PortletModeEx=
ception
+   protected void setPortletMode(PortletURL portletURL) throws PortletMode=
Exception
    {
       if (getPortletMode() !=3D null && getPortletMode().trim().length() >=
 0)
       {
@@ -242,7 +241,7 @@
     * @param portletURL
     * @throws PortletSecurityException
     */
-   private void setSecure(PortletURL portletURL) throws PortletSecurityExc=
eption
+   protected void setSecure(BaseURL portletURL) throws PortletSecurityExce=
ption
    {
       if (getSecure() !=3D null && getSecure().trim().length() > 0)
       {
@@ -255,7 +254,7 @@
       }
    }
 =

-   private void clearPreviousTag()
+   protected void clearPreviousTag()
    {
       parameters =3D new HashMap(5);
       // windowCtx =3D null;
@@ -276,42 +275,44 @@
       return EVAL_BODY_INCLUDE;
    }
 =

-   /** Generate the URL */
-   public int doEndTag() throws JspException
+   protected BaseURL generateURL() throws Exception
    {
-      String resultingURL =3D null;
-      try
-      {
+      BaseURL newPortletURL =3D getBasePortletEnvironmentAndURL();
 =

-         PortletURL newPortletURL =3D getBasePortletEnvironmentAndURL();
+      setSecure(newPortletURL);
 =

-         setWindowState(newPortletURL);
+      // Include parameters as part of the tag request.
 =

-         setPortletMode(newPortletURL);
+      if (!parameters.isEmpty())
+      {
+         newPortletURL.setParameters(getURLParameters());
+      }
+      return newPortletURL;
+   }
 =

-         setSecure(newPortletURL);
+   protected void writeURL(BaseURL portletURL) throws Exception
+   {
 =

-         // Include parameters as part of the tag request.
+      // If a variable was given in the tag to be set in the pageContext,
+      // do that. Otherwise, just write out the URL to the page.
 =

-         if (!parameters.isEmpty())
-         {
-            newPortletURL.setParameters(getURLParameters());
-         }
+      if (getVar() !=3D null)
+      {
+         pageContext.setAttribute(getVar(), portletURL.toString());
+      }
+      else
+      {
+         pageContext.getOut().print(portletURL.toString());
+      }
+   }
 =

-         resultingURL =3D newPortletURL.toString();
 =

-         // If a variable was given in the tag to be set in the pageContex=
t,
-         // do that. Otherwise, just write out the URL to the page.
-
-         if (getVar() !=3D null)
-         {
-            pageContext.setAttribute(getVar(), resultingURL);
-         }
-         else
-         {
-            pageContext.getOut().print(resultingURL);
-         }
-
+   /** Generate the URL */
+   public int doEndTag() throws JspException
+   {
+      try
+      {
+         writeURL(generateURL());
       }
       catch (Exception e)
       {
@@ -320,4 +321,6 @@
       }
       return EVAL_PAGE;
    }
+
+
 }

Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/port=
let/impl/jsr168/taglib/RenderURLTag.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/jsr168/taglib/RenderURLTag.java	2008-02-06 18:49:08 UTC (rev 9805)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/jsr168/taglib/RenderURLTag.java	2008-02-06 19:02:10 UTC (rev 9806)
@@ -22,6 +22,9 @@
  *************************************************************************=
*****/
 package org.jboss.portal.portlet.impl.jsr168.taglib;
 =

+import javax.portlet.PortletURL;
+import javax.portlet.BaseURL;
+
 /**
  * The renderURL tag for the JSR 168 Portlet specification.
  * 

@@ -45,4 +48,15 @@
    {
       return typeParameter;
    }
+   =

+   protected BaseURL generateURL() throws Exception
+   {
+      PortletURL newPortletURL =3D  (PortletURL)super.generateURL();
+
+      setWindowState(newPortletURL);
+
+      setPortletMode(newPortletURL);
+
+      return newPortletURL;
+   }
 }

Added: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet=
/impl/jsr286/taglib/ActionURL286Tag.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/jsr286/taglib/ActionURL286Tag.java	                        (rev 0)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/jsr286/taglib/ActionURL286Tag.java	2008-02-06 19:02:10 UTC (rev 9806)
@@ -0,0 +1,80 @@
+/*
+* 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.portlet.impl.jsr286.taglib;
+
+import javax.portlet.PortletURL;
+import javax.portlet.BaseURL;
+
+/**
+ * @author Boleslaw Dawidowicz
+ * @version : 0.1 $
+ */
+public class ActionURL286Tag extends GenerateURL286Tag
+{
+   /** The serialVersionUID */
+   private static final long serialVersionUID =3D 7920291581022525492L;
+   public static String typeParameter =3D "action";
+
+   private String name;
+
+   public String getName()
+   {
+      return name;
+   }
+
+   public void setName(String name)
+   {
+      this.name =3D name;
+   }
+
+   protected void setName(PortletURL portletURL)
+   {
+      if (name !=3D null)
+      {
+         portletURL.setParameter("javax.portlet.action", name);
+      }
+   }
+
+   /* (non-Javadoc)
+    * @see org.jboss.portal.portlet.taglib.GenerateURLTag#addTypeParameter=
()
+    */
+   protected String getTypeValue()
+   {
+      return typeParameter;
+   }
+
+   protected BaseURL generateURL() throws Exception
+   {
+      PortletURL newPortletURL =3D  (PortletURL)super.generateURL();
+
+      setWindowState(newPortletURL);
+
+      setPortletMode(newPortletURL);
+
+      setCopyCurrentRenderParameters(newPortletURL);
+
+      setName(newPortletURL);
+
+      return newPortletURL;
+   }
+}

Added: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet=
/impl/jsr286/taglib/GenerateURL286Tag.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/jsr286/taglib/GenerateURL286Tag.java	                        (rev 0)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/jsr286/taglib/GenerateURL286Tag.java	2008-02-06 19:02:10 UTC (rev 9806)
@@ -0,0 +1,185 @@
+/*
+* 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.portlet.impl.jsr286.taglib;
+
+import org.jboss.portal.portlet.impl.jsr168.taglib.GenerateURLTag;
+import org.jboss.portal.portlet.impl.jsr168.api.PortletRequestImpl;
+import org.jboss.portal.portlet.impl.jsr168.api.ResourceURLImpl;
+
+import javax.portlet.PortletURL;
+import javax.portlet.PortletContext;
+import javax.portlet.BaseURL;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Enumeration;
+import java.io.StringWriter;
+
+/**
+ * @author Boleslaw Dawidowicz
+ * @version : 0.1 $
+ */
+public abstract class GenerateURL286Tag extends GenerateURLTag
+{
+   private Map properties;
+
+   private String escapeXml;
+
+   private String copyCurrentRenderParameters;
+
+   private StringWriter stringWriter;
+
+   public String getEscapeXml()
+   {
+      return escapeXml;
+   }
+
+   public void setEscapeXml(String escapeXml)
+   {
+      this.escapeXml =3D escapeXml;
+   }
+
+   public String getCopyCurrentRenderParameters()
+   {
+      return copyCurrentRenderParameters;
+   }
+
+   public void setCopyCurrentRenderParameters(String copyCurrentRenderPara=
meters)
+   {
+      this.copyCurrentRenderParameters =3D copyCurrentRenderParameters;
+   }
+
+   protected void setCopyCurrentRenderParameters(PortletURL portletURL)
+   {
+      //default is false
+      if (copyCurrentRenderParameters !=3D null && copyCurrentRenderParame=
ters.equalsIgnoreCase("true"))
+      {
+         portletURL.setParameters(getPortletRequest().getPrivateParameterM=
ap());
+      }
+   }
+
+   protected boolean isEscapeXml()
+   {
+
+      boolean def =3D true;
+
+      String[] runtime =3D getConfig().getContainerRuntimeOptions().get("j=
avax.portlet.escapeXml");
+
+      if (runtime !=3D null && runtime.length > 0)
+      {
+         if (runtime[0].equalsIgnoreCase("true"))
+         {
+            def =3D true;
+         }
+         else if (runtime[0].equalsIgnoreCase("false"))
+         {
+            def =3D false;
+         }
+      }
+
+      if(escapeXml !=3D null)
+      {
+         return Boolean.parseBoolean(escapeXml);
+      }
+
+      return def;
+   }
+
+   /**
+    * Add a named property. Cater for multiple properties with the same na=
me by storing them in a list.
+    *
+    * @param name
+    * @param value
+    */
+   public void addProperty(String name, String value)
+   {
+      List l =3D properties.get(name);
+      if (l =3D=3D null)
+      {
+         l =3D new ArrayList(5);
+         properties.put(name, l);
+      }
+
+      l.add(value);
+   }
+
+   protected void clearPreviousTag()
+   {
+      stringWriter =3D new StringWriter();
+      properties =3D new HashMap();
+
+      super.clearPreviousTag();
+   }
+
+   protected BaseURL getBasePortletEnvironmentAndURL()
+   {
+      PortletRequestImpl preq =3D (PortletRequestImpl)getPortletRequest();
+
+      if ("resource".equals(getTypeValue()))
+      {
+         return ResourceURLImpl.createResourceURL(getInvocation(), preq);
+      }
+      else
+      {
+         return super.getBasePortletEnvironmentAndURL();
+      }
+   }
+
+   protected BaseURL generateURL() throws Exception
+   {
+      BaseURL newPortletURL =3D  super.generateURL();
+
+      if (!properties.isEmpty())
+      {
+         for (String name : properties.keySet())
+         {
+            List props =3D properties.get(name);
+            for (String prop : props)
+            {
+               newPortletURL.setProperty(name, prop);
+            }
+         }
+      }
+
+      return newPortletURL;
+   }
+
+   protected void writeURL(BaseURL portletURL) throws Exception
+   {
+
+      // If a variable was given in the tag to be set in the pageContext,
+      // do that. Otherwise, just write out the URL to the page.
+
+      portletURL.write(stringWriter, isEscapeXml());
+
+      if (getVar() !=3D null)
+      {
+         pageContext.setAttribute(getVar(), stringWriter.toString());
+      }
+      else
+      {
+         pageContext.getOut().print(stringWriter.toString());
+      }
+   }
+}

Added: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet=
/impl/jsr286/taglib/GenerateURL286TagTEI.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/jsr286/taglib/GenerateURL286TagTEI.java	                        (rev 0)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/jsr286/taglib/GenerateURL286TagTEI.java	2008-02-06 19:02:10 UTC (rev 980=
6)
@@ -0,0 +1,93 @@
+/*
+* 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.portlet.impl.jsr286.taglib;
+
+import org.jboss.portal.portlet.impl.jsr168.taglib.GenerateURLTagTEI;
+
+import javax.servlet.jsp.tagext.TagData;
+
+/**
+ * @author Boleslaw Dawidowicz
+ * @version : 0.1 $
+ */
+public class GenerateURL286TagTEI extends GenerateURLTagTEI
+{
+
+   public boolean isValid(TagData data)
+   {
+      return true;
+//      if (super.isValid(data) &&
+//         isEscapeXmlValid(data) &&
+//         isCopyCurrentRenderParameters(data))
+//      {
+//         return true;
+//      }
+      //return false;
+   }
+
+   public boolean isEscapeXmlValid(TagData data)
+   {
+      Object o =3D data.getAttribute("escapeXml");
+      if (o !=3D null && o !=3D TagData.REQUEST_TIME_VALUE)
+      {
+         String s =3D (String)o;
+         if (s.toLowerCase().equals("true") ||
+            s.toLowerCase().equals("false"))
+         {
+            return true;
+         }
+         else
+         {
+            return false;
+         }
+      }
+      else
+      {
+         return true;
+      }
+   }
+
+   public boolean isCopyCurrentRenderParameters(TagData data)
+   {
+      Object o =3D data.getAttribute("copyCurrentRenderParameters");
+      if (o !=3D null && o !=3D TagData.REQUEST_TIME_VALUE)
+      {
+         String s =3D (String)o;
+         if (s.toLowerCase().equals("true") ||
+            s.toLowerCase().equals("false"))
+         {
+            return true;
+         }
+         else
+         {
+            return false;
+         }
+      }
+      else
+      {
+         return true;
+      }
+   }
+
+
+}

Added: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet=
/impl/jsr286/taglib/Namespace286Tag.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/jsr286/taglib/Namespace286Tag.java	                        (rev 0)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/jsr286/taglib/Namespace286Tag.java	2008-02-06 19:02:10 UTC (rev 9806)
@@ -0,0 +1,33 @@
+/*
+* 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.portlet.impl.jsr286.taglib;
+
+import org.jboss.portal.portlet.impl.jsr168.taglib.NamespaceTag;
+
+/**
+ * @author Boleslaw Dawidowicz
+ * @version : 0.1 $
+ */
+public class Namespace286Tag extends NamespaceTag
+{
+}

Added: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet=
/impl/jsr286/taglib/RenderURL286Tag.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/jsr286/taglib/RenderURL286Tag.java	                        (rev 0)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/jsr286/taglib/RenderURL286Tag.java	2008-02-06 19:02:10 UTC (rev 9806)
@@ -0,0 +1,59 @@
+/*
+* 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.portlet.impl.jsr286.taglib;
+
+import javax.portlet.PortletURL;
+import javax.portlet.BaseURL;
+import javax.portlet.ResourceURL;
+
+/**
+ * @author Boleslaw Dawidowicz
+ * @version : 0.1 $
+ */
+public class RenderURL286Tag extends GenerateURL286Tag
+{
+   /** The serialVersionUID */
+   private static final long serialVersionUID =3D -4232451651940217557L;
+   public static String typeParameter =3D "render";
+
+   /* (non-Javadoc)
+    * @see org.jboss.portal.portlet.taglib.GenerateURLTag#addTypeParameter=
()
+    */
+   protected String getTypeValue()
+   {
+      return typeParameter;
+   }
+
+   protected BaseURL generateURL() throws Exception
+   {
+      PortletURL newPortletURL =3D  (PortletURL)super.generateURL();
+
+      setWindowState(newPortletURL);
+
+      setPortletMode(newPortletURL);
+
+      setCopyCurrentRenderParameters(newPortletURL);
+
+      return newPortletURL;
+   }
+}

Added: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet=
/impl/jsr286/taglib/ResourceURL286Tag.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/jsr286/taglib/ResourceURL286Tag.java	                        (rev 0)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/jsr286/taglib/ResourceURL286Tag.java	2008-02-06 19:02:10 UTC (rev 9806)
@@ -0,0 +1,104 @@
+/*
+* 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.portlet.impl.jsr286.taglib;
+
+import javax.portlet.PortletURL;
+import javax.portlet.ResourceURL;
+import javax.portlet.BaseURL;
+
+
+/**
+ * @author Boleslaw Dawidowicz
+ * @version : 0.1 $
+ */
+public class ResourceURL286Tag extends GenerateURL286Tag
+{
+   /** The serialVersionUID */
+   private static final long serialVersionUID =3D -4132423536342433557L;
+   public static String typeParameter =3D "resource";
+
+   private String id;
+
+   private String cacheability;
+
+   public String getId()
+   {
+      return id;
+   }
+
+   public void setId(String id)
+   {
+      this.id =3D id;
+   }
+
+   public String getCacheability()
+   {
+      return cacheability;
+   }
+
+   protected void setId(ResourceURL resourceURL)
+   {
+      if (id !=3D null)
+      {
+         resourceURL.setResourceID(id);
+      }
+   }
+
+   public void setCacheability(ResourceURL resourceURL)
+   {
+      if (cacheability !=3D null)
+      {
+         resourceURL.setCacheability(cacheability);
+      }
+      else
+      {
+         resourceURL.setCacheability("PAGE");
+      }
+   }
+
+
+   public void setCacheability(String cacheability)
+   {
+      this.cacheability =3D cacheability;
+   }
+
+   /* (non-Javadoc)
+    * @see org.jboss.portal.portlet.taglib.GenerateURLTag#addTypeParameter=
()
+    */
+   protected String getTypeValue()
+   {
+      return typeParameter;
+   }
+
+   protected BaseURL generateURL() throws Exception
+   {
+      BaseURL newPortletURL =3D  super.generateURL();
+
+      setId((ResourceURL)newPortletURL);
+      setCacheability((ResourceURL)newPortletURL);
+
+      return newPortletURL;
+   }
+
+}
+

Added: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet=
/impl/jsr286/taglib/ResourceURL286TagTEI.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/jsr286/taglib/ResourceURL286TagTEI.java	                        (rev 0)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/jsr286/taglib/ResourceURL286TagTEI.java	2008-02-06 19:02:10 UTC (rev 980=
6)
@@ -0,0 +1,66 @@
+/*
+* 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.portlet.impl.jsr286.taglib;
+
+import javax.servlet.jsp.tagext.TagData;
+
+/**
+ * @author Boleslaw Dawidowicz
+ * @version : 0.1 $
+ */
+public class ResourceURL286TagTEI extends GenerateURL286TagTEI
+{
+
+   public boolean isValid(TagData data)
+   {
+      if (super.isValid(data) &&
+         isCacheability(data))
+      {
+         return true;
+      }
+      return false;
+   }
+
+   public boolean isCacheability(TagData data)
+   {
+      Object o =3D data.getAttribute("cacheability");
+      if (o !=3D null && o !=3D TagData.REQUEST_TIME_VALUE)
+      {
+         String s =3D (String)o;
+         if (s.toLowerCase().equals("full") ||
+            s.toLowerCase().equals("portlet") ||
+            s.toLowerCase().equals("page"))
+         {
+            return true;
+         }
+         else
+         {
+            return false;
+         }
+      }
+      else
+      {
+         return true;
+      }
+   }
+}

Added: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet=
/impl/jsr286/taglib/URLParameter286Tag.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/jsr286/taglib/URLParameter286Tag.java	                        (rev 0)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/jsr286/taglib/URLParameter286Tag.java	2008-02-06 19:02:10 UTC (rev 9806)
@@ -0,0 +1,33 @@
+/*
+* 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.portlet.impl.jsr286.taglib;
+
+import org.jboss.portal.portlet.impl.jsr168.taglib.URLParameterTag;
+
+/**
+ * @author Boleslaw Dawidowicz
+ * @version : 0.1 $
+ */
+public class URLParameter286Tag extends URLParameterTag
+{
+}

Added: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet=
/impl/jsr286/taglib/URLProperty286Tag.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/jsr286/taglib/URLProperty286Tag.java	                        (rev 0)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/jsr286/taglib/URLProperty286Tag.java	2008-02-06 19:02:10 UTC (rev 9806)
@@ -0,0 +1,155 @@
+/*
+* 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.portlet.impl.jsr286.taglib;
+
+import org.jboss.portal.portlet.impl.jsr168.taglib.GenerateURLTag;
+
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.tagext.TagSupport;
+
+/**
+ * @author Boleslaw Dawidowicz
+ * @version : 0.1 $
+ */
+public class URLProperty286Tag extends TagSupport
+{
+   /** The serialVersionUID */
+   private static final long serialVersionUID =3D 1432342354333218087L;
+   private String name;
+   private String value;
+
+   /**
+    * The name of the property to add to the URL.
+    * 

+    * If null or empty, no action is performed.
+    *
+    * @return Returns the name.
+    * @jsp.attribute required=3D"true" rtexprvalue=3D"true"
+    */
+   public String getName()
+   {
+      return name;
+   }
+
+   /** @param name The name to set. */
+   public void setName(String name)
+   {
+      this.name =3D name;
+   }
+
+   /**
+    * The value of the property to add to the URL.
+    * 

+    * If null, it is processed as an empty value.
+    *
+    * @return Returns the value.
+    * @jsp.attribute required=3D"true" rtexprvalue=3D"true"
+    */
+   public String getValue()
+   {
+      return value;
+   }
+
+   /** @param value The value to set. */
+   public void setValue(String value)
+   {
+      this.value =3D value;
+   }
+
+   /**
+    * No body to process
+    *
+    * @see javax.servlet.jsp.tagext.Tag#doStartTag()
+    */
+   public int doStartTag() throws JspException
+   {
+      return SKIP_BODY;
+   }
+
+   /**
+    * Include the property in the surround tag properties
+    *
+    * @see javax.servlet.jsp.tagext.Tag#doEndTag()
+    */
+   public int doEndTag() throws JspException
+   {
+      try
+      {
+         GenerateURL286Tag ancestorTag =3D
+            (GenerateURL286Tag)findAncestorWithClass(this, GenerateURL286T=
ag.class);
+
+         Property p =3D new Property(getName(), getValue());
+
+         if (p.isValid())
+         {
+            ancestorTag.addProperty(p.getName(), p.getValue());
+         }
+         else
+         {
+            // Should throw a JspException?
+            // Not according to the JSR 286 spec. Ignore it
+         }
+
+      }
+      catch (Exception e)
+      {
+         e.printStackTrace();
+         throw new JspException(e);
+      }
+      return EVAL_PAGE;
+   }
+
+   public class Property
+   {
+      private String name;
+      private String value;
+
+      /** @return Returns the name. */
+      public String getName()
+      {
+         return name;
+      }
+
+      /**
+       * Per JSR 286 spec, if null, return an empty value
+       *
+       * @return Returns the value.
+       */
+      public String getValue()
+      {
+         return value;
+      }
+
+      public Property(String name, String value)
+      {
+         this.name =3D name;
+         this.value =3D value;
+      }
+
+      public boolean isValid()
+      {
+         return name !=3D null && name.length() > 0;
+      }
+   }
+
+}

Modified: modules/portlet/trunk/portlet/src/main/resources/org/jboss/portal=
/portlet/portlet_2_0.tld
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/resources/org/jboss/portal/portl=
et/portlet_2_0.tld	2008-02-06 18:49:08 UTC (rev 9805)
+++ modules/portlet/trunk/portlet/src/main/resources/org/jboss/portal/portl=
et/portlet_2_0.tld	2008-02-06 19:02:10 UTC (rev 9806)
@@ -14,7 +14,7 @@
    
 =

       param
-      org.jboss.portal.portlet.impl.jsr168.taglib.URLParameterT=
ag
+      org.jboss.portal.portlet.impl.jsr286.taglib.URLParameter2=
86Tag
       empty
 =

       
@@ -33,9 +33,29 @@
    
    
 =

+      property
+      org.jboss.portal.portlet.impl.jsr286.taglib.URLProperty28=
6Tag
+      empty
+
+      
+         name
+         true
+         true
+
+      
+      
+         value
+         true
+         true
+
+      
+
+   
+   
+
       renderURL
-      org.jboss.portal.portlet.impl.jsr168.taglib.RenderURLTag<=
/tag-class>
-      org.jboss.portal.portlet.impl.jsr168.taglib.GenerateURLTa=
gTEI
+      org.jboss.portal.portlet.impl.jsr286.taglib.RenderURL286T=
ag
+      org.jboss.portal.portlet.impl.jsr286.taglib.GenerateURL28=
6TagTEI
       JSP
 =

       
@@ -58,7 +78,17 @@
          true
 =

       
+      
+         escapeXml
+         true
 =

+      
+      
+         copyCurrentRenderParameters
+         true
+
+      
+
    
    
 =

@@ -71,8 +101,8 @@
    
 =

       actionURL
-      org.jboss.portal.portlet.impl.jsr168.taglib.ActionURLTag<=
/tag-class>
-      org.jboss.portal.portlet.impl.jsr168.taglib.GenerateURLTa=
gTEI
+      org.jboss.portal.portlet.impl.jsr286.taglib.ActionURL286T=
ag
+      org.jboss.portal.portlet.impl.jsr286.taglib.GenerateURL28=
6TagTEI
       JSP
 =

       
@@ -95,12 +125,62 @@
          true
 =

       
+      
+         escapeXml
+         true
 =

+      
+      
+         copyCurrentRenderParameters
+         true
+
+      
+      
+         name
+         true
+
+      
+
+
    
    
 =

+      resourceURL
+      org.jboss.portal.portlet.impl.jsr286.taglib.ResourceURL28=
6Tag
+      org.jboss.portal.portlet.impl.jsr286.taglib.ResourceURL28=
6TagTEI
+      JSP
+
+      
+         secure
+         true
+
+      
+      
+         var
+         true
+
+      
+      
+         escapeXml
+         true
+
+      
+      
+         cacheability
+         true
+
+      
+      
+         id
+         true
+
+      
+
+   
+   
+
       namespace
-      org.jboss.portal.portlet.impl.jsr168.taglib.NamespaceTag<=
/tag-class>
+      org.jboss.portal.portlet.impl.jsr286.taglib.Namespace286T=
ag
       empty
 =

    

Added: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/po=
rtlet/jsr168/ext/taglib/ActionURLTestCase.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portl=
et/jsr168/ext/taglib/ActionURLTestCase.java	                        (rev 0)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portl=
et/jsr168/ext/taglib/ActionURLTestCase.java	2008-02-06 19:02:10 UTC (rev 98=
06)
@@ -0,0 +1,111 @@
+/*
+* 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.jsr168.ext.taglib;
+
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.base.AbstractUniversalTestPortlet;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
+import org.jboss.portal.test.portlet.framework.UTP1;
+import org.jboss.portal.portlet.invocation.PortletInvocation;
+import org.jboss.portal.portlet.impl.jsr168.api.PortletURLImpl;
+import org.jboss.portal.portlet.impl.jsr168.api.PortletRequestImpl;
+import org.jboss.unit.driver.DriverResponse;
+import org.jboss.unit.driver.response.EndTestResponse;
+import org.jboss.unit.remote.driver.handler.http.response.InvokeGetRespons=
e;
+
+import javax.portlet.Portlet;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+import javax.portlet.PortletException;
+import javax.portlet.PortletRequestDispatcher;
+import javax.portlet.PortletURL;
+import javax.portlet.WindowState;
+import javax.portlet.PortletMode;
+import java.io.IOException;
+import java.io.StringWriter;
+
+/**
+ * @author Boleslaw Dawidowicz
+ * @version : 0.1 $
+ */
+(a)TestCase
+public class ActionURLTestCase extends TaglibTestCase
+{
+   public ActionURLTestCase(PortletTestCase seq)
+   {
+
+      seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestActio=
n()
+      {
+         protected DriverResponse run(Portlet portlet, RenderRequest reque=
st, RenderResponse response, PortletTestContext context) throws IOException=
, PortletException
+         {
+            response.setContentType("text/html");
+            PortletRequestDispatcher dispatcher =3D ((AbstractUniversalTes=
tPortlet)portlet).getPortletContext().
+               getRequestDispatcher("/actionURL.jsp");
+
+            PortletURL pu1 =3D response.createActionURL();
+
+            pu1.setWindowState(WindowState.MAXIMIZED);
+            pu1.setPortletMode(PortletMode.EDIT);
+            pu1.setSecure(true);
+
+            PortletURL pu2 =3D response.createActionURL();
+            pu2.setSecure(false);
+
+            pu2.setParameter("testParam", new String[] {"testParamValue", =
"testParamValue2"});
+            pu2.setParameter("secondParam", "testParamValue");
+            =

+            // Create session
+            request.getPortletSession();
+
+            // escapeXml=3Dtrue
+            String url1 =3D response.encodeURL(pu1.toString());
+
+            // escapeXml=3Dfalse
+            String url2 =3D response.encodeURL(pu2.toString());
+            =

+            expectedResults =3D new String[]{ url1 , url1 , url2 };
+
+            include(dispatcher, request, response);
+
+
+            return new InvokeGetResponse(response.createRenderURL().toStri=
ng());
+         }
+      });
+
+      seq.bindAction(1, UTP1.RENDER_JOIN_POINT, new PortletRenderTestActio=
n()
+      {
+         protected DriverResponse run(Portlet portlet, RenderRequest reque=
st, RenderResponse response, PortletTestContext context) throws IOException=
, PortletException
+         {
+            response.setContentType("text/html");
+
+            assertResults(context);
+
+            return new EndTestResponse();
+         }
+      });
+
+
+   }
+}
\ No newline at end of file

Copied: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/p=
ortlet/jsr168/ext/taglib/DefineObjectsTestCase.java (from rev 9794, modules=
/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/t=
ck/taglib/DefineObjectsTestCase.java)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portl=
et/jsr168/ext/taglib/DefineObjectsTestCase.java	                        (re=
v 0)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portl=
et/jsr168/ext/taglib/DefineObjectsTestCase.java	2008-02-06 19:02:10 UTC (re=
v 9806)
@@ -0,0 +1,95 @@
+/*
+* 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.jsr168.ext.taglib;
+
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.Assertion;
+import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.base.AbstractUniversalTestPortlet;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
+import org.jboss.portal.unit.actions.PortletActionTestAction;
+import org.jboss.portal.unit.actions.PortletEventTestAction;
+import org.jboss.portal.unit.actions.PortletResourceTestAction;
+import org.jboss.portal.test.portlet.framework.UTP1;
+import org.jboss.portal.test.portlet.jsr286.tck.taglib.*;
+import org.jboss.unit.driver.DriverResponse;
+import org.jboss.unit.driver.response.EndTestResponse;
+import org.jboss.unit.remote.driver.handler.http.response.InvokeGetRespons=
e;
+import static org.jboss.unit.api.Assert.*;
+
+import javax.portlet.Portlet;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+import javax.portlet.PortletException;
+import javax.portlet.PortletRequestDispatcher;
+import javax.portlet.ActionRequest;
+import javax.portlet.ActionResponse;
+import javax.portlet.EventRequest;
+import javax.portlet.EventResponse;
+import javax.portlet.ResourceRequest;
+import javax.portlet.ResourceResponse;
+import java.io.IOException;
+import java.io.Writer;
+
+/**
+ * @author Boleslaw Dawidowicz
+ * @version : 0.1 $
+ */
+(a)TestCase({
+   Assertion.JSR286_113
+   })
+public class DefineObjectsTestCase extends TaglibTestCase
+{
+
+   //TODO: doesn't test include from action/event - the actionRequest/acti=
onResponse/eventRequest/eventResponse objects
+
+   public DefineObjectsTestCase(PortletTestCase seq)
+   {
+      seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestActio=
n()
+      {
+         protected DriverResponse run(Portlet portlet, RenderRequest reque=
st, RenderResponse response, PortletTestContext context) throws IOException=
, PortletException
+         {
+            response.setContentType("text/html");
+            PortletRequestDispatcher dispatcher =3D ((AbstractUniversalTes=
tPortlet)portlet).getPortletContext().getRequestDispatcher("/defineObjects.=
jsp");
+
+            include(dispatcher, request, response);
+
+            expectedResult =3D "jspDispatch,renderRequest,renderResponse,p=
ortletConfig";
+
+
+            return new InvokeGetResponse(response.createRenderURL().toStri=
ng());
+         }
+      });
+
+      seq.bindAction(1, UTP1.RENDER_JOIN_POINT, new PortletRenderTestActio=
n()
+      {
+         protected DriverResponse run(Portlet portlet, RenderRequest reque=
st, RenderResponse response, PortletTestContext context) throws IOException=
, PortletException
+         {
+            assertResult(context);
+
+            return new EndTestResponse();
+         }
+      });
+   }
+}
\ No newline at end of file

Added: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/po=
rtlet/jsr168/ext/taglib/NamespaceTestCase.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portl=
et/jsr168/ext/taglib/NamespaceTestCase.java	                        (rev 0)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portl=
et/jsr168/ext/taglib/NamespaceTestCase.java	2008-02-06 19:02:10 UTC (rev 98=
06)
@@ -0,0 +1,89 @@
+/*
+* 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.jsr168.ext.taglib;
+
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.base.AbstractUniversalTestPortlet;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
+import org.jboss.portal.unit.actions.PortletResourceTestAction;
+import org.jboss.portal.test.portlet.framework.UTP1;
+import org.jboss.portal.test.portlet.jsr286.tck.taglib.*;
+import org.jboss.unit.driver.DriverResponse;
+import org.jboss.unit.driver.response.EndTestResponse;
+import org.jboss.unit.remote.driver.handler.http.response.InvokeGetRespons=
e;
+import static org.jboss.unit.api.Assert.assertEquals;
+
+import javax.portlet.Portlet;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+import javax.portlet.PortletException;
+import javax.portlet.PortletRequestDispatcher;
+import javax.portlet.ResourceRequest;
+import javax.portlet.ResourceResponse;
+import java.io.IOException;
+import java.io.Writer;
+
+/**
+ * @author Boleslaw Dawidowicz
+ * @version : 0.1 $
+ */
+(a)TestCase
+public class NamespaceTestCase extends TaglibTestCase
+{
+
+   public NamespaceTestCase(PortletTestCase seq)
+   {
+      seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestActio=
n()
+      {
+         protected DriverResponse run(Portlet portlet, RenderRequest reque=
st, RenderResponse response, PortletTestContext context) throws IOException=
, PortletException
+         {
+            response.setContentType("text/html");
+            PortletRequestDispatcher dispatcher =3D ((AbstractUniversalTes=
tPortlet)portlet).getPortletContext().
+               getRequestDispatcher("/namespace.jsp");
+
+            expectedResult =3D response.getNamespace();
+
+            include(dispatcher, request, response);
+
+
+            return new InvokeGetResponse(response.createRenderURL().toStri=
ng());
+         }
+      });
+
+      seq.bindAction(1, UTP1.RENDER_JOIN_POINT, new PortletRenderTestActio=
n()
+      {
+         protected DriverResponse run(Portlet portlet, RenderRequest reque=
st, RenderResponse response, PortletTestContext context) throws IOException=
, PortletException
+         {
+            response.setContentType("text/html");
+
+            assertResult(context);
+
+            return new EndTestResponse();
+         }
+      });
+
+
+   }
+}
\ No newline at end of file

Added: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/po=
rtlet/jsr168/ext/taglib/RenderURLTestCase.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portl=
et/jsr168/ext/taglib/RenderURLTestCase.java	                        (rev 0)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portl=
et/jsr168/ext/taglib/RenderURLTestCase.java	2008-02-06 19:02:10 UTC (rev 98=
06)
@@ -0,0 +1,125 @@
+/*
+* 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.jsr168.ext.taglib;
+
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.base.AbstractUniversalTestPortlet;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
+import org.jboss.portal.test.portlet.framework.UTP1;
+import org.jboss.portal.test.portlet.jsr286.tck.taglib.*;
+import org.jboss.unit.driver.DriverResponse;
+import org.jboss.unit.driver.response.EndTestResponse;
+import org.jboss.unit.remote.driver.handler.http.response.InvokeGetRespons=
e;
+
+import javax.portlet.Portlet;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+import javax.portlet.PortletException;
+import javax.portlet.PortletURL;
+import javax.portlet.PortletRequestDispatcher;
+import javax.portlet.WindowState;
+import javax.portlet.PortletMode;
+import java.io.IOException;
+import java.io.StringWriter;
+
+/**
+ * @author Boleslaw Dawidowicz
+ * @version : 0.1 $
+ */
+(a)TestCase
+public class RenderURLTestCase extends TaglibTestCase
+{
+   public RenderURLTestCase(PortletTestCase seq)
+   {
+
+      seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestActio=
n()
+      {
+         protected DriverResponse run(Portlet portlet, RenderRequest reque=
st, RenderResponse response, PortletTestContext context) throws IOException=
, PortletException
+         {
+            response.setContentType("text/html");
+            PortletRequestDispatcher dispatcher =3D ((AbstractUniversalTes=
tPortlet)portlet).getPortletContext().
+               getRequestDispatcher("/renderURL.jsp");
+
+            PortletURL pu1 =3D response.createRenderURL();
+
+            pu1.setWindowState(WindowState.NORMAL);
+            pu1.setPortletMode(PortletMode.EDIT);
+            pu1.setSecure(true);
+
+            PortletURL pu2 =3D response.createRenderURL();
+            pu2.setSecure(false);
+
+            pu2.setParameter("testParam", new String[] {"testParamValue", =
"testParamValue2"});
+            pu2.setParameter("secondParam", "testParamValue");
+
+            // Create session
+            request.getPortletSession();
+
+            // escapeXml=3Dtrue
+            String url1 =3D response.encodeURL(pu1.toString());
+
+
+            // escapeXml=3Dfalse
+            String url2 =3D response.encodeURL(pu2.toString());
+
+
+            expectedResults =3D new String[]{ url2 };
+
+            include(dispatcher, request, response);
+
+
+//            
+//
+//
+//
+//
+//<%
+//   //Put url placed as page variable
+//   out.print(pageContext.getAttribute("testVar"));
+//%>
+//
+//
+
+            return new InvokeGetResponse(response.createRenderURL().toStri=
ng());
+
+
+         }
+      });
+
+      seq.bindAction(1, UTP1.RENDER_JOIN_POINT, new PortletRenderTestActio=
n()
+      {
+         protected DriverResponse run(Portlet portlet, RenderRequest reque=
st, RenderResponse response, PortletTestContext context) throws IOException=
, PortletException
+         {
+            response.setContentType("text/html");
+
+            assertResults(context);
+
+            return new EndTestResponse();
+         }
+      });
+
+
+   }
+}
\ No newline at end of file

Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test=
/portlet/jsr168/ext/taglib/TaglibTestCase.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portl=
et/jsr168/ext/taglib/TaglibTestCase.java	2008-02-06 18:49:08 UTC (rev 9805)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portl=
et/jsr168/ext/taglib/TaglibTestCase.java	2008-02-06 19:02:10 UTC (rev 9806)
@@ -31,6 +31,8 @@
 import org.jboss.portal.unit.annotations.TestCase;
 import org.jboss.portal.unit.PortletTestContext;
 import org.jboss.portal.unit.base.AbstractUniversalTestPortlet;
+import org.jboss.portal.portlet.invocation.PortletInvocation;
+import org.jboss.portal.portlet.aspects.portlet.ContextDispatcherIntercept=
or;
 import org.jboss.unit.driver.DriverResponse;
 import org.jboss.unit.driver.response.EndTestResponse;
 import org.jboss.unit.remote.driver.handler.http.response.InvokeGetRespons=
e;
@@ -42,12 +44,14 @@
 import javax.portlet.PortletSession;
 import javax.portlet.PortletRequestDispatcher;
 import javax.portlet.PortletException;
+import javax.portlet.PortletRequest;
 import javax.servlet.Servlet;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 import java.io.IOException;
+import java.io.Writer;
 =

 /**
  * The goal is to test that cross context session attributes are set in co=
ntainer and are accessible from the direct
@@ -59,20 +63,58 @@
  * @author Julien Viet
  * @version $Revision: 1.1 $
  */
-(a)TestCase
-public class TaglibTestCase
+public abstract class TaglibTestCase
 {
-   public TaglibTestCase(PortletTestCase seq)
+
+   protected String startTag;
+   protected String endTag;
+   protected String expectedResult;
+   protected String[] expectedResults;
+
+
+   protected void include(PortletRequestDispatcher dispatcher, RenderReque=
st request, RenderResponse response) throws IOException, PortletException
    {
-      seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestActio=
n()
+      startTag =3D "
";
+      endTag =3D "";
+
+      Writer writer =3D response.getWriter();
+
+      writer.write(startTag);
+      dispatcher.include(request, response);
+      writer.write(endTag);
+   }
+
+   protected void assertResult(PortletTestContext context)
+   {
+      String prevResponse =3D new String(context.getResponseBody());
+
+      String portletResp =3D prevResponse.substring(prevResponse.indexOf(s=
tartTag) + startTag.length(), prevResponse.indexOf(endTag));
+
+      assertEquals(expectedResult, portletResp.trim());
+   }
+
+   protected void assertResults(PortletTestContext context)
+   {
+      String prevResponse =3D new String(context.getResponseBody());
+
+      String portletResp =3D prevResponse.substring(prevResponse.indexOf(s=
tartTag) + startTag.length(), prevResponse.indexOf(endTag));
+
+      String[] results =3D portletResp.split("");
+
+      // Trim all results
+      for (int i =3D 0; i < results.length; i++)
       {
-         protected DriverResponse run(Portlet portlet, RenderRequest reque=
st, RenderResponse response, PortletTestContext context) throws IOException=
, PortletException
-         {
-            response.setContentType("text/html");
-            PortletRequestDispatcher dispatcher =3D ((AbstractUniversalTes=
tPortlet)portlet).getPortletContext().getRequestDispatcher("/usetaglib.jsp"=
);
-            dispatcher.include(request, response);
-            return new EndTestResponse();
-         }
-      });
+         results[i] =3D results[i].trim();
+
+      }
+
+
+      assertEquals(expectedResults, results);
    }
-}
\ No newline at end of file
+
+   protected PortletInvocation getInvocation(PortletRequest req)
+   {
+      // Get the invocation
+      return (PortletInvocation)req.getAttribute(ContextDispatcherIntercep=
tor.REQ_ATT_COMPONENT_INVOCATION);
+   }
+}

Added: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/po=
rtlet/jsr286/tck/taglib/ActionURLTestCase.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portl=
et/jsr286/tck/taglib/ActionURLTestCase.java	                        (rev 0)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portl=
et/jsr286/tck/taglib/ActionURLTestCase.java	2008-02-06 19:02:10 UTC (rev 98=
06)
@@ -0,0 +1,142 @@
+/*
+* 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.taglib;
+
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.base.AbstractUniversalTestPortlet;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
+import org.jboss.portal.test.portlet.framework.UTP1;
+import org.jboss.portal.portlet.invocation.PortletInvocation;
+import org.jboss.portal.portlet.impl.jsr168.api.PortletURLImpl;
+import org.jboss.portal.portlet.impl.jsr168.api.PortletRequestImpl;
+import org.jboss.unit.driver.DriverResponse;
+import org.jboss.unit.driver.response.EndTestResponse;
+import org.jboss.unit.remote.driver.handler.http.response.InvokeGetRespons=
e;
+
+import javax.portlet.Portlet;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+import javax.portlet.PortletException;
+import javax.portlet.PortletRequestDispatcher;
+import javax.portlet.PortletURL;
+import javax.portlet.WindowState;
+import javax.portlet.PortletMode;
+import java.io.IOException;
+import java.io.StringWriter;
+
+/**
+ * @author Boleslaw Dawidowicz
+ * @version : 0.1 $
+ */
+(a)TestCase
+public class ActionURLTestCase extends TaglibTestCase
+{
+   public ActionURLTestCase(PortletTestCase seq)
+   {
+
+      seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestActio=
n()
+      {
+         protected DriverResponse run(Portlet portlet, RenderRequest reque=
st, RenderResponse response, PortletTestContext context) throws IOException=
, PortletException
+         {
+
+            PortletURL url =3D response.createRenderURL();
+            url.setParameter("testParamOne", "testValue1");
+            url.setParameter("testParameterTwo", "testValue2");
+
+
+            return new InvokeGetResponse(url.toString());
+         }
+      });
+
+      seq.bindAction(1, UTP1.RENDER_JOIN_POINT, new PortletRenderTestActio=
n()
+      {
+         protected DriverResponse run(Portlet portlet, RenderRequest reque=
st, RenderResponse response, PortletTestContext context) throws IOException=
, PortletException
+         {
+            response.setContentType("text/html");
+            PortletRequestDispatcher dispatcher =3D ((AbstractUniversalTes=
tPortlet)portlet).getPortletContext().
+               getRequestDispatcher("/actionURL.jsp");
+
+            PortletURL pu1 =3D response.createActionURL();
+            =

+            pu1.setWindowState(WindowState.MAXIMIZED);
+            pu1.setPortletMode(PortletMode.EDIT);
+            pu1.setSecure(true);
+            pu1.setParameter("javax.portlet.action", "testAction");
+
+            // Params from previos request =

+            pu1.setParameter("testParamOne", "testValue1");
+            pu1.setParameter("testParameterTwo", "testValue2");
+
+            PortletURL pu2 =3D response.createActionURL();
+            pu2.setSecure(false);
+            pu2.setParameter("javax.portlet.action", "testAction");
+
+            pu2.setParameter("testParam", new String[] {"testParamValue", =
"testParamValue2"});
+            pu2.setParameter("secondParam", "testParamValue");
+            pu2.setProperty("testProperty", "testPropValue");
+            pu2.setProperty("testProperty", "testPropValue2");
+            pu2.setProperty("secondProperty", "testPropValue");
+
+            StringWriter sw =3D new StringWriter();
+
+            // Create session
+            request.getPortletSession();
+
+            // escapeXml=3Dtrue
+            pu1.write(sw, true);
+            String url1 =3D response.encodeURL(sw.toString());
+
+            sw =3D new StringWriter();
+            =

+            // escapeXml=3Dfalse
+            pu2.write(sw, false);
+            String url2 =3D response.encodeURL(sw.toString());
+            sw.flush();
+
+
+            expectedResults =3D new String[]{ url1, url1, url2};
+
+            include(dispatcher, request, response);
+
+
+            return new InvokeGetResponse(response.createRenderURL().toStri=
ng());
+         }
+      });
+
+      seq.bindAction(2, UTP1.RENDER_JOIN_POINT, new PortletRenderTestActio=
n()
+      {
+         protected DriverResponse run(Portlet portlet, RenderRequest reque=
st, RenderResponse response, PortletTestContext context) throws IOException=
, PortletException
+         {
+            response.setContentType("text/html");
+
+            assertResults(context);
+
+            return new EndTestResponse();
+         }
+      });
+
+
+   }
+}

Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test=
/portlet/jsr286/tck/taglib/DefineObjectsTestCase.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portl=
et/jsr286/tck/taglib/DefineObjectsTestCase.java	2008-02-06 18:49:08 UTC (re=
v 9805)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portl=
et/jsr286/tck/taglib/DefineObjectsTestCase.java	2008-02-06 19:02:10 UTC (re=
v 9806)
@@ -58,14 +58,11 @@
 @TestCase({
    Assertion.JSR286_113
    })
-public class DefineObjectsTestCase
+public class DefineObjectsTestCase extends TaglibTestCase
 {
 =

    //TODO: doesn't test include from action/event - the actionRequest/acti=
onResponse/eventRequest/eventResponse objects
 =

-   private String startTag;
-   private String endTag;
-
    public DefineObjectsTestCase(PortletTestCase seq)
    {
       seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestActio=
n()
@@ -73,18 +70,14 @@
          protected DriverResponse run(Portlet portlet, RenderRequest reque=
st, RenderResponse response, PortletTestContext context) throws IOException=
, PortletException
          {
             response.setContentType("text/html");
-            PortletRequestDispatcher dispatcher =3D ((AbstractUniversalTes=
tPortlet)portlet).getPortletContext().getRequestDispatcher("/taglib.jsp");
+            PortletRequestDispatcher dispatcher =3D ((AbstractUniversalTes=
tPortlet)portlet).getPortletContext().getRequestDispatcher("/defineObjects.=
jsp");
 =

-            startTag =3D "";
-            endTag =3D "";
+            include(dispatcher, request, response);
 =

-            Writer writer =3D response.getWriter();
+            expectedResult =3D "jspDispatch,renderRequest,renderResponse,p=
ortletConfig,portletSession,portletSessionScope," +
+               "portletPreferences,portletPreferencesValues";
 =

-            writer.write(startTag);
-            dispatcher.include(request, response);
-            writer.write(endTag);
 =

-
             return new InvokeGetResponse(response.createRenderURL().toStri=
ng());
          }
       });
@@ -95,15 +88,8 @@
       {
          protected DriverResponse run(Portlet portlet, RenderRequest reque=
st, RenderResponse response, PortletTestContext context) throws IOException=
, PortletException
          {
-            response.setContentType("text/html");
-
-            String prevResponse =3D new String(context.getResponseBody());
-
-            String portletResp =3D prevResponse.substring(prevResponse.ind=
exOf(startTag) + startTag.length(), prevResponse.indexOf(endTag));
-
-            assertEquals("jspDispatch,renderRequest,renderResponse,portlet=
Config,portletSession,portletSessionScope," +
-               "portletPreferences,portletPreferencesValues", portletResp.=
trim());
-
+            assertResult(context);
+            =

             return new InvokeGetResponse(response.createResourceURL().toSt=
ring());
          }
       });
@@ -113,7 +99,7 @@
          protected DriverResponse run(Portlet portlet, ResourceRequest req=
uest, ResourceResponse response, PortletTestContext context) throws IOExcep=
tion, PortletException
          {
             response.setContentType("text/html");
-            PortletRequestDispatcher dispatcher =3D ((AbstractUniversalTes=
tPortlet)portlet).getPortletContext().getRequestDispatcher("/taglib.jsp");
+            PortletRequestDispatcher dispatcher =3D ((AbstractUniversalTes=
tPortlet)portlet).getPortletContext().getRequestDispatcher("/defineObjects.=
jsp");
 =

             startTag =3D "";
             endTag =3D "";
@@ -124,6 +110,9 @@
             dispatcher.include(request, response);
             writer.write(endTag);
 =

+            expectedResult =3D "jspDispatch,resourceRequest,resourceRespon=
se,portletConfig,portletSession,portletSessionScope," +
+               "portletPreferences,portletPreferencesValues";
+
             return new InvokeGetResponse(response.createRenderURL().toStri=
ng());
          }
       });
@@ -132,15 +121,8 @@
       {
          protected DriverResponse run(Portlet portlet, RenderRequest reque=
st, RenderResponse response, PortletTestContext context) throws IOException=
, PortletException
          {
-            response.setContentType("text/html");
+            assertResult(context);
 =

-            String prevResponse =3D new String(context.getResponseBody());
-
-            String portletResp =3D prevResponse.substring(prevResponse.ind=
exOf(startTag) + startTag.length(), prevResponse.indexOf(endTag));
-
-            assertEquals("jspDispatch,resourceRequest,resourceResponse,por=
tletConfig,portletSession,portletSessionScope," +
-               "portletPreferences,portletPreferencesValues", portletResp.=
trim());
-
             return new EndTestResponse();
          }
       });

Added: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/po=
rtlet/jsr286/tck/taglib/NamespaceTestCase.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portl=
et/jsr286/tck/taglib/NamespaceTestCase.java	                        (rev 0)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portl=
et/jsr286/tck/taglib/NamespaceTestCase.java	2008-02-06 19:02:10 UTC (rev 98=
06)
@@ -0,0 +1,88 @@
+/*
+* 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.taglib;
+
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.base.AbstractUniversalTestPortlet;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
+import org.jboss.portal.unit.actions.PortletResourceTestAction;
+import org.jboss.portal.test.portlet.framework.UTP1;
+import org.jboss.unit.driver.DriverResponse;
+import org.jboss.unit.driver.response.EndTestResponse;
+import org.jboss.unit.remote.driver.handler.http.response.InvokeGetRespons=
e;
+import static org.jboss.unit.api.Assert.assertEquals;
+
+import javax.portlet.Portlet;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+import javax.portlet.PortletException;
+import javax.portlet.PortletRequestDispatcher;
+import javax.portlet.ResourceRequest;
+import javax.portlet.ResourceResponse;
+import java.io.IOException;
+import java.io.Writer;
+
+/**
+ * @author Boleslaw Dawidowicz
+ * @version : 0.1 $
+ */
+(a)TestCase
+public class NamespaceTestCase extends TaglibTestCase
+{
+   =

+   public NamespaceTestCase(PortletTestCase seq)
+   {
+      seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestActio=
n()
+      {
+         protected DriverResponse run(Portlet portlet, RenderRequest reque=
st, RenderResponse response, PortletTestContext context) throws IOException=
, PortletException
+         {
+            response.setContentType("text/html");
+            PortletRequestDispatcher dispatcher =3D ((AbstractUniversalTes=
tPortlet)portlet).getPortletContext().
+               getRequestDispatcher("/namespace.jsp");
+
+            expectedResult =3D response.getNamespace();
+
+            include(dispatcher, request, response);
+
+
+            return new InvokeGetResponse(response.createRenderURL().toStri=
ng());
+         }
+      });
+
+      seq.bindAction(1, UTP1.RENDER_JOIN_POINT, new PortletRenderTestActio=
n()
+      {
+         protected DriverResponse run(Portlet portlet, RenderRequest reque=
st, RenderResponse response, PortletTestContext context) throws IOException=
, PortletException
+         {
+            response.setContentType("text/html");
+
+            assertResult(context);
+
+            return new EndTestResponse();
+         }
+      });
+
+      =

+   }
+}

Added: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/po=
rtlet/jsr286/tck/taglib/RenderURLTestCase.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portl=
et/jsr286/tck/taglib/RenderURLTestCase.java	                        (rev 0)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portl=
et/jsr286/tck/taglib/RenderURLTestCase.java	2008-02-06 19:02:10 UTC (rev 98=
06)
@@ -0,0 +1,137 @@
+/*
+* 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.taglib;
+
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.base.AbstractUniversalTestPortlet;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
+import org.jboss.portal.test.portlet.framework.UTP1;
+import org.jboss.unit.driver.DriverResponse;
+import org.jboss.unit.driver.response.EndTestResponse;
+import org.jboss.unit.remote.driver.handler.http.response.InvokeGetRespons=
e;
+
+import javax.portlet.Portlet;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+import javax.portlet.PortletException;
+import javax.portlet.PortletURL;
+import javax.portlet.PortletRequestDispatcher;
+import javax.portlet.WindowState;
+import javax.portlet.PortletMode;
+import java.io.IOException;
+import java.io.StringWriter;
+
+/**
+ * @author Boleslaw Dawidowicz
+ * @version : 0.1 $
+ */
+(a)TestCase
+public class RenderURLTestCase extends TaglibTestCase
+{
+   public RenderURLTestCase(PortletTestCase seq)
+   {
+
+      seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestActio=
n()
+      {
+         protected DriverResponse run(Portlet portlet, RenderRequest reque=
st, RenderResponse response, PortletTestContext context) throws IOException=
, PortletException
+         {
+
+            PortletURL url =3D response.createRenderURL();
+            url.setParameter("testParamOne", "testValue1");
+            url.setParameter("testParameterTwo", "testValue2");
+
+
+            return new InvokeGetResponse(url.toString());
+         }
+      });
+
+      seq.bindAction(1, UTP1.RENDER_JOIN_POINT, new PortletRenderTestActio=
n()
+      {
+         protected DriverResponse run(Portlet portlet, RenderRequest reque=
st, RenderResponse response, PortletTestContext context) throws IOException=
, PortletException
+         {
+            response.setContentType("text/html");
+            PortletRequestDispatcher dispatcher =3D ((AbstractUniversalTes=
tPortlet)portlet).getPortletContext().
+               getRequestDispatcher("/renderURL.jsp");
+
+            PortletURL pu1 =3D response.createRenderURL();
+
+            pu1.setWindowState(WindowState.NORMAL);
+            pu1.setPortletMode(PortletMode.EDIT);
+            pu1.setSecure(true);
+
+            // Params from previos request
+            pu1.setParameter("testParamOne", "testValue1");
+            pu1.setParameter("testParameterTwo", "testValue2");
+
+            PortletURL pu2 =3D response.createRenderURL();
+            pu2.setSecure(false);
+
+            pu2.setParameter("testParam", new String[] {"testParamValue", =
"testParamValue2"});
+            pu2.setParameter("secondParam", "testParamValue");
+            pu2.setProperty("testProperty", "testPropValue");
+            pu2.setProperty("testProperty", "testPropValue2");
+            pu2.setProperty("secondProperty", "testPropValue");
+
+            StringWriter sw =3D new StringWriter();
+
+            // Create session
+            request.getPortletSession();
+
+            // escapeXml=3Dtrue
+            pu1.write(sw, true);
+            String url1 =3D response.encodeURL(sw.toString());
+
+            sw =3D new StringWriter();
+
+            // escapeXml=3Dfalse
+            pu2.write(sw, false);
+            String url2 =3D response.encodeURL(sw.toString());
+            sw.flush();
+
+
+            expectedResults =3D new String[]{ url1, url1, url2};
+
+            include(dispatcher, request, response);
+
+
+            return new InvokeGetResponse(response.createRenderURL().toStri=
ng());
+         }
+      });
+
+      seq.bindAction(2, UTP1.RENDER_JOIN_POINT, new PortletRenderTestActio=
n()
+      {
+         protected DriverResponse run(Portlet portlet, RenderRequest reque=
st, RenderResponse response, PortletTestContext context) throws IOException=
, PortletException
+         {
+            response.setContentType("text/html");
+
+            assertResults(context);
+
+            return new EndTestResponse();
+         }
+      });
+
+
+   }
+}

Added: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/po=
rtlet/jsr286/tck/taglib/ResourceURLTestCase.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portl=
et/jsr286/tck/taglib/ResourceURLTestCase.java	                        (rev =
0)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portl=
et/jsr286/tck/taglib/ResourceURLTestCase.java	2008-02-06 19:02:10 UTC (rev =
9806)
@@ -0,0 +1,131 @@
+/*
+* 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.taglib;
+
+import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.base.AbstractUniversalTestPortlet;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
+import org.jboss.portal.test.portlet.framework.UTP1;
+import org.jboss.unit.driver.DriverResponse;
+import org.jboss.unit.driver.response.EndTestResponse;
+import org.jboss.unit.remote.driver.handler.http.response.InvokeGetRespons=
e;
+
+import javax.portlet.Portlet;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+import javax.portlet.PortletException;
+import javax.portlet.PortletURL;
+import javax.portlet.PortletRequestDispatcher;
+import javax.portlet.WindowState;
+import javax.portlet.PortletMode;
+import javax.portlet.ResourceURL;
+import java.io.IOException;
+import java.io.StringWriter;
+
+/**
+ * @author Boleslaw Dawidowicz
+ * @version : 0.1 $
+ */
+(a)TestCase
+public class ResourceURLTestCase extends TaglibTestCase
+{
+   public ResourceURLTestCase(PortletTestCase seq)
+   {
+
+      seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestActio=
n()
+      {
+         protected DriverResponse run(Portlet portlet, RenderRequest reque=
st, RenderResponse response, PortletTestContext context) throws IOException=
, PortletException
+         {
+            response.setContentType("text/html");
+            PortletRequestDispatcher dispatcher =3D ((AbstractUniversalTes=
tPortlet)portlet).getPortletContext().
+               getRequestDispatcher("/resourceURL.jsp");
+
+            ResourceURL pu1 =3D response.createResourceURL();
+
+            pu1.setSecure(true);
+            pu1.setCacheability("FULL");
+
+            ResourceURL pu2 =3D response.createResourceURL();
+
+            pu2.setSecure(true);
+            pu2.setResourceID("testId1");
+
+
+            ResourceURL pu3 =3D response.createResourceURL();
+            pu3.setSecure(false);
+
+            pu3.setParameter("testParam", new String[] {"testParamValue", =
"testParamValue2"});
+            pu3.setParameter("secondParam", "testParamValue");
+            pu3.setProperty("testProperty", "testPropValue");
+            pu3.setProperty("testProperty", "testPropValue2");
+            pu3.setProperty("secondProperty", "testPropValue");
+
+
+            StringWriter sw =3D new StringWriter();
+
+            // Create session
+            request.getPortletSession();
+
+            // escapeXml=3Dtrue
+            pu1.write(sw, true);
+            String url1 =3D response.encodeURL(sw.toString());
+
+            sw =3D new StringWriter();
+
+            // escapeXml=3Dtrue
+            pu2.write(sw, true);
+            String url2 =3D response.encodeURL(sw.toString());
+
+            sw =3D new StringWriter();
+
+            // escapeXml=3Dfalse
+            pu3.write(sw, false);
+            String url3 =3D response.encodeURL(sw.toString());
+
+
+            expectedResults =3D new String[]{ url1, url2, url3};
+
+            include(dispatcher, request, response);
+
+
+            return new InvokeGetResponse(response.createRenderURL().toStri=
ng());
+         }
+      });
+
+      seq.bindAction(1, UTP1.RENDER_JOIN_POINT, new PortletRenderTestActio=
n()
+      {
+         protected DriverResponse run(Portlet portlet, RenderRequest reque=
st, RenderResponse response, PortletTestContext context) throws IOException=
, PortletException
+         {
+            response.setContentType("text/html");
+
+            assertResults(context);
+
+            return new EndTestResponse();
+         }
+      });
+
+
+   }
+}

Added: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/po=
rtlet/jsr286/tck/taglib/TaglibTestCase.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portl=
et/jsr286/tck/taglib/TaglibTestCase.java	                        (rev 0)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portl=
et/jsr286/tck/taglib/TaglibTestCase.java	2008-02-06 19:02:10 UTC (rev 9806)
@@ -0,0 +1,99 @@
+/*
+* 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.taglib;
+
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.portlet.invocation.PortletInvocation;
+import org.jboss.portal.portlet.aspects.portlet.ContextDispatcherIntercept=
or;
+import static org.jboss.unit.api.Assert.assertEquals;
+
+import javax.portlet.PortletRequestDispatcher;
+import javax.portlet.PortletRequest;
+import javax.portlet.PortletResponse;
+import javax.portlet.RenderResponse;
+import javax.portlet.RenderRequest;
+import javax.portlet.PortletException;
+import javax.servlet.ServletRequest;
+import java.io.Writer;
+import java.io.IOException;
+
+
+/**
+ * @author Boleslaw Dawidowicz
+ * @version : 0.1 $
+ */
+public abstract class TaglibTestCase
+{
+
+   protected String startTag;
+   protected String endTag;
+   protected String expectedResult;
+   protected String[] expectedResults;
+
+
+   protected void include(PortletRequestDispatcher dispatcher, RenderReque=
st request, RenderResponse response) throws IOException, PortletException
+   {
+      startTag =3D "";
+      endTag =3D "";
+
+      Writer writer =3D response.getWriter();
+
+      writer.write(startTag);
+      dispatcher.include(request, response);
+      writer.write(endTag);
+   }
+
+   protected void assertResult(PortletTestContext context)
+   {
+      String prevResponse =3D new String(context.getResponseBody());
+
+      String portletResp =3D prevResponse.substring(prevResponse.indexOf(s=
tartTag) + startTag.length(), prevResponse.indexOf(endTag));
+
+      assertEquals(expectedResult, portletResp.trim());
+   }
+
+   protected void assertResults(PortletTestContext context)
+   {
+      String prevResponse =3D new String(context.getResponseBody());
+
+      String portletResp =3D prevResponse.substring(prevResponse.indexOf(s=
tartTag) + startTag.length(), prevResponse.indexOf(endTag));
+
+      String[] results =3D portletResp.split("");
+
+      // Trim all results
+      for (int i =3D 0; i < results.length; i++)
+      {
+         results[i] =3D results[i].trim();
+
+      }
+
+
+      assertEquals(expectedResults, results);
+   }
+
+   protected PortletInvocation getInvocation(PortletRequest req)
+   {
+      // Get the invocation
+      return (PortletInvocation)req.getAttribute(ContextDispatcherIntercep=
tor.REQ_ATT_COMPONENT_INVOCATION);
+   }
+}

Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/unit=
/Assertion.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/unit/Asser=
tion.java	2008-02-06 18:49:08 UTC (rev 9805)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/unit/Asser=
tion.java	2008-02-06 19:02:10 UTC (rev 9806)
@@ -1280,37 +1280,78 @@
       "that the portlet must have when this link is executed, if no error =
condition ocurred"),
    JSR286_319(new TCK(319), "PLT.26.2", "If the specified portlet mode is =
illegal for the current request, a " +
       "JspException must be thrown."),
-   JSR286_320(new TCK(320), "PLT.26.2", ""),
-   JSR286_321(new TCK(321), "PLT.26.2", ""),
-   JSR286_322(new TCK(322), "PLT.26.2", ""),
-   JSR286_323(new TCK(323), Status.specUntestable(""), "PLT.26.2", ""),
-   JSR286_324(new TCK(324), Status.specUntestable(""), "PLT.26.2", ""),
-   JSR286_325(new TCK(325), Status.specUntestable(""), "PLT.26.2", ""),
-   JSR286_326(new TCK(326), Status.specUntestable(""), "PLT.26.2", ""),
-   JSR286_327(new TCK(327), "PLT.26.3", ""),
-   JSR286_328(new TCK(328), "PLT.26.3", ""),
-   JSR286_329(new TCK(329), "PLT.26.3", ""),
-   JSR286_330(new TCK(330), "PLT.26.3", ""),
-   JSR286_331(new TCK(331), "PLT.26.3", ""),
-   JSR286_332(new TCK(332), "PLT.26.3", ""),
-   JSR286_333(new TCK(333), "PLT.26.3", ""),
-   JSR286_334(new TCK(334), "PLT.26.3", ""),
-   JSR286_335(new TCK(335), Status.specUntestable(""), "PLT.26.3", ""),
-   JSR286_336(new TCK(336), Status.specUntestable(""), "PLT.26.3", ""),
-   JSR286_337(new TCK(337), Status.specUntestable(""), "PLT.26.3", ""),
-   JSR286_338(new TCK(338), Status.specUntestable(""), "PLT.26.3", ""),
-   JSR286_339(new TCK(339), "PLT.26.4", ""),
-   JSR286_340(new TCK(340), "PLT.26.4", ""),
-   JSR286_341(new TCK(341), "PLT.26.4", ""),
-   JSR286_342(new TCK(342), "PLT.26.4", ""),
-   JSR286_343(new TCK(343), "PLT.26.4", ""),
-   JSR286_344(new TCK(344), "PLT.26.4", ""),
-   JSR286_345(new TCK(345), "PLT.26.4", ""),
-   JSR286_346(new TCK(346), "PLT.26.5", ""),
-   JSR286_347(new TCK(347), "PLT.26.6", ""),
-   JSR286_348(new TCK(348), "PLT.26.6", ""),
-   JSR286_349(new TCK(349), "PLT.26.6", ""),
-   JSR286_350(new TCK(350), "PLT.26.6", "")
+   JSR286_320(new TCK(320), "PLT.26.2", "If a portlet mode is not set for =
a URL, it must stay the same as the mode of " +
+      "the current request."),
+   JSR286_321(new TCK(321), "PLT.26.2", "If the result is exported as a JS=
P scoped variable, defined via the var " +
+      "attributes, nothing is written to the current JspWriter."),
+   JSR286_322(new TCK(322), "PLT.26.2", "If the given variable name alread=
y exists in the scope of the page or it " +
+      "is used within an iteration loop, the new value overwrites the old =
one."),
+   JSR286_323(new TCK(323), Status.specUntestable(""), "PLT.26.2", "If the=
 specified security setting is not supported " +
+      "by the run-time environment, a JspException must be thrown"),
+   JSR286_324(new TCK(324), Status.specUntestable(""), "PLT.26.2", "copyCu=
rrentRenderParameters (Type: boolean, " +
+      "non-required) =E2=80=93 if set to true requests that the private re=
nder parameters of the portlet of the current " +
+      "request must be attached to this URL."),
+   JSR286_325(new TCK(325), Status.specUntestable(""), "PLT.26.2", "If add=
itional  tags are specified " +
+      "parameters with the same name as an existing render parameter will =
get merged and the value defined in " +
+      "additional  tags must be pre-pended."),
+   JSR286_326(new TCK(326), Status.specUntestable(""), "PLT.26.2", "escape=
Xml (Type: boolean, non-required) =E2=80=93 " +
+      "determines whether characters <,>,&,=E2=80=99,=E2=80=9D in the resu=
lting output should be converted to their corresponding " +
+      "character entity codes (=E2=80=98<=E2=80=99 gets converted to =E2=
=80=98<=E2=80=99, =E2=80=98>=E2=80=99 gets converted to =E2=80=98>=E2=
=80=99 =E2=80=98&=E2=80=99 gets converted to " +
+      "=E2=80=98&=E2=80=99, =E2=80=98=E2=80=98=E2=80=99 gets converted=
 to =E2=80=98'=E2=80=99, =E2=80=98=E2=80=9D=E2=80=99 gets converted to=
 =E2=80=98"=E2=80=99)."),
+   JSR286_327(new TCK(327), "PLT.26.3", "The portlet renderURL tag creates=
 a URL that must point to the current " +
+      "portlet and must trigger a render request with the supplied paramet=
ers."),
+   JSR286_328(new TCK(328), "PLT.26.3", "If the specified window state is =
illegal for the current request, a " +
+      "JspException must be thrown."),
+   JSR286_329(new TCK(329), "PLT.26.3", "If a window state is not set for =
a URL, it should stay the same as the " +
+      "window state of the current request."),
+   JSR286_330(new TCK(330), "PLT.26.3", "portletMode (Type: String, non-re=
quired) =E2=80=93 indicates the portlet mode that " +
+      "the portlet must have when this link is executed, if not error cond=
ition ocurred."),
+   JSR286_331(new TCK(331), "PLT.26.3", "If the specified portlet mode is =
illegal for the current request, a " +
+      "JspException must be thrown."),
+   JSR286_332(new TCK(332), "PLT.26.3", "If a portlet mode is not set for =
a URL, it must stay the same as the " +
+      "mode of the current request."),
+   JSR286_333(new TCK(333), "PLT.26.3", "If the result is exported as a JS=
P scoped variable, defined via the var " +
+      "attributes, nothing is written to the current JspWriter."),
+   JSR286_334(new TCK(334), "PLT.26.3", "If the given variable name alread=
y exists in the scope of the page or it " +
+      "is used within an iteration loop, the new value overwrites the old =
one"),
+   JSR286_335(new TCK(335), Status.specUntestable(""), "PLT.26.3", "If the=
 security is not set for a URL, it must " +
+      "stay the same as the security setting of the current request."),
+   JSR286_336(new TCK(336), Status.specUntestable(""), "PLT.26.3", "copyCu=
rrentRenderParameters (Type: boolean, " +
+      "non-required) =E2=80=93 if set to true requests that the private re=
nder parameters of the portlet of the current " +
+      "request must attached to this URL."),
+   JSR286_337(new TCK(337), Status.specUntestable(""), "PLT.26.3", "If add=
itional  tags are specified " +
+      "parameters with the same name as an existing render parameter will =
get merged and the value defined in " +
+      "additional  tags must be pre-pended."),
+   JSR286_338(new TCK(338), Status.specUntestable(""), "PLT.26.3", "escape=
Xml (Type: boolean, non-required) =E2=80=93 " +
+      "deterrmines whether characters <,>,&,=E2=80=99,=E2=80=9D in the res=
ulting output should be converted to their corresponding " +
+      "character entity codes (=E2=80=98<=E2=80=99 gets converted to =E2=
=80=98<=E2=80=99, =E2=80=98>=E2=80=99 gets converted to =E2=80=98>=E2=
=80=99 =E2=80=98&=E2=80=99 gets converted to " +
+      "=E2=80=98&=E2=80=99, =E2=80=98=E2=80=98=E2=80=99 gets converted=
 to =E2=80=98'=E2=80=99, =E2=80=98=E2=80=9D=E2=80=99 gets converted to=
 =E2=80=98"=E2=80=99)."),
+   JSR286_339(new TCK(339), "PLT.26.4", "The portlet resourceURL tag creat=
es a URL that must point to the current " +
+      "portlet and must trigger a serveResource request with the supplied =
parameters"),
+   JSR286_340(new TCK(340), "PLT.26.4", "The resourceURL must preserve the=
 current portlet mode, window state and " +
+      "render parameters."),
+   JSR286_341(new TCK(341), "PLT.26.4", "If such a parameter has the same =
name as a render parameter in this URL, " +
+      "the render parameter value must be the last value in the attribute =
value array."),
+   JSR286_342(new TCK(342), "PLT.26.4", "If the result is exported as a JS=
P scoped variable, defined via the var " +
+      "attributes, nothing is written to the current JspWriter"),
+   JSR286_343(new TCK(343), "PLT.26.4", "If the given variable name alread=
y exists in the scope of the page or it " +
+      "is used within an iteration loop, the new value overwrites the old =
one."),
+   JSR286_344(new TCK(344), Status.specUntestable(""), "PLT.26.4", "If the=
 security is not set for a URL, it must " +
+      "stay the same as the security setting of the current request."),
+   JSR286_345(new TCK(345), Status.specUntestable(""), "PLT.26.4", "escape=
Xml (Type: boolean, non-required) =E2=80=93 " +
+      "determines whether characters <,>,&,=E2=80=99,=E2=80=9D in the resu=
lting output should be converted to their corresponding " +
+      "character entity codes (=E2=80=98<=E2=80=99 gets converted to =E2=
=80=98<=E2=80=99, =E2=80=98>=E2=80=99 gets converted to =E2=80=98>=E2=
=80=99 =E2=80=98&=E2=80=99 gets converted to " +
+      "=E2=80=98&=E2=80=99, =E2=80=98=E2=80=98=E2=80=99 gets converted=
 to =E2=80=98'=E2=80=99, =E2=80=98=E2=80=9D=E2=80=99 gets converted to=
 =E2=80=98"=E2=80=99)."),
+   JSR286_346(new TCK(346), "PLT.26.5", "This tag produces a unique value =
for the current portlet and must match " +
+      "the value of PortletResponse.getNamespace method."),
+   JSR286_347(new TCK(347), "PLT.26.6", "This tag defines a parameter that=
 may be added to an actionURL, renderURL " +
+      "or resourceURL."),
+   JSR286_348(new TCK(348), Status.specUntestable(""), "PLT.26.6", "The pa=
ram tag must not contain any body content."),
+   JSR286_349(new TCK(349), "PLT.26.6", "If the param tag has an empty val=
ue the specified parameter name must be " +
+      "removed from the URL."),
+   JSR286_350(new TCK(350), "PLT.26.6", "If the same name of a parameter o=
ccurs more than once within an actionURL, " +
+      "renderURL or resourceURL the values must be delivered as parameter =
value array with the values in the order " +
+      "of the declaration within the URL tag.")
    =

    ;
 =


Modified: modules/portlet/trunk/test/src/test/resources/jsr168/ext/taglib-w=
ar/WEB-INF/portlet.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/jsr168/ext/taglib-war/WEB=
-INF/portlet.xml	2008-02-06 18:49:08 UTC (rev 9805)
+++ modules/portlet/trunk/test/src/test/resources/jsr168/ext/taglib-war/WEB=
-INF/portlet.xml	2008-02-06 19:02:10 UTC (rev 9806)
@@ -31,7 +31,8 @@
       UniversalTestPortletA
       org.jboss.portal.test.portlet.framework.UTP1
       
-        text/html
+         text/html
+         EDIT
       
       
          

Added: modules/portlet/trunk/test/src/test/resources/jsr168/ext/taglib-war/=
actionURL.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/jsr168/ext/taglib-war/act=
ionURL.jsp	                        (rev 0)
+++ modules/portlet/trunk/test/src/test/resources/jsr168/ext/taglib-war/act=
ionURL.jsp	2008-02-06 19:02:10 UTC (rev 9806)
@@ -0,0 +1,23 @@
+<%@ page language=3D"java" %>
+<%@ taglib uri=3D"http://java.sun.com/portlet" prefix=3D"portlet" %>
+
+
+
+
+
+
+
+<%
+   //Put url placed as page variable
+   out.print(pageContext.getAttribute("testVar"));
+%>
+
+
+
+
+
+   
+   
+   
+
+

Added: modules/portlet/trunk/test/src/test/resources/jsr168/ext/taglib-war/=
defineObjects.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/jsr168/ext/taglib-war/def=
ineObjects.jsp	                        (rev 0)
+++ modules/portlet/trunk/test/src/test/resources/jsr168/ext/taglib-war/def=
ineObjects.jsp	2008-02-06 19:02:10 UTC (rev 9806)
@@ -0,0 +1,23 @@
+<%@ page import=3D"javax.portlet.RenderRequest" %>
+<%@ page import=3D"javax.portlet.RenderResponse" %>
+<%@ page import=3D"javax.portlet.PortletConfig" %>
+<%@ page language=3D"java" %>
+<%@ taglib uri=3D"http://java.sun.com/portlet" prefix=3D"portlet" %>
+
+<%
+   out.print("jspDispatch");
+
+   if (renderRequest !=3D null && renderRequest instanceof RenderRequest)
+   {
+      out.print(",renderRequest");
+   }
+   if (renderResponse !=3D null && renderResponse instanceof RenderRespons=
e)
+   {
+      out.print(",renderResponse");
+   }
+   if (portletConfig !=3D null && portletConfig instanceof PortletConfig)
+   {
+      out.print(",portletConfig");
+   }
+
+%>
\ No newline at end of file

Added: modules/portlet/trunk/test/src/test/resources/jsr168/ext/taglib-war/=
namespace.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/jsr168/ext/taglib-war/nam=
espace.jsp	                        (rev 0)
+++ modules/portlet/trunk/test/src/test/resources/jsr168/ext/taglib-war/nam=
espace.jsp	2008-02-06 19:02:10 UTC (rev 9806)
@@ -0,0 +1,4 @@
+<%@ page language=3D"java" %>
+<%@ taglib uri=3D"http://java.sun.com/portlet" prefix=3D"portlet" %>
+
+
\ No newline at end of file

Added: modules/portlet/trunk/test/src/test/resources/jsr168/ext/taglib-war/=
renderURL.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/jsr168/ext/taglib-war/ren=
derURL.jsp	                        (rev 0)
+++ modules/portlet/trunk/test/src/test/resources/jsr168/ext/taglib-war/ren=
derURL.jsp	2008-02-06 19:02:10 UTC (rev 9806)
@@ -0,0 +1,9 @@
+<%@ page language=3D"java" %>
+<%@ taglib uri=3D"http://java.sun.com/portlet" prefix=3D"portlet" %>
+
+
+
+   
+   
+   
+
\ No newline at end of file

Modified: modules/portlet/trunk/test/src/test/resources/jsr286/tck/taglib-w=
ar/WEB-INF/portlet.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/jsr286/tck/taglib-war/WEB=
-INF/portlet.xml	2008-02-06 18:49:08 UTC (rev 9805)
+++ modules/portlet/trunk/test/src/test/resources/jsr286/tck/taglib-war/WEB=
-INF/portlet.xml	2008-02-06 19:02:10 UTC (rev 9806)
@@ -32,6 +32,7 @@
       org.jboss.portal.test.portlet.framework.UTP1
       
         text/html
+        EDIT
       
    
    =


Added: modules/portlet/trunk/test/src/test/resources/jsr286/tck/taglib-war/=
actionURL.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/jsr286/tck/taglib-war/act=
ionURL.jsp	                        (rev 0)
+++ modules/portlet/trunk/test/src/test/resources/jsr286/tck/taglib-war/act=
ionURL.jsp	2008-02-06 19:02:10 UTC (rev 9806)
@@ -0,0 +1,29 @@
+<%@ page language=3D"java" %>
+<%@ taglib uri=3D"http://java.sun.com/portlet_2_0" prefix=3D"portlet" %>
+
+
+
+
+
+
+
+<%
+   //Put url placed as page variable
+   out.print(pageContext.getAttribute("testVar"));
+%>
+
+
+
+
+
+   
+   
+   
+
+   
+   
+   
+
+

Copied: modules/portlet/trunk/test/src/test/resources/jsr286/tck/taglib-war=
/defineObjects.jsp (from rev 9794, modules/portlet/trunk/test/src/test/reso=
urces/jsr286/tck/taglib-war/taglib.jsp)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/jsr286/tck/taglib-war/def=
ineObjects.jsp	                        (rev 0)
+++ modules/portlet/trunk/test/src/test/resources/jsr286/tck/taglib-war/def=
ineObjects.jsp	2008-02-06 19:02:10 UTC (rev 9806)
@@ -0,0 +1,73 @@
+<%@ page import=3D"org.jboss.unit.api.Assert" %>
+<%@ page import=3D"javax.portlet.RenderRequest" %>
+<%@ page import=3D"javax.portlet.RenderResponse" %>
+<%@ page import=3D"javax.portlet.ActionRequest" %>
+<%@ page import=3D"javax.portlet.ActionResponse" %>
+<%@ page import=3D"javax.portlet.EventRequest" %>
+<%@ page import=3D"javax.portlet.EventResponse" %>
+<%@ page import=3D"javax.portlet.ResourceRequest" %>
+<%@ page import=3D"javax.portlet.ResourceResponse" %>
+<%@ page import=3D"javax.portlet.PortletConfig" %>
+<%@ page import=3D"javax.portlet.PortletSession" %>
+<%@ page import=3D"java.util.Map" %>
+<%@ page import=3D"javax.portlet.PortletPreferences" %>
+<%@ page language=3D"java" %>
+<%@ taglib uri=3D"http://java.sun.com/portlet_2_0" prefix=3D"portlet" %>
+
+<%
+   out.print("jspDispatch");
+
+   if (renderRequest !=3D null && renderRequest instanceof RenderRequest)
+   {
+      out.print(",renderRequest");
+   }
+   if (renderResponse !=3D null && renderResponse instanceof RenderRespons=
e)
+   {
+      out.print(",renderResponse");
+   }
+   if (actionRequest !=3D null && actionRequest instanceof ActionRequest)
+   {
+      out.print(",actionRequest");
+   }
+   if (actionResponse !=3D null && actionResponse instanceof ActionRespons=
e)
+   {
+      out.print(",actionResponse");
+   }
+   if (eventRequest !=3D null && eventRequest instanceof EventRequest)
+   {
+      out.print(",eventRequest");
+   }
+   if (eventResponse !=3D null && eventResponse instanceof EventResponse)
+   {
+      out.print(",eventResponse");
+   }
+   if (resourceRequest !=3D null && resourceRequest instanceof ResourceReq=
uest)
+   {
+      out.print(",resourceRequest");
+   }
+   if (resourceResponse !=3D null && resourceResponse instanceof ResourceR=
esponse)
+   {
+      out.print(",resourceResponse");
+   }
+   if (portletConfig !=3D null && portletConfig instanceof PortletConfig)
+   {
+      out.print(",portletConfig");
+   }
+   if (portletSession !=3D null && portletSession instanceof PortletSessio=
n)
+   {
+      out.print(",portletSession");
+   }
+   if (portletSessionScope !=3D null && portletSessionScope instanceof Map)
+   {
+      out.print(",portletSessionScope");
+   }
+   if (portletPreferences !=3D null && portletPreferences instanceof Portl=
etPreferences)
+   {
+      out.print(",portletPreferences");
+   }
+   if (portletPreferencesValues !=3D null && portletPreferencesValues inst=
anceof Map)
+   {
+      out.print(",portletPreferencesValues");
+   }
+
+%>
\ No newline at end of file

Added: modules/portlet/trunk/test/src/test/resources/jsr286/tck/taglib-war/=
namespace.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/jsr286/tck/taglib-war/nam=
espace.jsp	                        (rev 0)
+++ modules/portlet/trunk/test/src/test/resources/jsr286/tck/taglib-war/nam=
espace.jsp	2008-02-06 19:02:10 UTC (rev 9806)
@@ -0,0 +1,4 @@
+<%@ page language=3D"java" %>
+<%@ taglib uri=3D"http://java.sun.com/portlet_2_0" prefix=3D"portlet" %>
+
+
\ No newline at end of file

Added: modules/portlet/trunk/test/src/test/resources/jsr286/tck/taglib-war/=
renderURL.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/jsr286/tck/taglib-war/ren=
derURL.jsp	                        (rev 0)
+++ modules/portlet/trunk/test/src/test/resources/jsr286/tck/taglib-war/ren=
derURL.jsp	2008-02-06 19:02:10 UTC (rev 9806)
@@ -0,0 +1,27 @@
+<%@ page language=3D"java" %>
+<%@ taglib uri=3D"http://java.sun.com/portlet_2_0" prefix=3D"portlet" %>
+
+
+
+
+
+
+
+<%
+   //Put url placed as page variable
+   out.print(pageContext.getAttribute("testVar"));
+%>
+
+
+
+
+   
+   
+   
+
+   
+   
+   
+
\ No newline at end of file

Added: modules/portlet/trunk/test/src/test/resources/jsr286/tck/taglib-war/=
resourceURL.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/jsr286/tck/taglib-war/res=
ourceURL.jsp	                        (rev 0)
+++ modules/portlet/trunk/test/src/test/resources/jsr286/tck/taglib-war/res=
ourceURL.jsp	2008-02-06 19:02:10 UTC (rev 9806)
@@ -0,0 +1,26 @@
+<%@ page language=3D"java" %>
+<%@ taglib uri=3D"http://java.sun.com/portlet_2_0" prefix=3D"portlet" %>
+
+
+
+
+
+
+
+
+<%
+   //Put url placed as page variable
+   out.print(pageContext.getAttribute("testVar"));
+%>
+
+
+
+
+   
+   
+   
+
+   
+   
+   
+

Deleted: modules/portlet/trunk/test/src/test/resources/jsr286/tck/taglib-wa=
r/taglib.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/jsr286/tck/taglib-war/tag=
lib.jsp	2008-02-06 18:49:08 UTC (rev 9805)
+++ modules/portlet/trunk/test/src/test/resources/jsr286/tck/taglib-war/tag=
lib.jsp	2008-02-06 19:02:10 UTC (rev 9806)
@@ -1,73 +0,0 @@
-<%@ page import=3D"org.jboss.unit.api.Assert" %>
-<%@ page import=3D"javax.portlet.RenderRequest" %>
-<%@ page import=3D"javax.portlet.RenderResponse" %>
-<%@ page import=3D"javax.portlet.ActionRequest" %>
-<%@ page import=3D"javax.portlet.ActionResponse" %>
-<%@ page import=3D"javax.portlet.EventRequest" %>
-<%@ page import=3D"javax.portlet.EventResponse" %>
-<%@ page import=3D"javax.portlet.ResourceRequest" %>
-<%@ page import=3D"javax.portlet.ResourceResponse" %>
-<%@ page import=3D"javax.portlet.PortletConfig" %>
-<%@ page import=3D"javax.portlet.PortletSession" %>
-<%@ page import=3D"java.util.Map" %>
-<%@ page import=3D"javax.portlet.PortletPreferences" %>
-<%@ page language=3D"java" %>
-<%@ taglib uri=3D"http://java.sun.com/portlet_2_0" prefix=3D"portlet" %>
-
-<%
-   out.print("jspDispatch");
-
-   if (renderRequest !=3D null && renderRequest instanceof RenderRequest)
-   {
-      out.print(",renderRequest");
-   }
-   if (renderResponse !=3D null && renderResponse instanceof RenderRespons=
e)
-   {
-      out.print(",renderResponse");
-   }
-   if (actionRequest !=3D null && actionRequest instanceof ActionRequest)
-   {
-      out.print(",actionRequest");
-   }
-   if (actionResponse !=3D null && actionResponse instanceof ActionRespons=
e)
-   {
-      out.print(",actionResponse");
-   }
-   if (eventRequest !=3D null && eventRequest instanceof EventRequest)
-   {
-      out.print(",eventRequest");
-   }
-   if (eventResponse !=3D null && eventResponse instanceof EventResponse)
-   {
-      out.print(",eventResponse");
-   }
-   if (resourceRequest !=3D null && resourceRequest instanceof ResourceReq=
uest)
-   {
-      out.print(",resourceRequest");
-   }
-   if (resourceResponse !=3D null && resourceResponse instanceof ResourceR=
esponse)
-   {
-      out.print(",resourceResponse");
-   }
-   if (portletConfig !=3D null && portletConfig instanceof PortletConfig)
-   {
-      out.print(",portletConfig");
-   }
-   if (portletSession !=3D null && portletSession instanceof PortletSessio=
n)
-   {
-      out.print(",portletSession");
-   }
-   if (portletSessionScope !=3D null && portletSessionScope instanceof Map)
-   {
-      out.print(",portletSessionScope");
-   }
-   if (portletPreferences !=3D null && portletPreferences instanceof Portl=
etPreferences)
-   {
-      out.print(",portletPreferences");
-   }
-   if (portletPreferencesValues !=3D null && portletPreferencesValues inst=
anceof Map)
-   {
-      out.print(",portletPreferencesValues");
-   }
-
-%>
\ No newline at end of file


--===============1421916223868970075==--

From portal-commits at lists.jboss.org Wed Feb  6 15:02:07 2008
Content-Type: multipart/mixed; boundary="===============8178067305071830242=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9808 -
 tags/JBoss_Portal_2_6_4/server/src/main/org/jboss/portal/server.
Date: Wed, 06 Feb 2008 15:02:05 -0500
Message-ID: 

--===============8178067305071830242==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: prabhat.jha(a)jboss.com
Date: 2008-02-06 15:02:05 -0500 (Wed, 06 Feb 2008)
New Revision: 9808

Modified:
   tags/JBoss_Portal_2_6_4/server/src/main/org/jboss/portal/server/PortalCo=
nstants.java
Log:
updating the version number

Modified: tags/JBoss_Portal_2_6_4/server/src/main/org/jboss/portal/server/P=
ortalConstants.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- tags/JBoss_Portal_2_6_4/server/src/main/org/jboss/portal/server/PortalC=
onstants.java	2008-02-06 19:58:09 UTC (rev 9807)
+++ tags/JBoss_Portal_2_6_4/server/src/main/org/jboss/portal/server/PortalC=
onstants.java	2008-02-06 20:02:05 UTC (rev 9808)
@@ -36,7 +36,7 @@
 {
 =

    /** Current version. */
-   public static final Version VERSION =3D new Version("JBoss Portal", 2, =
6, 3, new Version.Qualifier(Version.Qualifier.Prefix.SNAPSHOT), "Ninja");
+   public static final Version VERSION =3D new Version("JBoss Portal", 2, =
6, 4, new Version.Qualifier(Version.Qualifier.Prefix.GA), "Ninja");
 =

    /** The default portal name. */
    public static final String DEFAULT_PORTAL_NAME =3D "default";


--===============8178067305071830242==--

From portal-commits at lists.jboss.org Wed Feb  6 15:39:58 2008
Content-Type: multipart/mixed; boundary="===============1729991072659202277=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9809 -
 modules/portlet/trunk/test/src/test/resources/google-weather-portlet-war/WEB-INF.
Date: Wed, 06 Feb 2008 15:39:58 -0500
Message-ID: 

--===============1729991072659202277==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: chris.laprun(a)jboss.com
Date: 2008-02-06 15:39:58 -0500 (Wed, 06 Feb 2008)
New Revision: 9809

Modified:
   modules/portlet/trunk/test/src/test/resources/google-weather-portlet-war=
/WEB-INF/portlet.xml
Log:
- Changed initial zip code so that it's more obvious when the public render=
 parameters are used.

Modified: modules/portlet/trunk/test/src/test/resources/google-weather-port=
let-war/WEB-INF/portlet.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/google-weather-portlet-wa=
r/WEB-INF/portlet.xml	2008-02-06 20:02:05 UTC (rev 9808)
+++ modules/portlet/trunk/test/src/test/resources/google-weather-portlet-wa=
r/WEB-INF/portlet.xml	2008-02-06 20:39:58 UTC (rev 9809)
@@ -42,7 +42,7 @@
       
          
             zipcode
-            94102
+            80201
             false
          
       


--===============1729991072659202277==--

From portal-commits at lists.jboss.org Wed Feb  6 16:56:21 2008
Content-Type: multipart/mixed; boundary="===============8164619514810313740=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9810 - in
 modules/portlet/trunk/test/src: test and 3 other directories.
Date: Wed, 06 Feb 2008 16:56:20 -0500
Message-ID: 

--===============8164619514810313740==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: chris.laprun(a)jboss.com
Date: 2008-02-06 16:56:20 -0500 (Wed, 06 Feb 2008)
New Revision: 9810

Added:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/samples=
/RemoteControlResourcePortlet.java
   modules/portlet/trunk/test/src/test/resources/remotecontrol-portlet-war/
   modules/portlet/trunk/test/src/test/resources/remotecontrol-portlet-war/=
WEB-INF/
   modules/portlet/trunk/test/src/test/resources/remotecontrol-portlet-war/=
WEB-INF/portlet.xml
   modules/portlet/trunk/test/src/test/resources/remotecontrol-portlet-war/=
WEB-INF/web.xml
Modified:
   modules/portlet/trunk/test/src/test/build.xml
Log:
- Resource serving portlet supposed to act as a remote control... doesn't r=
eally work right now.

Added: modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/sam=
ples/RemoteControlResourcePortlet.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/sample=
s/RemoteControlResourcePortlet.java	                        (rev 0)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/sample=
s/RemoteControlResourcePortlet.java	2008-02-06 21:56:20 UTC (rev 9810)
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2008, Your Corporation. All Rights Reserved.
+ */
+
+package org.jboss.portal.simple.samples;
+
+import javax.portlet.GenericPortlet;
+import javax.portlet.PortletException;
+import javax.portlet.PortletURL;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+import javax.portlet.ResourceRequest;
+import javax.portlet.ResourceResponse;
+import javax.portlet.ResourceURL;
+import javax.portlet.WindowState;
+import java.io.IOException;
+import java.io.PrintWriter;
+
+/**
+ * @author Chris Laprun
+ * @version $Revision$
+ */
+public class RemoteControlResourcePortlet extends GenericPortlet
+{
+   private static final String ZIPCODE =3D "zipcode";
+
+   @Override
+   protected void doView(RenderRequest renderRequest, RenderResponse rende=
rResponse) throws PortletException, IOException
+   {
+      renderResponse.setContentType("text/html");
+      PrintWriter printWriter =3D renderResponse.getWriter();
+      printWriter.print("Open remote control!");
+   }
+
+   @Override
+   public void serveResource(ResourceRequest resourceRequest, ResourceResp=
onse resourceResponse) throws PortletException, IOException
+   {
+      resourceResponse.setContentType("text/html");
+      PrintWriter writer =3D resourceResponse.getWriter();
+      PortletURL url =3D resourceResponse.createRenderURL();
+      url.setWindowState(WindowState.MINIMIZED);
+      writer.print("min=
imize");
+      url.setWindowState(WindowState.MAXIMIZED);
+      writer.print("maximize");
+      url.setWindowState(WindowState.NORMAL);
+      writer.print("normal");
+      writer.print("'zipcode' public render parameter value: " +=
 resourceRequest.getParameter(ZIPCODE) + "
");
+      writer.print("
Set value of 'zipcode' public render paramet=
er to:");
+      url.setParameter(ZIPCODE, "80201");
+      writer.print("
Denver");
+      url.setParameter(ZIPCODE, "94102");
+      writer.print("
San Francisco");
+      url.setParameter(ZIPCODE, "20001");
+      writer.print("
Washington, DC");
+      writer.print("");
+   }
+}


Property changes on: modules/portlet/trunk/test/src/main/java/org/jboss/por=
tal/simple/samples/RemoteControlResourcePortlet.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: modules/portlet/trunk/test/src/test/build.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/build.xml	2008-02-06 20:39:58 UTC (=
rev 9809)
+++ modules/portlet/trunk/test/src/test/build.xml	2008-02-06 21:56:20 UTC (=
rev 9810)
@@ -759,6 +759,15 @@
       
          
       
+
+      
+         
+         
+      
+      
+         
+      
    
 =

 
\ No newline at end of file

Copied: modules/portlet/trunk/test/src/test/resources/remotecontrol-portlet=
-war/WEB-INF/portlet.xml (from rev 9803, modules/portlet/trunk/test/src/tes=
t/resources/google-map-portlet-war/WEB-INF/portlet.xml)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/remotecontrol-portlet-war=
/WEB-INF/portlet.xml	                        (rev 0)
+++ modules/portlet/trunk/test/src/test/resources/remotecontrol-portlet-war=
/WEB-INF/portlet.xml	2008-02-06 21:56:20 UTC (rev 9810)
@@ -0,0 +1,49 @@
+
+
+
+   
+      Portlet controlling display of other portlets
+      RemoteControl
+      Remote Control Resource Portlet
+      org.jboss.portal.simple.samples.RemoteControlResource=
Portlet
+      
+         text/html
+         VIEW
+      
+      
+         Remote Control Resource Portlet
+         sample,resource,remotecontrol
+      
+      zipcode
+   
+
+   
+      zipcode
+      g:zipcode
+   
+
+

Copied: modules/portlet/trunk/test/src/test/resources/remotecontrol-portlet=
-war/WEB-INF/web.xml (from rev 9803, modules/portlet/trunk/test/src/test/re=
sources/google-map-portlet-war/WEB-INF/web.xml)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/remotecontrol-portlet-war=
/WEB-INF/web.xml	                        (rev 0)
+++ modules/portlet/trunk/test/src/test/resources/remotecontrol-portlet-war=
/WEB-INF/web.xml	2008-02-06 21:56:20 UTC (rev 9810)
@@ -0,0 +1,28 @@
+
+
+
+
+
+


--===============8164619514810313740==--

From portal-commits at lists.jboss.org Wed Feb  6 17:12:02 2008
Content-Type: multipart/mixed; boundary="===============2520161241992060133=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9811 - in modules/portlet/trunk:
 test/src/main/java/org/jboss/portal/portlet/test and 3 other directories.
Date: Wed, 06 Feb 2008 17:12:02 -0500
Message-ID: 

--===============2520161241992060133==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-06 17:12:01 -0500 (Wed, 06 Feb 2008)
New Revision: 9811

Added:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/c=
ontroller/AbstractPortletControllerContext.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/Page.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/PagePortletControllerContext.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/Window.java
Removed:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/t=
aglib/
Modified:
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/imp=
l/info/ContainerPortletInfo.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/c=
ontroller/PortletControllerContextImpl.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/ControllerServlet.java
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/index.jsp
Log:
more implementation of the taglib

Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/port=
let/impl/info/ContainerPortletInfo.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/info/ContainerPortletInfo.java	2008-02-06 21:56:20 UTC (rev 9810)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/info/ContainerPortletInfo.java	2008-02-06 22:12:01 UTC (rev 9811)
@@ -163,7 +163,7 @@
 =

    public String getApplicationName()
    {
-      return null;
+      return applicationName;
    }
 =

    public Map getOptions()

Added: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/te=
st/controller/AbstractPortletControllerContext.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
controller/AbstractPortletControllerContext.java	                        (r=
ev 0)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
controller/AbstractPortletControllerContext.java	2008-02-06 22:12:01 UTC (r=
ev 9811)
@@ -0,0 +1,357 @@
+/*************************************************************************=
*****
+ * 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.controller;
+
+import org.jboss.portal.Mode;
+import org.jboss.portal.WindowState;
+import org.jboss.portal.common.io.IOTools;
+import org.jboss.portal.common.util.MarkupInfo;
+import org.jboss.portal.common.util.MediaType;
+import org.jboss.portal.common.util.ParameterMap;
+import org.jboss.portal.common.util.Tools;
+import org.jboss.portal.portlet.ContainerURL;
+import org.jboss.portal.portlet.ParametersStateString;
+import org.jboss.portal.portlet.Portlet;
+import org.jboss.portal.portlet.PortletInvokerException;
+import org.jboss.portal.portlet.StateString;
+import org.jboss.portal.portlet.cache.CacheLevel;
+import org.jboss.portal.portlet.controller.PortletControllerContext;
+import org.jboss.portal.portlet.controller.event.EventControllerContext;
+import org.jboss.portal.portlet.controller.impl.state.StateControllerConte=
xtImpl;
+import org.jboss.portal.portlet.controller.request.ControllerRequest;
+import org.jboss.portal.portlet.controller.request.FullScopedCacheablePort=
letResourceRequest;
+import org.jboss.portal.portlet.controller.request.PageScopedFullPortletRe=
sourceRequest;
+import org.jboss.portal.portlet.controller.request.PortletActionRequest;
+import org.jboss.portal.portlet.controller.request.PortletRenderRequest;
+import org.jboss.portal.portlet.controller.request.PortletScopedPortletRes=
ourceRequest;
+import org.jboss.portal.portlet.controller.state.PageNavigationalState;
+import org.jboss.portal.portlet.controller.state.StateControllerContext;
+import org.jboss.portal.portlet.controller.state.WindowNavigationalState;
+import org.jboss.portal.portlet.impl.spi.AbstractClientContext;
+import org.jboss.portal.portlet.impl.spi.AbstractRequestContext;
+import org.jboss.portal.portlet.impl.spi.AbstractSecurityContext;
+import org.jboss.portal.portlet.impl.spi.AbstractServerContext;
+import org.jboss.portal.portlet.impl.spi.AbstractUserContext;
+import org.jboss.portal.portlet.impl.spi.AbstractWindowContext;
+import org.jboss.portal.portlet.info.PortletInfo;
+import org.jboss.portal.portlet.invocation.ActionInvocation;
+import org.jboss.portal.portlet.invocation.EventInvocation;
+import org.jboss.portal.portlet.invocation.PortletInvocation;
+import org.jboss.portal.portlet.invocation.ResourceInvocation;
+import org.jboss.portal.portlet.invocation.response.PortletInvocationRespo=
nse;
+import org.jboss.portal.portlet.spi.PortletInvocationContext;
+import org.jboss.portal.portlet.test.StringCodec;
+import static org.jboss.portal.portlet.test.URLParameterConstants.*;
+import org.jboss.portal.web.Body;
+import org.jboss.portal.web.IllegalRequestException;
+import org.jboss.portal.web.WebRequest;
+
+import javax.servlet.ServletContext;
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author Julien Viet
+ * @version $Revision: 1.1 $
+ */
+public abstract class AbstractPortletControllerContext implements PortletC=
ontrollerContext
+{
+
+   /** . */
+   public static final MarkupInfo MARKUP_INFO =3D new MarkupInfo(MediaType=
.HTML, "UTF8");
+
+   /** . */
+   public static final int NAV_SCOPE =3D 0;
+
+   /** . */
+   public static final int SESSION_SCOPE =3D 1;
+
+   /** . */
+   private final HttpServletRequest req;
+
+   /** . */
+   private final HttpServletResponse resp;
+
+   /** . */
+   private final ServletContext servletContext;
+
+   /** . */
+   private final ControllerRequest request;
+
+   /** . */
+   private final StateControllerContextImpl stateControllerContext;
+
+   public AbstractPortletControllerContext(
+      HttpServletRequest req,
+      HttpServletResponse resp,
+      ServletContext servletContext)
+      throws IllegalRequestException, IOException, ClassNotFoundException
+   {
+      StateControllerContextImpl tmp =3D new StateControllerContextImpl(th=
is);
+
+      // The nav state provided with the request
+      PageNavigationalState pageState =3D null;
+
+      // The request decoded if not null
+      ControllerRequest request =3D null;
+
+      // Process
+      String pathInfo =3D req.getPathInfo();
+      if (pathInfo !=3D null && pathInfo.startsWith("/") && pathInfo.lengt=
h() > 1)
+      {
+         // Get the target portlet
+         String targetId =3D StringCodec.decode(pathInfo.substring(1));
+
+         // Helper
+         WebRequest ri =3D new WebRequest(req);
+
+         // Unmarshall portal navigational state if it is provided
+         String context =3D req.getParameter(PAGE_STATE);
+         if (context !=3D null)
+         {
+            byte[] bytes =3D Tools.fromHexString(context);
+            pageState =3D tmp.unserialize(bytes);
+         }
+
+         //
+         Mode mode =3D null;
+         if (req.getParameter(MODE) !=3D null)
+         {
+            mode =3D Mode.create(req.getParameter(MODE));
+         }
+
+         //
+         WindowState windowState =3D null;
+         if (req.getParameter(WINDOW_STATE) !=3D null)
+         {
+            windowState =3D WindowState.create(req.getParameter(WINDOW_STA=
TE));
+         }
+
+         //
+         String navigationalStateString =3D req.getParameter(NAVIGATIONAL_=
STATE);
+         StateString navigationalState =3D null;
+         if (navigationalStateString !=3D null)
+         {
+            navigationalState =3D ParametersStateString.create(navigationa=
lStateString);
+         }
+
+         //
+         WindowNavigationalState windowNavigationalState =3D new WindowNav=
igationalState(navigationalState, mode, windowState);
+
+         //
+         String type =3D req.getParameter(LIFECYCLE_TYPE);
+         if (RESOURCE_LIFECYCLE.equals(type))
+         {
+            StateString resourceState =3D ParametersStateString.create(req=
.getParameter(RESOURCE_STATE));
+            String resourceId =3D req.getParameter(RESOURCE_ID);
+
+            //
+            ParameterMap formParameters =3D null;
+            if (ri.getBody() instanceof Body.Form)
+            {
+               formParameters =3D ((Body.Form)ri.getBody()).getParameters(=
);
+            }
+
+            //
+            CacheLevel resourceCacheLevel =3D CacheLevel.valueOf(req.getPa=
rameter(RESOURCE_CACHEABILITY));
+
+            //
+            switch (resourceCacheLevel)
+            {
+               case FULL:
+                  request =3D new FullScopedCacheablePortletResourceReques=
t(
+                     this,
+                     targetId,
+                     resourceId,
+                     resourceState,
+                     formParameters);
+                  break;
+               case PORTLET:
+                  request =3D new PortletScopedPortletResourceRequest(
+                     this,
+                     targetId,
+                     resourceId,
+                     resourceState,
+                     formParameters,
+                     windowNavigationalState);
+                  break;
+               case PAGE:
+                  request =3D new PageScopedFullPortletResourceRequest(
+                     this,
+                     targetId,
+                     resourceId,
+                     resourceState,
+                     formParameters,
+                     pageState,
+                     windowNavigationalState);
+                  break;
+            }
+         }
+         else
+         {
+            if (ACTION_LIFECYCLE.equals(type))
+            {
+               ParameterMap formParameters =3D null;
+               if (ri.getBody() instanceof Body.Form)
+               {
+                  formParameters =3D ((Body.Form)ri.getBody()).getParamete=
rs();
+               }
+
+               //
+               StateString interactionState =3D ParametersStateString.crea=
te(req.getParameter(INTERACTION_STATE));
+
+               //
+               request =3D new PortletActionRequest(
+                  this,
+                  targetId,
+                  interactionState,
+                  formParameters,
+                  windowNavigationalState,
+                  pageState);
+            }
+            else
+            {
+               Map publicNavigationalStateChanges =3D (M=
ap)IOTools.unserialize(Tools.fromHexString(req.getParamet=
er(PUBLIC_NAVIGATIONAL_STATE_CHANGES)));
+
+               //
+               request =3D new PortletRenderRequest(
+                  this,
+                  targetId,
+                  windowNavigationalState,
+                  publicNavigationalStateChanges,
+                  pageState);
+            }
+         }
+      }
+
+      //
+      this.request =3D request;
+      this.req =3D req;
+      this.resp =3D resp;
+      this.servletContext =3D servletContext;
+      this.stateControllerContext =3D tmp;
+   }
+
+   public ControllerRequest getRequest()
+   {
+      return request;
+   }
+
+   public ServletContext getServletContext()
+   {
+      return servletContext;
+   }
+
+   public HttpServletRequest getClientRequest()
+   {
+      return req;
+   }
+
+   public HttpServletResponse getClientResponse()
+   {
+      return resp;
+   }
+
+   public PortletInfo getPortletInfo(String windowId) throws PortletInvoke=
rException
+   {
+      return getPortlet(windowId).getInfo();
+   }
+
+   protected abstract Portlet getPortlet(String windowId) throws PortletIn=
vokerException;
+
+   protected abstract PortletInvocationResponse invoke(PortletInvocation i=
nvocation) throws PortletInvokerException;
+
+   public abstract EventControllerContext getEventControllerContext();
+
+   public StateControllerContext getStateControllerContext()
+   {
+      return stateControllerContext;
+   }
+
+   public PortletInvocationResponse invoke(String windowId, ActionInvocati=
on actionInvocation) throws PortletInvokerException
+   {
+
+      Portlet portlet =3D getPortlet(windowId);
+
+      TestInstanceContext instanceContext =3D new TestInstanceContext(req,=
 portlet.getContext(), true);
+
+      actionInvocation.setClientContext(new AbstractClientContext(req));
+      actionInvocation.setServerContext(new AbstractServerContext(req, res=
p));
+      actionInvocation.setInstanceContext(instanceContext);
+      actionInvocation.setUserContext(new AbstractUserContext(req));
+      actionInvocation.setWindowContext(new AbstractWindowContext(portlet.=
getContext().getId()));
+      actionInvocation.setPortalContext(new TestPortalContext());
+      actionInvocation.setSecurityContext(new AbstractSecurityContext(req)=
);
+      actionInvocation.setRequestContext(new AbstractRequestContext(req));
+      actionInvocation.setTarget(instanceContext.getTarget());
+
+      return invoke(actionInvocation);
+   }
+
+   public PortletInvocationResponse invoke(String windowId, List r=
equestCookies, EventInvocation eventInvocation) throws PortletInvokerExcept=
ion
+   {
+      Portlet portlet =3D getPortlet(windowId);
+
+      TestInstanceContext instanceContext =3D new TestInstanceContext(req,=
 portlet.getContext(), true);
+
+      eventInvocation.setClientContext(new AbstractClientContext(req, requ=
estCookies));
+      eventInvocation.setServerContext(new AbstractServerContext(req, resp=
));
+      eventInvocation.setInstanceContext(instanceContext);
+      eventInvocation.setUserContext(new AbstractUserContext(req));
+      eventInvocation.setWindowContext(new AbstractWindowContext(windowId)=
);
+      eventInvocation.setPortalContext(new TestPortalContext());
+      eventInvocation.setSecurityContext(new AbstractSecurityContext(req));
+      eventInvocation.setTarget(instanceContext.getTarget());
+
+      return invoke(eventInvocation);
+   }
+
+   public PortletInvocationResponse invoke(String windowId, ResourceInvoca=
tion resourceInvocation) throws PortletInvokerException
+   {
+      Portlet portlet =3D getPortlet(windowId);
+
+      TestInstanceContext instanceContext =3D new TestInstanceContext(req,=
 portlet.getContext(), true);
+
+      resourceInvocation.setClientContext(new AbstractClientContext(req));
+      resourceInvocation.setServerContext(new AbstractServerContext(req, r=
esp));
+      resourceInvocation.setInstanceContext(instanceContext);
+      resourceInvocation.setUserContext(new AbstractUserContext(req));
+      resourceInvocation.setWindowContext(new AbstractWindowContext(portle=
t.getContext().getId()));
+      resourceInvocation.setPortalContext(new TestPortalContext());
+      resourceInvocation.setSecurityContext(new AbstractSecurityContext(re=
q));
+      resourceInvocation.setRequestContext(new AbstractRequestContext(req)=
);
+      resourceInvocation.setTarget(instanceContext.getTarget());
+
+      return invoke(resourceInvocation);
+   }
+
+   public PortletInvocationContext createPortletInvocationContext(String w=
indowId, PageNavigationalState pageState)
+   {
+      return new TestPortletInvocationContext(stateControllerContext, req,=
 resp, windowId, pageState, MARKUP_INFO);
+   }
+}
\ No newline at end of file

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/controller/PortletControllerContextImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
controller/PortletControllerContextImpl.java	2008-02-06 21:56:20 UTC (rev 9=
810)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
controller/PortletControllerContextImpl.java	2008-02-06 22:12:01 UTC (rev 9=
811)
@@ -83,312 +83,43 @@
  * @author Julien Viet
  * @version $Revision: 1.1 $
  */
-public class PortletControllerContextImpl implements PortletControllerCont=
ext
+public class PortletControllerContextImpl extends AbstractPortletControlle=
rContext
 {
 =

    /** . */
-   public static final MarkupInfo MARKUP_INFO =3D new MarkupInfo(MediaType=
.HTML, "UTF8");
-
-   /** . */
-   public static final int NAV_SCOPE =3D 0;
-
-   /** . */
-   public static final int SESSION_SCOPE =3D 1;
-
-   /** . */
-   private final HttpServletRequest req;
-
-   /** . */
-   private final HttpServletResponse resp;
-
-   /** . */
-   private final ServletContext servletContext;
-
-   /** . */
-   private final ControllerRequest request;
-
-   /** . */
    private final PortletInvoker invoker;
-
+   =

    /** . */
    private final EventControllerContext eventControllerContext;
 =

-   /** . */
-   private final StateControllerContextImpl stateControllerContext;
-
-   public PortletControllerContextImpl(
-      HttpServletRequest req,
-      HttpServletResponse resp,
-      ServletContext servletContext)
+   public PortletControllerContextImpl(HttpServletRequest req, HttpServlet=
Response resp, ServletContext servletContext)
       throws IllegalRequestException, IOException, ClassNotFoundException
    {
-      PortletInvoker invoker =3D (PortletInvoker)servletContext.getAttribu=
te("ConsumerPortletInvoker");
+      super(req, resp, servletContext);
 =

       //
-      StateControllerContextImpl tmp =3D new StateControllerContextImpl(th=
is);
-
-      // The nav state provided with the request
-      PageNavigationalState pageState =3D null;
-
-      // The request decoded if not null
-      ControllerRequest request =3D null;
-
-      // Process
-      String pathInfo =3D req.getPathInfo();
-      if (pathInfo !=3D null && pathInfo.startsWith("/") && pathInfo.lengt=
h() > 1)
-      {
-         // Get the target portlet
-         String targetId =3D StringCodec.decode(pathInfo.substring(1));
-
-         // Helper
-         WebRequest ri =3D new WebRequest(req);
-
-         // Unmarshall portal navigational state if it is provided
-         String context =3D req.getParameter(PAGE_STATE);
-         if (context !=3D null)
-         {
-            byte[] bytes =3D Tools.fromHexString(context);
-            pageState =3D tmp.unserialize(bytes);
-         }
-
-         //
-         Mode mode =3D null;
-         if (req.getParameter(MODE) !=3D null)
-         {
-            mode =3D Mode.create(req.getParameter(MODE));
-         }
-
-         //
-         WindowState windowState =3D null;
-         if (req.getParameter(WINDOW_STATE) !=3D null)
-         {
-            windowState =3D WindowState.create(req.getParameter(WINDOW_STA=
TE));
-         }
-
-         //
-         String navigationalStateString =3D req.getParameter(NAVIGATIONAL_=
STATE);
-         StateString navigationalState =3D null;
-         if (navigationalStateString !=3D null)
-         {
-            navigationalState =3D ParametersStateString.create(navigationa=
lStateString);
-         }
-
-         //
-         WindowNavigationalState windowNavigationalState =3D new WindowNav=
igationalState(navigationalState, mode, windowState);
-
-         //
-         String type =3D req.getParameter(LIFECYCLE_TYPE);
-         if (RESOURCE_LIFECYCLE.equals(type))
-         {
-            StateString resourceState =3D ParametersStateString.create(req=
.getParameter(RESOURCE_STATE));
-            String resourceId =3D req.getParameter(RESOURCE_ID);
-
-            //
-            ParameterMap formParameters =3D null;
-            if (ri.getBody() instanceof Body.Form)
-            {
-               formParameters =3D ((Body.Form)ri.getBody()).getParameters(=
);
-            }
-
-            //
-            CacheLevel resourceCacheLevel =3D CacheLevel.valueOf(req.getPa=
rameter(RESOURCE_CACHEABILITY));
-
-            //
-            switch (resourceCacheLevel)
-            {
-               case FULL:
-                  request =3D new FullScopedCacheablePortletResourceReques=
t(
-                     this,
-                     targetId,
-                     resourceId,
-                     resourceState,
-                     formParameters);
-                  break;
-               case PORTLET:
-                  request =3D new PortletScopedPortletResourceRequest(
-                     this,
-                     targetId,
-                     resourceId,
-                     resourceState,
-                     formParameters,
-                     windowNavigationalState);
-                  break;
-               case PAGE:
-                  request =3D new PageScopedFullPortletResourceRequest(
-                     this,
-                     targetId,
-                     resourceId,
-                     resourceState,
-                     formParameters,
-                     pageState,
-                     windowNavigationalState);
-                  break;
-            }
-         }
-         else
-         {
-            if (ACTION_LIFECYCLE.equals(type))
-            {
-               ParameterMap formParameters =3D null;
-               if (ri.getBody() instanceof Body.Form)
-               {
-                  formParameters =3D ((Body.Form)ri.getBody()).getParamete=
rs();
-               }
-
-               //
-               StateString interactionState =3D ParametersStateString.crea=
te(req.getParameter(INTERACTION_STATE));
-
-               //
-               request =3D new PortletActionRequest(
-                  this,
-                  targetId,
-                  interactionState,
-                  formParameters,
-                  windowNavigationalState,
-                  pageState);
-            }
-            else
-            {
-               Map publicNavigationalStateChanges =3D (M=
ap)IOTools.unserialize(Tools.fromHexString(req.getParamet=
er(PUBLIC_NAVIGATIONAL_STATE_CHANGES)));
-
-               //
-               request =3D new PortletRenderRequest(
-                  this,
-                  targetId,
-                  windowNavigationalState,
-                  publicNavigationalStateChanges,
-                  pageState);
-            }
-         }
-      }
-
-      //
-      this.request =3D request;
-      this.req =3D req;
-      this.resp =3D resp;
-      this.servletContext =3D servletContext;
-      this.invoker =3D invoker;
+      this.invoker =3D (PortletInvoker)servletContext.getAttribute("Consum=
erPortletInvoker");
       this.eventControllerContext =3D new EventControllerContextImpl(invok=
er);
-      this.stateControllerContext =3D tmp;
    }
 =

-   public ControllerRequest getRequest()
+   protected Portlet getPortlet(String windowId) throws PortletInvokerExce=
ption
    {
-      return request;
-   }
-
-   public ServletContext getServletContext()
-   {
-      return servletContext;
-   }
-
-   public HttpServletRequest getClientRequest()
-   {
-      return req;
-   }
-
-   public HttpServletResponse getClientResponse()
-   {
-      return resp;
-   }
-
-   public PortletInfo getPortletInfo(String windowId) throws PortletInvoke=
rException
-   {
-      return _getPortlet(windowId).getInfo();
-   }
-
-   private Portlet _getPortlet(String windowId) throws PortletInvokerExcep=
tion
-   {
       return invoker.getPortlet(PortletContext.createPortletContext(window=
Id));
    }
 =

-   public PortletInvocationResponse invoke(PortletInvocation invocation) t=
hrows PortletInvokerException
+   protected PortletInvocationResponse invoke(PortletInvocation invocation=
) throws PortletInvokerException
    {
       return invoker.invoke(invocation);
    }
 =

-   public Collection getPortlets() throws PortletInvokerException
-   {
-      return invoker.getPortlets();
-   }
-
    public EventControllerContext getEventControllerContext()
    {
       return eventControllerContext;
    }
 =

-   public StateControllerContext getStateControllerContext()
+   public Collection getPortlets() throws PortletInvokerException
    {
-      return stateControllerContext;
+      return invoker.getPortlets();
    }
 =

-   public String renderURL(String windowId, PageNavigationalState pageStat=
e, ContainerURL containerURL, Boolean wantSecure, Boolean wantAuthenticated=
, boolean relative)
-   {
-      PortletURLRenderer renderer =3D new PortletURLRenderer(stateControll=
erContext, pageState, windowId, req, resp);
-
-      //
-      return renderer.renderURL(containerURL, wantSecure, wantAuthenticate=
d, relative);
-   }
-
-   public PortletInvocationResponse invoke(String windowId, ActionInvocati=
on actionInvocation) throws PortletInvokerException
-   {
-
-      Portlet portlet =3D _getPortlet(windowId);
-
-      TestInstanceContext instanceContext =3D new TestInstanceContext(req,=
 portlet.getContext(), true);
-
-      actionInvocation.setClientContext(new AbstractClientContext(req));
-      actionInvocation.setServerContext(new AbstractServerContext(req, res=
p));
-      actionInvocation.setInstanceContext(instanceContext);
-      actionInvocation.setUserContext(new AbstractUserContext(req));
-      actionInvocation.setWindowContext(new AbstractWindowContext(portlet.=
getContext().getId()));
-      actionInvocation.setPortalContext(new TestPortalContext());
-      actionInvocation.setSecurityContext(new AbstractSecurityContext(req)=
);
-      actionInvocation.setRequestContext(new AbstractRequestContext(req));
-      actionInvocation.setTarget(instanceContext.getTarget());
-
-      return invoke(actionInvocation);
-   }
-
-   public PortletInvocationResponse invoke(String windowId, List r=
equestCookies, EventInvocation eventInvocation) throws PortletInvokerExcept=
ion
-   {
-      Portlet portlet =3D _getPortlet(windowId);
-
-      TestInstanceContext instanceContext =3D new TestInstanceContext(req,=
 portlet.getContext(), true);
-
-      eventInvocation.setClientContext(new AbstractClientContext(req, requ=
estCookies));
-      eventInvocation.setServerContext(new AbstractServerContext(req, resp=
));
-      eventInvocation.setInstanceContext(instanceContext);
-      eventInvocation.setUserContext(new AbstractUserContext(req));
-      eventInvocation.setWindowContext(new AbstractWindowContext(windowId)=
);
-      eventInvocation.setPortalContext(new TestPortalContext());
-      eventInvocation.setSecurityContext(new AbstractSecurityContext(req));
-      eventInvocation.setTarget(instanceContext.getTarget());
-
-      return invoke(eventInvocation);
-   }
-
-   public PortletInvocationResponse invoke(String windowId, ResourceInvoca=
tion resourceInvocation) throws PortletInvokerException
-   {
-      Portlet portlet =3D _getPortlet(windowId);
-
-      TestInstanceContext instanceContext =3D new TestInstanceContext(req,=
 portlet.getContext(), true);
-
-      resourceInvocation.setClientContext(new AbstractClientContext(req));
-      resourceInvocation.setServerContext(new AbstractServerContext(req, r=
esp));
-      resourceInvocation.setInstanceContext(instanceContext);
-      resourceInvocation.setUserContext(new AbstractUserContext(req));
-      resourceInvocation.setWindowContext(new AbstractWindowContext(portle=
t.getContext().getId()));
-      resourceInvocation.setPortalContext(new TestPortalContext());
-      resourceInvocation.setSecurityContext(new AbstractSecurityContext(re=
q));
-      resourceInvocation.setRequestContext(new AbstractRequestContext(req)=
);
-      resourceInvocation.setTarget(instanceContext.getTarget());
-
-      return invoke(resourceInvocation);
-   }
-
-   public PortletInvocationContext createPortletInvocationContext(String w=
indowId, PageNavigationalState pageState)
-   {
-      return new TestPortletInvocationContext(stateControllerContext, req,=
 resp, windowId, pageState, MARKUP_INFO);
-   }
 }

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/ControllerServlet.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/ControllerServlet.java	2008-02-06 21:56:20 UTC (rev 9810)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/ControllerServlet.java	2008-02-06 22:12:01 UTC (rev 9811)
@@ -28,6 +28,16 @@
 import org.jboss.portal.portlet.test.jsp.response.CharsChunk;
 import org.jboss.portal.portlet.test.jsp.response.PortletChunk;
 import org.jboss.portal.portlet.test.jsp.response.BufferingResponse;
+import org.jboss.portal.portlet.PortletInvoker;
+import org.jboss.portal.portlet.Portlet;
+import org.jboss.portal.portlet.PortletInvokerException;
+import org.jboss.portal.portlet.invocation.response.PortletInvocationRespo=
nse;
+import org.jboss.portal.portlet.invocation.response.FragmentResponse;
+import org.jboss.portal.portlet.controller.PortletController;
+import org.jboss.portal.portlet.controller.response.ControllerResponse;
+import org.jboss.portal.portlet.controller.response.PageUpdateResponse;
+import org.jboss.portal.portlet.controller.state.PageNavigationalState;
+import org.jboss.portal.portlet.info.PortletInfo;
 =

 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
@@ -36,6 +46,7 @@
 import javax.servlet.RequestDispatcher;
 import java.io.IOException;
 import java.io.PrintWriter;
+import java.util.Map;
 =

 /**
  * @author Julien Viet
@@ -44,9 +55,23 @@
 public class ControllerServlet extends HttpServlet
 {
 =

-
    protected void service(HttpServletRequest req, HttpServletResponse resp=
) throws ServletException, IOException
    {
+      try
+      {
+         _service(req, resp);
+      }
+      catch (ClassNotFoundException e)
+      {
+         throw new ServletException(e);
+      }
+   }
+
+   protected void _service(HttpServletRequest req, HttpServletResponse res=
p) throws ServletException, IOException, ClassNotFoundException
+   {
+      PortletInvoker invoker =3D (PortletInvoker)getServletContext().getAt=
tribute("ConsumerPortletInvoker");
+
+      //
       RequestDispatcher dispatcher =3D req.getRequestDispatcher("/index.js=
p");
 =

       //
@@ -59,9 +84,75 @@
       ResponseBuffer buffer =3D bufferingResponse.getBuffer();
       buffer.close();
 =

+      // Collect portlets to create the page
+      int counter =3D 0;
+      Page page =3D new Page();
+      for (Chunk chunk : buffer.getChunks())
+      {
+         if (chunk instanceof PortletChunk)
+         {
+            PortletChunk portletChunk =3D (PortletChunk)chunk;
+            String windowId =3D "" + counter++;
+
+            //
+            try
+            {
+               for (Portlet portlet : invoker.getPortlets())
+               {
+                  PortletInfo portletInfo =3D portlet.getInfo();
+                  String portletName =3D portletInfo.getName();
+                  String applicationName =3D portletInfo.getApplicationNam=
e();
+
+                  //
+                  if (applicationName.equals(portletChunk.getApplicationNa=
me()) && portletName.equals(portletChunk.getPortletName()))
+                  {
+                     page.addWindow(new Window(windowId, portlet));
+                  }
+               }
+            }
+            catch (PortletInvokerException e)
+            {
+               throw new ServletException(e);
+            }
+         }
+      }
+
       //
+      PagePortletControllerContext context =3D new PagePortletControllerCo=
ntext(req, resp, getServletContext(), page, invoker);
+
+      //
+      PageNavigationalState pageState =3D null;
+      if (context.getRequest() !=3D null)
+      {
+         ControllerResponse controllerResponse;
+         try
+         {
+            controllerResponse =3D new PortletController().process(context=
.getRequest());
+         }
+         catch (PortletInvokerException e)
+         {
+            throw new ServletException(e);
+         }
+
+         //
+         if (controllerResponse instanceof PageUpdateResponse)
+         {
+            PageUpdateResponse pageUpdate =3D (PageUpdateResponse)controll=
erResponse;
+            pageState =3D pageUpdate.getPageState();
+         }
+      }
+      else
+      {
+         pageState =3D context.getStateControllerContext().createPageState=
();
+      }
+
+      //
+      Map responses =3D page.render(con=
text, pageState);
+
+      //
       resp.setContentType("text/html");
       PrintWriter writer =3D resp.getWriter();
+      int count =3D 0;
       for (Chunk chunk : buffer.getChunks())
       {
          if (chunk instanceof BytesChunk)
@@ -77,7 +168,39 @@
          else if (chunk instanceof PortletChunk)
          {
             PortletChunk portletChunk =3D (PortletChunk)chunk;
-            writer.write("Portlet[" + portletChunk.getPortletName() + "," =
+ portletChunk.getApplicationName() + "]");
+            String windowId =3D "" + count++;
+
+            PortletInvocationResponse response =3D responses.get(windowId);
+            if (response !=3D null)
+            {
+               if (response instanceof FragmentResponse)
+               {
+                  FragmentResponse fragment =3D (FragmentResponse)response;
+                  if (fragment.getType() !=3D FragmentResponse.TYPE_EMPTY)
+                  {
+                     String frag;
+                     if (fragment.getType() =3D=3D FragmentResponse.TYPE_B=
YTES)
+                     {
+                        frag =3D fragment.getBytes().toString();
+                     }
+                     else
+                     {
+                        frag =3D fragment.getChars().toString();
+                     }
+
+                     //
+                     writer.write(frag);
+                  }
+               }
+               else
+               {
+                  writer.write(response.getClass().getSimpleName() + "[" +=
 portletChunk.getPortletName() + "," + portletChunk.getApplicationName() + =
"]");
+               }
+            }
+            else
+            {
+               writer.write("Empty[" + portletChunk.getPortletName() + ","=
 + portletChunk.getApplicationName() + "]");
+            }
          }
       }
 =


Added: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/te=
st/jsp/Page.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/Page.java	                        (rev 0)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/Page.java	2008-02-06 22:12:01 UTC (rev 9811)
@@ -0,0 +1,76 @@
+/*************************************************************************=
*****
+ * 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.PortletInvocationRespo=
nse;
+import org.jboss.portal.portlet.controller.PortletControllerContext;
+import org.jboss.portal.portlet.controller.state.PageNavigationalState;
+
+import java.util.Map;
+import java.util.HashMap;
+
+/**
+ * @author Julien Viet
+ * @version $Revision: 630 $
+ */
+public class Page
+{
+
+   /** . */
+   private Map windows;
+
+   public Page()
+   {
+      this.windows =3D new HashMap();
+   }
+
+   public void addWindow(Window window)
+   {
+      windows.put(window.getId(), window);
+   }
+
+   public Window getWindow(String windowId)
+   {
+      return windows.get(windowId);
+   }
+
+   public Map render(PortletControllerC=
ontext context, PageNavigationalState pageState)
+   {
+      Map responses =3D new HashMap();
+
+      //
+      for (Window window : windows.values())
+      {
+         PortletInvocationResponse response =3D window.render(context, pag=
eState);
+
+         //
+         if (response !=3D null)
+         {
+            responses.put(window.getId(), response);
+         }
+      }
+
+      //
+      return responses;
+   }
+}

Added: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/te=
st/jsp/PagePortletControllerContext.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/PagePortletControllerContext.java	                        (rev 0)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/PagePortletControllerContext.java	2008-02-06 22:12:01 UTC (rev 9811)
@@ -0,0 +1,87 @@
+/*************************************************************************=
*****
+ * 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.test.controller.AbstractPortletControllerC=
ontext;
+import org.jboss.portal.portlet.Portlet;
+import org.jboss.portal.portlet.PortletInvokerException;
+import org.jboss.portal.portlet.PortletInvoker;
+import org.jboss.portal.portlet.controller.event.EventControllerContext;
+import org.jboss.portal.portlet.controller.impl.event.EventControllerConte=
xtImpl;
+import org.jboss.portal.portlet.invocation.response.PortletInvocationRespo=
nse;
+import org.jboss.portal.portlet.invocation.PortletInvocation;
+import org.jboss.portal.web.IllegalRequestException;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.ServletContext;
+import java.io.IOException;
+
+/**
+ * @author Julien Viet
+ * @version $Revision: 630 $
+ */
+public class PagePortletControllerContext extends AbstractPortletControlle=
rContext
+{
+
+   /** . */
+   private final Page page;
+
+   /** . */
+   private final PortletInvoker invoker;
+
+   /** . */
+   private final EventControllerContext eventControllerContext;
+
+   public PagePortletControllerContext(
+      HttpServletRequest req,
+      HttpServletResponse resp,
+      ServletContext servletContext,
+      Page page,
+      PortletInvoker invoker)
+      throws IllegalRequestException, IOException, ClassNotFoundException
+   {
+      super(req, resp, servletContext);
+
+      //
+      this.page =3D page;
+      this.invoker =3D invoker;
+      this.eventControllerContext =3D new EventControllerContextImpl(invok=
er);
+   }
+
+   protected Portlet getPortlet(String windowId) throws PortletInvokerExce=
ption
+   {
+      Window window =3D page.getWindow(windowId);
+      return window.getPortlet();
+   }
+
+   protected PortletInvocationResponse invoke(PortletInvocation invocation=
) throws PortletInvokerException
+   {
+      return invoker.invoke(invocation);
+   }
+
+   public EventControllerContext getEventControllerContext()
+   {
+      return eventControllerContext;
+   }
+}

Added: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/te=
st/jsp/Window.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/Window.java	                        (rev 0)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/Window.java	2008-02-06 22:12:01 UTC (rev 9811)
@@ -0,0 +1,137 @@
+/*************************************************************************=
*****
+ * 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.Portlet;
+import org.jboss.portal.portlet.StateString;
+import org.jboss.portal.portlet.PortletInvokerException;
+import org.jboss.portal.portlet.test.controller.TestInstanceContext;
+import org.jboss.portal.portlet.test.controller.TestPortalContext;
+import org.jboss.portal.portlet.impl.spi.AbstractClientContext;
+import org.jboss.portal.portlet.impl.spi.AbstractServerContext;
+import org.jboss.portal.portlet.impl.spi.AbstractUserContext;
+import org.jboss.portal.portlet.impl.spi.AbstractWindowContext;
+import org.jboss.portal.portlet.impl.spi.AbstractSecurityContext;
+import org.jboss.portal.portlet.spi.PortletInvocationContext;
+import org.jboss.portal.portlet.controller.PortletControllerContext;
+import org.jboss.portal.portlet.controller.state.WindowNavigationalState;
+import org.jboss.portal.portlet.controller.state.PageNavigationalState;
+import org.jboss.portal.portlet.invocation.response.PortletInvocationRespo=
nse;
+import org.jboss.portal.portlet.invocation.RenderInvocation;
+import org.jboss.portal.Mode;
+import org.jboss.portal.WindowState;
+import org.jboss.portal.common.util.ParameterMap;
+
+/**
+ * @author Julien Viet
+ * @version $Revision: 630 $
+ */
+public class Window
+{
+
+   /** . */
+   private final String id;
+
+   /** . */
+   private final Portlet portlet;
+
+   public Window(String id, Portlet portlet)
+   {
+      this.id =3D id;
+      this.portlet =3D portlet;
+   }
+
+   public String getId()
+   {
+      return id;
+   }
+
+   public Portlet getPortlet()
+   {
+      return portlet;
+   }
+
+   public PortletInvocationResponse render(
+      PortletControllerContext context,
+      PageNavigationalState pageState)
+   {
+      WindowNavigationalState windowNS =3D pageState.getWindowNavigational=
State(id);
+
+      //
+      Mode mode =3D Mode.VIEW;
+      WindowState windowState =3D WindowState.NORMAL;
+      StateString portletNS =3D null;
+
+      //
+      if (windowNS !=3D null)
+      {
+         if (windowNS.getMode() !=3D null)
+         {
+            mode =3D windowNS.getMode();
+         }
+         if (windowNS.getWindowState() !=3D null)
+         {
+            windowState =3D windowNS.getWindowState();
+         }
+         if (windowNS.getPortletNavigationalState() !=3D null)
+         {
+            portletNS =3D windowNS.getPortletNavigationalState();
+         }
+      }
+
+      //
+      ParameterMap publicNS =3D pageState.getPublicNavigationalState(id);
+
+      //
+      PortletInvocationContext renderContext =3D context.createPortletInvo=
cationContext(id, pageState);
+      RenderInvocation render =3D new RenderInvocation(renderContext);
+      render.setClientContext(new AbstractClientContext(context.getClientR=
equest()));
+      render.setServerContext(new AbstractServerContext(context.getClientR=
equest(), context.getClientResponse()));
+      render.setInstanceContext(new TestInstanceContext(context.getClientR=
equest(), portlet.getContext(), false));
+      render.setUserContext(new AbstractUserContext(context.getClientReque=
st()));
+      render.setWindowContext(new AbstractWindowContext(id));
+      render.setPortalContext(new TestPortalContext());
+      render.setSecurityContext(new AbstractSecurityContext(context.getCli=
entRequest()));
+      render.setTarget(portlet.getContext());
+      render.setMode(mode);
+      render.setWindowState(windowState);
+      render.setNavigationalState(portletNS);
+      render.setPublicNavigationalState(publicNS);
+
+      //
+      try
+      {
+         return ((PagePortletControllerContext)context).invoke(render);
+
+      }
+      catch (PortletInvokerException e)
+      {
+         e.printStackTrace();
+
+         // todo
+
+         //
+         return null;
+      }
+   }
+}

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/i=
ndex.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/index.j=
sp	2008-02-06 21:56:20 UTC (rev 9810)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/index.j=
sp	2008-02-06 22:12:01 UTC (rev 9811)
@@ -5,11 +5,15 @@
 
 
 
-   BEFORE
+   ONE
    
+   TWO
+   
-   AFTER
+   THREE
 
 
 


--===============2520161241992060133==--

From portal-commits at lists.jboss.org Wed Feb  6 17:15:07 2008
Content-Type: multipart/mixed; boundary="===============8770407093765576655=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9812 -
 modules/portlet/trunk/test/src/test/resources/simple-portal-war.
Date: Wed, 06 Feb 2008 17:15:06 -0500
Message-ID: 

--===============8770407093765576655==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-06 17:15:06 -0500 (Wed, 06 Feb 2008)
New Revision: 9812

Modified:
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/index.jsp
Log:
portlet taglib not used here

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/i=
ndex.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/index.j=
sp	2008-02-06 22:12:01 UTC (rev 9811)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/index.j=
sp	2008-02-06 22:15:06 UTC (rev 9812)
@@ -1,6 +1,5 @@
 <%@ page language=3D"java" %>
 <%@ taglib uri=3D"/WEB-INF/portal.tld" prefix=3D"portal" %>
-<%@ taglib uri=3D"http://java.sun.com/portlet" prefix=3D"portlet" %>
 <%@ page isELIgnored=3D"false" %>
 
 


--===============8770407093765576655==--

From portal-commits at lists.jboss.org Wed Feb  6 17:48:17 2008
Content-Type: multipart/mixed; boundary="===============1943223928087920979=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9813 - in
 modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet:
 controller/state and 1 other directories.
Date: Wed, 06 Feb 2008 17:48:16 -0500
Message-ID: 

--===============1943223928087920979==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-06 17:48:16 -0500 (Wed, 06 Feb 2008)
New Revision: 9813

Modified:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contro=
ller/impl/state/PageNavigationalStateImpl.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contro=
ller/state/PageNavigationalState.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/ControllerServlet.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/Page.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/PagePortletControllerContext.java
Log:
stuff the page id in the public NS

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/controller/impl/state/PageNavigationalStateImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr=
oller/impl/state/PageNavigationalStateImpl.java	2008-02-06 22:15:06 UTC (re=
v 9812)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr=
oller/impl/state/PageNavigationalStateImpl.java	2008-02-06 22:48:16 UTC (re=
v 9813)
@@ -104,6 +104,11 @@
       return publicNavigationalState;
    }
 =

+   public String[] getPublicNavigationalState(QName name)
+   {
+      return page.get(name).clone();
+   }
+
    public void setWindowNavigationalState(String windowId, WindowNavigatio=
nalState windowState) throws UnsupportedOperationException
    {
       throw new UnsupportedOperationException();

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/controller/state/PageNavigationalState.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr=
oller/state/PageNavigationalState.java	2008-02-06 22:15:06 UTC (rev 9812)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr=
oller/state/PageNavigationalState.java	2008-02-06 22:48:16 UTC (rev 9813)
@@ -24,6 +24,7 @@
 =

 import org.jboss.portal.common.util.ParameterMap;
 =

+import javax.xml.namespace.QName;
 import java.util.Map;
 =

 /**
@@ -74,4 +75,10 @@
     * @throws UnsupportedOperationException if the page state is read only
     */
    void setPublicNavigationalState(String windowId, Map =
update) throws UnsupportedOperationException;
+
+   String[] getPublicNavigationalState(QName name);
+
+   void setPublicNavigationalState(QName name, String[] value);
+
+   void removePublicNavigationalState(QName name);
 }

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/ControllerServlet.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/ControllerServlet.java	2008-02-06 22:15:06 UTC (rev 9812)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/ControllerServlet.java	2008-02-06 22:48:16 UTC (rev 9813)
@@ -22,14 +22,11 @@
  *************************************************************************=
*****/
 package org.jboss.portal.portlet.test.jsp;
 =

-import org.jboss.portal.portlet.test.jsp.response.ResponseBuffer;
 import org.jboss.portal.portlet.test.jsp.response.Chunk;
 import org.jboss.portal.portlet.test.jsp.response.BytesChunk;
 import org.jboss.portal.portlet.test.jsp.response.CharsChunk;
 import org.jboss.portal.portlet.test.jsp.response.PortletChunk;
-import org.jboss.portal.portlet.test.jsp.response.BufferingResponse;
 import org.jboss.portal.portlet.PortletInvoker;
-import org.jboss.portal.portlet.Portlet;
 import org.jboss.portal.portlet.PortletInvokerException;
 import org.jboss.portal.portlet.invocation.response.PortletInvocationRespo=
nse;
 import org.jboss.portal.portlet.invocation.response.FragmentResponse;
@@ -37,13 +34,11 @@
 import org.jboss.portal.portlet.controller.response.ControllerResponse;
 import org.jboss.portal.portlet.controller.response.PageUpdateResponse;
 import org.jboss.portal.portlet.controller.state.PageNavigationalState;
-import org.jboss.portal.portlet.info.PortletInfo;
 =

 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.ServletException;
-import javax.servlet.RequestDispatcher;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.util.Map;
@@ -72,55 +67,9 @@
       PortletInvoker invoker =3D (PortletInvoker)getServletContext().getAt=
tribute("ConsumerPortletInvoker");
 =

       //
-      RequestDispatcher dispatcher =3D req.getRequestDispatcher("/index.js=
p");
+      PagePortletControllerContext context =3D new PagePortletControllerCo=
ntext(req, resp, getServletContext(), invoker);
 =

       //
-      BufferingResponse bufferingResponse =3D new BufferingResponse(resp);
-
-      //
-      dispatcher.include(req, bufferingResponse);
-
-      //
-      ResponseBuffer buffer =3D bufferingResponse.getBuffer();
-      buffer.close();
-
-      // Collect portlets to create the page
-      int counter =3D 0;
-      Page page =3D new Page();
-      for (Chunk chunk : buffer.getChunks())
-      {
-         if (chunk instanceof PortletChunk)
-         {
-            PortletChunk portletChunk =3D (PortletChunk)chunk;
-            String windowId =3D "" + counter++;
-
-            //
-            try
-            {
-               for (Portlet portlet : invoker.getPortlets())
-               {
-                  PortletInfo portletInfo =3D portlet.getInfo();
-                  String portletName =3D portletInfo.getName();
-                  String applicationName =3D portletInfo.getApplicationNam=
e();
-
-                  //
-                  if (applicationName.equals(portletChunk.getApplicationNa=
me()) && portletName.equals(portletChunk.getPortletName()))
-                  {
-                     page.addWindow(new Window(windowId, portlet));
-                  }
-               }
-            }
-            catch (PortletInvokerException e)
-            {
-               throw new ServletException(e);
-            }
-         }
-      }
-
-      //
-      PagePortletControllerContext context =3D new PagePortletControllerCo=
ntext(req, resp, getServletContext(), page, invoker);
-
-      //
       PageNavigationalState pageState =3D null;
       if (context.getRequest() !=3D null)
       {
@@ -140,20 +89,23 @@
             PageUpdateResponse pageUpdate =3D (PageUpdateResponse)controll=
erResponse;
             pageState =3D pageUpdate.getPageState();
          }
+         else
+         {
+            // todo
+         }
       }
-      else
-      {
-         pageState =3D context.getStateControllerContext().createPageState=
();
-      }
 =

       //
+      Page page =3D context.getPage();
+
+      //
       Map responses =3D page.render(con=
text, pageState);
 =

       //
       resp.setContentType("text/html");
       PrintWriter writer =3D resp.getWriter();
       int count =3D 0;
-      for (Chunk chunk : buffer.getChunks())
+      for (Chunk chunk : page.getChunks())
       {
          if (chunk instanceof BytesChunk)
          {
@@ -203,8 +155,6 @@
             }
          }
       }
-
-      //
       writer.close();
    }
 }

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/Page.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/Page.java	2008-02-06 22:15:06 UTC (rev 9812)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/Page.java	2008-02-06 22:48:16 UTC (rev 9813)
@@ -25,9 +25,17 @@
 import org.jboss.portal.portlet.invocation.response.PortletInvocationRespo=
nse;
 import org.jboss.portal.portlet.controller.PortletControllerContext;
 import org.jboss.portal.portlet.controller.state.PageNavigationalState;
+import org.jboss.portal.portlet.test.jsp.response.Chunk;
+import org.jboss.portal.portlet.test.jsp.response.PortletChunk;
+import org.jboss.portal.portlet.Portlet;
+import org.jboss.portal.portlet.PortletInvokerException;
+import org.jboss.portal.portlet.info.PortletInfo;
 =

+import javax.servlet.ServletException;
+import javax.xml.namespace.QName;
 import java.util.Map;
 import java.util.HashMap;
+import java.util.List;
 =

 /**
  * @author Julien Viet
@@ -37,16 +45,27 @@
 {
 =

    /** . */
+   public static final QName PAGE_ID_NAME =3D new QName("urn:jboss-portlet=
-container", "pageid");
+
+   /** . */
    private Map windows;
 =

-   public Page()
+   /** . */
+   private List chunks;
+
+   /** . */
+   private final String pageId;
+
+   public Page(List chunks, Map windows, String pag=
eId)
    {
-      this.windows =3D new HashMap();
+      this.chunks =3D chunks;
+      this.windows =3D windows;
+      this.pageId =3D pageId;
    }
 =

-   public void addWindow(Window window)
+   public List getChunks()
    {
-      windows.put(window.getId(), window);
+      return chunks;
    }
 =

    public Window getWindow(String windowId)
@@ -56,6 +75,13 @@
 =

    public Map render(PortletControllerC=
ontext context, PageNavigationalState pageState)
    {
+      if (pageState =3D=3D null)
+      {
+         pageState =3D context.getStateControllerContext().createPageState=
();
+         pageState.setPublicNavigationalState(PAGE_ID_NAME, new String[]{p=
ageId});
+      }
+
+      //
       Map responses =3D new HashMap();
 =

       //

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/PagePortletControllerContext.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/PagePortletControllerContext.java	2008-02-06 22:15:06 UTC (rev 9812)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/PagePortletControllerContext.java	2008-02-06 22:48:16 UTC (rev 9813)
@@ -23,11 +23,19 @@
 package org.jboss.portal.portlet.test.jsp;
 =

 import org.jboss.portal.portlet.test.controller.AbstractPortletControllerC=
ontext;
+import org.jboss.portal.portlet.test.jsp.response.Chunk;
+import org.jboss.portal.portlet.test.jsp.response.PortletChunk;
+import org.jboss.portal.portlet.test.jsp.response.BufferingResponse;
+import org.jboss.portal.portlet.test.jsp.response.ResponseBuffer;
 import org.jboss.portal.portlet.Portlet;
 import org.jboss.portal.portlet.PortletInvokerException;
 import org.jboss.portal.portlet.PortletInvoker;
+import org.jboss.portal.portlet.info.PortletInfo;
 import org.jboss.portal.portlet.controller.event.EventControllerContext;
 import org.jboss.portal.portlet.controller.impl.event.EventControllerConte=
xtImpl;
+import org.jboss.portal.portlet.controller.request.PortletRequest;
+import org.jboss.portal.portlet.controller.request.PageScopedFullPortletRe=
sourceRequest;
+import org.jboss.portal.portlet.controller.state.PageNavigationalState;
 import org.jboss.portal.portlet.invocation.response.PortletInvocationRespo=
nse;
 import org.jboss.portal.portlet.invocation.PortletInvocation;
 import org.jboss.portal.web.IllegalRequestException;
@@ -35,7 +43,11 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.RequestDispatcher;
 import java.io.IOException;
+import java.util.Map;
+import java.util.HashMap;
 =

 /**
  * @author Julien Viet
@@ -43,7 +55,7 @@
  */
 public class PagePortletControllerContext extends AbstractPortletControlle=
rContext
 {
-
+   =

    /** . */
    private final Page page;
 =

@@ -57,18 +69,97 @@
       HttpServletRequest req,
       HttpServletResponse resp,
       ServletContext servletContext,
-      Page page,
       PortletInvoker invoker)
-      throws IllegalRequestException, IOException, ClassNotFoundException
+      throws IllegalRequestException, IOException, ClassNotFoundException,=
 ServletException
    {
       super(req, resp, servletContext);
 =

+
       //
-      this.page =3D page;
+      PageNavigationalState pageState =3D null;
+      if (getRequest() instanceof PortletRequest)
+      {
+         PortletRequest request =3D (PortletRequest)getRequest();
+         pageState =3D request.getPageState();
+      }
+      else if (getRequest() instanceof PageScopedFullPortletResourceReques=
t)
+      {
+         PageScopedFullPortletResourceRequest request =3D (PageScopedFullP=
ortletResourceRequest)getRequest();
+         pageState =3D request.getPageState();
+      }
+
+      //
+      String pageId =3D null;
+      if (pageState !=3D null)
+      {
+         String[] values =3D pageState.getPublicNavigationalState(Page.PAG=
E_ID_NAME);
+         if (values !=3D null && values.length > 0)
+         {
+            pageId =3D values[0];
+         }
+      }
+      if (pageId =3D=3D null)
+      {
+         pageId =3D "/index.jsp";
+      }
+
+      //
+      RequestDispatcher dispatcher =3D req.getRequestDispatcher(pageId);
+
+      //
+      BufferingResponse bufferingResponse =3D new BufferingResponse(resp);
+
+      //
+      dispatcher.include(req, bufferingResponse);
+
+      //
+      ResponseBuffer buffer =3D bufferingResponse.getBuffer();
+      buffer.close();
+
+      // Collect portlets to create the page
+      int counter =3D 0;
+      Map windows =3D new HashMap();
+      for (Chunk chunk : buffer.getChunks())
+      {
+         if (chunk instanceof PortletChunk)
+         {
+            PortletChunk portletChunk =3D (PortletChunk)chunk;
+            String windowId =3D "" + counter++;
+
+            //
+            try
+            {
+               for (Portlet portlet : invoker.getPortlets())
+               {
+                  PortletInfo portletInfo =3D portlet.getInfo();
+                  String portletName =3D portletInfo.getName();
+                  String applicationName =3D portletInfo.getApplicationNam=
e();
+
+                  //
+                  if (applicationName.equals(portletChunk.getApplicationNa=
me()) && portletName.equals(portletChunk.getPortletName()))
+                  {
+                     windows.put(windowId, new Window(windowId, portlet));
+                  }
+               }
+            }
+            catch (PortletInvokerException e)
+            {
+               throw new ServletException(e);
+            }
+         }
+      }
+
+      //
+      this.page =3D new Page(buffer.getChunks(), windows, pageId);
       this.invoker =3D invoker;
       this.eventControllerContext =3D new EventControllerContextImpl(invok=
er);
    }
 =

+   public Page getPage()
+   {
+      return page;
+   }
+
    protected Portlet getPortlet(String windowId) throws PortletInvokerExce=
ption
    {
       Window window =3D page.getWindow(windowId);


--===============1943223928087920979==--

From portal-commits at lists.jboss.org Wed Feb  6 17:49:03 2008
Content-Type: multipart/mixed; boundary="===============7487822192087870322=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9814 -
 modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib.
Date: Wed, 06 Feb 2008 17:49:03 -0500
Message-ID: 

--===============7487822192087870322==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-06 17:49:03 -0500 (Wed, 06 Feb 2008)
New Revision: 9814

Modified:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/PageTag.java
Log:
removed sysout

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/taglib/PageTag.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PageTag.java	2008-02-06 22:48:16 UTC (rev 9813)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PageTag.java	2008-02-06 22:49:03 UTC (rev 9814)
@@ -34,16 +34,11 @@
 =

    public int doStartTag() throws JspException
    {
-      System.out.println("START");
-
-
       return EVAL_BODY_INCLUDE;
    }
 =

    public int doEndTag() throws JspException
    {
-      System.out.println("END");
-
       return EVAL_PAGE;
    }
 }


--===============7487822192087870322==--

From portal-commits at lists.jboss.org Wed Feb  6 17:58:00 2008
Content-Type: multipart/mixed; boundary="===============0059035973886820168=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9815 - in
 modules/portlet/trunk/test/src: test/resources/simple-portal-war and 1 other
 directory.
Date: Wed, 06 Feb 2008 17:58:00 -0500
Message-ID: 

--===============0059035973886820168==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-06 17:58:00 -0500 (Wed, 06 Feb 2008)
New Revision: 9815

Modified:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/ControllerServlet.java
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/index.jsp
Log:
implement resource serving in portal jsp

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/ControllerServlet.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/ControllerServlet.java	2008-02-06 22:49:03 UTC (rev 9814)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/ControllerServlet.java	2008-02-06 22:58:00 UTC (rev 9815)
@@ -33,14 +33,18 @@
 import org.jboss.portal.portlet.controller.PortletController;
 import org.jboss.portal.portlet.controller.response.ControllerResponse;
 import org.jboss.portal.portlet.controller.response.PageUpdateResponse;
+import org.jboss.portal.portlet.controller.response.ResourceResponse;
 import org.jboss.portal.portlet.controller.state.PageNavigationalState;
+import org.jboss.portal.common.io.IOTools;
 =

 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.ServletException;
+import javax.servlet.ServletOutputStream;
 import java.io.IOException;
 import java.io.PrintWriter;
+import java.io.Writer;
 import java.util.Map;
 =

 /**
@@ -89,6 +93,63 @@
             PageUpdateResponse pageUpdate =3D (PageUpdateResponse)controll=
erResponse;
             pageState =3D pageUpdate.getPageState();
          }
+         else if (controllerResponse instanceof ResourceResponse)
+         {
+            ResourceResponse resourceResponse =3D (ResourceResponse)contro=
llerResponse;
+            PortletInvocationResponse pir =3D resourceResponse.response;
+
+            //
+            if (pir instanceof FragmentResponse)
+            {
+               FragmentResponse fragment =3D (FragmentResponse)pir;
+               =

+               //
+               if (fragment.getType() =3D=3D FragmentResponse.TYPE_EMPTY)
+               {
+                  resp.setStatus(HttpServletResponse.SC_NO_CONTENT);
+               }
+               else
+               {
+                  String contentType =3D fragment.getContentType();
+                  if (contentType !=3D null)
+                  {
+                     resp.setContentType(contentType);
+                  }
+
+                  //
+                  if (fragment.getType() =3D=3D FragmentResponse.TYPE_BYTE=
S)
+                  {
+                     ServletOutputStream out =3D null;
+                     try
+                     {
+                        out =3D resp.getOutputStream();
+                        out.write(fragment.getBytes().toByteArray());
+                     }
+                     finally
+                     {
+                        IOTools.safeClose(out);
+                     }
+                  }
+                  else
+                  {
+                     Writer writer =3D null;
+                     try
+                     {
+                        writer =3D resp.getWriter();
+                        writer.write(fragment.getChars().toString());
+                     }
+                     finally
+                     {
+                        writer.close();
+                     }
+                  }
+               }
+            }
+            else
+            {
+               // todo
+            }
+         }
          else
          {
             // todo

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/i=
ndex.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/index.j=
sp	2008-02-06 22:49:03 UTC (rev 9814)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/index.j=
sp	2008-02-06 22:58:00 UTC (rev 9815)
@@ -13,6 +13,10 @@
       name=3D"GoogleMap"
       applicationName=3D"google-map-portlet"/>
    THREE
+   
+   FOUR
 
 
 


--===============0059035973886820168==--

From portal-commits at lists.jboss.org Wed Feb  6 18:47:22 2008
Content-Type: multipart/mixed; boundary="===============3202538653446116753=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9816 - in
 modules/portlet/trunk/test/src:
 main/java/org/jboss/portal/portlet/test/controller and 2 other directories.
Date: Wed, 06 Feb 2008 18:47:22 -0500
Message-ID: 

--===============3202538653446116753==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-06 18:47:22 -0500 (Wed, 06 Feb 2008)
New Revision: 9816

Added:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/ControllerFilter.java
Modified:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/U=
RLParameterConstants.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/c=
ontroller/AbstractPortletControllerContext.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/c=
ontroller/PortletURLRenderer.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/Page.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/PagePortletControllerContext.java
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/=
web.xml
Log:
make the controller as a filter as it is more powerful that way

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/URLParameterConstants.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
URLParameterConstants.java	2008-02-06 22:58:00 UTC (rev 9815)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
URLParameterConstants.java	2008-02-06 23:47:22 UTC (rev 9816)
@@ -39,6 +39,9 @@
     */
    public static final String LIFECYCLE_TYPE =3D "type";
 =

+   /** The window id. */
+   public static final String WINDOW_ID =3D "windowid";
+
    /** The portlet mode. */
    public static final String MODE =3D "mode";
 =


Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/controller/AbstractPortletControllerContext.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
controller/AbstractPortletControllerContext.java	2008-02-06 22:58:00 UTC (r=
ev 9815)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
controller/AbstractPortletControllerContext.java	2008-02-06 23:47:22 UTC (r=
ev 9816)
@@ -30,7 +30,6 @@
 import org.jboss.portal.common.util.MediaType;
 import org.jboss.portal.common.util.ParameterMap;
 import org.jboss.portal.common.util.Tools;
-import org.jboss.portal.portlet.ContainerURL;
 import org.jboss.portal.portlet.ParametersStateString;
 import org.jboss.portal.portlet.Portlet;
 import org.jboss.portal.portlet.PortletInvokerException;
@@ -61,7 +60,6 @@
 import org.jboss.portal.portlet.invocation.ResourceInvocation;
 import org.jboss.portal.portlet.invocation.response.PortletInvocationRespo=
nse;
 import org.jboss.portal.portlet.spi.PortletInvocationContext;
-import org.jboss.portal.portlet.test.StringCodec;
 import static org.jboss.portal.portlet.test.URLParameterConstants.*;
 import org.jboss.portal.web.Body;
 import org.jboss.portal.web.IllegalRequestException;
@@ -120,13 +118,12 @@
       // The request decoded if not null
       ControllerRequest request =3D null;
 =

+      // Get the window id
+      String windowId =3D req.getParameter(WINDOW_ID);
+
       // Process
-      String pathInfo =3D req.getPathInfo();
-      if (pathInfo !=3D null && pathInfo.startsWith("/") && pathInfo.lengt=
h() > 1)
+      if (windowId !=3D null)
       {
-         // Get the target portlet
-         String targetId =3D StringCodec.decode(pathInfo.substring(1));
-
          // Helper
          WebRequest ri =3D new WebRequest(req);
 =

@@ -186,7 +183,7 @@
                case FULL:
                   request =3D new FullScopedCacheablePortletResourceReques=
t(
                      this,
-                     targetId,
+                     windowId,
                      resourceId,
                      resourceState,
                      formParameters);
@@ -194,7 +191,7 @@
                case PORTLET:
                   request =3D new PortletScopedPortletResourceRequest(
                      this,
-                     targetId,
+                     windowId,
                      resourceId,
                      resourceState,
                      formParameters,
@@ -203,7 +200,7 @@
                case PAGE:
                   request =3D new PageScopedFullPortletResourceRequest(
                      this,
-                     targetId,
+                     windowId,
                      resourceId,
                      resourceState,
                      formParameters,
@@ -228,7 +225,7 @@
                //
                request =3D new PortletActionRequest(
                   this,
-                  targetId,
+                  windowId,
                   interactionState,
                   formParameters,
                   windowNavigationalState,
@@ -241,7 +238,7 @@
                //
                request =3D new PortletRenderRequest(
                   this,
-                  targetId,
+                  windowId,
                   windowNavigationalState,
                   publicNavigationalStateChanges,
                   pageState);

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/controller/PortletURLRenderer.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
controller/PortletURLRenderer.java	2008-02-06 22:58:00 UTC (rev 9815)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
controller/PortletURLRenderer.java	2008-02-06 23:47:22 UTC (rev 9816)
@@ -91,13 +91,20 @@
       buffer.append(Integer.toString(clientReq.getServerPort()));
       buffer.append(clientReq.getContextPath());
       buffer.append(clientReq.getServletPath());
-      buffer.append('/');
-      buffer.append(StringCodec.encode(windowId));
 =

       //
+      if (clientReq.getPathInfo() !=3D null)
+      {
+         buffer.append(clientReq.getPathInfo());
+      }
+
+      //
       Map parameters =3D new HashMap();
 =

       //
+      parameters.put(WINDOW_ID, windowId);
+
+      //
       String type;
       if (containerURL instanceof ActionURL)
       {

Copied: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/t=
est/jsp/ControllerFilter.java (from rev 9815, modules/portlet/trunk/test/sr=
c/main/java/org/jboss/portal/portlet/test/jsp/ControllerServlet.java)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/ControllerFilter.java	                        (rev 0)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/ControllerFilter.java	2008-02-06 23:47:22 UTC (rev 9816)
@@ -0,0 +1,274 @@
+/*************************************************************************=
*****
+ * 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.test.jsp.response.Chunk;
+import org.jboss.portal.portlet.test.jsp.response.BytesChunk;
+import org.jboss.portal.portlet.test.jsp.response.CharsChunk;
+import org.jboss.portal.portlet.test.jsp.response.PortletChunk;
+import org.jboss.portal.portlet.test.jsp.response.BufferingResponse;
+import org.jboss.portal.portlet.test.jsp.response.ResponseBuffer;
+import org.jboss.portal.portlet.PortletInvoker;
+import org.jboss.portal.portlet.PortletInvokerException;
+import org.jboss.portal.portlet.invocation.response.PortletInvocationRespo=
nse;
+import org.jboss.portal.portlet.invocation.response.FragmentResponse;
+import org.jboss.portal.portlet.controller.PortletController;
+import org.jboss.portal.portlet.controller.response.ControllerResponse;
+import org.jboss.portal.portlet.controller.response.PageUpdateResponse;
+import org.jboss.portal.portlet.controller.response.ResourceResponse;
+import org.jboss.portal.portlet.controller.state.PageNavigationalState;
+import org.jboss.portal.common.io.IOTools;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.ServletException;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.Filter;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.FilterChain;
+import javax.servlet.ServletContext;
+import java.io.IOException;
+import java.io.Writer;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.util.Map;
+
+/**
+ * @author Julien Viet
+ * @version $Revision: 630 $
+ */
+public class ControllerFilter implements Filter
+{
+
+   /** . */
+   private FilterConfig config;
+
+   private ServletContext getServletContext()
+   {
+      return config.getServletContext();
+   }
+
+   public void init(FilterConfig config) throws ServletException
+   {
+      this.config =3D config;
+   }
+
+   public void doFilter(ServletRequest req, ServletResponse resp, FilterCh=
ain chain) throws IOException, ServletException
+   {
+      doFilter((HttpServletRequest)req, (HttpServletResponse)resp, chain);
+   }
+
+   public void doFilter(HttpServletRequest req, HttpServletResponse resp, =
FilterChain chain) throws IOException, ServletException
+   {
+      BufferingResponse bufferingResponse =3D new BufferingResponse(resp);
+
+      //
+      chain.doFilter(req, bufferingResponse);
+
+      //
+      ResponseBuffer buffer =3D bufferingResponse.getBuffer();
+      buffer.close();
+
+      //
+      try
+      {
+         service(req, resp, buffer);
+      }
+      catch (ClassNotFoundException e)
+      {
+         throw new ServletException(e);
+      }
+   }
+
+   public void destroy()
+   {
+      this.config =3D null;
+   }
+
+   protected void service(HttpServletRequest req, HttpServletResponse resp=
, ResponseBuffer buffer) throws ServletException, IOException, ClassNotFoun=
dException
+   {
+      PortletInvoker invoker =3D (PortletInvoker)getServletContext().getAt=
tribute("ConsumerPortletInvoker");
+
+      //
+      PagePortletControllerContext context =3D new PagePortletControllerCo=
ntext(
+         req,
+         resp,
+         getServletContext(),
+         invoker,
+         buffer);
+
+      //
+      PageNavigationalState pageState =3D null;
+      if (context.getRequest() !=3D null)
+      {
+         ControllerResponse controllerResponse;
+         try
+         {
+            controllerResponse =3D new PortletController().process(context=
.getRequest());
+         }
+         catch (PortletInvokerException e)
+         {
+            throw new ServletException(e);
+         }
+
+         //
+         if (controllerResponse instanceof PageUpdateResponse)
+         {
+            PageUpdateResponse pageUpdate =3D (PageUpdateResponse)controll=
erResponse;
+            pageState =3D pageUpdate.getPageState();
+         }
+         else if (controllerResponse instanceof ResourceResponse)
+         {
+            ResourceResponse resourceResponse =3D (ResourceResponse)contro=
llerResponse;
+            PortletInvocationResponse pir =3D resourceResponse.response;
+
+            //
+            if (pir instanceof FragmentResponse)
+            {
+               FragmentResponse fragment =3D (FragmentResponse)pir;
+               =

+               //
+               if (fragment.getType() =3D=3D FragmentResponse.TYPE_EMPTY)
+               {
+                  resp.setStatus(HttpServletResponse.SC_NO_CONTENT);
+               }
+               else
+               {
+                  String contentType =3D fragment.getContentType();
+                  if (contentType !=3D null)
+                  {
+                     resp.setContentType(contentType);
+                  }
+
+                  //
+                  if (fragment.getType() =3D=3D FragmentResponse.TYPE_BYTE=
S)
+                  {
+                     ServletOutputStream out =3D null;
+                     try
+                     {
+                        out =3D resp.getOutputStream();
+                        out.write(fragment.getBytes().toByteArray());
+                     }
+                     finally
+                     {
+                        IOTools.safeClose(out);
+                     }
+                  }
+                  else
+                  {
+                     Writer writer =3D null;
+                     try
+                     {
+                        writer =3D resp.getWriter();
+                        writer.write(fragment.getChars().toString());
+                     }
+                     finally
+                     {
+                        writer.close();
+                     }
+                  }
+               }
+            }
+            else
+            {
+               // todo
+            }
+         }
+         else
+         {
+            // todo
+         }
+      }
+
+      //
+      Page page =3D context.getPage();
+
+      //
+      Map responses =3D page.render(con=
text, pageState);
+
+      //
+      OutputStream out =3D resp.getOutputStream();
+      OutputStreamWriter writer =3D new OutputStreamWriter(out);
+
+      //
+      int count =3D 0;
+      for (Chunk chunk : page.getChunks())
+      {
+         if (chunk instanceof BytesChunk)
+         {
+            BytesChunk bytesChunk =3D (BytesChunk)chunk;
+            out.write(bytesChunk.getBytes());
+            out.flush();
+         }
+         else if (chunk instanceof CharsChunk)
+         {
+            CharsChunk bytesChunk =3D (CharsChunk)chunk;
+            writer.write(bytesChunk.getChars());
+            writer.flush();
+         }
+         else if (chunk instanceof PortletChunk)
+         {
+            PortletChunk portletChunk =3D (PortletChunk)chunk;
+            String windowId =3D "" + count++;
+
+            PortletInvocationResponse response =3D responses.get(windowId);
+            if (response !=3D null)
+            {
+               if (response instanceof FragmentResponse)
+               {
+                  FragmentResponse fragment =3D (FragmentResponse)response;
+                  if (fragment.getType() !=3D FragmentResponse.TYPE_EMPTY)
+                  {
+                     String frag;
+                     if (fragment.getType() =3D=3D FragmentResponse.TYPE_B=
YTES)
+                     {
+                        frag =3D fragment.getBytes().toString();
+                     }
+                     else
+                     {
+                        frag =3D fragment.getChars().toString();
+                     }
+
+                     //
+                     writer.write(frag);
+                     writer.flush();
+                  }
+               }
+               else
+               {
+                  writer.write(response.getClass().getSimpleName() + "[" +=
 portletChunk.getPortletName() + "," + portletChunk.getApplicationName() + =
"]");
+                  writer.flush();
+               }
+            }
+            else
+            {
+               writer.write("Empty[" + portletChunk.getPortletName() + ","=
 + portletChunk.getApplicationName() + "]");
+               writer.flush();
+            }
+         }
+      }
+      out.close();
+   }
+}

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/Page.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/Page.java	2008-02-06 22:58:00 UTC (rev 9815)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/Page.java	2008-02-06 23:47:22 UTC (rev 9816)
@@ -26,13 +26,7 @@
 import org.jboss.portal.portlet.controller.PortletControllerContext;
 import org.jboss.portal.portlet.controller.state.PageNavigationalState;
 import org.jboss.portal.portlet.test.jsp.response.Chunk;
-import org.jboss.portal.portlet.test.jsp.response.PortletChunk;
-import org.jboss.portal.portlet.Portlet;
-import org.jboss.portal.portlet.PortletInvokerException;
-import org.jboss.portal.portlet.info.PortletInfo;
 =

-import javax.servlet.ServletException;
-import javax.xml.namespace.QName;
 import java.util.Map;
 import java.util.HashMap;
 import java.util.List;
@@ -45,22 +39,15 @@
 {
 =

    /** . */
-   public static final QName PAGE_ID_NAME =3D new QName("urn:jboss-portlet=
-container", "pageid");
-
-   /** . */
    private Map windows;
 =

    /** . */
    private List chunks;
 =

-   /** . */
-   private final String pageId;
-
-   public Page(List chunks, Map windows, String pag=
eId)
+   public Page(List chunks, Map windows)
    {
       this.chunks =3D chunks;
       this.windows =3D windows;
-      this.pageId =3D pageId;
    }
 =

    public List getChunks()
@@ -78,7 +65,6 @@
       if (pageState =3D=3D null)
       {
          pageState =3D context.getStateControllerContext().createPageState=
();
-         pageState.setPublicNavigationalState(PAGE_ID_NAME, new String[]{p=
ageId});
       }
 =

       //

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/PagePortletControllerContext.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/PagePortletControllerContext.java	2008-02-06 22:58:00 UTC (rev 9815)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/PagePortletControllerContext.java	2008-02-06 23:47:22 UTC (rev 9816)
@@ -33,9 +33,6 @@
 import org.jboss.portal.portlet.info.PortletInfo;
 import org.jboss.portal.portlet.controller.event.EventControllerContext;
 import org.jboss.portal.portlet.controller.impl.event.EventControllerConte=
xtImpl;
-import org.jboss.portal.portlet.controller.request.PortletRequest;
-import org.jboss.portal.portlet.controller.request.PageScopedFullPortletRe=
sourceRequest;
-import org.jboss.portal.portlet.controller.state.PageNavigationalState;
 import org.jboss.portal.portlet.invocation.response.PortletInvocationRespo=
nse;
 import org.jboss.portal.portlet.invocation.PortletInvocation;
 import org.jboss.portal.web.IllegalRequestException;
@@ -44,7 +41,6 @@
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.ServletContext;
 import javax.servlet.ServletException;
-import javax.servlet.RequestDispatcher;
 import java.io.IOException;
 import java.util.Map;
 import java.util.HashMap;
@@ -69,53 +65,12 @@
       HttpServletRequest req,
       HttpServletResponse resp,
       ServletContext servletContext,
-      PortletInvoker invoker)
+      PortletInvoker invoker,
+      ResponseBuffer buffer)
       throws IllegalRequestException, IOException, ClassNotFoundException,=
 ServletException
    {
       super(req, resp, servletContext);
 =

-
-      //
-      PageNavigationalState pageState =3D null;
-      if (getRequest() instanceof PortletRequest)
-      {
-         PortletRequest request =3D (PortletRequest)getRequest();
-         pageState =3D request.getPageState();
-      }
-      else if (getRequest() instanceof PageScopedFullPortletResourceReques=
t)
-      {
-         PageScopedFullPortletResourceRequest request =3D (PageScopedFullP=
ortletResourceRequest)getRequest();
-         pageState =3D request.getPageState();
-      }
-
-      //
-      String pageId =3D null;
-      if (pageState !=3D null)
-      {
-         String[] values =3D pageState.getPublicNavigationalState(Page.PAG=
E_ID_NAME);
-         if (values !=3D null && values.length > 0)
-         {
-            pageId =3D values[0];
-         }
-      }
-      if (pageId =3D=3D null)
-      {
-         pageId =3D "/index.jsp";
-      }
-
-      //
-      RequestDispatcher dispatcher =3D req.getRequestDispatcher(pageId);
-
-      //
-      BufferingResponse bufferingResponse =3D new BufferingResponse(resp);
-
-      //
-      dispatcher.include(req, bufferingResponse);
-
-      //
-      ResponseBuffer buffer =3D bufferingResponse.getBuffer();
-      buffer.close();
-
       // Collect portlets to create the page
       int counter =3D 0;
       Map windows =3D new HashMap();
@@ -150,7 +105,7 @@
       }
 =

       //
-      this.page =3D new Page(buffer.getChunks(), windows, pageId);
+      this.page =3D new Page(buffer.getChunks(), windows);
       this.invoker =3D invoker;
       this.eventControllerContext =3D new EventControllerContextImpl(invok=
er);
    }

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/W=
EB-INF/web.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF=
/web.xml	2008-02-06 22:58:00 UTC (rev 9815)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF=
/web.xml	2008-02-06 23:47:22 UTC (rev 9816)
@@ -26,6 +26,14 @@
    "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
    "http://java.sun.com/dtd/web-app_2_3.dtd">
 
+   
+      ControllerFilter
+      org.jboss.portal.portlet.test.jsp.ControllerFilter
+   
+   
+      ControllerFilter
+      /*
+   
    
       org.jboss.portal.common.mc.bootstrap.WebBootstrap
    
@@ -38,16 +46,8 @@
       PortalServlet
       org.jboss.portal.simple.SimplePortalServlet
    
-   
-      ControllerServlet
-      org.jboss.portal.portlet.test.jsp.ControllerServlet
-   
    
       PortalServlet
-      /
+      /simple
    
-   
-      ControllerServlet
-      /jsp/*
-   
 


--===============3202538653446116753==--

From portal-commits at lists.jboss.org Wed Feb  6 18:48:20 2008
Content-Type: multipart/mixed; boundary="===============4554360991728347194=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9817 -
 modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF.
Date: Wed, 06 Feb 2008 18:48:20 -0500
Message-ID: 

--===============4554360991728347194==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-06 18:48:20 -0500 (Wed, 06 Feb 2008)
New Revision: 9817

Modified:
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/=
web.xml
Log:
fitler only jsps

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/W=
EB-INF/web.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF=
/web.xml	2008-02-06 23:47:22 UTC (rev 9816)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF=
/web.xml	2008-02-06 23:48:20 UTC (rev 9817)
@@ -32,7 +32,7 @@
    
    
       ControllerFilter
-      /*
+      /*.jsp
    
    
       org.jboss.portal.common.mc.bootstrap.WebBootstrap


--===============4554360991728347194==--

From portal-commits at lists.jboss.org Wed Feb  6 18:49:49 2008
Content-Type: multipart/mixed; boundary="===============6821031568687281188=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9818 -
 modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF.
Date: Wed, 06 Feb 2008 18:49:49 -0500
Message-ID: 

--===============6821031568687281188==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-06 18:49:49 -0500 (Wed, 06 Feb 2008)
New Revision: 9818

Modified:
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/=
web.xml
Log:
crap I suck at this time of the day

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/W=
EB-INF/web.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF=
/web.xml	2008-02-06 23:48:20 UTC (rev 9817)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF=
/web.xml	2008-02-06 23:49:49 UTC (rev 9818)
@@ -32,7 +32,7 @@
    
    
       ControllerFilter
-      /*.jsp
+      *.jsp
    
    
       org.jboss.portal.common.mc.bootstrap.WebBootstrap


--===============6821031568687281188==--

From portal-commits at lists.jboss.org Wed Feb  6 19:07:32 2008
Content-Type: multipart/mixed; boundary="===============8378729095755235264=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9819 -
 modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp.
Date: Wed, 06 Feb 2008 19:07:31 -0500
Message-ID: 

--===============8378729095755235264==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-06 19:07:31 -0500 (Wed, 06 Feb 2008)
New Revision: 9819

Removed:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/ControllerServlet.java
Log:
removed what idea should have removed

Deleted: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/=
test/jsp/ControllerServlet.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/ControllerServlet.java	2008-02-06 23:49:49 UTC (rev 9818)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/ControllerServlet.java	2008-02-07 00:07:31 UTC (rev 9819)
@@ -1,221 +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.test.jsp.response.Chunk;
-import org.jboss.portal.portlet.test.jsp.response.BytesChunk;
-import org.jboss.portal.portlet.test.jsp.response.CharsChunk;
-import org.jboss.portal.portlet.test.jsp.response.PortletChunk;
-import org.jboss.portal.portlet.PortletInvoker;
-import org.jboss.portal.portlet.PortletInvokerException;
-import org.jboss.portal.portlet.invocation.response.PortletInvocationRespo=
nse;
-import org.jboss.portal.portlet.invocation.response.FragmentResponse;
-import org.jboss.portal.portlet.controller.PortletController;
-import org.jboss.portal.portlet.controller.response.ControllerResponse;
-import org.jboss.portal.portlet.controller.response.PageUpdateResponse;
-import org.jboss.portal.portlet.controller.response.ResourceResponse;
-import org.jboss.portal.portlet.controller.state.PageNavigationalState;
-import org.jboss.portal.common.io.IOTools;
-
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.ServletException;
-import javax.servlet.ServletOutputStream;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.Writer;
-import java.util.Map;
-
-/**
- * @author Julien Viet
- * @version $Revision: 630 $
- */
-public class ControllerServlet extends HttpServlet
-{
-
-   protected void service(HttpServletRequest req, HttpServletResponse resp=
) throws ServletException, IOException
-   {
-      try
-      {
-         _service(req, resp);
-      }
-      catch (ClassNotFoundException e)
-      {
-         throw new ServletException(e);
-      }
-   }
-
-   protected void _service(HttpServletRequest req, HttpServletResponse res=
p) throws ServletException, IOException, ClassNotFoundException
-   {
-      PortletInvoker invoker =3D (PortletInvoker)getServletContext().getAt=
tribute("ConsumerPortletInvoker");
-
-      //
-      PagePortletControllerContext context =3D new PagePortletControllerCo=
ntext(req, resp, getServletContext(), invoker);
-
-      //
-      PageNavigationalState pageState =3D null;
-      if (context.getRequest() !=3D null)
-      {
-         ControllerResponse controllerResponse;
-         try
-         {
-            controllerResponse =3D new PortletController().process(context=
.getRequest());
-         }
-         catch (PortletInvokerException e)
-         {
-            throw new ServletException(e);
-         }
-
-         //
-         if (controllerResponse instanceof PageUpdateResponse)
-         {
-            PageUpdateResponse pageUpdate =3D (PageUpdateResponse)controll=
erResponse;
-            pageState =3D pageUpdate.getPageState();
-         }
-         else if (controllerResponse instanceof ResourceResponse)
-         {
-            ResourceResponse resourceResponse =3D (ResourceResponse)contro=
llerResponse;
-            PortletInvocationResponse pir =3D resourceResponse.response;
-
-            //
-            if (pir instanceof FragmentResponse)
-            {
-               FragmentResponse fragment =3D (FragmentResponse)pir;
-               =

-               //
-               if (fragment.getType() =3D=3D FragmentResponse.TYPE_EMPTY)
-               {
-                  resp.setStatus(HttpServletResponse.SC_NO_CONTENT);
-               }
-               else
-               {
-                  String contentType =3D fragment.getContentType();
-                  if (contentType !=3D null)
-                  {
-                     resp.setContentType(contentType);
-                  }
-
-                  //
-                  if (fragment.getType() =3D=3D FragmentResponse.TYPE_BYTE=
S)
-                  {
-                     ServletOutputStream out =3D null;
-                     try
-                     {
-                        out =3D resp.getOutputStream();
-                        out.write(fragment.getBytes().toByteArray());
-                     }
-                     finally
-                     {
-                        IOTools.safeClose(out);
-                     }
-                  }
-                  else
-                  {
-                     Writer writer =3D null;
-                     try
-                     {
-                        writer =3D resp.getWriter();
-                        writer.write(fragment.getChars().toString());
-                     }
-                     finally
-                     {
-                        writer.close();
-                     }
-                  }
-               }
-            }
-            else
-            {
-               // todo
-            }
-         }
-         else
-         {
-            // todo
-         }
-      }
-
-      //
-      Page page =3D context.getPage();
-
-      //
-      Map responses =3D page.render(con=
text, pageState);
-
-      //
-      resp.setContentType("text/html");
-      PrintWriter writer =3D resp.getWriter();
-      int count =3D 0;
-      for (Chunk chunk : page.getChunks())
-      {
-         if (chunk instanceof BytesChunk)
-         {
-            BytesChunk bytesChunk =3D (BytesChunk)chunk;
-            writer.write(new String(bytesChunk.getBytes()));
-         }
-         else if (chunk instanceof CharsChunk)
-         {
-            CharsChunk bytesChunk =3D (CharsChunk)chunk;
-            writer.write(bytesChunk.getChars());
-         }
-         else if (chunk instanceof PortletChunk)
-         {
-            PortletChunk portletChunk =3D (PortletChunk)chunk;
-            String windowId =3D "" + count++;
-
-            PortletInvocationResponse response =3D responses.get(windowId);
-            if (response !=3D null)
-            {
-               if (response instanceof FragmentResponse)
-               {
-                  FragmentResponse fragment =3D (FragmentResponse)response;
-                  if (fragment.getType() !=3D FragmentResponse.TYPE_EMPTY)
-                  {
-                     String frag;
-                     if (fragment.getType() =3D=3D FragmentResponse.TYPE_B=
YTES)
-                     {
-                        frag =3D fragment.getBytes().toString();
-                     }
-                     else
-                     {
-                        frag =3D fragment.getChars().toString();
-                     }
-
-                     //
-                     writer.write(frag);
-                  }
-               }
-               else
-               {
-                  writer.write(response.getClass().getSimpleName() + "[" +=
 portletChunk.getPortletName() + "," + portletChunk.getApplicationName() + =
"]");
-               }
-            }
-            else
-            {
-               writer.write("Empty[" + portletChunk.getPortletName() + ","=
 + portletChunk.getApplicationName() + "]");
-            }
-         }
-      }
-      writer.close();
-   }
-}


--===============8378729095755235264==--

From portal-commits at lists.jboss.org Wed Feb  6 20:08:47 2008
Content-Type: multipart/mixed; boundary="===============7239968275378333018=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9820 -
 docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
Date: Wed, 06 Feb 2008 20:08:47 -0500
Message-ID: 

--===============7239968275378333018==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mmcallis
Date: 2008-02-06 20:08:46 -0500 (Wed, 06 Feb 2008)
New Revision: 9820

Modified:
   docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/configur=
ation.xml
   docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/migratio=
n.xml
Log:
revising 4.1. Manual Upgrade and 4.1.1. Themes
minor corrections to 3.6. Disabling Dynamic
Proxy Un-wrapping


Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/c=
onfiguration.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/configu=
ration.xml	2008-02-07 00:07:31 UTC (rev 9819)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/configu=
ration.xml	2008-02-07 01:08:46 UTC (rev 9820)
@@ -262,10 +262,10 @@
    
    
       Disabling Dynamic Proxy Un-wrapping
-      JBoss Portal uses the JBoss Microkernel for the service infras=
tructure. The JBoss Microkernel provides injection of services into other s=
ervices, otherwise known as wiring. Due to the Microkernel being JMX based,=
 tt is only possible to inject dynamic proxies that talk to the MBeanServer=
. The overhead at runtime is minimal since the Microkernel implementation i=
s highly optimized; however, when it is used with Java 5, a noticeable bott=
leneck appears due to the fact that the implementation of the JMX API class=
es, javax.management.*, provided by the Java Platform,=
 performs synchronization. This does not occur under JDK 1.4 since those cl=
asses are implemented by JBoss MX.
+      JBoss Portal uses the JBoss Microkernel for the service infras=
tructure. The JBoss Microkernel provides injection of services into other s=
ervices, otherwise known as wiring. Due to the Microkernel being JMX based,=
 it is only possible to inject dynamic proxies that talk to the MBeanServer=
. The overhead at runtime is minimal since the Microkernel implementation i=
s highly optimized; however, when it is used with Java 5, a noticeable bott=
leneck occurs due to the fact that the implementation of the JMX API classe=
s, javax.management.*, provided by the Java Platform, =
perform synchronization. This does not occur under JDK 1.4, since those cla=
sses are implemented by JBoss MX.
  	
          
-		 JBoss Portal services use a special kind of Model MBean called JBossServiceModelMBean, which allows the un-wrapping of inject=
ed dynamic proxies, and replaces them with real plain old java object (POJO=
) services. This allows the removal of the bottleneck with Java 5, and also=
 provides a performance boost on JDK 1.4. By default this feature is enable=
d, but it is possible to disable. To do this on Linux systems, change into =
the $JBOSS_HOME/bin/ directory and run the following c=
ommand:
+		 JBoss Portal services use a special kind of Model MBean called JBossServiceModelMBean, which allows the un-wrapping of inject=
ed dynamic proxies, and replaces them with plain old java object (POJO) ser=
vices. This removes the bottleneck when using Java 5, and also provides a p=
erformance boost on JDK 1.4. By default this feature is enabled, but it is =
possible to disable. To do this on Linux systems, change into the $JBOSS_HOME/bin/ directory and run the following command:
 	 
 	 
 

Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/m=
igration.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/migrati=
on.xml	2008-02-07 00:07:31 UTC (rev 9819)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/migrati=
on.xml	2008-02-07 01:08:46 UTC (rev 9820)
@@ -11,52 +11,63 @@
          boleslaw dot dawidowicz at redhat dot com
       
    
-   Upgrading 2.4 - 2.6
+   Upgrading JBoss Portal 2.4 to 2.6
+   
    
-      Before performing any instructions or operations mentioned below rem=
ember to backup your database content and
-      the whole application server directory!
+	   
+		Before performing any instructions or operations in this chapter, back u=
p your database content and
+		the entire JBoss EAP or JBoss AS directory!
+	   
    
+   
    
-      Manual upgrade
+      Manual Upgrade
       
-         Although database schema remains the same in JBoss Portal 2.6 the=
re are several differences that prevent from simple deployment
-         of newest portal version using JBoss Portal 2.4 database. In this=
 chapter we will list major ones and give
-         instructions on how to manually update proper data.
+         Although the database schema remains the same in JBoss Portal 2.6=
, there are several differences that prevent simply deploying the latest ve=
rsion of JBoss Portal, when using a database created for JBoss Portal 2.4. =
This chapter describes updating a JBoss Portal 2.4 MySQL database for use w=
ith JBoss Portal 2.6.
       
       
-         Upgrading procedure can be quite straightforward:
-         
+	      The upgrade procedure can be straightforward:
+      
+      
+         
             
-               Remove $JBOSS_HOME/server/default/d=
eploy/jboss-portal.sar file.
+		    
+			If you are using the JBoss Portal binary, remove the $JBOSS_H=
OME/server/default/deploy/jboss-portal.sar/ directory. If JBoss =
Portal was built from source, remove the $JBOSS_HOME/server/defau=
lt/deploy/jboss-portal.sar file.
+		    
             
             
             
-               Update data in portal database like described in following =
sections of this chapter
+		    
+			    Update the data in the JBoss Portal database, as described in .
+		    
             
             
-               Deploy JBoss Portal 2.6
+		    
+			    Deploy JBoss Portal 2.6.
+		    
             
-         
+         
       
       
-         Theme
+         Themes
+	 
+		 Themes in JBoss Portal 2.6 have changed since the Portal pages now cont=
ain additional areas, such as the Login, Admin<=
/guiicon>, and Dashboard links, on the top right-hand co=
rner:
+	 
+	 
          
             
                
             
          
+ 	
          
-            Themes in 2.6 version changed as now they
-            contain additional areas - the best example is upper right cor=
ner where links like "Login", "Admin", "My Dashboard"
-            are visable. If you use default theme like "renaissance" that =
is present in 2.6, you shouldn't need to do anything. To update your custom=
 themes please
-            refer to those bundled with portal as an example.
-         
-         If you stay with old theme files you may find JBP 2.6 unusa=
ble to the point that you may not even be able to log in
+		 If you use a default theme that exists in JBoss Portal 2.6, such as ren=
aissance, no configuration should be necessary. Using old themes from JBoss=
 Portal 2.4 may make JBoss Portal 2.6 unusable, for example, not being able=
 to log in. To update custom themes, please refer to those bundled with JBo=
ss Portal as an example.
+    	
       
-      
-         Database
+      
+         Updating the Database
          All things described in this section can be done using Admi=
nPortlet. Treat this directions more as guideline
          if you need to automate migration for big portal deployment.
          


--===============7239968275378333018==--

From portal-commits at lists.jboss.org Wed Feb  6 20:28:49 2008
Content-Type: multipart/mixed; boundary="===============5184982454702107037=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9821 - in
 modules/portlet/trunk/test/src:
 main/java/org/jboss/portal/portlet/test/jsp/response and 4 other directories.
Date: Wed, 06 Feb 2008 20:28:49 -0500
Message-ID: 

--===============5184982454702107037==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-06 20:28:49 -0500 (Wed, 06 Feb 2008)
New Revision: 9821

Added:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/response/portlet/
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/response/portlet/PortletChunk.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/response/portlet/PortletMarkupChunk.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/response/portlet/PortletTitleChunk.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/response/portlet/PortletURLChunk.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/MarkupTag.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/TitleTag.java
Removed:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/response/PortletChunk.java
Modified:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/ControllerFilter.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/PagePortletControllerContext.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/PortletTag.java
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/=
portal.tld
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/index.jsp
Log:
improve taglib with support of markup/title

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/ControllerFilter.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/ControllerFilter.java	2008-02-07 01:08:46 UTC (rev 9820)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/ControllerFilter.java	2008-02-07 01:28:49 UTC (rev 9821)
@@ -25,7 +25,9 @@
 import org.jboss.portal.portlet.test.jsp.response.Chunk;
 import org.jboss.portal.portlet.test.jsp.response.BytesChunk;
 import org.jboss.portal.portlet.test.jsp.response.CharsChunk;
-import org.jboss.portal.portlet.test.jsp.response.PortletChunk;
+import org.jboss.portal.portlet.test.jsp.response.portlet.PortletChunk;
+import org.jboss.portal.portlet.test.jsp.response.portlet.PortletMarkupChu=
nk;
+import org.jboss.portal.portlet.test.jsp.response.portlet.PortletTitleChun=
k;
 import org.jboss.portal.portlet.test.jsp.response.BufferingResponse;
 import org.jboss.portal.portlet.test.jsp.response.ResponseBuffer;
 import org.jboss.portal.portlet.PortletInvoker;
@@ -214,6 +216,8 @@
 =

       //
       int count =3D 0;
+      PortletChunk portletChunk =3D null;
+      PortletInvocationResponse portletResponse =3D null;
       for (Chunk chunk : page.getChunks())
       {
          if (chunk instanceof BytesChunk)
@@ -230,15 +234,29 @@
          }
          else if (chunk instanceof PortletChunk)
          {
-            PortletChunk portletChunk =3D (PortletChunk)chunk;
+            portletChunk =3D (PortletChunk)chunk;
             String windowId =3D "" + count++;
-
-            PortletInvocationResponse response =3D responses.get(windowId);
-            if (response !=3D null)
+            portletResponse =3D responses.get(windowId);
+         }
+         else if (chunk instanceof PortletTitleChunk)
+         {
+            if (portletResponse !=3D null)
             {
-               if (response instanceof FragmentResponse)
+               if (portletResponse instanceof FragmentResponse)
                {
-                  FragmentResponse fragment =3D (FragmentResponse)response;
+                  FragmentResponse fragment =3D (FragmentResponse)portletR=
esponse;
+                  writer.write(fragment.getTitle());
+                  writer.flush();
+               }
+            }
+         }
+         else if (chunk instanceof PortletMarkupChunk)
+         {
+            if (portletResponse !=3D null)
+            {
+               if (portletResponse instanceof FragmentResponse)
+               {
+                  FragmentResponse fragment =3D (FragmentResponse)portletR=
esponse;
                   if (fragment.getType() !=3D FragmentResponse.TYPE_EMPTY)
                   {
                      String frag;
@@ -258,7 +276,7 @@
                }
                else
                {
-                  writer.write(response.getClass().getSimpleName() + "[" +=
 portletChunk.getPortletName() + "," + portletChunk.getApplicationName() + =
"]");
+                  writer.write(portletResponse.getClass().getSimpleName() =
+ "[" + portletChunk.getPortletName() + "," + portletChunk.getApplicationNa=
me() + "]");
                   writer.flush();
                }
             }

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/PagePortletControllerContext.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/PagePortletControllerContext.java	2008-02-07 01:08:46 UTC (rev 9820)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/PagePortletControllerContext.java	2008-02-07 01:28:49 UTC (rev 9821)
@@ -24,8 +24,7 @@
 =

 import org.jboss.portal.portlet.test.controller.AbstractPortletControllerC=
ontext;
 import org.jboss.portal.portlet.test.jsp.response.Chunk;
-import org.jboss.portal.portlet.test.jsp.response.PortletChunk;
-import org.jboss.portal.portlet.test.jsp.response.BufferingResponse;
+import org.jboss.portal.portlet.test.jsp.response.portlet.PortletChunk;
 import org.jboss.portal.portlet.test.jsp.response.ResponseBuffer;
 import org.jboss.portal.portlet.Portlet;
 import org.jboss.portal.portlet.PortletInvokerException;

Deleted: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/=
test/jsp/response/PortletChunk.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/response/PortletChunk.java	2008-02-07 01:08:46 UTC (rev 9820)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/response/PortletChunk.java	2008-02-07 01:28:49 UTC (rev 9821)
@@ -1,53 +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.response;
-
-/**
- * @author Julien Viet
- * @version $Revision: 630 $
- */
-public class PortletChunk extends Chunk
-{
-
-   /** . */
-   private final String portletName;
-
-   /** . */
-   private final String applicationName;
-
-   public PortletChunk(String portletName, String applicationName)
-   {
-      this.portletName =3D portletName;
-      this.applicationName =3D applicationName;
-   }
-
-   public String getPortletName()
-   {
-      return portletName;
-   }
-
-   public String getApplicationName()
-   {
-      return applicationName;
-   }
-}

Added: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/te=
st/jsp/response/portlet/PortletChunk.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/response/portlet/PortletChunk.java	                        (rev 0)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/response/portlet/PortletChunk.java	2008-02-07 01:28:49 UTC (rev 9821)
@@ -0,0 +1,86 @@
+/*************************************************************************=
*****
+ * 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.response.portlet;
+
+import org.jboss.portal.Mode;
+import org.jboss.portal.WindowState;
+import org.jboss.portal.portlet.test.jsp.response.Chunk;
+
+import java.util.Set;
+
+/**
+ * @author Julien Viet
+ * @version $Revision: 630 $
+ */
+public class PortletChunk extends Chunk
+{
+
+   /** . */
+   private final String portletName;
+
+   /** . */
+   private final String applicationName;
+
+   /** . */
+   private final Mode initialMode;
+
+   /** . */
+   private final Set supportedModes;
+
+   /** . */
+   private final Set supportedWindowStates;
+
+   public PortletChunk(String portletName, String applicationName, Mode in=
itialMode, Set supportedModes, Set supportedWindowStates)
+   {
+      this.portletName =3D portletName;
+      this.applicationName =3D applicationName;
+      this.initialMode =3D initialMode;
+      this.supportedModes =3D supportedModes;
+      this.supportedWindowStates =3D supportedWindowStates;
+   }
+
+   public String getPortletName()
+   {
+      return portletName;
+   }
+
+   public String getApplicationName()
+   {
+      return applicationName;
+   }
+
+   public Mode getInitialMode()
+   {
+      return initialMode;
+   }
+
+   public Set getSupportedModes()
+   {
+      return supportedModes;
+   }
+
+   public Set getSupportedWindowStates()
+   {
+      return supportedWindowStates;
+   }
+}

Added: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/te=
st/jsp/response/portlet/PortletMarkupChunk.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/response/portlet/PortletMarkupChunk.java	                        (rev 0)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/response/portlet/PortletMarkupChunk.java	2008-02-07 01:28:49 UTC (rev 9=
821)
@@ -0,0 +1,33 @@
+/*************************************************************************=
*****
+ * 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.response.portlet;
+
+import org.jboss.portal.portlet.test.jsp.response.Chunk;
+
+/**
+ * @author Julien Viet
+ * @version $Revision: 630 $
+ */
+public class PortletMarkupChunk extends Chunk
+{
+}

Added: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/te=
st/jsp/response/portlet/PortletTitleChunk.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/response/portlet/PortletTitleChunk.java	                        (rev 0)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/response/portlet/PortletTitleChunk.java	2008-02-07 01:28:49 UTC (rev 98=
21)
@@ -0,0 +1,33 @@
+/*************************************************************************=
*****
+ * 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.response.portlet;
+
+import org.jboss.portal.portlet.test.jsp.response.Chunk;
+
+/**
+ * @author Julien Viet
+ * @version $Revision: 630 $
+ */
+public class PortletTitleChunk extends Chunk
+{
+}

Added: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/te=
st/jsp/response/portlet/PortletURLChunk.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/response/portlet/PortletURLChunk.java	                        (rev 0)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/response/portlet/PortletURLChunk.java	2008-02-07 01:28:49 UTC (rev 9821)
@@ -0,0 +1,33 @@
+/*************************************************************************=
*****
+ * 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.response.portlet;
+
+import org.jboss.portal.portlet.test.jsp.response.Chunk;
+
+/**
+ * @author Julien Viet
+ * @version $Revision: 630 $
+ */
+public class PortletURLChunk extends Chunk
+{
+}

Added: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/te=
st/jsp/taglib/MarkupTag.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/MarkupTag.java	                        (rev 0)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/MarkupTag.java	2008-02-07 01:28:49 UTC (rev 9821)
@@ -0,0 +1,47 @@
+/*************************************************************************=
*****
+ * 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.taglib;
+
+import org.jboss.portal.portlet.test.jsp.response.BufferingResponse;
+import org.jboss.portal.portlet.test.jsp.response.portlet.PortletTitleChun=
k;
+import org.jboss.portal.portlet.test.jsp.response.portlet.PortletMarkupChu=
nk;
+
+import javax.servlet.jsp.tagext.SimpleTagSupport;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.PageContext;
+import java.io.IOException;
+
+/**
+ * @author Julien Viet
+ * @version $Revision: 630 $
+ */
+public class MarkupTag extends SimpleTagSupport
+{
+   public void doTag() throws JspException, IOException
+   {
+      PageContext pageCtx =3D (PageContext)getJspContext();
+      pageCtx.getOut().flush();
+      BufferingResponse response =3D (BufferingResponse)pageCtx.getRespons=
e();
+      response.addChunk(new PortletMarkupChunk());
+   }
+}

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/taglib/PortletTag.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortletTag.java	2008-02-07 01:08:46 UTC (rev 9820)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortletTag.java	2008-02-07 01:28:49 UTC (rev 9821)
@@ -23,26 +23,48 @@
 package org.jboss.portal.portlet.test.jsp.taglib;
 =

 import org.jboss.portal.portlet.test.jsp.response.BufferingResponse;
-import org.jboss.portal.portlet.test.jsp.response.PortletChunk;
+import org.jboss.portal.portlet.test.jsp.response.portlet.PortletChunk;
+import org.jboss.portal.Mode;
+import org.jboss.portal.WindowState;
+import org.jboss.portal.common.util.Tools;
 =

 import javax.servlet.jsp.tagext.SimpleTagSupport;
+import javax.servlet.jsp.tagext.BodyTagSupport;
 import javax.servlet.jsp.JspException;
 import javax.servlet.jsp.PageContext;
 import java.io.IOException;
+import java.util.LinkedHashSet;
+import java.util.Set;
+import java.util.Collections;
 =

 /**
  * @author Julien Viet
  * @version $Revision: 630 $
  */
-public class PortletTag extends SimpleTagSupport
+public class PortletTag extends BodyTagSupport
 {
 =

    /** . */
+   private static final Set DEFAULT_MODES =3D Collections.unmodifiab=
leSet(Tools.toSet(Mode.VIEW, Mode.EDIT, Mode.HELP));
+
+   /** . */
+   private static final Set DEFAULT_WINDOW_STATES =3D Collect=
ions.unmodifiableSet(Tools.toSet(WindowState.NORMAL, WindowState.MAXIMIZED,=
 WindowState.MINIMIZED));
+
+   /** . */
    private String name;
 =

    /** . */
    private String applicationName;
 =

+   /** . */
+   private String supportedWindowStateValues;
+
+   /** . */
+   private String supportedModeValues;
+
+   /** . */
+   private String initialModeValue;
+
    public String getName()
    {
       return name;
@@ -63,11 +85,99 @@
       this.applicationName =3D applicationName;
    }
 =

-   public void doTag() throws JspException, IOException
+   public String getSupportedWindowStates()
    {
-      PageContext pageCtx =3D (PageContext)getJspContext();
-      pageCtx.getOut().flush();
-      BufferingResponse response =3D (BufferingResponse)pageCtx.getRespons=
e();
-      response.addChunk(new PortletChunk(name, applicationName));
+      return supportedWindowStateValues;
    }
+
+   public void setSupportedWindowStates(String supportedWindowStates)
+   {
+      this.supportedWindowStateValues =3D supportedWindowStates;
+   }
+
+   public String getSupportedModes()
+   {
+      return supportedModeValues;
+   }
+
+   public void setSupportedModes(String supportedModes)
+   {
+      this.supportedModeValues =3D supportedModes;
+   }
+
+   public String getInitialMode()
+   {
+      return initialModeValue;
+   }
+
+   public void setInitialMode(String initialMode)
+   {
+      this.initialModeValue =3D initialMode;
+   }
+
+   public int doStartTag() throws JspException
+   {
+      Set supportedModes =3D new LinkedHashSet();
+      if (supportedModeValues !=3D null)
+      {
+         for (String supportedModeValue : supportedModeValues.split(","))
+         {
+            Mode mode =3D Mode.create(supportedModeValue.trim());
+            supportedModes.add(mode);
+         }
+      }
+      else
+      {
+         supportedModes =3D DEFAULT_MODES;
+      }
+
+      //
+      Set supportedWindowStates =3D new LinkedHashSet();
+      if (supportedWindowStateValues !=3D null)
+      {
+         for (String supportedWindowStateValue : supportedWindowStateValue=
s.split(","))
+         {
+            WindowState windowState =3D WindowState.create(supportedWindow=
StateValue.trim());
+            supportedWindowStates.add(windowState);
+         }
+      }
+      else
+      {
+         supportedWindowStates =3D DEFAULT_WINDOW_STATES;
+      }
+
+      //
+      Mode initialMode =3D Mode.VIEW;
+      if (initialModeValue !=3D null)
+      {
+         initialMode =3D Mode.create(initialModeValue.trim());
+      }
+
+      //
+      try
+      {
+         pageContext.getOut().flush();
+      }
+      catch (IOException e)
+      {
+         throw new JspException(e);
+      }
+
+      //
+      BufferingResponse response =3D (BufferingResponse)pageContext.getRes=
ponse();
+      response.addChunk(new PortletChunk(
+         name,
+         applicationName,
+         initialMode,
+         supportedModes,
+         supportedWindowStates));
+
+      //
+      return EVAL_BODY_INCLUDE;
+   }
+
+   public int doEndTag() throws JspException
+   {
+      return EVAL_PAGE;
+   }
 }

Added: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/te=
st/jsp/taglib/TitleTag.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/TitleTag.java	                        (rev 0)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/TitleTag.java	2008-02-07 01:28:49 UTC (rev 9821)
@@ -0,0 +1,46 @@
+/*************************************************************************=
*****
+ * 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.taglib;
+
+import org.jboss.portal.portlet.test.jsp.response.BufferingResponse;
+import org.jboss.portal.portlet.test.jsp.response.portlet.PortletTitleChun=
k;
+
+import javax.servlet.jsp.tagext.SimpleTagSupport;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.PageContext;
+import java.io.IOException;
+
+/**
+ * @author Julien Viet
+ * @version $Revision: 630 $
+ */
+public class TitleTag extends SimpleTagSupport
+{
+   public void doTag() throws JspException, IOException
+   {
+      PageContext pageCtx =3D (PageContext)getJspContext();
+      pageCtx.getOut().flush();
+      BufferingResponse response =3D (BufferingResponse)pageCtx.getRespons=
e();
+      response.addChunk(new PortletTitleChunk());
+   }
+}

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/W=
EB-INF/portal.tld
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF=
/portal.tld	2008-02-07 01:08:46 UTC (rev 9820)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF=
/portal.tld	2008-02-07 01:28:49 UTC (rev 9821)
@@ -17,7 +17,7 @@
    
       portlet
       org.jboss.portal.portlet.test.jsp.taglib.PortletTag
-      empty
+      JSP
       
          name
          true
@@ -28,6 +28,30 @@
          true
          java.lang.String
       
+      
+         initialMode
+         java.lang.String
+      
+      
+         supportedModes
+         java.lang.String
+      
+      
+         supportedWindowStates
+         java.lang.String
+      
    
 =

+   
+      markup
+      org.jboss.portal.portlet.test.jsp.taglib.MarkupTag
+      empty
+   
+
+   
+      title
+      org.jboss.portal.portlet.test.jsp.taglib.TitleTag
+      empty
+   
+
 

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/i=
ndex.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/index.j=
sp	2008-02-07 01:08:46 UTC (rev 9820)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/index.j=
sp	2008-02-07 01:28:49 UTC (rev 9821)
@@ -4,19 +4,37 @@
 
 
 
-   ONE
+****************************************************

    
-   TWO
+      applicationName=3D"google-weather-portlet">
+-----------------------------------

+

+-----------------------------------

+      
+-----------------------------------

+   
+****************************************************

    
-   THREE
+      applicationName=3D"google-map-portlet">
+-----------------------------------

+

+-----------------------------------

+      
+-----------------------------------

+   
+****************************************************

    
-   FOUR
+      applicationName=3D"remotecontrol-portlet">
+-----------------------------------

+

+-----------------------------------

+      
+-----------------------------------

+   
+****************************************************

 
 
 


--===============5184982454702107037==--

From portal-commits at lists.jboss.org Wed Feb  6 21:04:14 2008
Content-Type: multipart/mixed; boundary="===============5051961681456671938=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9822 -
 docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
Date: Wed, 06 Feb 2008 21:04:13 -0500
Message-ID: 

--===============5051961681456671938==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mmcallis
Date: 2008-02-06 21:04:13 -0500 (Wed, 06 Feb 2008)
New Revision: 9822

Modified:
   docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/migratio=
n.xml
Log:
revising 4.1.2. Updating the Database


Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/m=
igration.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/migrati=
on.xml	2008-02-07 01:28:49 UTC (rev 9821)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/migrati=
on.xml	2008-02-07 02:04:13 UTC (rev 9822)
@@ -68,23 +68,22 @@
       
       
          Updating the Database
-         All things described in this section can be done using Admi=
nPortlet. Treat this directions more as guideline
-         if you need to automate migration for big portal deployment.
          
-            Database schema wasn't changed between 2.4 and 2.6 releases, b=
ut still content that is kept in it
-            changed slightly in few areas. You can easily update the data =
manually by using tools proper for your
-            RDBMS. If you use MySQL you can use MySQL Query Browser that can
-            be downloaded from MySQL website.
+		 All procedures described in the following sections can performed using =
the AdminPortlet. Treat the directions as guidelines if you need to automat=
e the migration of a large JBoss Portal deployment.
+	 
+	 
+		 Database schema has not changed between the JBoss Portal 2.4 and 2.6 re=
leases, but certain content that is kept in the databases has changed. Data=
 can be updated manually by using the correct tools for your RDBMS. For exa=
mple, if you are using a MySQL database, you can use the MySQL Query Browser.
          
-         
-            Instructions below refer to standard JBoss Portal 2.4 deployme=
nt. If you named core portlets, portlet instances
-            or portlet windows differently you will need to make proper mo=
difications in those steps.
-         
+	 
+		 The following instructions refer to a standard JBoss Portal 2.4 deploym=
ent. If you named core portlets, portlet instances, or portlet windows diff=
erently, you will need to make the appropriate modifications. The following=
 is an example of using the MySQL Query Browser:
+         
+	 
          
             
                
             
          
+ 	
          
             Portlet names
             Names of few core bundled portlets changed. To update th=
em you need to:


--===============5051961681456671938==--

From portal-commits at lists.jboss.org Wed Feb  6 22:54:29 2008
Content-Type: multipart/mixed; boundary="===============3271019994040681384=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9823 -
 docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
Date: Wed, 06 Feb 2008 22:54:29 -0500
Message-ID: 

--===============3271019994040681384==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mmcallis
Date: 2008-02-06 22:54:28 -0500 (Wed, 06 Feb 2008)
New Revision: 9823

Modified:
   docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/migratio=
n.xml
Log:
revising 4.1.2.1. Portlet Names, removing note admonitions,
changing itemized list to orderedlist


Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/m=
igration.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/migrati=
on.xml	2008-02-07 02:04:13 UTC (rev 9822)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/migrati=
on.xml	2008-02-07 03:54:28 UTC (rev 9823)
@@ -85,47 +85,51 @@
          
  	
          
-            Portlet names
-            Names of few core bundled portlets changed. To update th=
em you need to:
+            Portlet Names
             
-               In JBP_INSTANCES table:
-               
-                  Change "local.portal.CMSPorlet" in PORTLET_REF column to
-                     "local./portal-cms.CMSPortlet"
-                  
-                  Change "local.portal.CMSAdminPorlet<=
/emphasis>" in PORTLET_REF column to
-                     "local./portal-cms.CMSAdminPortlet"
-                  
-                  Change "local.portal.ManagementPorle=
t" in PORTLET_REF column to
-                     "local./portal-admin.AdminPortlet"
-                  
-               
-            
-            Instead of editing database you can destroy those instan=
ces in AdminPortlet and recreate them.
+		    Names of certain core bundled portlets have changed. Destroy the fol=
lowing instances and use the AdminPortlet to recreate them, or, edit the JBP_INSTANCES table as follows:
+	    
+	    
+		    
+			    
+				    
+					    Change local.portal.CMSPorlet in the  PORTLET_REF column to local./portal-cms.CMSPortlet=
.
+				    
+			    
+			    
+				    
+					    Change local.portal.CMSAdminPorlet in the PORTLET_REF column to local./portal-cms.CMSAdm=
inPortlet.
+				    
+			    
+			    
+				    
+					    Change local.portal.ManagementPorlet in the =
PORTLET_REF column to local./portal-admin.Ad=
minPortlet.
+				    
+			    
+		    
+	    
             
-               NavigationPortlet from JBP 2.4 is not =
present anymore. Its functionality is now realized by
-               PageCustomizerInterceptor so all refer=
ences to NavigationPortlet should
-               be removed from all portal pages. You can do it either by c=
leaning up database content or by using
-               AdminPortlet in Portal interface. In d=
atabase you should remove:
-               
-                  
-                     Rows containing "local.portal.NavigationPor=
tlet" in
-                     "PORTLET_REF" column in
-                     "JBP_INSTANCES" table.
-                  
-                  
-                     Rows containing "NavigationPortletInstance<=
/emphasis>" in
-                     "INSTANCE_REF" column in
-                     "JBP_WINDOW" table.
-                  
-                  
-                     Rows containing "NavigationPortletWindow" in
-                     "NAME" column in
-                     "JBP_OBJECT" table.
-                  
-               
-            
-            Instead of editing database you can just remove Navigati=
onPortletInstance using AdminPortlet.
+		    The NavigationPortlet from JBoss Portal 2.4 has=
 been removed, and its functionality is now replaced by PageCusto=
mizerInterceptor. All references to the NavigationPort=
let should be removed from all portal pages. Remove Na=
vigationPortletInstance using the AdminPortlet, or edit the data=
base as follows:
+	    
+	     
+		     
+			     
+				     
+					     In the JBP_INSTANCES table, rows containing=
 local.portal.NavigationPortlet in the PORTL=
ET_REF column.
+				     
+			     
+			     
+				     
+					     In the JBP_WINDOW table, rows containing NavigationPortletInstance in the INSTANCE_REF<=
/emphasis> column.
+				     
+			     
+			     
+				     
+					     In the JBP_OBJECT table, rows containing NavigationPortletWindow in the NAME=
 column.
+				     
+			     
+		     
+	     
          
          
             CMS


--===============3271019994040681384==--

From portal-commits at lists.jboss.org Thu Feb  7 00:21:26 2008
Content-Type: multipart/mixed; boundary="===============2192975626102257150=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9824 -
 modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/samples.
Date: Thu, 07 Feb 2008 00:21:26 -0500
Message-ID: 

--===============2192975626102257150==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: chris.laprun(a)jboss.com
Date: 2008-02-07 00:21:26 -0500 (Thu, 07 Feb 2008)
New Revision: 9824

Modified:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/samples=
/RemoteControlResourcePortlet.java
Log:
- Make remote control work. I don't like javascript! :p

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/=
samples/RemoteControlResourcePortlet.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/sample=
s/RemoteControlResourcePortlet.java	2008-02-07 03:54:28 UTC (rev 9823)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/sample=
s/RemoteControlResourcePortlet.java	2008-02-07 05:21:26 UTC (rev 9824)
@@ -29,12 +29,12 @@
    {
       renderResponse.setContentType("text/html");
       PrintWriter printWriter =3D renderResponse.getWriter();
-      printWriter.print("function openRem=
ote(url){window.name=3D'jbp_parent';" +
+         "window.open(url, 'jbp_remote', 'width=3D400,height=3D200,scrolla=
ble=3Dyes')}");
+      printWriter.print("
Open remote control!");
+      printWriter.print(resource);
+      printWriter.print("')\">Open remote control!");
    }
 =

    @Override
@@ -42,21 +42,27 @@
    {
       resourceResponse.setContentType("text/html");
       PrintWriter writer =3D resourceResponse.getWriter();
+      writer.print("");
       PortletURL url =3D resourceResponse.createRenderURL();
       url.setWindowState(WindowState.MINIMIZED);
-      writer.print("min=
imize");
+      writer.print("minimize");
       url.setWindowState(WindowState.MAXIMIZED);
-      writer.print("maximize");
+      writer.print("maximize");
       url.setWindowState(WindowState.NORMAL);
-      writer.print("normal");
+      writer.print("normal");
       writer.print("'zipcode' public render parameter value: " +=
 resourceRequest.getParameter(ZIPCODE) + "
");
       writer.print("
Set value of 'zipcode' public render paramet=
er to:");
       url.setParameter(ZIPCODE, "80201");
-      writer.print("
Denver");
+      writer.print("
Denver");
       url.setParameter(ZIPCODE, "94102");
-      writer.print("
San Francisco");
+      writer.print("
San Francisco");
       url.setParameter(ZIPCODE, "20001");
-      writer.print("
Washington, DC");
+      writer.print("Washington, DC");
       writer.print("");
    }
+
+   private String createParentURL(PortletURL url)
+   {
+      return "openLinkInParent('" + url + "')";
+   }
 }


--===============2192975626102257150==--

From portal-commits at lists.jboss.org Thu Feb  7 00:22:15 2008
Content-Type: multipart/mixed; boundary="===============3956689067812955543=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9825 -
 docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
Date: Thu, 07 Feb 2008 00:22:15 -0500
Message-ID: 

--===============3956689067812955543==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mmcallis
Date: 2008-02-07 00:22:15 -0500 (Thu, 07 Feb 2008)
New Revision: 9825

Modified:
   docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/migratio=
n.xml
Log:
revising 4.1.2.2. CMS


Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/m=
igration.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/migrati=
on.xml	2008-02-07 05:21:26 UTC (rev 9824)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/migrati=
on.xml	2008-02-07 05:22:15 UTC (rev 9825)
@@ -134,15 +134,10 @@
          
             CMS
             
-               This is probably the less trival part to do directly in dat=
abase. In JBP 2.6 version the way that CMS
-               content is being displayed changed significantly. Please re=
fer to
-               Content Integration and CMS Portlet
-               chapters for more information. Basically currently there is=
 no need to have more than one instance of
-               CMSPortlet and the portlet window disp=
lays CMS content not by referring to that portlet instance
-               but by having proper content-type defi=
ned. In "default-object.xml
-               you will find following configuration:
-               
-                   and . Currently th=
ere is no need to have more than one instance of the CMSPortlet. The portlet window displays CMS content, not by referring to tha=
t portlet instance, but by having the proper content-type defined. The following configuration is in the jboss-portal.s=
ar/conf/data/default-object.xml file:
+	    
+	    
+
    CMSWindow
    
@@ -151,53 +146,54 @@
    
    center
    0
-
-                  ]]>
-               
-            
+]]>
+
+
             
-               Open JBP_OBJECT_NODE tab=
le in your database schema. By looking at
-               PATH column you will eas=
ily find any occurances of CMS in your portal
-               deployment
+		    The following example uses the MySQL Query Browser. Open the JBP_OBJECT_NODE table in your database schema. =
Look at the PATH column to identify any =
occurrences of CMS in your JBoss Portal deployment. Identify any row referr=
ing to CMSPortletWindow, and remember the number in PARENT_KEY column. The PARENT_KEY number is needed in the following steps:
             
+            
             
                
                   
                
             
+           
             
-               For any row you will identify as referring to CMS=
PortletWindow in your system remember
-               the number in PK column.=
 It will be needed in next steps
+		    Go to the JBP_WINDOW table and fi=
nd a row with the same
+		    PARENT_KEY value from the JBP_OBJECT_NODE table. In such a row, replace <=
emphasis>CMSPortletInstance with a path to your CMS resource. Fo=
r example, by default, JBoss Portal displays /default/index.html<=
/filename>.
             
-             Go to JBP_WINDOW tab=
le and find row with the same
-               PK value like the one fr=
om
-               JBP_OBJECT_NODE table. I=
n such row replace
-               "CMSPortletInstance" with a path to yo=
ur CMS resource. For example by default
-               portal is displaying "/default/index.html".
-            
-             Go to JBP_PORTAL_OBJECT_PROPS table and add a row containing:
+             Go to the JBP_PORTAL_OBJECT_PRO=
PS table and add a row containing:
                
                   
-                     The number you remembered in "OBJECT_KEY" column.
-                  
-                  
-                     "portal.windowContentType" in "<=
emphasis>NAME" column.
-                  
-                  
-                     "cms" in "jbp_VALUE" column.
-                  
-               
-            
+			  
+				  The PARENT_KEY number remembered =
from the OBJECT_KEY column.
+			  
+		  
+		  
+			  
+				  portal.windowContentType in the NAME<=
/emphasis> column.
+			  
+		  
+		  
+			  
+				  cms in the jbp_VALUE colum=
n.
+			  
+		  
+	    
+          
             
-            Remember that you can also change portlet window content=
 type and configure path to CMS resource
-               using AdminPortlet
+            
+		    Portlet Content Type and Path to the CMS Resource
+		    
+				You can change the portlet window content type and configure the path =
to the CMS resource
+			using the AdminPortlet.
+		    
+	    
             
          
       
-
-
-
-   
+
    
 =

       
-         Deploying your first portlet
+         Deploying your First Portlet
          
             Introduction
-            This section will introduce the reader to deploying his =
first portlet in JBoss Portal. It requires you
-               download the HelloWorldPortlet from PortletSwap.com, using =
this
-               link.
-            
+            
+		    This section details deploying your first portlet in JBoss Portal. B=
efore proceeding, download the HelloWorldPorlet from JBoss PortletSwap.
+	    
          
          
             Package Structure


--===============4860120218687580383==--

From portal-commits at lists.jboss.org Thu Feb  7 06:10:07 2008
Content-Type: multipart/mixed; boundary="===============8584549153455503592=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9831 - in
 modules/portlet/trunk/test/src: main/java/org/jboss/portal/portlet/test/jsp
 and 5 other directories.
Date: Thu, 07 Feb 2008 06:10:06 -0500
Message-ID: 

--===============8584549153455503592==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-07 06:10:06 -0500 (Thu, 07 Feb 2008)
New Revision: 9831

Added:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/response/portlet/EndPortletChunk.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/response/portlet/StartPortletTitleChunk.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/AbstractURLTag.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/BodyChunkTagSupport.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/ParamTag.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/PortletURLTag.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/SimpleChunkTagSupport.java
Modified:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/c=
ontroller/PortletURLRenderer.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/ControllerFilter.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/Page.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/response/BufferingResponse.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/response/ResponseBuffer.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/response/portlet/PortletURLChunk.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/MarkupTag.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/PortletTag.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/TitleTag.java
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/=
portal.tld
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/index.jsp
Log:
add support for portleturl tag

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/controller/PortletURLRenderer.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
controller/PortletURLRenderer.java	2008-02-07 08:31:51 UTC (rev 9830)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
controller/PortletURLRenderer.java	2008-02-07 11:10:06 UTC (rev 9831)
@@ -125,11 +125,14 @@
       parameters.put(LIFECYCLE_TYPE, type);
 =

       //
-      String pageState;
+      String pageState =3D null;
       try
       {
-         byte[] bytes =3D stateContext.serialize(pageNS);
-         pageState =3D Tools.toHexString(bytes);
+         if (pageNS !=3D null)
+         {
+            byte[] bytes =3D stateContext.serialize(pageNS);
+            pageState =3D Tools.toHexString(bytes);
+         }
       }
       catch (IOException e)
       {
@@ -153,7 +156,10 @@
          }
 =

          //
-         parameters.put(PAGE_STATE, pageState);
+         if (pageState !=3D null)
+         {
+            parameters.put(PAGE_STATE, pageState);
+         }
 =

          //
          if (containerURL instanceof ActionURL)
@@ -190,7 +196,10 @@
 =

             //
             StateString navigationalState =3D renderURL.getNavigationalSta=
te();
-            parameters.put(NAVIGATIONAL_STATE, navigationalState.getString=
Value());
+            if (navigationalState !=3D null)
+            {
+               parameters.put(NAVIGATIONAL_STATE, navigationalState.getStr=
ingValue());
+            }
          }
       }
       else

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/ControllerFilter.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/ControllerFilter.java	2008-02-07 08:31:51 UTC (rev 9830)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/ControllerFilter.java	2008-02-07 11:10:06 UTC (rev 9831)
@@ -27,19 +27,28 @@
 import org.jboss.portal.portlet.test.jsp.response.CharsChunk;
 import org.jboss.portal.portlet.test.jsp.response.portlet.PortletChunk;
 import org.jboss.portal.portlet.test.jsp.response.portlet.PortletMarkupChu=
nk;
-import org.jboss.portal.portlet.test.jsp.response.portlet.PortletTitleChun=
k;
+import org.jboss.portal.portlet.test.jsp.response.portlet.StartPortletTitl=
eChunk;
+import org.jboss.portal.portlet.test.jsp.response.portlet.PortletURLChunk;
+import org.jboss.portal.portlet.test.jsp.response.portlet.EndPortletChunk;
 import org.jboss.portal.portlet.test.jsp.response.BufferingResponse;
 import org.jboss.portal.portlet.test.jsp.response.ResponseBuffer;
+import org.jboss.portal.portlet.test.controller.PortletURLRenderer;
 import org.jboss.portal.portlet.PortletInvoker;
 import org.jboss.portal.portlet.PortletInvokerException;
+import org.jboss.portal.portlet.RenderURL;
+import org.jboss.portal.portlet.StateString;
 import org.jboss.portal.portlet.invocation.response.PortletInvocationRespo=
nse;
 import org.jboss.portal.portlet.invocation.response.FragmentResponse;
 import org.jboss.portal.portlet.controller.PortletController;
+import org.jboss.portal.portlet.controller.impl.state.StateControllerConte=
xtImpl;
 import org.jboss.portal.portlet.controller.response.ControllerResponse;
 import org.jboss.portal.portlet.controller.response.PageUpdateResponse;
 import org.jboss.portal.portlet.controller.response.ResourceResponse;
 import org.jboss.portal.portlet.controller.state.PageNavigationalState;
+import org.jboss.portal.portlet.controller.state.WindowNavigationalState;
 import org.jboss.portal.common.io.IOTools;
+import org.jboss.portal.Mode;
+import org.jboss.portal.WindowState;
 =

 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -206,6 +215,10 @@
 =

       //
       Page page =3D context.getPage();
+      if (pageState =3D=3D null)
+      {
+         pageState =3D context.getStateControllerContext().createPageState=
();
+      }
 =

       //
       Map responses =3D page.render(con=
text, pageState);
@@ -216,6 +229,7 @@
 =

       //
       int count =3D 0;
+      String windowId =3D null;
       PortletChunk portletChunk =3D null;
       PortletInvocationResponse portletResponse =3D null;
       for (Chunk chunk : page.getChunks())
@@ -235,10 +249,10 @@
          else if (chunk instanceof PortletChunk)
          {
             portletChunk =3D (PortletChunk)chunk;
-            String windowId =3D "" + count++;
+            windowId =3D "" + count++;
             portletResponse =3D responses.get(windowId);
          }
-         else if (chunk instanceof PortletTitleChunk)
+         else if (chunk instanceof StartPortletTitleChunk)
          {
             if (portletResponse !=3D null)
             {
@@ -250,28 +264,76 @@
                }
             }
          }
-         else if (chunk instanceof PortletMarkupChunk)
+         else if (chunk instanceof PortletURLChunk)
          {
+            final PortletURLChunk portletURL =3D (PortletURLChunk)chunk;
             if (portletResponse !=3D null)
             {
                if (portletResponse instanceof FragmentResponse)
                {
-                  FragmentResponse fragment =3D (FragmentResponse)portletR=
esponse;
-                  if (fragment.getType() !=3D FragmentResponse.TYPE_EMPTY)
+                  PortletURLRenderer renderer =3D new PortletURLRenderer(
+                     (StateControllerContextImpl)context.getStateControlle=
rContext(),
+                     pageState,
+                     windowId,
+                     context.getClientRequest(),
+                     context.getClientResponse());
+
+                  RenderURL url =3D new RenderURL()
                   {
-                     String frag;
-                     if (fragment.getType() =3D=3D FragmentResponse.TYPE_B=
YTES)
+                     public StateString getNavigationalState()
                      {
-                        frag =3D fragment.getBytes().toString();
+                        return null;
                      }
-                     else
+
+                     public Map getPublicNavigationalSta=
teChanges()
                      {
-                        frag =3D fragment.getChars().toString();
+                        return portletURL.getParams();
                      }
 =

-                     //
-                     writer.write(frag);
-                     writer.flush();
+                     public Mode getMode()
+                     {
+                        return portletURL.getMode();
+                     }
+
+                     public WindowState getWindowState()
+                     {
+                        return portletURL.getWindowState();
+                     }
+                  };
+
+                  //
+                  String renderedURL =3D renderer.renderURL(url, null, nul=
l, true);
+                  writer.write(renderedURL);
+                  writer.flush();
+               }
+            }
+         }
+         else if (chunk instanceof PortletMarkupChunk)
+         {
+            if (portletResponse !=3D null)
+            {
+               if (portletResponse instanceof FragmentResponse)
+               {
+                  FragmentResponse fragment =3D (FragmentResponse)portletR=
esponse;
+                  WindowNavigationalState windowNS =3D pageState.getWindow=
NavigationalState(windowId);
+                  if (windowNS =3D=3D null || windowNS.getWindowState().eq=
uals(WindowState.NORMAL))
+                  {
+                     if (fragment.getType() !=3D FragmentResponse.TYPE_EMP=
TY)
+                     {
+                        String frag;
+                        if (fragment.getType() =3D=3D FragmentResponse.TYP=
E_BYTES)
+                        {
+                           frag =3D fragment.getBytes().toString();
+                        }
+                        else
+                        {
+                           frag =3D fragment.getChars().toString();
+                        }
+
+                        //
+                        writer.write(frag);
+                        writer.flush();
+                     }
                   }
                }
                else
@@ -286,6 +348,12 @@
                writer.flush();
             }
          }
+         else if (chunk instanceof EndPortletChunk)
+         {
+            windowId =3D null;
+            portletChunk =3D null;
+            portletResponse =3D null;
+         }
       }
       out.close();
    }

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/Page.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/Page.java	2008-02-07 08:31:51 UTC (rev 9830)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/Page.java	2008-02-07 11:10:06 UTC (rev 9831)
@@ -62,12 +62,6 @@
 =

    public Map render(PortletControllerC=
ontext context, PageNavigationalState pageState)
    {
-      if (pageState =3D=3D null)
-      {
-         pageState =3D context.getStateControllerContext().createPageState=
();
-      }
-
-      //
       Map responses =3D new HashMap();
 =

       //

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/response/BufferingResponse.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/response/BufferingResponse.java	2008-02-07 08:31:51 UTC (rev 9830)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/response/BufferingResponse.java	2008-02-07 11:10:06 UTC (rev 9831)
@@ -65,9 +65,4 @@
    {
       buffer.close();
    }
-
-   public void addChunk(Chunk chunk)
-   {
-      buffer.addChunk(chunk);
-   }
 }

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/response/ResponseBuffer.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/response/ResponseBuffer.java	2008-02-07 08:31:51 UTC (rev 9830)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/response/ResponseBuffer.java	2008-02-07 11:10:06 UTC (rev 9831)
@@ -49,11 +49,36 @@
    /** . */
    private PrintWriter writer;
 =

+   /** . */
+   private boolean muted;
+
+   public boolean isMuted()
+   {
+      return muted;
+   }
+
+   public void setMuted(boolean muted)
+   {
+      this.muted =3D muted;
+   }
+
    public List getChunks()
    {
       return chunks;
    }
 =

+   public void flush()
+   {
+      if (chunkWriter !=3D null)
+      {
+         chunkWriter.writeChunk();
+      }
+      else if (chunkOutputStream !=3D null)
+      {
+         chunkOutputStream.writeChunk();
+      }
+   }
+
    public void close()
    {
       try
@@ -131,10 +156,15 @@
          StringBuffer sb =3D getBuffer();
          if (sb.length() > 0)
          {
-            char[] chars =3D new char[sb.length()];
-            sb.getChars(0, sb.length(), chars, 0);
-            CharsChunk chunk =3D new CharsChunk(chars);
-            chunks.add(chunk);
+            if (!muted)
+            {
+               char[] chars =3D new char[sb.length()];
+               sb.getChars(0, sb.length(), chars, 0);
+               CharsChunk chunk =3D new CharsChunk(chars);
+               chunks.add(chunk);
+            }
+
+            //
             sb.setLength(0);
          }
       }
@@ -161,12 +191,17 @@
 =

       public void writeChunk()
       {
-         if (bytebuffer.size() > 0)
+         if (bytebuffer.size() > 0 && !muted)
          {
-            byte[] bytes =3D bytebuffer.toByteArray();
+            if (!muted)
+            {
+               byte[] bytes =3D bytebuffer.toByteArray();
+               BytesChunk chunk =3D new BytesChunk(bytes);
+               chunks.add(chunk);
+            }
+
+            //
             bytebuffer.reset();
-            BytesChunk chunk =3D new BytesChunk(bytes);
-            chunks.add(chunk);
          }
       }
 =


Added: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/te=
st/jsp/response/portlet/EndPortletChunk.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/response/portlet/EndPortletChunk.java	                        (rev 0)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/response/portlet/EndPortletChunk.java	2008-02-07 11:10:06 UTC (rev 9831)
@@ -0,0 +1,33 @@
+/*************************************************************************=
*****
+ * 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.response.portlet;
+
+import org.jboss.portal.portlet.test.jsp.response.Chunk;
+
+/**
+ * @author Julien Viet
+ * @version $Revision: 630 $
+ */
+public class EndPortletChunk extends Chunk
+{
+}

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/response/portlet/PortletURLChunk.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/response/portlet/PortletURLChunk.java	2008-02-07 08:31:51 UTC (rev 9830)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/response/portlet/PortletURLChunk.java	2008-02-07 11:10:06 UTC (rev 9831)
@@ -23,11 +23,46 @@
 package org.jboss.portal.portlet.test.jsp.response.portlet;
 =

 import org.jboss.portal.portlet.test.jsp.response.Chunk;
+import org.jboss.portal.Mode;
+import org.jboss.portal.WindowState;
 =

+import java.util.Map;
+
 /**
  * @author Julien Viet
  * @version $Revision: 630 $
  */
 public class PortletURLChunk extends Chunk
 {
+
+   /** . */
+   private final Mode mode;
+
+   /** . */
+   private final WindowState windowState;
+
+   /** . */
+   private final Map params;
+
+   public PortletURLChunk(Mode mode, WindowState windowState, Map params)
+   {
+      this.mode =3D mode;
+      this.windowState =3D windowState;
+      this.params =3D params;
+   }
+
+   public Mode getMode()
+   {
+      return mode;
+   }
+
+   public WindowState getWindowState()
+   {
+      return windowState;
+   }
+
+   public Map getParams()
+   {
+      return params;
+   }
 }

Copied: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/t=
est/jsp/response/portlet/StartPortletTitleChunk.java (from rev 9821, module=
s/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/respon=
se/portlet/PortletTitleChunk.java)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/response/portlet/StartPortletTitleChunk.java	                        (r=
ev 0)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/response/portlet/StartPortletTitleChunk.java	2008-02-07 11:10:06 UTC (r=
ev 9831)
@@ -0,0 +1,33 @@
+/*************************************************************************=
*****
+ * 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.response.portlet;
+
+import org.jboss.portal.portlet.test.jsp.response.Chunk;
+
+/**
+ * @author Julien Viet
+ * @version $Revision: 630 $
+ */
+public class StartPortletTitleChunk extends Chunk
+{
+}

Added: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/te=
st/jsp/taglib/AbstractURLTag.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/AbstractURLTag.java	                        (rev 0)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/AbstractURLTag.java	2008-02-07 11:10:06 UTC (rev 9831)
@@ -0,0 +1,53 @@
+/*************************************************************************=
*****
+ * 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.taglib;
+
+import javax.servlet.jsp.JspException;
+import java.util.Map;
+import java.util.HashMap;
+
+/**
+ * @author Julien Viet
+ * @version $Revision: 630 $
+ */
+public class AbstractURLTag extends BodyChunkTagSupport
+{
+
+   /** . */
+   private Map params =3D new HashMap(=
);
+
+   public void setParam(String name, String value)
+   {
+      params.put(name, new String[]{value});
+   }
+
+   public Map getParams()
+   {
+      return new HashMap(params);
+   }
+
+   public void doInitBody() throws JspException
+   {
+      params.clear();
+   }
+}

Added: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/te=
st/jsp/taglib/BodyChunkTagSupport.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/BodyChunkTagSupport.java	                        (rev 0)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/BodyChunkTagSupport.java	2008-02-07 11:10:06 UTC (rev 9831)
@@ -0,0 +1,75 @@
+/*************************************************************************=
*****
+ * 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.taglib;
+
+import org.jboss.portal.portlet.test.jsp.response.BufferingResponse;
+import org.jboss.portal.portlet.test.jsp.response.Chunk;
+import org.jboss.portal.portlet.test.jsp.response.ResponseBuffer;
+
+import javax.servlet.jsp.tagext.BodyTagSupport;
+import javax.servlet.jsp.JspException;
+import java.io.IOException;
+
+/**
+ * @author Julien Viet
+ * @version $Revision: 630 $
+ */
+public class BodyChunkTagSupport extends BodyTagSupport
+{
+
+   protected final ResponseBuffer getBuffer()
+   {
+      BufferingResponse response =3D (BufferingResponse)pageContext.getRes=
ponse();
+      return response.getBuffer();
+   }
+
+   protected void mute(boolean on) throws JspException
+   {
+      try
+      {
+         pageContext.getOut().flush();
+         BufferingResponse response =3D (BufferingResponse)pageContext.get=
Response();
+         ResponseBuffer buffer =3D response.getBuffer();
+         buffer.flush();
+         buffer.setMuted(on);
+      }
+      catch (IOException e)
+      {
+         throw new JspException(e);
+      }
+   }
+
+   protected final void addChunk(Chunk chunk) throws JspException
+   {
+      try
+      {
+         pageContext.getOut().flush();
+         BufferingResponse response =3D (BufferingResponse)pageContext.get=
Response();
+         response.getBuffer().addChunk(chunk);
+      }
+      catch (IOException e)
+      {
+         throw new JspException(e);
+      }
+   }
+}

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/taglib/MarkupTag.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/MarkupTag.java	2008-02-07 08:31:51 UTC (rev 9830)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/MarkupTag.java	2008-02-07 11:10:06 UTC (rev 9831)
@@ -22,26 +22,17 @@
  *************************************************************************=
*****/
 package org.jboss.portal.portlet.test.jsp.taglib;
 =

-import org.jboss.portal.portlet.test.jsp.response.BufferingResponse;
-import org.jboss.portal.portlet.test.jsp.response.portlet.PortletTitleChun=
k;
+import org.jboss.portal.portlet.test.jsp.response.Chunk;
 import org.jboss.portal.portlet.test.jsp.response.portlet.PortletMarkupChu=
nk;
 =

-import javax.servlet.jsp.tagext.SimpleTagSupport;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
-import java.io.IOException;
-
 /**
  * @author Julien Viet
  * @version $Revision: 630 $
  */
-public class MarkupTag extends SimpleTagSupport
+public class MarkupTag extends SimpleChunkTagSupport
 {
-   public void doTag() throws JspException, IOException
+   protected Chunk doChunkTag()
    {
-      PageContext pageCtx =3D (PageContext)getJspContext();
-      pageCtx.getOut().flush();
-      BufferingResponse response =3D (BufferingResponse)pageCtx.getRespons=
e();
-      response.addChunk(new PortletMarkupChunk());
+      return new PortletMarkupChunk();
    }
 }

Added: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/te=
st/jsp/taglib/ParamTag.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/ParamTag.java	                        (rev 0)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/ParamTag.java	2008-02-07 11:10:06 UTC (rev 9831)
@@ -0,0 +1,67 @@
+/*************************************************************************=
*****
+ * 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.taglib;
+
+import javax.servlet.jsp.tagext.SimpleTagSupport;
+import javax.servlet.jsp.JspException;
+import java.io.IOException;
+
+/**
+ * @author Julien Viet
+ * @version $Revision: 630 $
+ */
+public class ParamTag extends SimpleTagSupport
+{
+
+   /** . */
+   private String name;
+
+   /** . */
+   private String value;
+
+   public String getName()
+   {
+      return name;
+   }
+
+   public void setName(String name)
+   {
+      this.name =3D name;
+   }
+
+   public String getValue()
+   {
+      return value;
+   }
+
+   public void setValue(String value)
+   {
+      this.value =3D value;
+   }
+
+   public void doTag() throws JspException, IOException
+   {
+      AbstractURLTag urlTag =3D (AbstractURLTag)SimpleTagSupport.findAnces=
torWithClass(this, AbstractURLTag.class);
+      urlTag.setParam(name, value);
+   }
+}

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/taglib/PortletTag.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortletTag.java	2008-02-07 08:31:51 UTC (rev 9830)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortletTag.java	2008-02-07 11:10:06 UTC (rev 9831)
@@ -22,16 +22,13 @@
  *************************************************************************=
*****/
 package org.jboss.portal.portlet.test.jsp.taglib;
 =

-import org.jboss.portal.portlet.test.jsp.response.BufferingResponse;
 import org.jboss.portal.portlet.test.jsp.response.portlet.PortletChunk;
+import org.jboss.portal.portlet.test.jsp.response.portlet.EndPortletChunk;
 import org.jboss.portal.Mode;
 import org.jboss.portal.WindowState;
 import org.jboss.portal.common.util.Tools;
 =

-import javax.servlet.jsp.tagext.SimpleTagSupport;
-import javax.servlet.jsp.tagext.BodyTagSupport;
 import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
 import java.io.IOException;
 import java.util.LinkedHashSet;
 import java.util.Set;
@@ -41,7 +38,7 @@
  * @author Julien Viet
  * @version $Revision: 630 $
  */
-public class PortletTag extends BodyTagSupport
+public class PortletTag extends BodyChunkTagSupport
 {
 =

    /** . */
@@ -164,8 +161,7 @@
       }
 =

       //
-      BufferingResponse response =3D (BufferingResponse)pageContext.getRes=
ponse();
-      response.addChunk(new PortletChunk(
+      addChunk(new PortletChunk(
          name,
          applicationName,
          initialMode,
@@ -178,6 +174,9 @@
 =

    public int doEndTag() throws JspException
    {
+      addChunk(new EndPortletChunk());
+
+      //
       return EVAL_PAGE;
    }
 }

Added: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/te=
st/jsp/taglib/PortletURLTag.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortletURLTag.java	                        (rev 0)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortletURLTag.java	2008-02-07 11:10:06 UTC (rev 9831)
@@ -0,0 +1,96 @@
+/*************************************************************************=
*****
+ * 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.taglib;
+
+import org.jboss.portal.Mode;
+import org.jboss.portal.WindowState;
+import org.jboss.portal.portlet.test.jsp.response.portlet.PortletURLChunk;
+
+import javax.servlet.jsp.JspException;
+
+/**
+ * @author Julien Viet
+ * @version $Revision: 630 $
+ */
+public class PortletURLTag extends AbstractURLTag
+{
+
+   /** . */
+   private String modeValue;
+
+   /** . */
+   private String windowStateValue;
+
+   public String getMode()
+   {
+      return modeValue;
+   }
+
+   public void setMode(String mode)
+   {
+      this.modeValue =3D mode;
+   }
+
+   public String getWindowState()
+   {
+      return windowStateValue;
+   }
+
+   public void setWindowState(String windowState)
+   {
+      this.windowStateValue =3D windowState;
+   }
+
+   public int doStartTag() throws JspException
+   {
+      mute(true);
+
+      //
+      return EVAL_BODY_BUFFERED;
+   }
+
+   public int doEndTag() throws JspException
+   {
+      Mode mode =3D null;
+      if (modeValue !=3D null)
+      {
+         mode =3D Mode.create(modeValue.trim());
+      }
+
+      //
+      WindowState windowState =3D null;
+      if (windowStateValue !=3D null)
+      {
+         windowState =3D WindowState.create(windowStateValue.trim());
+      }
+
+      //
+      addChunk(new PortletURLChunk(mode, windowState, getParams()));
+
+      //
+      mute(false);
+
+      //
+      return EVAL_PAGE;
+   }
+}

Added: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/te=
st/jsp/taglib/SimpleChunkTagSupport.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/SimpleChunkTagSupport.java	                        (rev 0)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/SimpleChunkTagSupport.java	2008-02-07 11:10:06 UTC (rev 9831)
@@ -0,0 +1,56 @@
+/*************************************************************************=
*****
+ * 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.taglib;
+
+import org.jboss.portal.portlet.test.jsp.response.Chunk;
+import org.jboss.portal.portlet.test.jsp.response.BufferingResponse;
+
+import javax.servlet.jsp.tagext.SimpleTagSupport;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.PageContext;
+import java.io.IOException;
+
+/**
+ * @author Julien Viet
+ * @version $Revision: 630 $
+ */
+public abstract class SimpleChunkTagSupport extends SimpleTagSupport
+{
+
+   public final void doTag() throws JspException, IOException
+   {
+      Chunk chunk =3D doChunkTag();
+
+      //
+      if (chunk !=3D null)
+      {
+         PageContext pageCtx =3D (PageContext)getJspContext();
+         pageCtx.getOut().flush();
+         BufferingResponse response =3D (BufferingResponse)pageCtx.getResp=
onse();
+         response.getBuffer().addChunk(chunk);
+      }
+   }
+
+   protected abstract Chunk doChunkTag();
+
+}

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/taglib/TitleTag.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/TitleTag.java	2008-02-07 08:31:51 UTC (rev 9830)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/TitleTag.java	2008-02-07 11:10:06 UTC (rev 9831)
@@ -22,25 +22,17 @@
  *************************************************************************=
*****/
 package org.jboss.portal.portlet.test.jsp.taglib;
 =

-import org.jboss.portal.portlet.test.jsp.response.BufferingResponse;
-import org.jboss.portal.portlet.test.jsp.response.portlet.PortletTitleChun=
k;
+import org.jboss.portal.portlet.test.jsp.response.Chunk;
+import org.jboss.portal.portlet.test.jsp.response.portlet.StartPortletTitl=
eChunk;
 =

-import javax.servlet.jsp.tagext.SimpleTagSupport;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
-import java.io.IOException;
-
 /**
  * @author Julien Viet
  * @version $Revision: 630 $
  */
-public class TitleTag extends SimpleTagSupport
+public class TitleTag extends SimpleChunkTagSupport
 {
-   public void doTag() throws JspException, IOException
+   protected Chunk doChunkTag()
    {
-      PageContext pageCtx =3D (PageContext)getJspContext();
-      pageCtx.getOut().flush();
-      BufferingResponse response =3D (BufferingResponse)pageCtx.getRespons=
e();
-      response.addChunk(new PortletTitleChunk());
+      return new StartPortletTitleChunk();
    }
 }

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/W=
EB-INF/portal.tld
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF=
/portal.tld	2008-02-07 08:31:51 UTC (rev 9830)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF=
/portal.tld	2008-02-07 11:10:06 UTC (rev 9831)
@@ -54,4 +54,32 @@
       empty
    
 =

+   
+      portleturl
+      org.jboss.portal.portlet.test.jsp.taglib.PortletURLTag
+      JSP
+      
+         mode
+         java.lang.String
+      
+      
+         windowState
+         java.lang.String
+      
+   
+
+   
+      param
+      org.jboss.portal.portlet.test.jsp.taglib.ParamTag
+      empty
+      
+         name
+         java.lang.String
+      
+      
+         value
+         java.lang.String
+      
+   
+
 

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/i=
ndex.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/index.j=
sp	2008-02-07 08:31:51 UTC (rev 9830)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/index.j=
sp	2008-02-07 11:10:06 UTC (rev 9831)
@@ -10,6 +10,8 @@
       applicationName=3D"google-weather-portlet">
 -----------------------------------

 

+">Minimized
+">Derwood

 -----------------------------------

       
 -----------------------------------



--===============8584549153455503592==--

From portal-commits at lists.jboss.org Thu Feb  7 06:12:39 2008
Content-Type: multipart/mixed; boundary="===============0585842471972528220=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9832 - in
 modules/portlet/trunk/test/src: test/resources/simple-portal-war and 1 other
 directories.
Date: Thu, 07 Feb 2008 06:12:39 -0500
Message-ID: 

--===============0585842471972528220==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-07 06:12:39 -0500 (Thu, 07 Feb 2008)
New Revision: 9832

Added:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/PortletMarkupTag.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/PortletTitleTag.java
Modified:
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/=
portal.tld
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/index.jsp
Log:
rename jsp tag markup and title to portletmarkup and portlettitle

Copied: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/t=
est/jsp/taglib/PortletMarkupTag.java (from rev 9831, modules/portlet/trunk/=
test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/MarkupTag.java)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortletMarkupTag.java	                        (rev 0)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortletMarkupTag.java	2008-02-07 11:12:39 UTC (rev 9832)
@@ -0,0 +1,38 @@
+/*************************************************************************=
*****
+ * 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.taglib;
+
+import org.jboss.portal.portlet.test.jsp.response.Chunk;
+import org.jboss.portal.portlet.test.jsp.response.portlet.PortletMarkupChu=
nk;
+
+/**
+ * @author Julien Viet
+ * @version $Revision: 630 $
+ */
+public class PortletMarkupTag extends SimpleChunkTagSupport
+{
+   protected Chunk doChunkTag()
+   {
+      return new PortletMarkupChunk();
+   }
+}

Copied: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/t=
est/jsp/taglib/PortletTitleTag.java (from rev 9831, modules/portlet/trunk/t=
est/src/main/java/org/jboss/portal/portlet/test/jsp/taglib/TitleTag.java)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortletTitleTag.java	                        (rev 0)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortletTitleTag.java	2008-02-07 11:12:39 UTC (rev 9832)
@@ -0,0 +1,38 @@
+/*************************************************************************=
*****
+ * 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.taglib;
+
+import org.jboss.portal.portlet.test.jsp.response.Chunk;
+import org.jboss.portal.portlet.test.jsp.response.portlet.StartPortletTitl=
eChunk;
+
+/**
+ * @author Julien Viet
+ * @version $Revision: 630 $
+ */
+public class PortletTitleTag extends SimpleChunkTagSupport
+{
+   protected Chunk doChunkTag()
+   {
+      return new StartPortletTitleChunk();
+   }
+}

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/W=
EB-INF/portal.tld
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF=
/portal.tld	2008-02-07 11:10:06 UTC (rev 9831)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF=
/portal.tld	2008-02-07 11:12:39 UTC (rev 9832)
@@ -43,14 +43,14 @@
    
 =

    
-      markup
-      org.jboss.portal.portlet.test.jsp.taglib.MarkupTag
+      portletmarkup
+      org.jboss.portal.portlet.test.jsp.taglib.PortletMarkupTag=

       empty
    
 =

    
-      title
-      org.jboss.portal.portlet.test.jsp.taglib.TitleTag
+      portlettitle
+      org.jboss.portal.portlet.test.jsp.taglib.PortletTitleTag<=
/tag-class>
       empty
    
 =


Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/i=
ndex.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/index.j=
sp	2008-02-07 11:10:06 UTC (rev 9831)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/index.j=
sp	2008-02-07 11:12:39 UTC (rev 9832)
@@ -9,11 +9,11 @@
       name=3D"GoogleWeather"
       applicationName=3D"google-weather-portlet">
 -----------------------------------

-

+

 ">Minimized
 ">Derwood

 -----------------------------------

-      
+      
 -----------------------------------

    
 ****************************************************

@@ -21,9 +21,9 @@
       name=3D"GoogleMap"
       applicationName=3D"google-map-portlet">
 -----------------------------------

-

+

 -----------------------------------

-      
+      
 -----------------------------------

    
 ****************************************************

@@ -31,9 +31,9 @@
       name=3D"RemoteControl"
       applicationName=3D"remotecontrol-portlet">
 -----------------------------------

-

+

 -----------------------------------

-      
+      
 -----------------------------------

    
 ****************************************************



--===============0585842471972528220==--

From portal-commits at lists.jboss.org Thu Feb  7 07:04:09 2008
Content-Type: multipart/mixed; boundary="===============4315441290443788654=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9833 - in
 modules/portlet/trunk/test/src:
 main/java/org/jboss/portal/portlet/test/jsp/response and 3 other directories.
Date: Thu, 07 Feb 2008 07:04:09 -0500
Message-ID: 

--===============4315441290443788654==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-07 07:04:09 -0500 (Thu, 07 Feb 2008)
New Revision: 9833

Added:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/response/EndPageChunk.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/response/StartPageChunk.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/response/portlet/StartPortletChunk.java
Removed:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/response/portlet/PortletTitleChunk.java
Modified:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/ControllerFilter.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/Page.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/PagePortletControllerContext.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/PageTag.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/PortletTag.java
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/index.jsp
Log:
add support for maximized window in page

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/ControllerFilter.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/ControllerFilter.java	2008-02-07 11:12:39 UTC (rev 9832)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/ControllerFilter.java	2008-02-07 12:04:09 UTC (rev 9833)
@@ -25,13 +25,15 @@
 import org.jboss.portal.portlet.test.jsp.response.Chunk;
 import org.jboss.portal.portlet.test.jsp.response.BytesChunk;
 import org.jboss.portal.portlet.test.jsp.response.CharsChunk;
-import org.jboss.portal.portlet.test.jsp.response.portlet.PortletChunk;
+import org.jboss.portal.portlet.test.jsp.response.portlet.StartPortletChun=
k;
 import org.jboss.portal.portlet.test.jsp.response.portlet.PortletMarkupChu=
nk;
 import org.jboss.portal.portlet.test.jsp.response.portlet.StartPortletTitl=
eChunk;
 import org.jboss.portal.portlet.test.jsp.response.portlet.PortletURLChunk;
 import org.jboss.portal.portlet.test.jsp.response.portlet.EndPortletChunk;
 import org.jboss.portal.portlet.test.jsp.response.BufferingResponse;
 import org.jboss.portal.portlet.test.jsp.response.ResponseBuffer;
+import org.jboss.portal.portlet.test.jsp.response.StartPageChunk;
+import org.jboss.portal.portlet.test.jsp.response.EndPageChunk;
 import org.jboss.portal.portlet.test.controller.PortletURLRenderer;
 import org.jboss.portal.portlet.PortletInvoker;
 import org.jboss.portal.portlet.PortletInvokerException;
@@ -65,6 +67,10 @@
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.util.Map;
+import java.util.Iterator;
+import java.util.List;
+import java.util.LinkedList;
+import java.util.Collections;
 =

 /**
  * @author Julien Viet
@@ -220,6 +226,68 @@
          pageState =3D context.getStateControllerContext().createPageState=
();
       }
 =

+      // Look if we need to handle maxmized rendering
+      for (Window window : page.getWindows())
+      {
+         WindowNavigationalState windowState =3D pageState.getWindowNaviga=
tionalState(window.getId());
+         if (windowState !=3D null && WindowState.MAXIMIZED.equals(windowS=
tate.getWindowState()))
+         {
+            List chunks =3D new LinkedList();
+            int mode =3D 0;
+            int count =3D 0;
+            for (Iterator i =3D page.getChunks().iterator();i.hasNe=
xt();)
+            {
+               Chunk chunk =3D i.next();
+
+               switch (mode)
+               {
+                  case 0:
+                     if (chunk instanceof StartPageChunk)
+                     {
+                        mode =3D 1;
+                        chunks.add(chunk);
+                     }
+                     break;
+                  case 1:
+                     if (chunk instanceof StartPortletChunk)
+                     {
+                        StartPortletChunk startPortletChunk =3D (StartPort=
letChunk)chunk;
+                        String windowId =3D "" + count;
+                        if (window.getId().equals(windowId))
+                        {
+                           mode =3D 2;
+                           chunks.add(startPortletChunk);
+                        }
+                     }
+                     else if (chunk instanceof EndPageChunk)
+                     {
+                        mode =3D 0;
+                        chunks.add(chunk);
+                     }
+                     break;
+                  case 2:
+                     if (chunk instanceof EndPortletChunk)
+                     {
+                        mode =3D 1;
+                     }
+
+                     //
+                     chunks.add(chunk);
+                     break;
+               }
+
+               //
+               if (chunk instanceof EndPortletChunk)
+               {
+                  count++;
+               }
+            }
+
+            // New page
+            page =3D new Page(chunks, Collections.singletonMap(window.getI=
d(), window));
+         }
+      }
+
       //
       Map responses =3D page.render(con=
text, pageState);
 =

@@ -230,7 +298,7 @@
       //
       int count =3D 0;
       String windowId =3D null;
-      PortletChunk portletChunk =3D null;
+      StartPortletChunk startPortletChunk =3D null;
       PortletInvocationResponse portletResponse =3D null;
       for (Chunk chunk : page.getChunks())
       {
@@ -246,9 +314,9 @@
             writer.write(bytesChunk.getChars());
             writer.flush();
          }
-         else if (chunk instanceof PortletChunk)
+         else if (chunk instanceof StartPortletChunk)
          {
-            portletChunk =3D (PortletChunk)chunk;
+            startPortletChunk =3D (StartPortletChunk)chunk;
             windowId =3D "" + count++;
             portletResponse =3D responses.get(windowId);
          }
@@ -316,7 +384,7 @@
                {
                   FragmentResponse fragment =3D (FragmentResponse)portletR=
esponse;
                   WindowNavigationalState windowNS =3D pageState.getWindow=
NavigationalState(windowId);
-                  if (windowNS =3D=3D null || windowNS.getWindowState().eq=
uals(WindowState.NORMAL))
+                  if (windowNS =3D=3D null || !windowNS.getWindowState().e=
quals(WindowState.MINIMIZED))
                   {
                      if (fragment.getType() !=3D FragmentResponse.TYPE_EMP=
TY)
                      {
@@ -338,20 +406,20 @@
                }
                else
                {
-                  writer.write(portletResponse.getClass().getSimpleName() =
+ "[" + portletChunk.getPortletName() + "," + portletChunk.getApplicationNa=
me() + "]");
+                  writer.write(portletResponse.getClass().getSimpleName() =
+ "[" + startPortletChunk.getPortletName() + "," + startPortletChunk.getApp=
licationName() + "]");
                   writer.flush();
                }
             }
             else
             {
-               writer.write("Empty[" + portletChunk.getPortletName() + ","=
 + portletChunk.getApplicationName() + "]");
+               writer.write("Empty[" + startPortletChunk.getPortletName() =
+ "," + startPortletChunk.getApplicationName() + "]");
                writer.flush();
             }
          }
          else if (chunk instanceof EndPortletChunk)
          {
             windowId =3D null;
-            portletChunk =3D null;
+            startPortletChunk =3D null;
             portletResponse =3D null;
          }
       }

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/Page.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/Page.java	2008-02-07 11:12:39 UTC (rev 9832)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/Page.java	2008-02-07 12:04:09 UTC (rev 9833)
@@ -30,6 +30,7 @@
 import java.util.Map;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Collection;
 =

 /**
  * @author Julien Viet
@@ -60,6 +61,11 @@
       return windows.get(windowId);
    }
 =

+   public Collection getWindows()
+   {
+      return windows.values();
+   }
+
    public Map render(PortletControllerC=
ontext context, PageNavigationalState pageState)
    {
       Map responses =3D new HashMap();

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/PagePortletControllerContext.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/PagePortletControllerContext.java	2008-02-07 11:12:39 UTC (rev 9832)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/PagePortletControllerContext.java	2008-02-07 12:04:09 UTC (rev 9833)
@@ -24,7 +24,7 @@
 =

 import org.jboss.portal.portlet.test.controller.AbstractPortletControllerC=
ontext;
 import org.jboss.portal.portlet.test.jsp.response.Chunk;
-import org.jboss.portal.portlet.test.jsp.response.portlet.PortletChunk;
+import org.jboss.portal.portlet.test.jsp.response.portlet.StartPortletChun=
k;
 import org.jboss.portal.portlet.test.jsp.response.ResponseBuffer;
 import org.jboss.portal.portlet.Portlet;
 import org.jboss.portal.portlet.PortletInvokerException;
@@ -43,6 +43,7 @@
 import java.io.IOException;
 import java.util.Map;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 =

 /**
  * @author Julien Viet
@@ -72,12 +73,12 @@
 =

       // Collect portlets to create the page
       int counter =3D 0;
-      Map windows =3D new HashMap();
+      Map windows =3D new LinkedHashMap();
       for (Chunk chunk : buffer.getChunks())
       {
-         if (chunk instanceof PortletChunk)
+         if (chunk instanceof StartPortletChunk)
          {
-            PortletChunk portletChunk =3D (PortletChunk)chunk;
+            StartPortletChunk startPortletChunk =3D (StartPortletChunk)chu=
nk;
             String windowId =3D "" + counter++;
 =

             //
@@ -90,7 +91,7 @@
                   String applicationName =3D portletInfo.getApplicationNam=
e();
 =

                   //
-                  if (applicationName.equals(portletChunk.getApplicationNa=
me()) && portletName.equals(portletChunk.getPortletName()))
+                  if (applicationName.equals(startPortletChunk.getApplicat=
ionName()) && portletName.equals(startPortletChunk.getPortletName()))
                   {
                      windows.put(windowId, new Window(windowId, portlet));
                   }
@@ -104,6 +105,9 @@
       }
 =

       //
+      =

+
+      //
       this.page =3D new Page(buffer.getChunks(), windows);
       this.invoker =3D invoker;
       this.eventControllerContext =3D new EventControllerContextImpl(invok=
er);

Added: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/te=
st/jsp/response/EndPageChunk.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/response/EndPageChunk.java	                        (rev 0)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/response/EndPageChunk.java	2008-02-07 12:04:09 UTC (rev 9833)
@@ -0,0 +1,33 @@
+/*************************************************************************=
*****
+ * 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.response;
+
+import org.jboss.portal.portlet.test.jsp.response.Chunk;
+
+/**
+ * @author Julien Viet
+ * @version $Revision: 630 $
+ */
+public class EndPageChunk extends Chunk
+{
+}

Added: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/te=
st/jsp/response/StartPageChunk.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/response/StartPageChunk.java	                        (rev 0)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/response/StartPageChunk.java	2008-02-07 12:04:09 UTC (rev 9833)
@@ -0,0 +1,33 @@
+/*************************************************************************=
*****
+ * 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.response;
+
+import org.jboss.portal.portlet.test.jsp.response.Chunk;
+
+/**
+ * @author Julien Viet
+ * @version $Revision: 630 $
+ */
+public class StartPageChunk extends Chunk
+{
+}

Deleted: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/=
test/jsp/response/portlet/PortletTitleChunk.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/response/portlet/PortletTitleChunk.java	2008-02-07 11:12:39 UTC (rev 98=
32)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/response/portlet/PortletTitleChunk.java	2008-02-07 12:04:09 UTC (rev 98=
33)
@@ -1,33 +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.response.portlet;
-
-import org.jboss.portal.portlet.test.jsp.response.Chunk;
-
-/**
- * @author Julien Viet
- * @version $Revision: 630 $
- */
-public class PortletTitleChunk extends Chunk
-{
-}

Copied: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/t=
est/jsp/response/portlet/StartPortletChunk.java (from rev 9821, modules/por=
tlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/response/po=
rtlet/PortletChunk.java)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/response/portlet/StartPortletChunk.java	                        (rev 0)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/response/portlet/StartPortletChunk.java	2008-02-07 12:04:09 UTC (rev 98=
33)
@@ -0,0 +1,86 @@
+/*************************************************************************=
*****
+ * 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.response.portlet;
+
+import org.jboss.portal.Mode;
+import org.jboss.portal.WindowState;
+import org.jboss.portal.portlet.test.jsp.response.Chunk;
+
+import java.util.Set;
+
+/**
+ * @author Julien Viet
+ * @version $Revision: 630 $
+ */
+public class StartPortletChunk extends Chunk
+{
+
+   /** . */
+   private final String portletName;
+
+   /** . */
+   private final String applicationName;
+
+   /** . */
+   private final Mode initialMode;
+
+   /** . */
+   private final Set supportedModes;
+
+   /** . */
+   private final Set supportedWindowStates;
+
+   public StartPortletChunk(String portletName, String applicationName, Mo=
de initialMode, Set supportedModes, Set supportedWindowS=
tates)
+   {
+      this.portletName =3D portletName;
+      this.applicationName =3D applicationName;
+      this.initialMode =3D initialMode;
+      this.supportedModes =3D supportedModes;
+      this.supportedWindowStates =3D supportedWindowStates;
+   }
+
+   public String getPortletName()
+   {
+      return portletName;
+   }
+
+   public String getApplicationName()
+   {
+      return applicationName;
+   }
+
+   public Mode getInitialMode()
+   {
+      return initialMode;
+   }
+
+   public Set getSupportedModes()
+   {
+      return supportedModes;
+   }
+
+   public Set getSupportedWindowStates()
+   {
+      return supportedWindowStates;
+   }
+}

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/taglib/PageTag.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PageTag.java	2008-02-07 11:12:39 UTC (rev 9832)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PageTag.java	2008-02-07 12:04:09 UTC (rev 9833)
@@ -22,23 +22,31 @@
  *************************************************************************=
*****/
 package org.jboss.portal.portlet.test.jsp.taglib;
 =

-import javax.servlet.jsp.tagext.BodyTagSupport;
+import org.jboss.portal.portlet.test.jsp.response.StartPageChunk;
+import org.jboss.portal.portlet.test.jsp.response.EndPageChunk;
+
 import javax.servlet.jsp.JspException;
 =

 /**
  * @author Julien Viet
  * @version $Revision: 630 $
  */
-public class PageTag extends BodyTagSupport
+public class PageTag extends BodyChunkTagSupport
 {
 =

    public int doStartTag() throws JspException
    {
+      addChunk(new StartPageChunk());
+
+      //
       return EVAL_BODY_INCLUDE;
    }
 =

    public int doEndTag() throws JspException
    {
+      addChunk(new EndPageChunk());
+
+      //
       return EVAL_PAGE;
    }
 }

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/taglib/PortletTag.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortletTag.java	2008-02-07 11:12:39 UTC (rev 9832)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortletTag.java	2008-02-07 12:04:09 UTC (rev 9833)
@@ -22,7 +22,7 @@
  *************************************************************************=
*****/
 package org.jboss.portal.portlet.test.jsp.taglib;
 =

-import org.jboss.portal.portlet.test.jsp.response.portlet.PortletChunk;
+import org.jboss.portal.portlet.test.jsp.response.portlet.StartPortletChun=
k;
 import org.jboss.portal.portlet.test.jsp.response.portlet.EndPortletChunk;
 import org.jboss.portal.Mode;
 import org.jboss.portal.WindowState;
@@ -161,7 +161,7 @@
       }
 =

       //
-      addChunk(new PortletChunk(
+      addChunk(new StartPortletChunk(
          name,
          applicationName,
          initialMode,

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/i=
ndex.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/index.j=
sp	2008-02-07 11:12:39 UTC (rev 9832)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/index.j=
sp	2008-02-07 12:04:09 UTC (rev 9833)
@@ -10,6 +10,8 @@
       applicationName=3D"google-weather-portlet">
 -----------------------------------

 

+">Maximized
+">Normal

 ">Minimized
 ">Derwood

 -----------------------------------



--===============4315441290443788654==--

From portal-commits at lists.jboss.org Thu Feb  7 07:22:13 2008
Content-Type: multipart/mixed; boundary="===============1291083359689664316=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9834 -
 modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp.
Date: Thu, 07 Feb 2008 07:22:13 -0500
Message-ID: 

--===============1291083359689664316==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-07 07:22:13 -0500 (Thu, 07 Feb 2008)
New Revision: 9834

Modified:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/ControllerFilter.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/Page.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/PagePortletControllerContext.java
Log:
fix bug in maximize

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/ControllerFilter.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/ControllerFilter.java	2008-02-07 12:04:09 UTC (rev 9833)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/ControllerFilter.java	2008-02-07 12:22:13 UTC (rev 9834)
@@ -235,6 +235,7 @@
             List chunks =3D new LinkedList();
             int mode =3D 0;
             int count =3D 0;
+            Map windows =3D Collections.emptyMa=
p();
             for (Iterator i =3D page.getChunks().iterator();i.hasNe=
xt();)
             {
                Chunk chunk =3D i.next();
@@ -257,6 +258,7 @@
                         {
                            mode =3D 2;
                            chunks.add(startPortletChunk);
+                           windows =3D Collections.singletonMap(startPortl=
etChunk, window);
                         }
                      }
                      else if (chunk instanceof EndPageChunk)
@@ -284,7 +286,7 @@
             }
 =

             // New page
-            page =3D new Page(chunks, Collections.singletonMap(window.getI=
d(), window));
+            page =3D new Page(chunks, windows);
          }
       }
 =

@@ -296,7 +298,6 @@
       OutputStreamWriter writer =3D new OutputStreamWriter(out);
 =

       //
-      int count =3D 0;
       String windowId =3D null;
       StartPortletChunk startPortletChunk =3D null;
       PortletInvocationResponse portletResponse =3D null;
@@ -317,7 +318,8 @@
          else if (chunk instanceof StartPortletChunk)
          {
             startPortletChunk =3D (StartPortletChunk)chunk;
-            windowId =3D "" + count++;
+            Window window =3D page.getWindow(startPortletChunk);
+            windowId =3D window.getId();
             portletResponse =3D responses.get(windowId);
          }
          else if (chunk instanceof StartPortletTitleChunk)

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/Page.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/Page.java	2008-02-07 12:04:09 UTC (rev 9833)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/Page.java	2008-02-07 12:22:13 UTC (rev 9834)
@@ -26,11 +26,12 @@
 import org.jboss.portal.portlet.controller.PortletControllerContext;
 import org.jboss.portal.portlet.controller.state.PageNavigationalState;
 import org.jboss.portal.portlet.test.jsp.response.Chunk;
+import org.jboss.portal.portlet.test.jsp.response.portlet.StartPortletChun=
k;
 =

 import java.util.Map;
 import java.util.HashMap;
+import java.util.Collection;
 import java.util.List;
-import java.util.Collection;
 =

 /**
  * @author Julien Viet
@@ -40,25 +41,37 @@
 {
 =

    /** . */
-   private Map windows;
+   private List chunks;
 =

    /** . */
-   private List chunks;
+   private Map windows;
 =

-   public Page(List chunks, Map windows)
+   public Page(List chunks, Map windows)
    {
       this.chunks =3D chunks;
       this.windows =3D windows;
    }
 =

-   public List getChunks()
+   public Collection getChunks()
    {
       return chunks;
    }
 =

+   public Window getWindow(Chunk chunk)
+   {
+      return windows.get(chunk);
+   }
+
    public Window getWindow(String windowId)
    {
-      return windows.get(windowId);
+      for (Window window : windows.values())
+      {
+         if (window.getId().equals(windowId))
+         {
+            return window;
+         }
+      }
+      return null;
    }
 =

    public Collection getWindows()

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/PagePortletControllerContext.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/PagePortletControllerContext.java	2008-02-07 12:04:09 UTC (rev 9833)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/PagePortletControllerContext.java	2008-02-07 12:22:13 UTC (rev 9834)
@@ -73,7 +73,7 @@
 =

       // Collect portlets to create the page
       int counter =3D 0;
-      Map windows =3D new LinkedHashMap();
+      Map windows =3D new LinkedHashMap();
       for (Chunk chunk : buffer.getChunks())
       {
          if (chunk instanceof StartPortletChunk)
@@ -93,7 +93,7 @@
                   //
                   if (applicationName.equals(startPortletChunk.getApplicat=
ionName()) && portletName.equals(startPortletChunk.getPortletName()))
                   {
-                     windows.put(windowId, new Window(windowId, portlet));
+                     windows.put(startPortletChunk, new Window(windowId, p=
ortlet));
                   }
                }
             }
@@ -105,8 +105,8 @@
       }
 =

       //
-      =

 =

+
       //
       this.page =3D new Page(buffer.getChunks(), windows);
       this.invoker =3D invoker;


--===============1291083359689664316==--

From portal-commits at lists.jboss.org Thu Feb  7 11:47:40 2008
Content-Type: multipart/mixed; boundary="===============0073125092653401667=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9835 - in modules/portlet/trunk:
 portlet/src/test/java/org/jboss/portal/test/portlet and 10 other directories.
Date: Thu, 07 Feb 2008 11:47:40 -0500
Message-ID: 

--===============0073125092653401667==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-07 11:47:40 -0500 (Thu, 07 Feb 2008)
New Revision: 9835

Added:
   modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portle=
t/StateStringTestCase.java
   modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/contro=
ller/
   modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/contro=
ller/StateControllerContextTestCase.java
Removed:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/response/portlet/PortletChunk.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/MarkupTag.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/TitleTag.java
Modified:
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/Opa=
queStateString.java
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/Par=
ametersStateString.java
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/Sta=
teString.java
   modules/portlet/trunk/portlet/src/test/resources/local-jboss-unit.xml
   modules/portlet/trunk/test/pom.xml
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contro=
ller/impl/state/PageNavigationalStateImpl.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contro=
ller/impl/state/StateControllerContextImpl.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contro=
ller/state/PageNavigationalState.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/c=
ontroller/AbstractPortletControllerContext.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/c=
ontroller/PortletURLRenderer.java
   modules/portlet/trunk/test/src/test/resources/test/local-jboss-unit.xml
Log:
- rewrote PageNavigationalState marshalling to be optimized in size
- added test cases for PageNavigationalState marshalling

Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/port=
let/OpaqueStateString.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/Op=
aqueStateString.java	2008-02-07 12:22:13 UTC (rev 9834)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/Op=
aqueStateString.java	2008-02-07 16:47:40 UTC (rev 9835)
@@ -22,6 +22,9 @@
  *************************************************************************=
*****/
 package org.jboss.portal.portlet;
 =

+import java.io.DataOutputStream;
+import java.io.IOException;
+
 /**
  * An opaque implementation of the navigational state.
  *
@@ -31,6 +34,7 @@
 public class OpaqueStateString extends StateString
 {
 =

+   /** . */
    private String value;
 =

    public OpaqueStateString(String value)
@@ -47,6 +51,12 @@
       return value;
    }
 =

+   public void writeTo(DataOutputStream out) throws IOException
+   {
+      out.writeByte(2);
+      out.writeUTF(value);
+   }
+
    public int hashCode()
    {
       return value.hashCode();

Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/port=
let/ParametersStateString.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/Pa=
rametersStateString.java	2008-02-07 12:22:13 UTC (rev 9834)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/Pa=
rametersStateString.java	2008-02-07 16:47:40 UTC (rev 9835)
@@ -31,6 +31,9 @@
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.Serializable;
+import java.io.DataOutputStream;
+import java.io.InputStream;
+import java.io.DataInputStream;
 import java.util.HashMap;
 import java.util.Map;
 =

@@ -63,6 +66,36 @@
    }
 =

    /**
+    * Factory method that will create the most appropriate form from the b=
yte representation.
+    *
+    * @param in the inputstream to read from
+    * @return a new state string
+    * @throws IOException any IOException
+    */
+   public static StateString create(DataInputStream in) throws IOException
+   {
+      if (in =3D=3D null)
+      {
+         throw new IllegalArgumentException();
+      }
+
+      //
+      byte b =3D in.readByte();
+      switch (b)
+      {
+         case 0:
+            return new ParametersStateString();
+         case 1:
+            return new ParametersStateString(in);
+         case 2:
+            return new OpaqueStateString(in.readUTF());
+      }
+
+      //
+      throw new IllegalArgumentException("Wrong format unrecognized header=
 " + b);
+   }
+
+   /**
     * Factory method that will create the most appropriate form from the s=
tring representation.
     *
     * @param opaqueValue the opaque value
@@ -116,16 +149,34 @@
    /** The underlying map that does not have a copy read/write access mode=
. */
    private ParameterMap parameters;
 =

-   private ParametersStateString(String opaqueValue)
+   private ParametersStateString(DataInputStream in) throws IOException
    {
-      if (opaqueValue =3D=3D null)
+      int size =3D in.readInt();
+      Map tmp =3D new HashMap(size);
+      while (size-- > 0)
       {
-         throw new IllegalArgumentException("No navigational state provide=
d");
+         String name =3D in.readUTF();
+         int length =3D in.readInt();
+         String[] values =3D new String[length];
+         for (int i =3D 0;i < length;i++)
+         {
+            values[i] =3D in.readUTF();
+         }
+         tmp.put(name, values);
       }
+
+      //
+      parameters =3D ParameterMap.wrap(tmp);
+   }
+
+   private ParametersStateString(String opaqueValue)
+   {
       if (!opaqueValue.startsWith(JBPNS_PREFIX))
       {
          throw new IllegalArgumentException("Bad format");
       }
+
+      //
       opaqueValue =3D opaqueValue.substring(JBPNS_PREFIX.length());
       if (opaqueValue.length() > 0)
       {
@@ -166,7 +217,7 @@
          }
          catch (Exception e)
          {
-            throw new RuntimeException(e);
+            throw new Error(e);
          }
       }
       else
@@ -329,6 +380,31 @@
       }
    }
 =

+   public void writeTo(DataOutputStream out) throws IOException
+   {
+      if (parameters.isEmpty())
+      {
+         out.writeByte(0);
+      }
+      else
+      {
+         out.writeByte(1);
+         out.writeInt(parameters.size());
+         for (Map.Entry entry : parameters.entrySet())
+         {
+            String name =3D (String)entry.getKey();
+            out.writeUTF(name);
+            String[] values =3D (String[])entry.getValue();
+            int length =3D values.length;
+            out.writeInt(length);
+            for (String value : values)
+            {
+               out.writeUTF(value);
+            }
+         }
+      }
+   }
+
    public String toString()
    {
       return "StateString[" + parameters + "]";

Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/port=
let/StateString.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/St=
ateString.java	2008-02-07 12:22:13 UTC (rev 9834)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/St=
ateString.java	2008-02-07 16:47:40 UTC (rev 9835)
@@ -23,6 +23,10 @@
 package org.jboss.portal.portlet;
 =

 import java.io.Serializable;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.io.ByteArrayOutputStream;
+import java.util.zip.GZIPOutputStream;
 =

 /**
  * Encapsulate state as a string.
@@ -39,13 +43,6 @@
     */
    public abstract String getStringValue();
 =

-   public static StateString createFrom(String opaqueValue)
-   {
-      if (opaqueValue =3D=3D null)
-      {
-         return null;
-      }
-      return new OpaqueStateString(opaqueValue);
-   }
+   public abstract void writeTo(DataOutputStream out) throws IOException;
 =

 }

Added: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/po=
rtlet/StateStringTestCase.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portl=
et/StateStringTestCase.java	                        (rev 0)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portl=
et/StateStringTestCase.java	2008-02-07 16:47:40 UTC (rev 9835)
@@ -0,0 +1,74 @@
+/*************************************************************************=
*****
+ * 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.test.portlet;
+
+import org.jboss.unit.api.pojo.annotations.Test;
+import org.jboss.portal.portlet.ParametersStateString;
+import org.jboss.portal.portlet.StateString;
+import org.jboss.portal.portlet.OpaqueStateString;
+import org.jboss.portal.common.util.MapBuilder;
+import static org.jboss.unit.api.Assert.*;
+
+import java.io.ByteArrayOutputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.io.ByteArrayInputStream;
+import java.io.DataInputStream;
+import java.util.zip.GZIPOutputStream;
+import java.util.Map;
+
+/**
+ * @author Julien Viet
+ * @version $Revision: 630 $
+ */
+(a)Test
+public class StateStringTestCase
+{
+
+   @Test
+   public void testMarshalling() throws IOException
+   {
+      check(new OpaqueStateString("blah"));
+      check(ParametersStateString.create());
+      check(MapBuilder.hashMap("foo", new String[]{"bar"}).get());
+      check(MapBuilder.hashMap("foo", new String[]{"foo_1"}).put("bar", ne=
w String[]{"bar_1", "bar_2"}).get());
+   }
+
+   private void check(Map parameters) throws IOException
+   {
+      check(ParametersStateString.create(parameters));
+   }
+
+   private void check(StateString parameters) throws IOException
+   {
+      ByteArrayOutputStream baos =3D new ByteArrayOutputStream();
+      DataOutputStream out =3D new DataOutputStream(baos);
+      parameters.writeTo(out);
+      out.close();
+      byte[] bytes =3D baos.toByteArray();
+      ByteArrayInputStream bais =3D new ByteArrayInputStream(bytes);
+      DataInputStream in =3D new DataInputStream(bais);
+      StateString copy =3D ParametersStateString.create(in);
+      assertEquals(parameters, copy);
+   }
+}

Modified: modules/portlet/trunk/portlet/src/test/resources/local-jboss-unit=
.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/test/resources/local-jboss-unit.xml	2=
008-02-07 12:22:13 UTC (rev 9834)
+++ modules/portlet/trunk/portlet/src/test/resources/local-jboss-unit.xml	2=
008-02-07 16:47:40 UTC (rev 9835)
@@ -34,5 +34,8 @@
       
          
       
+      
+         
+      
    
 

Modified: modules/portlet/trunk/test/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/pom.xml	2008-02-07 12:22:13 UTC (rev 9834)
+++ modules/portlet/trunk/test/pom.xml	2008-02-07 16:47:40 UTC (rev 9835)
@@ -206,6 +206,11 @@
                
             
             
+               
+               
+               
+               
+               
                
                   
                      test/local-jboss-unit.xml

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/controller/impl/state/PageNavigationalStateImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr=
oller/impl/state/PageNavigationalStateImpl.java	2008-02-07 12:22:13 UTC (re=
v 9834)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr=
oller/impl/state/PageNavigationalStateImpl.java	2008-02-07 16:47:40 UTC (re=
v 9835)
@@ -33,6 +33,7 @@
 import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Set;
 =

 /**
  * @author Julien Viet
@@ -42,7 +43,7 @@
 {
 =

    /** We don't save it. */
-   protected transient StateControllerContextImpl context;
+   protected final StateControllerContextImpl context;
 =

    /** . */
    protected final Map windows;
@@ -64,6 +65,11 @@
       this.page =3D new HashMap(original.page);
    }
 =

+   public Set getWindowIds()
+   {
+      return windows.keySet();
+   }
+
    public WindowNavigationalState getWindowNavigationalState(String window=
Id)
    {
       return windows.get(windowId);

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/controller/impl/state/StateControllerContextImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr=
oller/impl/state/StateControllerContextImpl.java	2008-02-07 12:22:13 UTC (r=
ev 9834)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr=
oller/impl/state/StateControllerContextImpl.java	2008-02-07 16:47:40 UTC (r=
ev 9835)
@@ -25,14 +25,22 @@
 import org.jboss.portal.portlet.controller.PortletControllerContext;
 import org.jboss.portal.portlet.controller.state.PageNavigationalState;
 import org.jboss.portal.portlet.controller.state.StateControllerContext;
+import org.jboss.portal.portlet.controller.state.WindowNavigationalState;
+import org.jboss.portal.portlet.StateString;
+import org.jboss.portal.portlet.ParametersStateString;
+import org.jboss.portal.WindowState;
+import org.jboss.portal.Mode;
+import org.jboss.portal.common.io.UndeclaredIOException;
 =

 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
+import java.io.DataOutputStream;
+import java.io.DataInputStream;
 import java.util.zip.GZIPInputStream;
 import java.util.zip.GZIPOutputStream;
+import java.util.Map;
+import java.util.HashMap;
 =

 /**
  * @author Julien Viet
@@ -42,10 +50,44 @@
 {
 =

    /** . */
+   private static final Map windowStateToCode =3D ne=
w HashMap();
+
+   /** . */
+   private static final Map modeToCode =3D new HashMap();
+
+   /** . */
+   private static final Map codeToWindowState =3D ne=
w HashMap();
+
+   /** . */
+   private static final Map codeToMode =3D new HashMap();
+
+   static
+   {
+      windowStateToCode.put(WindowState.NORMAL, 1);
+      windowStateToCode.put(WindowState.MINIMIZED, 2);
+      windowStateToCode.put(WindowState.MAXIMIZED, 3);
+      codeToWindowState.put(1, WindowState.NORMAL);
+      codeToWindowState.put(2, WindowState.MINIMIZED);
+      codeToWindowState.put(3, WindowState.MAXIMIZED);
+      modeToCode.put(Mode.VIEW, 1);
+      modeToCode.put(Mode.EDIT, 2);
+      modeToCode.put(Mode.HELP, 3);
+      codeToMode.put(1, Mode.VIEW);
+      codeToMode.put(2, Mode.EDIT);
+      codeToMode.put(3, Mode.HELP);
+   }
+
+   /** . */
    protected final PortletControllerContext portletControllerContext;
 =

    public StateControllerContextImpl(PortletControllerContext portletContr=
ollerContext)
    {
+      if (portletControllerContext =3D=3D null)
+      {
+         throw new IllegalArgumentException("No portlet controller context=
 available");
+      }
+
+      //
       this.portletControllerContext =3D portletControllerContext;
    }
 =

@@ -59,23 +101,127 @@
       return new MutablePageNavigationalState(this);
    }
 =

-   public byte[] serialize(PageNavigationalState object) throws IOException
+   public byte[] serialize(PageNavigationalState object) =

    {
-      ByteArrayOutputStream baos =3D new ByteArrayOutputStream();
-      GZIPOutputStream zos =3D new GZIPOutputStream(baos);
-      ObjectOutputStream oos =3D new ObjectOutputStream(zos);
-      oos.writeObject(object);
-      oos.close();
-      return baos.toByteArray();
+      try
+      {
+         PageNavigationalStateImpl pageState =3D (PageNavigationalStateImp=
l)object;
+         ByteArrayOutputStream baos =3D new ByteArrayOutputStream();
+         GZIPOutputStream zos =3D new GZIPOutputStream(baos);
+         DataOutputStream out =3D new DataOutputStream(zos);
+         out.writeInt(pageState.windows.size());
+         for (Map.Entry entry : pageState=
.windows.entrySet())
+         {
+            out.writeUTF(entry.getKey());
+            WindowNavigationalState windowNS =3D entry.getValue();
+            byte header =3D 0;
+            int decision =3D 0;
+            if (windowNS.getPortletNavigationalState() !=3D null)
+            {
+               header |=3D 1;
+               decision |=3D 1;
+            }
+            if (windowNS.getWindowState() !=3D null)
+            {
+               Integer value =3D windowStateToCode.get(windowNS.getWindowS=
tate());
+               if (value !=3D null)
+               {
+                  header |=3D value << 1;
+               }
+               else
+               {
+                  header |=3D 4 << 1;
+                  decision |=3D 2;
+               }
+            }
+            if (windowNS.getMode() !=3D null)
+            {
+               Integer value =3D modeToCode.get(windowNS.getMode());
+               if (value !=3D null)
+               {
+                  header |=3D value << 4;
+               }
+               else
+               {
+                  header |=3D 4 << 4;
+                  decision |=3D 4;
+               }
+            }
+            out.writeByte(header);
+            if ((decision & 1) !=3D 0)
+            {
+               windowNS.getPortletNavigationalState().writeTo(out);
+            }
+            if ((decision & 2) !=3D 0)
+            {
+               out.writeUTF(windowNS.getWindowState().toString());
+            }
+            if ((decision & 4) !=3D 0)
+            {
+               out.writeUTF(windowNS.getMode().toString());
+            }
+         }
+         out.close();
+         return baos.toByteArray();
+      }
+      catch (IOException e)
+      {
+         throw new UndeclaredIOException(e);
+      }
    }
 =

-   public PageNavigationalState unserialize(byte[] bytes) throws IOExcepti=
on, ClassNotFoundException
+   public PageNavigationalState unserialize(byte[] bytes)
    {
-      ByteArrayInputStream bais =3D new ByteArrayInputStream(bytes);
-      GZIPInputStream zis =3D new GZIPInputStream(bais);
-      ObjectInputStream ois =3D new ObjectInputStream(zis);
-      PageNavigationalStateImpl state =3D (PageNavigationalStateImpl)ois.r=
eadObject();
-      state.context =3D this;
-      return state;
+      try
+      {
+         ByteArrayInputStream bais =3D new ByteArrayInputStream(bytes);
+         GZIPInputStream zis =3D new GZIPInputStream(bais);
+         DataInputStream in =3D new DataInputStream(zis);
+         PageNavigationalStateImpl pageState =3D new MutablePageNavigation=
alState(this);
+         int size =3D in.readInt();
+         while (size-- > 0)
+         {
+            String windowId =3D in.readUTF();
+            byte header =3D in.readByte();
+            StateString portletNS =3D null;
+            if ((header & 1) !=3D 0)
+            {
+               portletNS =3D ParametersStateString.create(in);
+            }
+            WindowState windowState =3D null;
+            int windowStateHeader =3D (header & (7 << 1)) >> 1;
+            switch (windowStateHeader)
+            {
+               case 0:
+                  break;
+               case 4:
+                  windowState =3D WindowState.create(in.readUTF());
+                  break;
+               default:
+                  windowState =3D codeToWindowState.get(windowStateHeader);
+            }
+            Mode mode =3D null;
+            int modeStateHeader =3D (header & (7 << (1 + 3))) >> (1 + 3);
+            switch (modeStateHeader)
+            {
+               case 0:
+                  break;
+               case 4:
+                  mode =3D Mode.create(in.readUTF());
+                  break;
+               default:
+                  mode =3D codeToMode.get(modeStateHeader);
+            }
+            WindowNavigationalState windowNS =3D new WindowNavigationalSta=
te(portletNS, mode, windowState);
+            pageState.setWindowNavigationalState(windowId, windowNS);
+         }
+
+         //
+         return pageState;
+      }
+      catch (IOException e)
+      {
+         throw new UndeclaredIOException(e);
+      }
    }
 }

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/controller/state/PageNavigationalState.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr=
oller/state/PageNavigationalState.java	2008-02-07 12:22:13 UTC (rev 9834)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr=
oller/state/PageNavigationalState.java	2008-02-07 16:47:40 UTC (rev 9835)
@@ -26,6 +26,7 @@
 =

 import javax.xml.namespace.QName;
 import java.util.Map;
+import java.util.Set;
 =

 /**
  * Defines the page navigational state that the controller needs.
@@ -36,6 +37,8 @@
 public interface PageNavigationalState
 {
 =

+   Set getWindowIds();
+
    /**
     * Returns the navigational state of a window or null if it does not ex=
ist.
     *

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/controller/AbstractPortletControllerContext.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
controller/AbstractPortletControllerContext.java	2008-02-07 12:22:13 UTC (r=
ev 9834)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
controller/AbstractPortletControllerContext.java	2008-02-07 16:47:40 UTC (r=
ev 9835)
@@ -30,6 +30,7 @@
 import org.jboss.portal.common.util.MediaType;
 import org.jboss.portal.common.util.ParameterMap;
 import org.jboss.portal.common.util.Tools;
+import org.jboss.portal.common.util.Base64;
 import org.jboss.portal.portlet.ParametersStateString;
 import org.jboss.portal.portlet.Portlet;
 import org.jboss.portal.portlet.PortletInvokerException;
@@ -131,7 +132,7 @@
          String context =3D req.getParameter(PAGE_STATE);
          if (context !=3D null)
          {
-            byte[] bytes =3D Tools.fromHexString(context);
+            byte[] bytes =3D Base64.decode(context, true);
             pageState =3D tmp.unserialize(bytes);
          }
 =


Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/controller/PortletURLRenderer.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
controller/PortletURLRenderer.java	2008-02-07 12:22:13 UTC (rev 9834)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
controller/PortletURLRenderer.java	2008-02-07 16:47:40 UTC (rev 9835)
@@ -27,6 +27,7 @@
 import org.jboss.portal.common.text.CharBuffer;
 import org.jboss.portal.common.text.FastURLEncoder;
 import org.jboss.portal.common.util.Tools;
+import org.jboss.portal.common.util.Base64;
 import org.jboss.portal.portlet.ActionURL;
 import org.jboss.portal.portlet.ContainerURL;
 import org.jboss.portal.portlet.PortletURL;
@@ -126,18 +127,11 @@
 =

       //
       String pageState =3D null;
-      try
+      if (pageNS !=3D null)
       {
-         if (pageNS !=3D null)
-         {
-            byte[] bytes =3D stateContext.serialize(pageNS);
-            pageState =3D Tools.toHexString(bytes);
-         }
+         byte[] bytes =3D stateContext.serialize(pageNS);
+         pageState =3D Base64.encodeBytes(bytes, true);
       }
-      catch (IOException e)
-      {
-         throw new Error(e); //
-      }
 =

       //
       if (containerURL instanceof PortletURL)

Deleted: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/=
test/jsp/response/portlet/PortletChunk.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/response/portlet/PortletChunk.java	2008-02-07 12:22:13 UTC (rev 9834)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/response/portlet/PortletChunk.java	2008-02-07 16:47:40 UTC (rev 9835)
@@ -1,86 +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.response.portlet;
-
-import org.jboss.portal.Mode;
-import org.jboss.portal.WindowState;
-import org.jboss.portal.portlet.test.jsp.response.Chunk;
-
-import java.util.Set;
-
-/**
- * @author Julien Viet
- * @version $Revision: 630 $
- */
-public class PortletChunk extends Chunk
-{
-
-   /** . */
-   private final String portletName;
-
-   /** . */
-   private final String applicationName;
-
-   /** . */
-   private final Mode initialMode;
-
-   /** . */
-   private final Set supportedModes;
-
-   /** . */
-   private final Set supportedWindowStates;
-
-   public PortletChunk(String portletName, String applicationName, Mode in=
itialMode, Set supportedModes, Set supportedWindowStates)
-   {
-      this.portletName =3D portletName;
-      this.applicationName =3D applicationName;
-      this.initialMode =3D initialMode;
-      this.supportedModes =3D supportedModes;
-      this.supportedWindowStates =3D supportedWindowStates;
-   }
-
-   public String getPortletName()
-   {
-      return portletName;
-   }
-
-   public String getApplicationName()
-   {
-      return applicationName;
-   }
-
-   public Mode getInitialMode()
-   {
-      return initialMode;
-   }
-
-   public Set getSupportedModes()
-   {
-      return supportedModes;
-   }
-
-   public Set getSupportedWindowStates()
-   {
-      return supportedWindowStates;
-   }
-}

Deleted: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/=
test/jsp/taglib/MarkupTag.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/MarkupTag.java	2008-02-07 12:22:13 UTC (rev 9834)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/MarkupTag.java	2008-02-07 16:47:40 UTC (rev 9835)
@@ -1,38 +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.taglib;
-
-import org.jboss.portal.portlet.test.jsp.response.Chunk;
-import org.jboss.portal.portlet.test.jsp.response.portlet.PortletMarkupChu=
nk;
-
-/**
- * @author Julien Viet
- * @version $Revision: 630 $
- */
-public class MarkupTag extends SimpleChunkTagSupport
-{
-   protected Chunk doChunkTag()
-   {
-      return new PortletMarkupChunk();
-   }
-}

Deleted: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/=
test/jsp/taglib/TitleTag.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/TitleTag.java	2008-02-07 12:22:13 UTC (rev 9834)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/TitleTag.java	2008-02-07 16:47:40 UTC (rev 9835)
@@ -1,38 +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.taglib;
-
-import org.jboss.portal.portlet.test.jsp.response.Chunk;
-import org.jboss.portal.portlet.test.jsp.response.portlet.StartPortletTitl=
eChunk;
-
-/**
- * @author Julien Viet
- * @version $Revision: 630 $
- */
-public class TitleTag extends SimpleChunkTagSupport
-{
-   protected Chunk doChunkTag()
-   {
-      return new StartPortletTitleChunk();
-   }
-}

Added: modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/co=
ntroller/StateControllerContextTestCase.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/contr=
oller/StateControllerContextTestCase.java	                        (rev 0)
+++ modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/contr=
oller/StateControllerContextTestCase.java	2008-02-07 16:47:40 UTC (rev 9835)
@@ -0,0 +1,165 @@
+/*************************************************************************=
*****
+ * 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.controller;
+
+import org.jboss.unit.api.pojo.annotations.Test;
+import org.jboss.portal.portlet.controller.impl.state.StateControllerConte=
xtImpl;
+import org.jboss.portal.portlet.controller.state.PageNavigationalState;
+import org.jboss.portal.portlet.controller.state.StateControllerContext;
+import org.jboss.portal.portlet.controller.state.WindowNavigationalState;
+import org.jboss.portal.portlet.controller.event.EventControllerContext;
+import org.jboss.portal.portlet.info.PortletInfo;
+import org.jboss.portal.portlet.PortletInvokerException;
+import org.jboss.portal.portlet.ParametersStateString;
+import org.jboss.portal.portlet.StateString;
+import org.jboss.portal.portlet.invocation.response.PortletInvocationRespo=
nse;
+import org.jboss.portal.portlet.invocation.ActionInvocation;
+import org.jboss.portal.portlet.invocation.EventInvocation;
+import org.jboss.portal.portlet.invocation.ResourceInvocation;
+import org.jboss.portal.portlet.spi.PortletInvocationContext;
+import org.jboss.portal.common.NotYetImplemented;
+import org.jboss.portal.Mode;
+import org.jboss.portal.WindowState;
+import static org.jboss.unit.api.Assert.*;
+
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.Cookie;
+import java.util.List;
+
+/**
+ * @author Julien Viet
+ * @version $Revision: 630 $
+ */
+(a)Test
+public class StateControllerContextTestCase
+{
+
+   /** . */
+   private StateControllerContextImpl cc =3D new StateControllerContextImp=
l(dummyContext);
+
+   @Test
+   public void testMarshalling1()
+   {
+      PageNavigationalState pageNS =3D cc.createPageState();
+      assertMarshallable(pageNS);
+   }
+
+   @Test
+   public void testMarshalling2()
+   {
+      ParametersStateString params =3D ParametersStateString.create();
+      params.setValue("foo", "bar");
+      test(null, null, null);
+      test(null, Mode.VIEW, null);
+      test(null, null, WindowState.NORMAL);
+      test(null, Mode.VIEW, WindowState.NORMAL);
+      test(null, Mode.create("foo"), null);
+      test(null, null, WindowState.create("bar"));
+      test(null, Mode.create("foo"), WindowState.create("bar"));
+      test(params, null, null);
+      test(params, Mode.VIEW, null);
+      test(params, null, WindowState.NORMAL);
+      test(params, Mode.VIEW, WindowState.NORMAL);
+      test(params, Mode.create("foo"), null);
+      test(params, null, WindowState.create("bar"));
+      test(params, Mode.create("foo"), WindowState.create("bar"));
+   }
+
+   private void test(StateString portletNavigationalState, Mode mode, Wind=
owState windowState)
+   {
+      PageNavigationalState pageNS =3D cc.createPageState();
+      pageNS.setWindowNavigationalState("foo", new WindowNavigationalState=
(portletNavigationalState, mode, windowState));
+      assertMarshallable(pageNS);
+   }
+
+   private void assertMarshallable(PageNavigationalState pageNS)
+   {
+      byte[] bytes =3D cc.serialize(pageNS);
+      PageNavigationalState expectedPageNS =3D cc.unserialize(bytes);
+      assertEquals(expectedPageNS.getWindowIds(), pageNS.getWindowIds());
+      for (String windowId : expectedPageNS.getWindowIds())
+      {
+         WindowNavigationalState windowNS =3D expectedPageNS.getWindowNavi=
gationalState(windowId);
+         WindowNavigationalState expectedWindowNS =3D pageNS.getWindowNavi=
gationalState(windowId);
+         assertEquals(windowNS.getPortletNavigationalState(), expectedWind=
owNS.getPortletNavigationalState());
+         assertEquals(windowNS.getMode(), expectedWindowNS.getMode());
+         assertEquals(windowNS.getWindowState(), expectedWindowNS.getWindo=
wState());
+      }
+   }
+
+   private static final PortletControllerContext dummyContext =3D new Port=
letControllerContext()
+   {
+      public ServletContext getServletContext()
+      {
+         throw new NotYetImplemented();
+      }
+
+      public HttpServletRequest getClientRequest()
+      {
+         throw new NotYetImplemented();
+      }
+
+      public HttpServletResponse getClientResponse()
+      {
+         throw new NotYetImplemented();
+      }
+
+      public PortletInfo getPortletInfo(String windowId) throws PortletInv=
okerException
+      {
+         throw new NotYetImplemented();
+      }
+
+      public PortletInvocationContext createPortletInvocationContext(Strin=
g windowId, PageNavigationalState pageState)
+      {
+         throw new NotYetImplemented();
+      }
+
+      public PortletInvocationResponse invoke(String windowId, ActionInvoc=
ation actionInvocation) throws PortletInvokerException
+      {
+         throw new NotYetImplemented();
+      }
+
+      public PortletInvocationResponse invoke(String windowId, List requestCookies, EventInvocation eventInvocation) throws PortletInvokerExc=
eption
+      {
+         throw new NotYetImplemented();
+      }
+
+      public PortletInvocationResponse invoke(String windowId, ResourceInv=
ocation resourceInvocation) throws PortletInvokerException
+      {
+         throw new NotYetImplemented();
+      }
+
+      public EventControllerContext getEventControllerContext()
+      {
+         throw new NotYetImplemented();
+      }
+
+      public StateControllerContext getStateControllerContext()
+      {
+         throw new NotYetImplemented();
+      }
+   };
+
+}

Modified: modules/portlet/trunk/test/src/test/resources/test/local-jboss-un=
it.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/test/local-jboss-unit.xml=
	2008-02-07 12:22:13 UTC (rev 9834)
+++ modules/portlet/trunk/test/src/test/resources/test/local-jboss-unit.xml=
	2008-02-07 16:47:40 UTC (rev 9835)
@@ -83,5 +83,9 @@
          	factory
          
       
+      
+         
+         
+      
    
 


--===============0073125092653401667==--

From portal-commits at lists.jboss.org Thu Feb  7 12:37:57 2008
Content-Type: multipart/mixed; boundary="===============8055955971280400607=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9836 - in
 modules/common/trunk/common/src: test/java/org/jboss/portal/test/common/io
 and 1 other directory.
Date: Thu, 07 Feb 2008 12:37:56 -0500
Message-ID: 

--===============8055955971280400607==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-07 12:37:56 -0500 (Thu, 07 Feb 2008)
New Revision: 9836

Added:
   modules/common/trunk/common/src/main/java/org/jboss/portal/common/io/Ser=
ialization.java
   modules/common/trunk/common/src/test/java/org/jboss/portal/test/common/i=
o/SerializationTestCase.java
Modified:
   modules/common/trunk/common/src/main/java/org/jboss/portal/common/io/IOT=
ools.java
Log:
added concept of Serialization for known types (such as the recurrent Map) with a compact format

Modified: modules/common/trunk/common/src/main/java/org/jboss/portal/common=
/io/IOTools.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/common/trunk/common/src/main/java/org/jboss/portal/common/io/IO=
Tools.java	2008-02-07 16:47:40 UTC (rev 9835)
+++ modules/common/trunk/common/src/main/java/org/jboss/portal/common/io/IO=
Tools.java	2008-02-07 17:37:56 UTC (rev 9836)
@@ -40,6 +40,8 @@
 import java.io.ObjectInputStream;
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
+import java.io.DataOutputStream;
+import java.util.Map;
 =

 /**
  * IO tools.
@@ -384,6 +386,49 @@
       return (Serializable)ois.readObject();
    }
 =

+   public static  byte[] serialize(Serialization serialization, T t)
+   {
+      if (serialization =3D=3D null)
+      {
+         throw new IllegalArgumentException();
+      }
+      if (t =3D=3D null)
+      {
+         throw new IllegalArgumentException("No null object to serialize");
+      }
+      try
+      {
+         ByteArrayOutputStream baos =3D new ByteArrayOutputStream();
+         serialization.serialize(t, baos);
+         return baos.toByteArray();
+      }
+      catch (IOException e)
+      {
+         throw new UndeclaredIOException(e);
+      }
+   }
+
+   public static  T unserialize(Serialization serialization, byte[] =
bytes)
+   {
+      if (serialization =3D=3D null)
+      {
+         throw new IllegalArgumentException();
+      }
+      if (bytes =3D=3D null)
+      {
+         throw new IllegalArgumentException("No null bytes to unserialize"=
);
+      }
+      try
+      {
+         ByteArrayInputStream bais =3D new ByteArrayInputStream(bytes);
+         return serialization.unserialize(bais);
+      }
+      catch (IOException e)
+      {
+         throw new UndeclaredIOException(e);
+      }
+   }
+
    /**
     * Check that the provided input stream is buffered. If the argument is=
 already an instance of BufferedInputStream
     * no operation will be performed, otherwise a instance of Buffer=
edInputStream will be created and returned.

Added: modules/common/trunk/common/src/main/java/org/jboss/portal/common/io=
/Serialization.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/common/trunk/common/src/main/java/org/jboss/portal/common/io/Se=
rialization.java	                        (rev 0)
+++ modules/common/trunk/common/src/main/java/org/jboss/portal/common/io/Se=
rialization.java	2008-02-07 17:37:56 UTC (rev 9836)
@@ -0,0 +1,121 @@
+/*************************************************************************=
*****
+ * 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.common.io;
+
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.io.DataInputStream;
+import java.io.OutputStream;
+import java.io.InputStream;
+import java.util.Map;
+import java.util.HashMap;
+
+/**
+ * @author Julien Viet
+ * @version $Revision: 630 $
+ */
+public interface Serialization
+{
+
+   Serialization> PARAMETER_MAP =3D new Serializatio=
n>()
+   {
+      public void serialize(Map map, OutputStream out) t=
hrows IOException, IllegalArgumentException
+      {
+         if (map =3D=3D null)
+         {
+            throw new IllegalArgumentException("No null map allowed");
+         }
+
+         //
+         DataOutputStream data =3D out instanceof DataOutputStream ? (Data=
OutputStream)out : new DataOutputStream(out);
+
+         //
+         data.writeInt(map.size());
+
+         //
+         for (Map.Entry entry : map.entrySet())
+         {
+            String name =3D (String)entry.getKey();
+            data.writeUTF(name);
+
+            //
+            String[] values =3D (String[])entry.getValue();
+            if (values =3D=3D null)
+            {
+               throw new IllegalArgumentException("No null values are allo=
wed in the map");
+            }
+
+            //
+            int length =3D values.length;
+            data.writeInt(length);
+
+            //
+            for (String value : values)
+            {
+               if (value =3D=3D null)
+               {
+                  throw new IllegalArgumentException("No null value in the=
 String[] are allowed in the map");
+               }
+               data.writeUTF(value);
+            }
+         }
+
+         //
+         data.flush();
+      }
+
+      public Map unserialize(InputStream in) throws IOEx=
ception
+      {
+         if (in =3D=3D null)
+         {
+            throw new IllegalArgumentException("No null input stream");
+         }
+
+         //
+         DataInputStream data =3D in instanceof DataInputStream ? (DataInp=
utStream)in : new DataInputStream(in);
+
+         //
+         int size =3D data.readInt();
+         Map tmp =3D new HashMap(size);
+         while (size-- > 0)
+         {
+            String name =3D data.readUTF();
+            int length =3D data.readInt();
+            String[] values =3D new String[length];
+            for (int i =3D 0;i < length;i++)
+            {
+               values[i] =3D data.readUTF();
+            }
+            tmp.put(name, values);
+         }
+
+         //
+         return tmp;
+      }
+   };
+
+   public abstract void serialize(T t, OutputStream out) throws IOExceptio=
n, IllegalArgumentException;
+
+   public abstract T unserialize(InputStream in) throws IOException, Illeg=
alArgumentException;
+
+}

Added: modules/common/trunk/common/src/test/java/org/jboss/portal/test/comm=
on/io/SerializationTestCase.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/common/trunk/common/src/test/java/org/jboss/portal/test/common/=
io/SerializationTestCase.java	                        (rev 0)
+++ modules/common/trunk/common/src/test/java/org/jboss/portal/test/common/=
io/SerializationTestCase.java	2008-02-07 17:37:56 UTC (rev 9836)
@@ -0,0 +1,62 @@
+/*************************************************************************=
*****
+ * 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.test.common.io;
+
+import org.jboss.portal.common.io.Serialization;
+import org.jboss.portal.common.io.IOTools;
+import org.jboss.portal.common.junit.ExtendedAssert;
+import org.jboss.portal.common.util.MapBuilder;
+
+import java.util.Map;
+import java.util.HashMap;
+
+import junit.framework.TestCase;
+
+/**
+ * @author Julien Viet
+ * @version $Revision: 630 $
+ */
+public class SerializationTestCase extends TestCase
+{
+
+   public void testParameterMapSerialization()
+   {
+      check(new HashMap());
+      check(MapBuilder.hashMap("foo", new String[]{"foo_value"}).get());
+      check(MapBuilder.hashMap("foo", new String[]{"foo_value1","foo_value=
2"}).get());
+      check(MapBuilder.hashMap("foo", new String[]{"foo_value1","foo_value=
2"}).put("bar", new String[]{"bar_value"}).get());
+   }
+
+   private void check(Map map)
+   {
+      byte[] bytes =3D IOTools.serialize(Serialization.PARAMETER_MAP, map);
+      Map copy =3D IOTools.unserialize(Serialization.PAR=
AMETER_MAP, bytes);
+      assertEquals(map.keySet(), copy.keySet());
+      for (Map.Entry entry : map.entrySet())
+      {
+         String[] values =3D map.get(entry.getKey());
+         String[] valuesCopy =3D copy.get(entry.getKey());
+         ExtendedAssert.assertEquals(values, valuesCopy);
+      }
+   }
+}


--===============8055955971280400607==--

From portal-commits at lists.jboss.org Thu Feb  7 13:03:30 2008
Content-Type: multipart/mixed; boundary="===============7105941869150384636=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9837 - in modules/portlet/trunk:
 test/src/main/java/org/jboss/portal/portlet/controller/impl/state and 1 other
 directories.
Date: Thu, 07 Feb 2008 13:01:50 -0500
Message-ID: 

--===============7105941869150384636==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-07 13:01:50 -0500 (Thu, 07 Feb 2008)
New Revision: 9837

Modified:
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/Par=
ametersStateString.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contro=
ller/impl/state/StateControllerContextImpl.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/c=
ontroller/AbstractPortletControllerContext.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/c=
ontroller/PortletURLRenderer.java
Log:
- reuse Map serialization in order to reduce now the publi=
c nav state size in the URL

Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/port=
let/ParametersStateString.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/Pa=
rametersStateString.java	2008-02-07 17:37:56 UTC (rev 9836)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/Pa=
rametersStateString.java	2008-02-07 18:01:50 UTC (rev 9837)
@@ -24,6 +24,7 @@
 =

 import org.jboss.portal.common.util.Base64;
 import org.jboss.portal.common.util.ParameterMap;
+import org.jboss.portal.common.io.Serialization;
 =

 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -151,19 +152,7 @@
 =

    private ParametersStateString(DataInputStream in) throws IOException
    {
-      int size =3D in.readInt();
-      Map tmp =3D new HashMap(size);
-      while (size-- > 0)
-      {
-         String name =3D in.readUTF();
-         int length =3D in.readInt();
-         String[] values =3D new String[length];
-         for (int i =3D 0;i < length;i++)
-         {
-            values[i] =3D in.readUTF();
-         }
-         tmp.put(name, values);
-      }
+      Map tmp =3D Serialization.PARAMETER_MAP.unserializ=
e(in);
 =

       //
       parameters =3D ParameterMap.wrap(tmp);
@@ -389,19 +378,7 @@
       else
       {
          out.writeByte(1);
-         out.writeInt(parameters.size());
-         for (Map.Entry entry : parameters.entrySet())
-         {
-            String name =3D (String)entry.getKey();
-            out.writeUTF(name);
-            String[] values =3D (String[])entry.getValue();
-            int length =3D values.length;
-            out.writeInt(length);
-            for (String value : values)
-            {
-               out.writeUTF(value);
-            }
-         }
+         Serialization.PARAMETER_MAP.serialize(parameters, out);
       }
    }
 =


Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/controller/impl/state/StateControllerContextImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr=
oller/impl/state/StateControllerContextImpl.java	2008-02-07 17:37:56 UTC (r=
ev 9836)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr=
oller/impl/state/StateControllerContextImpl.java	2008-02-07 18:01:50 UTC (r=
ev 9837)
@@ -32,6 +32,7 @@
 import org.jboss.portal.Mode;
 import org.jboss.portal.common.io.UndeclaredIOException;
 =

+import javax.xml.namespace.QName;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -109,6 +110,8 @@
          ByteArrayOutputStream baos =3D new ByteArrayOutputStream();
          GZIPOutputStream zos =3D new GZIPOutputStream(baos);
          DataOutputStream out =3D new DataOutputStream(zos);
+
+         //
          out.writeInt(pageState.windows.size());
          for (Map.Entry entry : pageState=
.windows.entrySet())
          {
@@ -161,6 +164,25 @@
                out.writeUTF(windowNS.getMode().toString());
             }
          }
+
+         //
+         Map publicNS =3D pageState.page;
+         out.writeInt(publicNS.size());
+         for (Map.Entry entry : publicNS.entrySet())
+         {
+            QName name =3D entry.getKey();
+            out.writeUTF(name.getNamespaceURI());
+            out.writeUTF(name.getLocalPart());
+            String[] values =3D entry.getValue();
+            int length =3D values.length;
+            out.writeInt(length);
+            for (String value : values)
+            {
+               out.writeUTF(value);
+            }
+         }
+
+         //
          out.close();
          return baos.toByteArray();
       }
@@ -178,6 +200,8 @@
          GZIPInputStream zis =3D new GZIPInputStream(bais);
          DataInputStream in =3D new DataInputStream(zis);
          PageNavigationalStateImpl pageState =3D new MutablePageNavigation=
alState(this);
+
+         //
          int size =3D in.readInt();
          while (size-- > 0)
          {
@@ -213,10 +237,26 @@
                   mode =3D codeToMode.get(modeStateHeader);
             }
             WindowNavigationalState windowNS =3D new WindowNavigationalSta=
te(portletNS, mode, windowState);
-            pageState.setWindowNavigationalState(windowId, windowNS);
+            pageState.windows.put(windowId, windowNS);
          }
 =

          //
+         size =3D in.readInt();
+         while (size-- > 0)
+         {
+            String namespaceURI =3D in.readUTF();
+            String localName =3D in.readUTF();
+            QName name =3D new QName(namespaceURI, localName);
+            int length =3D in.readInt();
+            String[] values =3D new String[length];
+            for (int i =3D 0;i < length;i++)
+            {
+               values[i] =3D in.readUTF();
+            }
+            pageState.page.put(name, values);
+         }
+
+         //
          return pageState;
       }
       catch (IOException e)

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/controller/AbstractPortletControllerContext.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
controller/AbstractPortletControllerContext.java	2008-02-07 17:37:56 UTC (r=
ev 9836)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
controller/AbstractPortletControllerContext.java	2008-02-07 18:01:50 UTC (r=
ev 9837)
@@ -26,10 +26,10 @@
 import org.jboss.portal.Mode;
 import org.jboss.portal.WindowState;
 import org.jboss.portal.common.io.IOTools;
+import org.jboss.portal.common.io.Serialization;
 import org.jboss.portal.common.util.MarkupInfo;
 import org.jboss.portal.common.util.MediaType;
 import org.jboss.portal.common.util.ParameterMap;
-import org.jboss.portal.common.util.Tools;
 import org.jboss.portal.common.util.Base64;
 import org.jboss.portal.portlet.ParametersStateString;
 import org.jboss.portal.portlet.Portlet;
@@ -234,7 +234,8 @@
             }
             else
             {
-               Map publicNavigationalStateChanges =3D (M=
ap)IOTools.unserialize(Tools.fromHexString(req.getParamet=
er(PUBLIC_NAVIGATIONAL_STATE_CHANGES)));
+               byte[] bytes =3D Base64.decode(req.getParameter(PUBLIC_NAVI=
GATIONAL_STATE_CHANGES), true);
+               Map publicNavigationalStateChanges =3D IO=
Tools.unserialize(Serialization.PARAMETER_MAP, bytes);
 =

                //
                request =3D new PortletRenderRequest(
@@ -352,4 +353,5 @@
    {
       return new TestPortletInvocationContext(stateControllerContext, req,=
 resp, windowId, pageState, MARKUP_INFO);
    }
+
 }
\ No newline at end of file

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/controller/PortletURLRenderer.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
controller/PortletURLRenderer.java	2008-02-07 17:37:56 UTC (rev 9836)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
controller/PortletURLRenderer.java	2008-02-07 18:01:50 UTC (rev 9837)
@@ -24,6 +24,7 @@
 package org.jboss.portal.portlet.test.controller;
 =

 import org.jboss.portal.common.io.IOTools;
+import org.jboss.portal.common.io.Serialization;
 import org.jboss.portal.common.text.CharBuffer;
 import org.jboss.portal.common.text.FastURLEncoder;
 import org.jboss.portal.common.util.Tools;
@@ -175,18 +176,10 @@
             RenderURL renderURL =3D (RenderURL)containerURL;
 =

             //
-            try
-            {
-               Map changes =3D renderURL.getPublicNaviga=
tionalStateChanges();
-               HashMap serialiableChanges =3D new HashMa=
p(changes);
-               byte[] bytes =3D IOTools.serialize(serialiableChanges);
-               String ns =3D Tools.toHexString(bytes);
-               parameters.put(PUBLIC_NAVIGATIONAL_STATE_CHANGES, ns);
-            }
-            catch (IOException e)
-            {
-               throw new Error(e);
-            }
+            Map changes =3D renderURL.getPublicNavigatio=
nalStateChanges();
+            byte[] bytes =3D IOTools.serialize(Serialization.PARAMETER_MAP=
, changes);
+            String ns =3D Base64.encodeBytes(bytes, true);
+            parameters.put(PUBLIC_NAVIGATIONAL_STATE_CHANGES, ns);
 =

             //
             StateString navigationalState =3D renderURL.getNavigationalSta=
te();


--===============7105941869150384636==--

From portal-commits at lists.jboss.org Thu Feb  7 13:31:22 2008
Content-Type: multipart/mixed; boundary="===============3918475556103001113=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9838 - in
 modules/portlet/trunk/test/src:
 main/java/org/jboss/portal/portlet/controller/impl/state and 6 other
 directories.
Date: Thu, 07 Feb 2008 13:31:22 -0500
Message-ID: 

--===============3918475556103001113==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-07 13:31:21 -0500 (Thu, 07 Feb 2008)
New Revision: 9838

Removed:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contro=
ller/impl/state/MutablePageNavigationalState.java
Modified:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contro=
ller/PortletRequestHandler.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contro=
ller/impl/state/PageNavigationalStateImpl.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contro=
ller/impl/state/StateControllerContextImpl.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contro=
ller/state/PageNavigationalState.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contro=
ller/state/StateControllerContext.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/P=
ortalServlet.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/c=
ontroller/AbstractPortletControllerContext.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/ControllerFilter.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/SimpleP=
ortalServlet.java
   modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/contro=
ller/StateControllerContextTestCase.java
Log:
simplify a bit, make PageNavigationalState use a boolean instead of having =
a *Mutable* subclass

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/controller/PortletRequestHandler.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr=
oller/PortletRequestHandler.java	2008-02-07 18:01:50 UTC (rev 9837)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr=
oller/PortletRequestHandler.java	2008-02-07 18:31:21 UTC (rev 9838)
@@ -88,11 +88,11 @@
       PageNavigationalState pageState =3D portletRequest.getPageState();
       if (pageState =3D=3D null)
       {
-         pageState =3D stateContext.createPageState();
+         pageState =3D stateContext.createPageState(true);
       }
       else
       {
-         pageState =3D stateContext.clonePageState(pageState);
+         pageState =3D stateContext.clonePageState(pageState, true);
       }
 =

       //

Deleted: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/=
controller/impl/state/MutablePageNavigationalState.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr=
oller/impl/state/MutablePageNavigationalState.java	2008-02-07 18:01:50 UTC =
(rev 9837)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr=
oller/impl/state/MutablePageNavigationalState.java	2008-02-07 18:31:21 UTC =
(rev 9838)
@@ -1,102 +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.controller.impl.state;
-
-import org.jboss.portal.portlet.PortletInvokerException;
-import org.jboss.portal.portlet.controller.state.WindowNavigationalState;
-import org.jboss.portal.portlet.info.NavigationInfo;
-import org.jboss.portal.portlet.info.ParameterInfo;
-import org.jboss.portal.portlet.info.PortletInfo;
-
-import javax.xml.namespace.QName;
-import java.util.Map;
-
-/**
- * @author Julien Viet
- * @version $Revision: 1.1 $
- */
-class MutablePageNavigationalState extends PageNavigationalStateImpl
-{
-
-   MutablePageNavigationalState(StateControllerContextImpl context)
-   {
-      super(context);
-   }
-
-   public MutablePageNavigationalState(PageNavigationalStateImpl original)
-   {
-      super(original);
-   }
-
-   public void setWindowNavigationalState(String windowId, WindowNavigatio=
nalState windowState)
-   {
-      windows.put(windowId, windowState);
-   }
-
-   public void setPublicNavigationalState(String windowId, Map update)
-   {
-      try
-      {
-         PortletInfo info =3D context.portletControllerContext.getPortletI=
nfo(windowId);
-
-         NavigationInfo navigationInfo =3D info.getNavigation();
-         for (Map.Entry entry : update.entrySet())
-         {
-            String id =3D entry.getKey();
-
-            //
-            ParameterInfo parameterInfo =3D navigationInfo.getPublicParame=
ter(id);
-
-            //
-            if (parameterInfo !=3D null)
-            {
-               QName name =3D parameterInfo.getName();
-               String[] value =3D entry.getValue();
-               if (value.length > 0)
-               {
-                  setPublicNavigationalState(name, value);
-               }
-               else
-               {
-                  removePublicNavigationalState(name);
-               }
-            }
-         }
-      }
-      catch (PortletInvokerException e)
-      {
-         e.printStackTrace();
-      }
-   }
-
-   public void setPublicNavigationalState(QName name, String[] value)
-   {
-      // We clone the value in order to keep the state not mutated by a si=
de effect
-      page.put(name, value.clone());
-   }
-
-   public void removePublicNavigationalState(QName name)
-   {
-      page.remove(name);
-   }
-}
\ No newline at end of file

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/controller/impl/state/PageNavigationalStateImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr=
oller/impl/state/PageNavigationalStateImpl.java	2008-02-07 18:01:50 UTC (re=
v 9837)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr=
oller/impl/state/PageNavigationalStateImpl.java	2008-02-07 18:31:21 UTC (re=
v 9838)
@@ -28,6 +28,7 @@
 import org.jboss.portal.portlet.controller.state.WindowNavigationalState;
 import org.jboss.portal.portlet.info.ParameterInfo;
 import org.jboss.portal.portlet.info.PortletInfo;
+import org.jboss.portal.portlet.info.NavigationInfo;
 =

 import javax.xml.namespace.QName;
 import java.io.Serializable;
@@ -51,18 +52,23 @@
    /** . */
    protected final Map page;
 =

-   public PageNavigationalStateImpl(StateControllerContextImpl context)
+   /** . */
+   private final boolean modifiable;
+
+   PageNavigationalStateImpl(StateControllerContextImpl context, boolean m=
odifiable)
    {
       this.context =3D context;
       this.windows =3D new HashMap();
       this.page =3D new HashMap();
+      this.modifiable =3D modifiable;
    }
 =

-   public PageNavigationalStateImpl(PageNavigationalStateImpl original)
+   public PageNavigationalStateImpl(PageNavigationalStateImpl original, bo=
olean modifiable)
    {
       this.context =3D original.context;
       this.windows =3D new HashMap(origin=
al.windows);
       this.page =3D new HashMap(original.page);
+      this.modifiable =3D modifiable;
    }
 =

    public Set getWindowIds()
@@ -115,24 +121,78 @@
       return page.get(name).clone();
    }
 =

-   public void setWindowNavigationalState(String windowId, WindowNavigatio=
nalState windowState) throws UnsupportedOperationException
+   public void setWindowNavigationalState(String windowId, WindowNavigatio=
nalState windowState)
    {
-      throw new UnsupportedOperationException();
+      if (!modifiable)
+      {
+         throw new IllegalStateException("The page navigational state is n=
ot modifiable");
+      }
+
+      //
+      windows.put(windowId, windowState);
    }
 =

    public void setPublicNavigationalState(String windowId, Map update)
    {
-      throw new UnsupportedOperationException();
+      if (!modifiable)
+      {
+         throw new IllegalStateException("The page navigational state is n=
ot modifiable");
+      }
+
+      //
+      try
+      {
+         PortletInfo info =3D context.portletControllerContext.getPortletI=
nfo(windowId);
+
+         NavigationInfo navigationInfo =3D info.getNavigation();
+         for (Map.Entry entry : update.entrySet())
+         {
+            String id =3D entry.getKey();
+
+            //
+            ParameterInfo parameterInfo =3D navigationInfo.getPublicParame=
ter(id);
+
+            //
+            if (parameterInfo !=3D null)
+            {
+               QName name =3D parameterInfo.getName();
+               String[] value =3D entry.getValue();
+               if (value.length > 0)
+               {
+                  setPublicNavigationalState(name, value);
+               }
+               else
+               {
+                  removePublicNavigationalState(name);
+               }
+            }
+         }
+      }
+      catch (PortletInvokerException e)
+      {
+         e.printStackTrace();
+      }
    }
 =

-   public void setPublicNavigationalState(QName name, String[] value) thro=
ws UnsupportedOperationException
+   public void setPublicNavigationalState(QName name, String[] value)
    {
-      throw new UnsupportedOperationException();
+      if (!modifiable)
+      {
+         throw new IllegalStateException("The page navigational state is n=
ot modifiable");
+      }
+
+      // We clone the value in order to keep the state not mutated by a si=
de effect
+      page.put(name, value.clone());
    }
 =

-   public void removePublicNavigationalState(QName name) throws Unsupporte=
dOperationException
+   public void removePublicNavigationalState(QName name)
    {
-      throw new UnsupportedOperationException();
+      if (!modifiable)
+      {
+         throw new IllegalStateException("The page navigational state is n=
ot modifiable");
+      }
+
+      //
+      page.remove(name);
    }
-
 }
\ No newline at end of file

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/controller/impl/state/StateControllerContextImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr=
oller/impl/state/StateControllerContextImpl.java	2008-02-07 18:01:50 UTC (r=
ev 9837)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr=
oller/impl/state/StateControllerContextImpl.java	2008-02-07 18:31:21 UTC (r=
ev 9838)
@@ -92,14 +92,14 @@
       this.portletControllerContext =3D portletControllerContext;
    }
 =

-   public PageNavigationalState clonePageState(PageNavigationalState pageS=
tate)
+   public PageNavigationalState clonePageState(PageNavigationalState pageS=
tate, boolean modifiable)
    {
-      return new MutablePageNavigationalState((PageNavigationalStateImpl)p=
ageState);
+      return new PageNavigationalStateImpl((PageNavigationalStateImpl)page=
State, modifiable);
    }
 =

-   public PageNavigationalState createPageState()
+   public PageNavigationalState createPageState(boolean modifiable)
    {
-      return new MutablePageNavigationalState(this);
+      return new PageNavigationalStateImpl(this, modifiable);
    }
 =

    public byte[] serialize(PageNavigationalState object) =

@@ -192,14 +192,14 @@
       }
    }
 =

-   public PageNavigationalState unserialize(byte[] bytes)
+   public PageNavigationalState unserialize(byte[] bytes, boolean modifiab=
le)
    {
       try
       {
          ByteArrayInputStream bais =3D new ByteArrayInputStream(bytes);
          GZIPInputStream zis =3D new GZIPInputStream(bais);
          DataInputStream in =3D new DataInputStream(zis);
-         PageNavigationalStateImpl pageState =3D new MutablePageNavigation=
alState(this);
+         PageNavigationalStateImpl pageState =3D new PageNavigationalState=
Impl(this, modifiable);
 =

          //
          int size =3D in.readInt();

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/controller/state/PageNavigationalState.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr=
oller/state/PageNavigationalState.java	2008-02-07 18:01:50 UTC (rev 9837)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr=
oller/state/PageNavigationalState.java	2008-02-07 18:31:21 UTC (rev 9838)
@@ -29,7 +29,9 @@
 import java.util.Set;
 =

 /**
- * Defines the page navigational state that the controller needs.
+ * Defines the page navigational state view that the controller needs to o=
perate on. Its name begins with page
+ * however it does not mandate that the represented context  to be a page.=
 I.E it could represent a set
+ * of physical pages or something else.
  *
  * @author Julien Viet
  * @version $Revision: 1.1 $
@@ -37,6 +39,11 @@
 public interface PageNavigationalState
 {
 =

+   /**
+    * Returns the window ids referenced.
+    *
+    * @return a set of window id
+    */
    Set getWindowIds();
 =

    /**
@@ -44,17 +51,19 @@
     *
     * @param windowId the window
     * @return the window navigational state
+    * @throws IllegalArgumentException if an argument is not valid
     */
-   WindowNavigationalState getWindowNavigationalState(String windowId);
+   WindowNavigationalState getWindowNavigationalState(String windowId) thr=
ows IllegalArgumentException;
 =

    /**
     * Update the navigational state of a window.
     *
     * @param windowId    the window id
     * @param windowState the window state
-    * @throws UnsupportedOperationException if the page state is read only
+    * @throws IllegalArgumentException if an argument is not valid
+    * @throws IllegalStateException if the page state is read only
     */
-   void setWindowNavigationalState(String windowId, WindowNavigationalStat=
e windowState) throws UnsupportedOperationException;
+   void setWindowNavigationalState(String windowId, WindowNavigationalStat=
e windowState) throws IllegalArgumentException, IllegalStateException;
 =

    /**
     * Obtain the public navigational state of a window. The interpretation=
 of what should be retrieved is left up to the
@@ -63,8 +72,9 @@
     *
     * @param windowId the window id
     * @return the public navigational state
+    * @throws IllegalArgumentException if an argument is not valid
     */
-   ParameterMap getPublicNavigationalState(String windowId);
+   ParameterMap getPublicNavigationalState(String windowId) throws Illegal=
ArgumentException;
 =

    /**
     * Update the public navigational state of a window. The interpretation=
 of what should be updated is left up to the
@@ -75,13 +85,36 @@
     *
     * @param windowId the window id
     * @param update   the updates
-    * @throws UnsupportedOperationException if the page state is read only
+    * @throws IllegalArgumentException if an argument is not valid
+    * @throws IllegalStateException if the page state is read only
     */
-   void setPublicNavigationalState(String windowId, Map =
update) throws UnsupportedOperationException;
+   void setPublicNavigationalState(String windowId, Map =
update) throws IllegalArgumentException, IllegalStateException;
 =

-   String[] getPublicNavigationalState(QName name);
+   /**
+    * Returns a public navigational state entry or null if it is not found.
+    *
+    * @param name the name
+    * @return the entry value
+    * @throws IllegalArgumentException if an argument is not valid
+    */
+   String[] getPublicNavigationalState(QName name) throws IllegalArgumentE=
xception;
 =

-   void setPublicNavigationalState(QName name, String[] value);
+   /**
+    * Sets a public navigational state entry.
+    *
+    * @param name the name
+    * @param value the new value
+    * @throws IllegalArgumentException if an argument is not valid
+    * @throws IllegalStateException if the page state is read only
+    */
+   void setPublicNavigationalState(QName name, String[] value) throws Ille=
galArgumentException, IllegalStateException;
 =

-   void removePublicNavigationalState(QName name);
+   /**
+    * Removes a public navigational state entry.
+    *
+    * @param name the name
+    * @throws IllegalArgumentException if an argument is not valid
+    * @throws IllegalStateException if the page state is read only
+    */
+   void removePublicNavigationalState(QName name) throws IllegalArgumentEx=
ception, IllegalStateException;
 }

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/controller/state/StateControllerContext.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr=
oller/state/StateControllerContext.java	2008-02-07 18:01:50 UTC (rev 9837)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr=
oller/state/StateControllerContext.java	2008-02-07 18:31:21 UTC (rev 9838)
@@ -35,15 +35,17 @@
     * Clone an existing page state object.
     *
     * @param pageState the page state to clone
+    * @param modifiable set the modifiable status
     * @return the page state clone
     */
-   PageNavigationalState clonePageState(PageNavigationalState pageState);
+   PageNavigationalState clonePageState(PageNavigationalState pageState, b=
oolean modifiable);
 =

    /**
     * Create a new page state object.
     *
+    * @param modifiable set the modifiable status
     * @return the new page state
     */
-   PageNavigationalState createPageState();
+   PageNavigationalState createPageState(boolean modifiable);
 =

 }

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/PortalServlet.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
PortalServlet.java	2008-02-07 18:01:50 UTC (rev 9837)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
PortalServlet.java	2008-02-07 18:31:21 UTC (rev 9838)
@@ -87,7 +87,7 @@
       }
       else
       {
-         PageRenderer renderer =3D new PageRenderer(new ResponseProperties=
(), context.getStateControllerContext().createPageState());
+         PageRenderer renderer =3D new PageRenderer(new ResponseProperties=
(), context.getStateControllerContext().createPageState(false));
 =

          //
          renderer.render(context);

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/controller/AbstractPortletControllerContext.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
controller/AbstractPortletControllerContext.java	2008-02-07 18:01:50 UTC (r=
ev 9837)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
controller/AbstractPortletControllerContext.java	2008-02-07 18:31:21 UTC (r=
ev 9838)
@@ -133,7 +133,7 @@
          if (context !=3D null)
          {
             byte[] bytes =3D Base64.decode(context, true);
-            pageState =3D tmp.unserialize(bytes);
+            pageState =3D tmp.unserialize(bytes, false);
          }
 =

          //

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/ControllerFilter.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/ControllerFilter.java	2008-02-07 18:01:50 UTC (rev 9837)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/ControllerFilter.java	2008-02-07 18:31:21 UTC (rev 9838)
@@ -223,7 +223,7 @@
       Page page =3D context.getPage();
       if (pageState =3D=3D null)
       {
-         pageState =3D context.getStateControllerContext().createPageState=
();
+         pageState =3D context.getStateControllerContext().createPageState=
(false);
       }
 =

       // Look if we need to handle maxmized rendering

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/=
SimplePortalServlet.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/Simple=
PortalServlet.java	2008-02-07 18:01:50 UTC (rev 9837)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/Simple=
PortalServlet.java	2008-02-07 18:31:21 UTC (rev 9838)
@@ -87,7 +87,7 @@
       }
       else
       {
-         PageRenderer renderer =3D new PageRenderer(new ResponseProperties=
(), context.getStateControllerContext().createPageState());
+         PageRenderer renderer =3D new PageRenderer(new ResponseProperties=
(), context.getStateControllerContext().createPageState(false));
 =

          //
          renderer.render(context);

Modified: modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet=
/controller/StateControllerContextTestCase.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/contr=
oller/StateControllerContextTestCase.java	2008-02-07 18:01:50 UTC (rev 9837)
+++ modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/contr=
oller/StateControllerContextTestCase.java	2008-02-07 18:31:21 UTC (rev 9838)
@@ -62,7 +62,7 @@
    @Test
    public void testMarshalling1()
    {
-      PageNavigationalState pageNS =3D cc.createPageState();
+      PageNavigationalState pageNS =3D cc.createPageState(true);
       assertMarshallable(pageNS);
    }
 =

@@ -89,7 +89,7 @@
 =

    private void test(StateString portletNavigationalState, Mode mode, Wind=
owState windowState)
    {
-      PageNavigationalState pageNS =3D cc.createPageState();
+      PageNavigationalState pageNS =3D cc.createPageState(true);
       pageNS.setWindowNavigationalState("foo", new WindowNavigationalState=
(portletNavigationalState, mode, windowState));
       assertMarshallable(pageNS);
    }
@@ -97,7 +97,7 @@
    private void assertMarshallable(PageNavigationalState pageNS)
    {
       byte[] bytes =3D cc.serialize(pageNS);
-      PageNavigationalState expectedPageNS =3D cc.unserialize(bytes);
+      PageNavigationalState expectedPageNS =3D cc.unserialize(bytes, true);
       assertEquals(expectedPageNS.getWindowIds(), pageNS.getWindowIds());
       for (String windowId : expectedPageNS.getWindowIds())
       {


--===============3918475556103001113==--

From portal-commits at lists.jboss.org Thu Feb  7 14:11:18 2008
Content-Type: multipart/mixed; boundary="===============7214852964521292844=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9839 - in
 modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test:
 controller and 1 other directories.
Date: Thu, 07 Feb 2008 14:11:18 -0500
Message-ID: 

--===============7214852964521292844==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-07 14:11:18 -0500 (Thu, 07 Feb 2008)
New Revision: 9839

Modified:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/U=
RLParameterConstants.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/c=
ontroller/AbstractPortletControllerContext.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/c=
ontroller/PortletURLRenderer.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/c=
ontroller/TestPortletInvocationContext.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/ControllerFilter.java
Log:
- allow other type of invocations in PortletURLRenderer (for page refresh)
- make the jsp portal use redirect after action

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/URLParameterConstants.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
URLParameterConstants.java	2008-02-07 18:31:21 UTC (rev 9838)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
URLParameterConstants.java	2008-02-07 19:11:18 UTC (rev 9839)
@@ -34,10 +34,21 @@
    }
 =

    /**
+    * The type of request. The goal is to allow other types of invocation =
to be used by the controller context.
+    * The controller context itself only works on the portlet type.
+    */
+   public static final String TYPE =3D "type";
+
+   /**
+    * The portlet type.
+    */
+   public static final String PORTLET_TYPE =3D "portlet";
+
+   /**
     * The life cycle type of the invocation. The values accepted are ACTION_LIFECYCLE,
     * RENDER_LIFECYCLE and RESOURCE_LIFECYCLE.
     */
-   public static final String LIFECYCLE_TYPE =3D "type";
+   public static final String LIFECYCLE_PHASE =3D "lifecycle";
 =

    /** The window id. */
    public static final String WINDOW_ID =3D "windowid";
@@ -70,12 +81,12 @@
    public static final String RESOURCE_CACHEABILITY =3D "resourcecacheabil=
ity";
 =

    /** Denotes an action lifecycle operation. */
-   public static final String ACTION_LIFECYCLE =3D "action";
+   public static final String ACTION_PHASE =3D "action";
 =

    /** Denotes a render lifecycle operation. */
-   public static final String RENDER_LIFECYCLE =3D "render";
+   public static final String RENDER_PHASE =3D "render";
 =

    /** Denotes a resource lifecycle operation. */
-   public static final String RESOURCE_LIFECYCLE =3D "resource";
+   public static final String RESOURCE_PHASE =3D "resource";
 =

 }

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/controller/AbstractPortletControllerContext.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
controller/AbstractPortletControllerContext.java	2008-02-07 18:31:21 UTC (r=
ev 9838)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
controller/AbstractPortletControllerContext.java	2008-02-07 19:11:18 UTC (r=
ev 9839)
@@ -105,6 +105,9 @@
    /** . */
    private final StateControllerContextImpl stateControllerContext;
 =

+   /** . */
+   private final PageNavigationalState pageState;
+
    public AbstractPortletControllerContext(
       HttpServletRequest req,
       HttpServletResponse resp,
@@ -114,28 +117,29 @@
       StateControllerContextImpl tmp =3D new StateControllerContextImpl(th=
is);
 =

       // The nav state provided with the request
+      // Unmarshall portal navigational state if it is provided
       PageNavigationalState pageState =3D null;
+      String context =3D req.getParameter(PAGE_STATE);
+      if (context !=3D null)
+      {
+         byte[] bytes =3D Base64.decode(context, true);
+         pageState =3D tmp.unserialize(bytes, false);
+      }
 =

+      // The type of invocation
+      String type =3D req.getParameter(TYPE);
+
+      // Process only portlet type
       // The request decoded if not null
       ControllerRequest request =3D null;
+      if (PORTLET_TYPE.equals(type))
+      {
+         // Get the window id
+         String windowId =3D req.getParameter(WINDOW_ID);
 =

-      // Get the window id
-      String windowId =3D req.getParameter(WINDOW_ID);
-
-      // Process
-      if (windowId !=3D null)
-      {
          // Helper
          WebRequest ri =3D new WebRequest(req);
 =

-         // Unmarshall portal navigational state if it is provided
-         String context =3D req.getParameter(PAGE_STATE);
-         if (context !=3D null)
-         {
-            byte[] bytes =3D Base64.decode(context, true);
-            pageState =3D tmp.unserialize(bytes, false);
-         }
-
          //
          Mode mode =3D null;
          if (req.getParameter(MODE) !=3D null)
@@ -162,8 +166,8 @@
          WindowNavigationalState windowNavigationalState =3D new WindowNav=
igationalState(navigationalState, mode, windowState);
 =

          //
-         String type =3D req.getParameter(LIFECYCLE_TYPE);
-         if (RESOURCE_LIFECYCLE.equals(type))
+         String phase =3D req.getParameter(LIFECYCLE_PHASE);
+         if (RESOURCE_PHASE.equals(phase))
          {
             StateString resourceState =3D ParametersStateString.create(req=
.getParameter(RESOURCE_STATE));
             String resourceId =3D req.getParameter(RESOURCE_ID);
@@ -212,7 +216,7 @@
          }
          else
          {
-            if (ACTION_LIFECYCLE.equals(type))
+            if (ACTION_PHASE.equals(phase))
             {
                ParameterMap formParameters =3D null;
                if (ri.getBody() instanceof Body.Form)
@@ -254,8 +258,14 @@
       this.resp =3D resp;
       this.servletContext =3D servletContext;
       this.stateControllerContext =3D tmp;
+      this.pageState =3D pageState;
    }
 =

+   public PageNavigationalState getPageState()
+   {
+      return pageState;
+   }
+
    public ControllerRequest getRequest()
    {
       return request;

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/controller/PortletURLRenderer.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
controller/PortletURLRenderer.java	2008-02-07 18:31:21 UTC (rev 9838)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
controller/PortletURLRenderer.java	2008-02-07 19:11:18 UTC (rev 9839)
@@ -27,7 +27,6 @@
 import org.jboss.portal.common.io.Serialization;
 import org.jboss.portal.common.text.CharBuffer;
 import org.jboss.portal.common.text.FastURLEncoder;
-import org.jboss.portal.common.util.Tools;
 import org.jboss.portal.common.util.Base64;
 import org.jboss.portal.portlet.ActionURL;
 import org.jboss.portal.portlet.ContainerURL;
@@ -38,14 +37,13 @@
 import org.jboss.portal.portlet.cache.CacheLevel;
 import org.jboss.portal.portlet.controller.impl.state.StateControllerConte=
xtImpl;
 import org.jboss.portal.portlet.controller.state.PageNavigationalState;
-import org.jboss.portal.portlet.test.StringCodec;
 import static org.jboss.portal.portlet.test.URLParameterConstants.*;
 =

 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Collections;
 =

 /**
  * @author Julien Viet
@@ -58,9 +56,6 @@
    final StateControllerContextImpl stateContext;
 =

    /** . */
-   final String windowId;
-
-   /** . */
    final HttpServletRequest clientReq;
 =

    /** . */
@@ -72,18 +67,16 @@
    public PortletURLRenderer(
       StateControllerContextImpl stateContext,
       PageNavigationalState pageNS,
-      String windowId,
       HttpServletRequest clientReq,
       HttpServletResponse clientResp)
    {
       this.stateContext =3D stateContext;
       this.pageNS =3D pageNS;
-      this.windowId =3D windowId;
       this.clientReq =3D clientReq;
       this.clientResp =3D clientResp;
    }
 =

-   public String renderURL(ContainerURL containerURL, Boolean wantSecure, =
Boolean wantAuthenticated, boolean relative)
+   private String renderURL(Map parameters, Boolean wantSe=
cure, Boolean wantAuthenticated, boolean relative)
    {
       CharBuffer buffer =3D new CharBuffer();
       buffer.append(clientReq.getScheme());
@@ -101,30 +94,68 @@
       }
 =

       //
+      boolean first =3D true;
+      for (Map.Entry entry : parameters.entrySet())
+      {
+         String name =3D entry.getKey();
+         String value =3D entry.getValue();
+         buffer.append(first ? '?' : '&');
+         buffer.append(name, FastURLEncoder.getUTF8Instance());
+         buffer.append('=3D');
+         buffer.append(value, FastURLEncoder.getUTF8Instance());
+         first =3D false;
+      }
+
+      //
+      String url =3D buffer.asString();
+      return clientResp.encodeURL(url);
+   }
+
+   public String renderURL(Boolean wantSecure, Boolean wantAuthenticated, =
boolean relative)
+   {
+      String pageState =3D null;
+      if (pageNS !=3D null)
+      {
+         byte[] bytes =3D stateContext.serialize(pageNS);
+         pageState =3D Base64.encodeBytes(bytes, true);
+      }
+
+      //
+      Map parameters =3D Collections.singletonMap(PAGE_STA=
TE, pageState);
+
+      //
+      return renderURL(parameters, wantSecure, wantAuthenticated, relative=
);
+   }
+
+   public String renderURL(String windowId, ContainerURL containerURL, Boo=
lean wantSecure, Boolean wantAuthenticated, boolean relative)
+   {
       Map parameters =3D new HashMap();
 =

       //
+      parameters.put(TYPE, PORTLET_TYPE);
+
+      //
       parameters.put(WINDOW_ID, windowId);
 =

       //
       String type;
       if (containerURL instanceof ActionURL)
       {
-         type =3D ACTION_LIFECYCLE;
+         type =3D ACTION_PHASE;
       }
       else if (containerURL instanceof RenderURL)
       {
-         type =3D RENDER_LIFECYCLE;
+         type =3D RENDER_PHASE;
       }
       else if (containerURL instanceof ResourceURL)
       {
-         type =3D RESOURCE_LIFECYCLE;
+         type =3D RESOURCE_PHASE;
       }
       else
       {
          throw new Error();
       }
-      parameters.put(LIFECYCLE_TYPE, type);
+      parameters.put(LIFECYCLE_PHASE, type);
 =

       //
       String pageState =3D null;
@@ -236,20 +267,6 @@
       }
 =

       //
-      boolean first =3D true;
-      for (Map.Entry entry : parameters.entrySet())
-      {
-         String name =3D entry.getKey();
-         String value =3D entry.getValue();
-         buffer.append(first ? '?' : '&');
-         buffer.append(name, FastURLEncoder.getUTF8Instance());
-         buffer.append('=3D');
-         buffer.append(value, FastURLEncoder.getUTF8Instance());
-         first =3D false;
-      }
-
-      //
-      String url =3D buffer.asString();
-      return clientResp.encodeURL(url);
+      return renderURL(parameters, wantSecure, wantAuthenticated, relative=
);
    }
 }

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/controller/TestPortletInvocationContext.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
controller/TestPortletInvocationContext.java	2008-02-07 18:31:21 UTC (rev 9=
838)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
controller/TestPortletInvocationContext.java	2008-02-07 19:11:18 UTC (rev 9=
839)
@@ -76,7 +76,7 @@
       this.clientResponse =3D clientResponse;
       this.windowId =3D windowId;
       this.pageState =3D pageState;
-      this.urlRenderer =3D new PortletURLRenderer(stateContext, pageState,=
 windowId, clientRequest, clientResponse);
+      this.urlRenderer =3D new PortletURLRenderer(stateContext, pageState,=
 clientRequest, clientResponse);
 =

       //
       addResolver(PortletInvocation.PRINCIPAL_SCOPE, new PrincipalAttribut=
eResolver(clientRequest));
@@ -98,6 +98,6 @@
 =

    public String renderURL(ContainerURL containerURL, Boolean wantSecure, =
Boolean wantAuthenticated, boolean relative)
    {
-      return urlRenderer.renderURL(containerURL, wantSecure, wantAuthentic=
ated, relative);
+      return urlRenderer.renderURL(windowId, containerURL, wantSecure, wan=
tAuthenticated, relative);
    }
 }

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/ControllerFilter.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/ControllerFilter.java	2008-02-07 18:31:21 UTC (rev 9838)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/ControllerFilter.java	2008-02-07 19:11:18 UTC (rev 9839)
@@ -42,6 +42,7 @@
 import org.jboss.portal.portlet.invocation.response.PortletInvocationRespo=
nse;
 import org.jboss.portal.portlet.invocation.response.FragmentResponse;
 import org.jboss.portal.portlet.controller.PortletController;
+import org.jboss.portal.portlet.controller.request.PortletActionRequest;
 import org.jboss.portal.portlet.controller.impl.state.StateControllerConte=
xtImpl;
 import org.jboss.portal.portlet.controller.response.ControllerResponse;
 import org.jboss.portal.portlet.controller.response.PageUpdateResponse;
@@ -154,7 +155,30 @@
          if (controllerResponse instanceof PageUpdateResponse)
          {
             PageUpdateResponse pageUpdate =3D (PageUpdateResponse)controll=
erResponse;
-            pageState =3D pageUpdate.getPageState();
+
+            // We perform a send redirect on actions
+            if (context.getRequest() instanceof PortletActionRequest)
+            {
+               //
+               PortletURLRenderer renderer =3D new PortletURLRenderer(
+                  (StateControllerContextImpl)context.getStateControllerCo=
ntext(),
+                  pageState,
+                  context.getClientRequest(),
+                  context.getClientResponse());
+
+               //
+               String url =3D renderer.renderURL(null, null, true);
+
+               //
+               resp.sendRedirect(url);
+
+               //
+               return;
+            }
+            else
+            {
+               pageState =3D pageUpdate.getPageState();
+            }
          }
          else if (controllerResponse instanceof ResourceResponse)
          {
@@ -218,6 +242,10 @@
             // todo
          }
       }
+      else
+      {
+         pageState =3D context.getPageState();
+      }
 =

       //
       Page page =3D context.getPage();
@@ -344,7 +372,6 @@
                   PortletURLRenderer renderer =3D new PortletURLRenderer(
                      (StateControllerContextImpl)context.getStateControlle=
rContext(),
                      pageState,
-                     windowId,
                      context.getClientRequest(),
                      context.getClientResponse());
 =

@@ -372,7 +399,7 @@
                   };
 =

                   //
-                  String renderedURL =3D renderer.renderURL(url, null, nul=
l, true);
+                  String renderedURL =3D renderer.renderURL(windowId, url,=
 null, null, true);
                   writer.write(renderedURL);
                   writer.flush();
                }


--===============7214852964521292844==--

From portal-commits at lists.jboss.org Thu Feb  7 16:33:34 2008
Content-Type: multipart/mixed; boundary="===============1792271220144349861=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9840 -
 modules/portlet/trunk/test/src/test/resources/simple-portal-war.
Date: Thu, 07 Feb 2008 16:33:34 -0500
Message-ID: 

--===============1792271220144349861==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: chris.laprun(a)jboss.com
Date: 2008-02-07 16:33:34 -0500 (Thu, 07 Feb 2008)
New Revision: 9840

Modified:
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/index.jsp
Log:
- Prepare markup for styling.

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/i=
ndex.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/index.j=
sp	2008-02-07 19:11:18 UTC (rev 9839)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/index.j=
sp	2008-02-07 21:33:34 UTC (rev 9840)
@@ -4,41 +4,58 @@
 
 
 
-****************************************************

-   
------------------------------------

-

-">Maximized
-">Normal

-">Minimized
-">Derwood

------------------------------------

-      
------------------------------------

+   
+      
+         
+            
+            
+               ">M
+               ">n
+               ">m
+               ">Edit
+            
+         
+         
+            
+         
+      
    
-****************************************************

-   
------------------------------------

-

------------------------------------

-      
------------------------------------

+
+
+   
+      
+         
+            
+            
+               ">M
+               ">n
+               ">m
+               ">Edit
+            
+         
+         
+            
+         
+      
    
-****************************************************

-   
------------------------------------

-

------------------------------------

-      
------------------------------------

+
+   

+   
+      
+         
+            
+            
+               ">M
+               ">n
+               ">m
+               ">Edit
+            
+         
+         
+            
+         
+      
    
-****************************************************

 
 
 


--===============1792271220144349861==--

From portal-commits at lists.jboss.org Thu Feb  7 17:34:26 2008
Content-Type: multipart/mixed; boundary="===============1660996087643396573=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9841 - in
 modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test: jsp
 and 3 other directories.
Date: Thu, 07 Feb 2008 17:34:26 -0500
Message-ID: 

--===============1660996087643396573==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-07 17:34:26 -0500 (Thu, 07 Feb 2008)
New Revision: 9841

Modified:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/c=
ontroller/AbstractPortletControllerContext.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/c=
ontroller/PortletURLRenderer.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/ControllerFilter.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/PagePortletControllerContext.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/response/BufferingResponse.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/response/portlet/StartPortletChunk.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/PortletTag.java
Log:
more streaming

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/controller/AbstractPortletControllerContext.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
controller/AbstractPortletControllerContext.java	2008-02-07 21:33:34 UTC (r=
ev 9840)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
controller/AbstractPortletControllerContext.java	2008-02-07 22:34:26 UTC (r=
ev 9841)
@@ -112,7 +112,7 @@
       HttpServletRequest req,
       HttpServletResponse resp,
       ServletContext servletContext)
-      throws IllegalRequestException, IOException, ClassNotFoundException
+      throws IllegalRequestException, IOException
    {
       StateControllerContextImpl tmp =3D new StateControllerContextImpl(th=
is);
 =


Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/controller/PortletURLRenderer.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
controller/PortletURLRenderer.java	2008-02-07 21:33:34 UTC (rev 9840)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
controller/PortletURLRenderer.java	2008-02-07 22:34:26 UTC (rev 9841)
@@ -121,7 +121,15 @@
       }
 =

       //
-      Map parameters =3D Collections.singletonMap(PAGE_STA=
TE, pageState);
+      Map parameters;
+      if (pageState !=3D null)
+      {
+         parameters =3D Collections.singletonMap(PAGE_STATE, pageState);
+      }
+      else
+      {
+         parameters =3D Collections.emptyMap();
+      }
 =

       //
       return renderURL(parameters, wantSecure, wantAuthenticated, relative=
);

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/ControllerFilter.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/ControllerFilter.java	2008-02-07 21:33:34 UTC (rev 9840)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/ControllerFilter.java	2008-02-07 22:34:26 UTC (rev 9841)
@@ -32,8 +32,6 @@
 import org.jboss.portal.portlet.test.jsp.response.portlet.EndPortletChunk;
 import org.jboss.portal.portlet.test.jsp.response.BufferingResponse;
 import org.jboss.portal.portlet.test.jsp.response.ResponseBuffer;
-import org.jboss.portal.portlet.test.jsp.response.StartPageChunk;
-import org.jboss.portal.portlet.test.jsp.response.EndPageChunk;
 import org.jboss.portal.portlet.test.controller.PortletURLRenderer;
 import org.jboss.portal.portlet.PortletInvoker;
 import org.jboss.portal.portlet.PortletInvokerException;
@@ -68,10 +66,6 @@
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.util.Map;
-import java.util.Iterator;
-import java.util.List;
-import java.util.LinkedList;
-import java.util.Collections;
 =

 /**
  * @author Julien Viet
@@ -100,44 +94,23 @@
 =

    public void doFilter(HttpServletRequest req, HttpServletResponse resp, =
FilterChain chain) throws IOException, ServletException
    {
-      BufferingResponse bufferingResponse =3D new BufferingResponse(resp);
+      PortletInvoker invoker =3D (PortletInvoker)getServletContext().getAt=
tribute("ConsumerPortletInvoker");
 =

       //
-      chain.doFilter(req, bufferingResponse);
-
-      //
-      ResponseBuffer buffer =3D bufferingResponse.getBuffer();
-      buffer.close();
-
-      //
+      PagePortletControllerContext context;
       try
       {
-         service(req, resp, buffer);
+         context =3D new PagePortletControllerContext(
+            req,
+            resp,
+            getServletContext(),
+            invoker);
       }
-      catch (ClassNotFoundException e)
+      catch (PortletInvokerException e)
       {
          throw new ServletException(e);
       }
-   }
 =

-   public void destroy()
-   {
-      this.config =3D null;
-   }
-
-   protected void service(HttpServletRequest req, HttpServletResponse resp=
, ResponseBuffer buffer) throws ServletException, IOException, ClassNotFoun=
dException
-   {
-      PortletInvoker invoker =3D (PortletInvoker)getServletContext().getAt=
tribute("ConsumerPortletInvoker");
-
-      //
-      PagePortletControllerContext context =3D new PagePortletControllerCo=
ntext(
-         req,
-         resp,
-         getServletContext(),
-         invoker,
-         buffer);
-
-      //
       PageNavigationalState pageState =3D null;
       if (context.getRequest() !=3D null)
       {
@@ -162,7 +135,7 @@
                //
                PortletURLRenderer renderer =3D new PortletURLRenderer(
                   (StateControllerContextImpl)context.getStateControllerCo=
ntext(),
-                  pageState,
+                  pageUpdate.getPageState(),
                   context.getClientRequest(),
                   context.getClientResponse());
 =

@@ -189,7 +162,7 @@
             if (pir instanceof FragmentResponse)
             {
                FragmentResponse fragment =3D (FragmentResponse)pir;
-               =

+
                //
                if (fragment.getType() =3D=3D FragmentResponse.TYPE_EMPTY)
                {
@@ -236,6 +209,9 @@
             {
                // todo
             }
+
+            //
+            return;
          }
          else
          {
@@ -248,13 +224,41 @@
       }
 =

       //
-      Page page =3D context.getPage();
-      if (pageState =3D=3D null)
+      BufferingResponse bufferingResponse =3D new BufferingResponse(resp, =
context, pageState);
+
+      //
+      chain.doFilter(req, bufferingResponse);
+
+      //
+      ResponseBuffer buffer =3D bufferingResponse.getBuffer();
+      buffer.close();
+
+      //
+      try
       {
-         pageState =3D context.getStateControllerContext().createPageState=
(false);
+         render(req, bufferingResponse);
       }
+      catch (ClassNotFoundException e)
+      {
+         throw new ServletException(e);
+      }
+   }
 =

+   public void destroy()
+   {
+      this.config =3D null;
+   }
+
+   protected void render(HttpServletRequest req, BufferingResponse resp) t=
hrows ServletException, IOException, ClassNotFoundException
+   {
+
+      //
+      PagePortletControllerContext context =3D resp.getPortletControllerCo=
ntext();
+
+      //
+
       // Look if we need to handle maxmized rendering
+/*
       for (Window window : page.getWindows())
       {
          WindowNavigationalState windowState =3D pageState.getWindowNaviga=
tionalState(window.getId());
@@ -317,19 +321,18 @@
             page =3D new Page(chunks, windows);
          }
       }
+*/
 =

       //
-      Map responses =3D page.render(con=
text, pageState);
+//      Map responses =3D page.render(c=
ontext, pageState);
 =

       //
-      OutputStream out =3D resp.getOutputStream();
+      OutputStream out =3D resp.getResponse().getOutputStream();
       OutputStreamWriter writer =3D new OutputStreamWriter(out);
 =

       //
-      String windowId =3D null;
       StartPortletChunk startPortletChunk =3D null;
-      PortletInvocationResponse portletResponse =3D null;
-      for (Chunk chunk : page.getChunks())
+      for (Chunk chunk : resp.getBuffer().getChunks())
       {
          if (chunk instanceof BytesChunk)
          {
@@ -346,12 +349,10 @@
          else if (chunk instanceof StartPortletChunk)
          {
             startPortletChunk =3D (StartPortletChunk)chunk;
-            Window window =3D page.getWindow(startPortletChunk);
-            windowId =3D window.getId();
-            portletResponse =3D responses.get(windowId);
          }
          else if (chunk instanceof StartPortletTitleChunk)
          {
+            PortletInvocationResponse portletResponse =3D startPortletChun=
k.getResponse();
             if (portletResponse !=3D null)
             {
                if (portletResponse instanceof FragmentResponse)
@@ -365,13 +366,14 @@
          else if (chunk instanceof PortletURLChunk)
          {
             final PortletURLChunk portletURL =3D (PortletURLChunk)chunk;
+            PortletInvocationResponse portletResponse =3D startPortletChun=
k.getResponse();
             if (portletResponse !=3D null)
             {
                if (portletResponse instanceof FragmentResponse)
                {
                   PortletURLRenderer renderer =3D new PortletURLRenderer(
                      (StateControllerContextImpl)context.getStateControlle=
rContext(),
-                     pageState,
+                     resp.getPageState(),
                      context.getClientRequest(),
                      context.getClientResponse());
 =

@@ -399,7 +401,7 @@
                   };
 =

                   //
-                  String renderedURL =3D renderer.renderURL(windowId, url,=
 null, null, true);
+                  String renderedURL =3D renderer.renderURL(startPortletCh=
unk.getWindowId(), url, null, null, true);
                   writer.write(renderedURL);
                   writer.flush();
                }
@@ -407,12 +409,17 @@
          }
          else if (chunk instanceof PortletMarkupChunk)
          {
+            PortletInvocationResponse portletResponse =3D startPortletChun=
k.getResponse();
             if (portletResponse !=3D null)
             {
                if (portletResponse instanceof FragmentResponse)
                {
                   FragmentResponse fragment =3D (FragmentResponse)portletR=
esponse;
-                  WindowNavigationalState windowNS =3D pageState.getWindow=
NavigationalState(windowId);
+                  WindowNavigationalState windowNS =3D null;
+                  if (resp.getPageState() !=3D null)
+                  {
+                     windowNS =3D resp.getPageState().getWindowNavigationa=
lState(startPortletChunk.getWindowId());
+                  }
                   if (windowNS =3D=3D null || !windowNS.getWindowState().e=
quals(WindowState.MINIMIZED))
                   {
                      if (fragment.getType() !=3D FragmentResponse.TYPE_EMP=
TY)
@@ -447,9 +454,7 @@
          }
          else if (chunk instanceof EndPortletChunk)
          {
-            windowId =3D null;
             startPortletChunk =3D null;
-            portletResponse =3D null;
          }
       }
       out.close();

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/PagePortletControllerContext.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/PagePortletControllerContext.java	2008-02-07 21:33:34 UTC (rev 9840)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/PagePortletControllerContext.java	2008-02-07 22:34:26 UTC (rev 9841)
@@ -23,12 +23,10 @@
 package org.jboss.portal.portlet.test.jsp;
 =

 import org.jboss.portal.portlet.test.controller.AbstractPortletControllerC=
ontext;
-import org.jboss.portal.portlet.test.jsp.response.Chunk;
-import org.jboss.portal.portlet.test.jsp.response.portlet.StartPortletChun=
k;
-import org.jboss.portal.portlet.test.jsp.response.ResponseBuffer;
 import org.jboss.portal.portlet.Portlet;
 import org.jboss.portal.portlet.PortletInvokerException;
 import org.jboss.portal.portlet.PortletInvoker;
+import org.jboss.portal.portlet.PortletContext;
 import org.jboss.portal.portlet.info.PortletInfo;
 import org.jboss.portal.portlet.controller.event.EventControllerContext;
 import org.jboss.portal.portlet.controller.impl.event.EventControllerConte=
xtImpl;
@@ -43,7 +41,6 @@
 import java.io.IOException;
 import java.util.Map;
 import java.util.HashMap;
-import java.util.LinkedHashMap;
 =

 /**
  * @author Julien Viet
@@ -51,9 +48,6 @@
  */
 public class PagePortletControllerContext extends AbstractPortletControlle=
rContext
 {
-   =

-   /** . */
-   private final Page page;
 =

    /** . */
    private final PortletInvoker invoker;
@@ -61,70 +55,49 @@
    /** . */
    private final EventControllerContext eventControllerContext;
 =

+   /** . */
+   private final Map portlets;
+
    public PagePortletControllerContext(
       HttpServletRequest req,
       HttpServletResponse resp,
       ServletContext servletContext,
-      PortletInvoker invoker,
-      ResponseBuffer buffer)
-      throws IllegalRequestException, IOException, ClassNotFoundException,=
 ServletException
+      PortletInvoker invoker)
+      throws IllegalRequestException, IOException, ServletException, Portl=
etInvokerException
    {
       super(req, resp, servletContext);
 =

-      // Collect portlets to create the page
-      int counter =3D 0;
-      Map windows =3D new LinkedHashMap();
-      for (Chunk chunk : buffer.getChunks())
+      //
+      Map portlets =3D new HashMap();
+      for (Portlet portlet : invoker.getPortlets())
       {
-         if (chunk instanceof StartPortletChunk)
-         {
-            StartPortletChunk startPortletChunk =3D (StartPortletChunk)chu=
nk;
-            String windowId =3D "" + counter++;
-
-            //
-            try
-            {
-               for (Portlet portlet : invoker.getPortlets())
-               {
-                  PortletInfo portletInfo =3D portlet.getInfo();
-                  String portletName =3D portletInfo.getName();
-                  String applicationName =3D portletInfo.getApplicationNam=
e();
-
-                  //
-                  if (applicationName.equals(startPortletChunk.getApplicat=
ionName()) && portletName.equals(startPortletChunk.getPortletName()))
-                  {
-                     windows.put(startPortletChunk, new Window(windowId, p=
ortlet));
-                  }
-               }
-            }
-            catch (PortletInvokerException e)
-            {
-               throw new ServletException(e);
-            }
-         }
+         PortletInfo portletInfo =3D portlet.getInfo();
+         String portletName =3D portletInfo.getName();
+         String applicationName =3D portletInfo.getApplicationName();
+         Key key =3D new Key(applicationName, portletName);
+         portlets.put(key, portlet);
       }
 =

       //
-
-
-      //
-      this.page =3D new Page(buffer.getChunks(), windows);
+      this.portlets =3D portlets;
       this.invoker =3D invoker;
       this.eventControllerContext =3D new EventControllerContextImpl(invok=
er);
    }
 =

-   public Page getPage()
+   public Portlet findPortlet(String applicationName, String portletName)
    {
-      return page;
+      return portlets.get(new Key(applicationName, portletName));
    }
 =

    protected Portlet getPortlet(String windowId) throws PortletInvokerExce=
ption
    {
-      Window window =3D page.getWindow(windowId);
-      return window.getPortlet();
+      int index =3D windowId.lastIndexOf('.');
+      String portletId =3D windowId.substring(0, index);
+      PortletContext portletContext =3D PortletContext.createPortletContex=
t(portletId);
+      return invoker.getPortlet(portletContext);
    }
 =

-   protected PortletInvocationResponse invoke(PortletInvocation invocation=
) throws PortletInvokerException
+   public PortletInvocationResponse invoke(PortletInvocation invocation) t=
hrows PortletInvokerException
    {
       return invoker.invoke(invocation);
    }
@@ -133,4 +106,40 @@
    {
       return eventControllerContext;
    }
+
+   private static class Key
+   {
+
+      /** . */
+      private final String applicationName;
+
+      /** . */
+      private final String portletName;
+
+      private Key(String applicationName, String portletName)
+      {
+         this.applicationName =3D applicationName;
+         this.portletName =3D portletName;
+      }
+
+      public boolean equals(Object obj)
+      {
+         if (obj =3D=3D this)
+         {
+            return true;
+         }
+         if (obj instanceof Key)
+         {
+            Key that =3D (Key)obj;
+            return applicationName.equals(that.applicationName) && portlet=
Name.equals(that.portletName);
+         }
+         return false;
+      }
+
+      public int hashCode()
+      {
+         return applicationName.hashCode() + portletName.hashCode();
+      }
+   }
+
 }

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/response/BufferingResponse.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/response/BufferingResponse.java	2008-02-07 21:33:34 UTC (rev 9840)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/response/BufferingResponse.java	2008-02-07 22:34:26 UTC (rev 9841)
@@ -24,6 +24,8 @@
 =

 import org.jboss.portal.portlet.test.jsp.response.ResponseBuffer;
 import org.jboss.portal.portlet.test.jsp.response.Chunk;
+import org.jboss.portal.portlet.test.jsp.PagePortletControllerContext;
+import org.jboss.portal.portlet.controller.state.PageNavigationalState;
 =

 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponseWrapper;
@@ -41,11 +43,37 @@
    /** . */
    private final ResponseBuffer buffer =3D new ResponseBuffer();
 =

-   public BufferingResponse(HttpServletResponse response)
+   /** . */
+   private final PagePortletControllerContext portletControllerContext;
+
+   /** . */
+   private final PageNavigationalState pageState;
+
+   /** . */
+   private int count =3D 0;
+
+   public BufferingResponse(
+      HttpServletResponse response,
+      PagePortletControllerContext portletControllerContext,
+      PageNavigationalState pageState)
    {
       super(response);
+
+      //
+      this.portletControllerContext =3D portletControllerContext;
+      this.pageState =3D pageState;
    }
 =

+   public PageNavigationalState getPageState()
+   {
+      return pageState;
+   }
+
+   public PagePortletControllerContext getPortletControllerContext()
+   {
+      return portletControllerContext;
+   }
+
    public ResponseBuffer getBuffer()
    {
       return buffer;
@@ -65,4 +93,9 @@
    {
       buffer.close();
    }
+
+   public String nextId()
+   {
+      return "" + count++;
+   }
 }

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/response/portlet/StartPortletChunk.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/response/portlet/StartPortletChunk.java	2008-02-07 21:33:34 UTC (rev 98=
40)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/response/portlet/StartPortletChunk.java	2008-02-07 22:34:26 UTC (rev 98=
41)
@@ -25,6 +25,7 @@
 import org.jboss.portal.Mode;
 import org.jboss.portal.WindowState;
 import org.jboss.portal.portlet.test.jsp.response.Chunk;
+import org.jboss.portal.portlet.invocation.response.PortletInvocationRespo=
nse;
 =

 import java.util.Set;
 =

@@ -42,6 +43,12 @@
    private final String applicationName;
 =

    /** . */
+   private final String windowId;
+
+   /** . */
+   private final PortletInvocationResponse response;
+
+   /** . */
    private final Mode initialMode;
 =

    /** . */
@@ -50,10 +57,19 @@
    /** . */
    private final Set supportedWindowStates;
 =

-   public StartPortletChunk(String portletName, String applicationName, Mo=
de initialMode, Set supportedModes, Set supportedWindowS=
tates)
+   public StartPortletChunk(
+      String portletName,
+      String applicationName,
+      String windowId,
+      PortletInvocationResponse response,
+      Mode initialMode,
+      Set supportedModes,
+      Set supportedWindowStates)
    {
       this.portletName =3D portletName;
       this.applicationName =3D applicationName;
+      this.windowId =3D windowId;
+      this.response =3D response;
       this.initialMode =3D initialMode;
       this.supportedModes =3D supportedModes;
       this.supportedWindowStates =3D supportedWindowStates;
@@ -69,6 +85,16 @@
       return applicationName;
    }
 =

+   public String getWindowId()
+   {
+      return windowId;
+   }
+
+   public PortletInvocationResponse getResponse()
+   {
+      return response;
+   }
+
    public Mode getInitialMode()
    {
       return initialMode;

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/taglib/PortletTag.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortletTag.java	2008-02-07 21:33:34 UTC (rev 9840)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortletTag.java	2008-02-07 22:34:26 UTC (rev 9841)
@@ -24,9 +24,27 @@
 =

 import org.jboss.portal.portlet.test.jsp.response.portlet.StartPortletChun=
k;
 import org.jboss.portal.portlet.test.jsp.response.portlet.EndPortletChunk;
+import org.jboss.portal.portlet.test.jsp.response.BufferingResponse;
+import org.jboss.portal.portlet.test.jsp.PagePortletControllerContext;
+import org.jboss.portal.portlet.test.controller.TestInstanceContext;
+import org.jboss.portal.portlet.test.controller.TestPortalContext;
+import org.jboss.portal.portlet.invocation.response.PortletInvocationRespo=
nse;
+import org.jboss.portal.portlet.invocation.RenderInvocation;
+import org.jboss.portal.portlet.controller.state.PageNavigationalState;
+import org.jboss.portal.portlet.controller.state.WindowNavigationalState;
+import org.jboss.portal.portlet.StateString;
+import org.jboss.portal.portlet.PortletInvokerException;
+import org.jboss.portal.portlet.Portlet;
+import org.jboss.portal.portlet.impl.spi.AbstractClientContext;
+import org.jboss.portal.portlet.impl.spi.AbstractServerContext;
+import org.jboss.portal.portlet.impl.spi.AbstractUserContext;
+import org.jboss.portal.portlet.impl.spi.AbstractWindowContext;
+import org.jboss.portal.portlet.impl.spi.AbstractSecurityContext;
+import org.jboss.portal.portlet.spi.PortletInvocationContext;
 import org.jboss.portal.Mode;
 import org.jboss.portal.WindowState;
 import org.jboss.portal.common.util.Tools;
+import org.jboss.portal.common.util.ParameterMap;
 =

 import javax.servlet.jsp.JspException;
 import java.io.IOException;
@@ -114,6 +132,38 @@
 =

    public int doStartTag() throws JspException
    {
+
+      //
+      BufferingResponse response =3D (BufferingResponse)pageContext.getRes=
ponse();
+      StartPortletChunk chunk =3D render(response);
+
+      //
+      try
+      {
+         pageContext.getOut().flush();
+      }
+      catch (IOException e)
+      {
+         throw new JspException(e);
+      }
+
+      //
+      addChunk(chunk);
+
+      //
+      return EVAL_BODY_INCLUDE;
+   }
+
+   public int doEndTag() throws JspException
+   {
+      addChunk(new EndPortletChunk());
+
+      //
+      return EVAL_PAGE;
+   }
+
+   public StartPortletChunk render(BufferingResponse response)
+   {
       Set supportedModes =3D new LinkedHashSet();
       if (supportedModeValues !=3D null)
       {
@@ -151,32 +201,91 @@
       }
 =

       //
+      PagePortletControllerContext context =3D response.getPortletControll=
erContext();
+
+      //
+      Portlet portlet =3D context.findPortlet(applicationName, name);
+
+      //
+      String windowId =3D portlet.getContext().getId() + "." + response.ne=
xtId();
+      PageNavigationalState pageNS =3D response.getPageState();
+
+      //
+      WindowNavigationalState windowNS =3D null;
+      if (pageNS !=3D null)
+      {
+         windowNS =3D pageNS.getWindowNavigationalState(windowId);
+      }
+
+      //
+      ParameterMap publicNS =3D null;
+      if (pageNS !=3D null)
+      {
+         publicNS =3D pageNS.getPublicNavigationalState(windowId);
+      }
+
+      //
+      Mode mode =3D Mode.VIEW;
+      WindowState windowState =3D WindowState.NORMAL;
+      StateString portletNS =3D null;
+
+      //
+      if (windowNS !=3D null)
+      {
+         if (windowNS.getMode() !=3D null)
+         {
+            mode =3D windowNS.getMode();
+         }
+         if (windowNS.getWindowState() !=3D null)
+         {
+            windowState =3D windowNS.getWindowState();
+         }
+         if (windowNS.getPortletNavigationalState() !=3D null)
+         {
+            portletNS =3D windowNS.getPortletNavigationalState();
+         }
+      }
+
+
+      //
+      PortletInvocationContext renderContext =3D context.createPortletInvo=
cationContext(windowId, pageNS);
+      RenderInvocation render =3D new RenderInvocation(renderContext);
+      render.setClientContext(new AbstractClientContext(context.getClientR=
equest()));
+      render.setServerContext(new AbstractServerContext(context.getClientR=
equest(), context.getClientResponse()));
+      render.setInstanceContext(new TestInstanceContext(context.getClientR=
equest(), portlet.getContext(), false));
+      render.setUserContext(new AbstractUserContext(context.getClientReque=
st()));
+      render.setWindowContext(new AbstractWindowContext(windowId));
+      render.setPortalContext(new TestPortalContext());
+      render.setSecurityContext(new AbstractSecurityContext(context.getCli=
entRequest()));
+      render.setTarget(portlet.getContext());
+      render.setMode(mode);
+      render.setWindowState(windowState);
+      render.setNavigationalState(portletNS);
+      render.setPublicNavigationalState(publicNS);
+
+      //
+      PortletInvocationResponse portletResponse =3D null;
       try
       {
-         pageContext.getOut().flush();
+         portletResponse =3D context.invoke(render);
+
+
       }
-      catch (IOException e)
+      catch (PortletInvokerException e)
       {
-         throw new JspException(e);
+         e.printStackTrace();
+
+         // todo
       }
 =

       //
-      addChunk(new StartPortletChunk(
+      return new StartPortletChunk(
          name,
          applicationName,
+         windowId,
+         portletResponse,
          initialMode,
          supportedModes,
-         supportedWindowStates));
-
-      //
-      return EVAL_BODY_INCLUDE;
+         supportedWindowStates);
    }
-
-   public int doEndTag() throws JspException
-   {
-      addChunk(new EndPortletChunk());
-
-      //
-      return EVAL_PAGE;
-   }
 }


--===============1660996087643396573==--

From portal-commits at lists.jboss.org Thu Feb  7 18:34:47 2008
Content-Type: multipart/mixed; boundary="===============8067131162679662602=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9842 - in
 modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp:
 response and 2 other directories.
Date: Thu, 07 Feb 2008 18:34:47 -0500
Message-ID: 

--===============8067131162679662602==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-07 18:34:46 -0500 (Thu, 07 Feb 2008)
New Revision: 9842

Added:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/PortalSimpleTagSupport.java
Removed:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/Page.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/Window.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/response/BytesChunk.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/response/CharsChunk.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/response/Chunk.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/response/EndPageChunk.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/response/ResponseBuffer.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/response/StartPageChunk.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/response/portlet/EndPortletChunk.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/response/portlet/PortletMarkupChunk.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/response/portlet/PortletURLChunk.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/response/portlet/StartPortletTitleChunk.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/BodyChunkTagSupport.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/SimpleChunkTagSupport.java
Modified:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/ControllerFilter.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/response/BufferingResponse.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/response/portlet/StartPortletChunk.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/AbstractURLTag.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/PageTag.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/PortletMarkupTag.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/PortletTag.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/PortletTitleTag.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/PortletURLTag.java
Log:
remove the chunk junk

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/ControllerFilter.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/ControllerFilter.java	2008-02-07 22:34:26 UTC (rev 9841)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/ControllerFilter.java	2008-02-07 23:34:46 UTC (rev 9842)
@@ -22,21 +22,10 @@
  *************************************************************************=
*****/
 package org.jboss.portal.portlet.test.jsp;
 =

-import org.jboss.portal.portlet.test.jsp.response.Chunk;
-import org.jboss.portal.portlet.test.jsp.response.BytesChunk;
-import org.jboss.portal.portlet.test.jsp.response.CharsChunk;
-import org.jboss.portal.portlet.test.jsp.response.portlet.StartPortletChun=
k;
-import org.jboss.portal.portlet.test.jsp.response.portlet.PortletMarkupChu=
nk;
-import org.jboss.portal.portlet.test.jsp.response.portlet.StartPortletTitl=
eChunk;
-import org.jboss.portal.portlet.test.jsp.response.portlet.PortletURLChunk;
-import org.jboss.portal.portlet.test.jsp.response.portlet.EndPortletChunk;
 import org.jboss.portal.portlet.test.jsp.response.BufferingResponse;
-import org.jboss.portal.portlet.test.jsp.response.ResponseBuffer;
 import org.jboss.portal.portlet.test.controller.PortletURLRenderer;
 import org.jboss.portal.portlet.PortletInvoker;
 import org.jboss.portal.portlet.PortletInvokerException;
-import org.jboss.portal.portlet.RenderURL;
-import org.jboss.portal.portlet.StateString;
 import org.jboss.portal.portlet.invocation.response.PortletInvocationRespo=
nse;
 import org.jboss.portal.portlet.invocation.response.FragmentResponse;
 import org.jboss.portal.portlet.controller.PortletController;
@@ -46,10 +35,7 @@
 import org.jboss.portal.portlet.controller.response.PageUpdateResponse;
 import org.jboss.portal.portlet.controller.response.ResourceResponse;
 import org.jboss.portal.portlet.controller.state.PageNavigationalState;
-import org.jboss.portal.portlet.controller.state.WindowNavigationalState;
 import org.jboss.portal.common.io.IOTools;
-import org.jboss.portal.Mode;
-import org.jboss.portal.WindowState;
 =

 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -63,9 +49,6 @@
 import javax.servlet.ServletContext;
 import java.io.IOException;
 import java.io.Writer;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.util.Map;
 =

 /**
  * @author Julien Viet
@@ -228,20 +211,6 @@
 =

       //
       chain.doFilter(req, bufferingResponse);
-
-      //
-      ResponseBuffer buffer =3D bufferingResponse.getBuffer();
-      buffer.close();
-
-      //
-      try
-      {
-         render(req, bufferingResponse);
-      }
-      catch (ClassNotFoundException e)
-      {
-         throw new ServletException(e);
-      }
    }
 =

    public void destroy()
@@ -253,7 +222,7 @@
    {
 =

       //
-      PagePortletControllerContext context =3D resp.getPortletControllerCo=
ntext();
+//      PagePortletControllerContext context =3D resp.getPortletController=
Context();
 =

       //
 =

@@ -322,141 +291,5 @@
          }
       }
 */
-
-      //
-//      Map responses =3D page.render(c=
ontext, pageState);
-
-      //
-      OutputStream out =3D resp.getResponse().getOutputStream();
-      OutputStreamWriter writer =3D new OutputStreamWriter(out);
-
-      //
-      StartPortletChunk startPortletChunk =3D null;
-      for (Chunk chunk : resp.getBuffer().getChunks())
-      {
-         if (chunk instanceof BytesChunk)
-         {
-            BytesChunk bytesChunk =3D (BytesChunk)chunk;
-            out.write(bytesChunk.getBytes());
-            out.flush();
-         }
-         else if (chunk instanceof CharsChunk)
-         {
-            CharsChunk bytesChunk =3D (CharsChunk)chunk;
-            writer.write(bytesChunk.getChars());
-            writer.flush();
-         }
-         else if (chunk instanceof StartPortletChunk)
-         {
-            startPortletChunk =3D (StartPortletChunk)chunk;
-         }
-         else if (chunk instanceof StartPortletTitleChunk)
-         {
-            PortletInvocationResponse portletResponse =3D startPortletChun=
k.getResponse();
-            if (portletResponse !=3D null)
-            {
-               if (portletResponse instanceof FragmentResponse)
-               {
-                  FragmentResponse fragment =3D (FragmentResponse)portletR=
esponse;
-                  writer.write(fragment.getTitle());
-                  writer.flush();
-               }
-            }
-         }
-         else if (chunk instanceof PortletURLChunk)
-         {
-            final PortletURLChunk portletURL =3D (PortletURLChunk)chunk;
-            PortletInvocationResponse portletResponse =3D startPortletChun=
k.getResponse();
-            if (portletResponse !=3D null)
-            {
-               if (portletResponse instanceof FragmentResponse)
-               {
-                  PortletURLRenderer renderer =3D new PortletURLRenderer(
-                     (StateControllerContextImpl)context.getStateControlle=
rContext(),
-                     resp.getPageState(),
-                     context.getClientRequest(),
-                     context.getClientResponse());
-
-                  RenderURL url =3D new RenderURL()
-                  {
-                     public StateString getNavigationalState()
-                     {
-                        return null;
-                     }
-
-                     public Map getPublicNavigationalSta=
teChanges()
-                     {
-                        return portletURL.getParams();
-                     }
-
-                     public Mode getMode()
-                     {
-                        return portletURL.getMode();
-                     }
-
-                     public WindowState getWindowState()
-                     {
-                        return portletURL.getWindowState();
-                     }
-                  };
-
-                  //
-                  String renderedURL =3D renderer.renderURL(startPortletCh=
unk.getWindowId(), url, null, null, true);
-                  writer.write(renderedURL);
-                  writer.flush();
-               }
-            }
-         }
-         else if (chunk instanceof PortletMarkupChunk)
-         {
-            PortletInvocationResponse portletResponse =3D startPortletChun=
k.getResponse();
-            if (portletResponse !=3D null)
-            {
-               if (portletResponse instanceof FragmentResponse)
-               {
-                  FragmentResponse fragment =3D (FragmentResponse)portletR=
esponse;
-                  WindowNavigationalState windowNS =3D null;
-                  if (resp.getPageState() !=3D null)
-                  {
-                     windowNS =3D resp.getPageState().getWindowNavigationa=
lState(startPortletChunk.getWindowId());
-                  }
-                  if (windowNS =3D=3D null || !windowNS.getWindowState().e=
quals(WindowState.MINIMIZED))
-                  {
-                     if (fragment.getType() !=3D FragmentResponse.TYPE_EMP=
TY)
-                     {
-                        String frag;
-                        if (fragment.getType() =3D=3D FragmentResponse.TYP=
E_BYTES)
-                        {
-                           frag =3D fragment.getBytes().toString();
-                        }
-                        else
-                        {
-                           frag =3D fragment.getChars().toString();
-                        }
-
-                        //
-                        writer.write(frag);
-                        writer.flush();
-                     }
-                  }
-               }
-               else
-               {
-                  writer.write(portletResponse.getClass().getSimpleName() =
+ "[" + startPortletChunk.getPortletName() + "," + startPortletChunk.getApp=
licationName() + "]");
-                  writer.flush();
-               }
-            }
-            else
-            {
-               writer.write("Empty[" + startPortletChunk.getPortletName() =
+ "," + startPortletChunk.getApplicationName() + "]");
-               writer.flush();
-            }
-         }
-         else if (chunk instanceof EndPortletChunk)
-         {
-            startPortletChunk =3D null;
-         }
-      }
-      out.close();
    }
 }

Deleted: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/=
test/jsp/Page.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/Page.java	2008-02-07 22:34:26 UTC (rev 9841)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/Page.java	2008-02-07 23:34:46 UTC (rev 9842)
@@ -1,101 +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.PortletInvocationRespo=
nse;
-import org.jboss.portal.portlet.controller.PortletControllerContext;
-import org.jboss.portal.portlet.controller.state.PageNavigationalState;
-import org.jboss.portal.portlet.test.jsp.response.Chunk;
-import org.jboss.portal.portlet.test.jsp.response.portlet.StartPortletChun=
k;
-
-import java.util.Map;
-import java.util.HashMap;
-import java.util.Collection;
-import java.util.List;
-
-/**
- * @author Julien Viet
- * @version $Revision: 630 $
- */
-public class Page
-{
-
-   /** . */
-   private List chunks;
-
-   /** . */
-   private Map windows;
-
-   public Page(List chunks, Map windows)
-   {
-      this.chunks =3D chunks;
-      this.windows =3D windows;
-   }
-
-   public Collection getChunks()
-   {
-      return chunks;
-   }
-
-   public Window getWindow(Chunk chunk)
-   {
-      return windows.get(chunk);
-   }
-
-   public Window getWindow(String windowId)
-   {
-      for (Window window : windows.values())
-      {
-         if (window.getId().equals(windowId))
-         {
-            return window;
-         }
-      }
-      return null;
-   }
-
-   public Collection getWindows()
-   {
-      return windows.values();
-   }
-
-   public Map render(PortletControllerC=
ontext context, PageNavigationalState pageState)
-   {
-      Map responses =3D new HashMap();
-
-      //
-      for (Window window : windows.values())
-      {
-         PortletInvocationResponse response =3D window.render(context, pag=
eState);
-
-         //
-         if (response !=3D null)
-         {
-            responses.put(window.getId(), response);
-         }
-      }
-
-      //
-      return responses;
-   }
-}

Deleted: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/=
test/jsp/Window.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/Window.java	2008-02-07 22:34:26 UTC (rev 9841)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/Window.java	2008-02-07 23:34:46 UTC (rev 9842)
@@ -1,137 +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.Portlet;
-import org.jboss.portal.portlet.StateString;
-import org.jboss.portal.portlet.PortletInvokerException;
-import org.jboss.portal.portlet.test.controller.TestInstanceContext;
-import org.jboss.portal.portlet.test.controller.TestPortalContext;
-import org.jboss.portal.portlet.impl.spi.AbstractClientContext;
-import org.jboss.portal.portlet.impl.spi.AbstractServerContext;
-import org.jboss.portal.portlet.impl.spi.AbstractUserContext;
-import org.jboss.portal.portlet.impl.spi.AbstractWindowContext;
-import org.jboss.portal.portlet.impl.spi.AbstractSecurityContext;
-import org.jboss.portal.portlet.spi.PortletInvocationContext;
-import org.jboss.portal.portlet.controller.PortletControllerContext;
-import org.jboss.portal.portlet.controller.state.WindowNavigationalState;
-import org.jboss.portal.portlet.controller.state.PageNavigationalState;
-import org.jboss.portal.portlet.invocation.response.PortletInvocationRespo=
nse;
-import org.jboss.portal.portlet.invocation.RenderInvocation;
-import org.jboss.portal.Mode;
-import org.jboss.portal.WindowState;
-import org.jboss.portal.common.util.ParameterMap;
-
-/**
- * @author Julien Viet
- * @version $Revision: 630 $
- */
-public class Window
-{
-
-   /** . */
-   private final String id;
-
-   /** . */
-   private final Portlet portlet;
-
-   public Window(String id, Portlet portlet)
-   {
-      this.id =3D id;
-      this.portlet =3D portlet;
-   }
-
-   public String getId()
-   {
-      return id;
-   }
-
-   public Portlet getPortlet()
-   {
-      return portlet;
-   }
-
-   public PortletInvocationResponse render(
-      PortletControllerContext context,
-      PageNavigationalState pageState)
-   {
-      WindowNavigationalState windowNS =3D pageState.getWindowNavigational=
State(id);
-
-      //
-      Mode mode =3D Mode.VIEW;
-      WindowState windowState =3D WindowState.NORMAL;
-      StateString portletNS =3D null;
-
-      //
-      if (windowNS !=3D null)
-      {
-         if (windowNS.getMode() !=3D null)
-         {
-            mode =3D windowNS.getMode();
-         }
-         if (windowNS.getWindowState() !=3D null)
-         {
-            windowState =3D windowNS.getWindowState();
-         }
-         if (windowNS.getPortletNavigationalState() !=3D null)
-         {
-            portletNS =3D windowNS.getPortletNavigationalState();
-         }
-      }
-
-      //
-      ParameterMap publicNS =3D pageState.getPublicNavigationalState(id);
-
-      //
-      PortletInvocationContext renderContext =3D context.createPortletInvo=
cationContext(id, pageState);
-      RenderInvocation render =3D new RenderInvocation(renderContext);
-      render.setClientContext(new AbstractClientContext(context.getClientR=
equest()));
-      render.setServerContext(new AbstractServerContext(context.getClientR=
equest(), context.getClientResponse()));
-      render.setInstanceContext(new TestInstanceContext(context.getClientR=
equest(), portlet.getContext(), false));
-      render.setUserContext(new AbstractUserContext(context.getClientReque=
st()));
-      render.setWindowContext(new AbstractWindowContext(id));
-      render.setPortalContext(new TestPortalContext());
-      render.setSecurityContext(new AbstractSecurityContext(context.getCli=
entRequest()));
-      render.setTarget(portlet.getContext());
-      render.setMode(mode);
-      render.setWindowState(windowState);
-      render.setNavigationalState(portletNS);
-      render.setPublicNavigationalState(publicNS);
-
-      //
-      try
-      {
-         return ((PagePortletControllerContext)context).invoke(render);
-
-      }
-      catch (PortletInvokerException e)
-      {
-         e.printStackTrace();
-
-         // todo
-
-         //
-         return null;
-      }
-   }
-}

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/response/BufferingResponse.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/response/BufferingResponse.java	2008-02-07 22:34:26 UTC (rev 9841)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/response/BufferingResponse.java	2008-02-07 23:34:46 UTC (rev 9842)
@@ -22,16 +22,13 @@
  *************************************************************************=
*****/
 package org.jboss.portal.portlet.test.jsp.response;
 =

-import org.jboss.portal.portlet.test.jsp.response.ResponseBuffer;
-import org.jboss.portal.portlet.test.jsp.response.Chunk;
 import org.jboss.portal.portlet.test.jsp.PagePortletControllerContext;
 import org.jboss.portal.portlet.controller.state.PageNavigationalState;
+import org.jboss.portal.portlet.controller.state.WindowNavigationalState;
+import org.jboss.portal.WindowState;
 =

 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponseWrapper;
-import javax.servlet.ServletOutputStream;
-import java.io.IOException;
-import java.io.PrintWriter;
 =

 /**
  * @author Julien Viet
@@ -41,7 +38,7 @@
 {
 =

    /** . */
-   private final ResponseBuffer buffer =3D new ResponseBuffer();
+//   private final ResponseBuffer buffer =3D new ResponseBuffer();
 =

    /** . */
    private final PagePortletControllerContext portletControllerContext;
@@ -64,36 +61,83 @@
       this.pageState =3D pageState;
    }
 =

+   /**
+    * The page state for the rendering.
+    *
+    * @return the page state
+    */
    public PageNavigationalState getPageState()
    {
       return pageState;
    }
 =

-   public PagePortletControllerContext getPortletControllerContext()
+   public String getMaximizedWindowId()
    {
-      return portletControllerContext;
-   }
+      if (pageState !=3D null)
+      {
+         for (String windowId : pageState.getWindowIds())
+         {
+            WindowNavigationalState windowNS =3D pageState.getWindowNaviga=
tionalState(windowId);
+            if (WindowState.MAXIMIZED.equals(windowNS.getWindowState()))
+            {
+               return windowId;
+            }
+         }
+      }
 =

-   public ResponseBuffer getBuffer()
-   {
-      return buffer;
+      //
+      return null;
    }
 =

-   public ServletOutputStream getOutputStream() throws IOException
+   public boolean isRenderable(String windowId)
    {
-      return buffer.getOutputStream();
-   }
+      if (windowId =3D=3D null)
+      {
+         throw new IllegalArgumentException();
+      }
 =

-   public PrintWriter getWriter() throws IOException
-   {
-      return buffer.getWriter();
+      //
+      if (pageState =3D=3D null)
+      {
+         return false;
+      }
+
+      //
+      String maximizedWindowId =3D getMaximizedWindowId();
+      if (maximizedWindowId !=3D null)
+      {
+         return maximizedWindowId.equals(windowId);
+      }
+
+      //
+      return true;
    }
 =

-   public void close()
+   public PagePortletControllerContext getPortletControllerContext()
    {
-      buffer.close();
+      return portletControllerContext;
    }
 =

+//   public ResponseBuffer getBuffer()
+//   {
+//      return buffer;
+//   }
+//
+//   public ServletOutputStream getOutputStream() throws IOException
+//   {
+//      return buffer.getOutputStream();
+//   }
+//
+//   public PrintWriter getWriter() throws IOException
+//   {
+//      return buffer.getWriter();
+//   }
+//
+//   public void close()
+//   {
+//      buffer.close();
+//   }
+
    public String nextId()
    {
       return "" + count++;

Deleted: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/=
test/jsp/response/BytesChunk.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/response/BytesChunk.java	2008-02-07 22:34:26 UTC (rev 9841)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/response/BytesChunk.java	2008-02-07 23:34:46 UTC (rev 9842)
@@ -1,44 +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.response;
-
-/**
- * @author Julien Viet
- * @version $Revision: 630 $
- */
-public class BytesChunk extends Chunk
-{
-
-   /** . */
-   private final byte[] bytes;
-
-   public BytesChunk(byte[] bytes)
-   {
-      this.bytes =3D bytes;
-   }
-
-   public byte[] getBytes()
-   {
-      return bytes;
-   }
-}

Deleted: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/=
test/jsp/response/CharsChunk.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/response/CharsChunk.java	2008-02-07 22:34:26 UTC (rev 9841)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/response/CharsChunk.java	2008-02-07 23:34:46 UTC (rev 9842)
@@ -1,44 +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.response;
-
-/**
- * @author Julien Viet
- * @version $Revision: 630 $
- */
-public class CharsChunk extends Chunk
-{
-
-   /** . */
-   private final char[] chars;
-
-   public CharsChunk(char[] chars)
-   {
-      this.chars =3D chars;
-   }
-
-   public char[] getChars()
-   {
-      return chars;
-   }
-}

Deleted: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/=
test/jsp/response/Chunk.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/response/Chunk.java	2008-02-07 22:34:26 UTC (rev 9841)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/response/Chunk.java	2008-02-07 23:34:46 UTC (rev 9842)
@@ -1,34 +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.response;
-
-/**
- * @author Julien Viet
- * @version $Revision: 630 $
- */
-public class Chunk
-{
-
-   =

-
-}

Deleted: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/=
test/jsp/response/EndPageChunk.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/response/EndPageChunk.java	2008-02-07 22:34:26 UTC (rev 9841)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/response/EndPageChunk.java	2008-02-07 23:34:46 UTC (rev 9842)
@@ -1,33 +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.response;
-
-import org.jboss.portal.portlet.test.jsp.response.Chunk;
-
-/**
- * @author Julien Viet
- * @version $Revision: 630 $
- */
-public class EndPageChunk extends Chunk
-{
-}

Deleted: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/=
test/jsp/response/ResponseBuffer.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/response/ResponseBuffer.java	2008-02-07 22:34:26 UTC (rev 9841)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/response/ResponseBuffer.java	2008-02-07 23:34:46 UTC (rev 9842)
@@ -1,216 +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.response;
-
-import javax.servlet.ServletOutputStream;
-import java.io.IOException;
-import java.io.ByteArrayOutputStream;
-import java.io.StringWriter;
-import java.io.PrintWriter;
-import java.util.LinkedList;
-import java.util.List;
-
-/**
- * @author Julien Viet
- * @version $Revision: 630 $
- */
-public class ResponseBuffer
-{
-
-   /** . */
-   private final List chunks =3D new LinkedList();
-
-   /** . */
-   private ChunkOutputStream chunkOutputStream;
-
-   /** . */
-   private ChunkWriter chunkWriter;
-
-   /** . */
-   private PrintWriter writer;
-
-   /** . */
-   private boolean muted;
-
-   public boolean isMuted()
-   {
-      return muted;
-   }
-
-   public void setMuted(boolean muted)
-   {
-      this.muted =3D muted;
-   }
-
-   public List getChunks()
-   {
-      return chunks;
-   }
-
-   public void flush()
-   {
-      if (chunkWriter !=3D null)
-      {
-         chunkWriter.writeChunk();
-      }
-      else if (chunkOutputStream !=3D null)
-      {
-         chunkOutputStream.writeChunk();
-      }
-   }
-
-   public void close()
-   {
-      try
-      {
-         if (chunkWriter !=3D null)
-         {
-            chunkWriter.close();
-         }
-         else if (chunkOutputStream !=3D null)
-         {
-            chunkOutputStream.close();
-         }
-      }
-      catch (IOException e)
-      {
-         e.printStackTrace();
-      }
-   }
-
-   public ServletOutputStream getOutputStream()
-   {
-      if (chunkOutputStream =3D=3D null)
-      {
-         if (writer !=3D null)
-         {
-            throw new IllegalStateException();
-         }
-
-         //
-         chunkOutputStream =3D new ChunkOutputStream();
-      }
-
-      //
-      return chunkOutputStream;
-   }
-
-   public PrintWriter getWriter()
-   {
-      if (chunkWriter =3D=3D null)
-      {
-         if (chunkOutputStream !=3D null)
-         {
-            throw new IllegalStateException();
-         }
-
-         //
-         chunkWriter =3D new ChunkWriter();
-         writer =3D new PrintWriter(chunkWriter);
-      }
-
-      //
-      return writer;
-   }
-
-   public void addChunk(Chunk chunk)
-   {
-      if (chunkWriter !=3D null)
-      {
-         chunkWriter.writeChunk();
-      }
-      else if (chunkOutputStream !=3D null)
-      {
-         chunkOutputStream.writeChunk();
-      }
-
-      //
-      chunks.add(chunk);
-   }
-
-   private class ChunkWriter extends StringWriter
-   {
-
-      public void writeChunk()
-      {
-         StringBuffer sb =3D getBuffer();
-         if (sb.length() > 0)
-         {
-            if (!muted)
-            {
-               char[] chars =3D new char[sb.length()];
-               sb.getChars(0, sb.length(), chars, 0);
-               CharsChunk chunk =3D new CharsChunk(chars);
-               chunks.add(chunk);
-            }
-
-            //
-            sb.setLength(0);
-         }
-      }
-
-      public void close() throws IOException
-      {
-         super.close();
-
-         //
-         writeChunk();
-      }
-   }
-
-   private class ChunkOutputStream extends ServletOutputStream
-   {
-
-      /** . */
-      private final ByteArrayOutputStream bytebuffer =3D new ByteArrayOutp=
utStream();
-
-      public void write(int b) throws IOException
-      {
-         bytebuffer.write(b);
-      }
-
-      public void writeChunk()
-      {
-         if (bytebuffer.size() > 0 && !muted)
-         {
-            if (!muted)
-            {
-               byte[] bytes =3D bytebuffer.toByteArray();
-               BytesChunk chunk =3D new BytesChunk(bytes);
-               chunks.add(chunk);
-            }
-
-            //
-            bytebuffer.reset();
-         }
-      }
-
-      public void close() throws IOException
-      {
-         super.close();
-
-         //
-         writeChunk();
-      }
-   }
-}

Deleted: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/=
test/jsp/response/StartPageChunk.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/response/StartPageChunk.java	2008-02-07 22:34:26 UTC (rev 9841)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/response/StartPageChunk.java	2008-02-07 23:34:46 UTC (rev 9842)
@@ -1,33 +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.response;
-
-import org.jboss.portal.portlet.test.jsp.response.Chunk;
-
-/**
- * @author Julien Viet
- * @version $Revision: 630 $
- */
-public class StartPageChunk extends Chunk
-{
-}

Deleted: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/=
test/jsp/response/portlet/EndPortletChunk.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/response/portlet/EndPortletChunk.java	2008-02-07 22:34:26 UTC (rev 9841)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/response/portlet/EndPortletChunk.java	2008-02-07 23:34:46 UTC (rev 9842)
@@ -1,33 +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.response.portlet;
-
-import org.jboss.portal.portlet.test.jsp.response.Chunk;
-
-/**
- * @author Julien Viet
- * @version $Revision: 630 $
- */
-public class EndPortletChunk extends Chunk
-{
-}

Deleted: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/=
test/jsp/response/portlet/PortletMarkupChunk.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/response/portlet/PortletMarkupChunk.java	2008-02-07 22:34:26 UTC (rev 9=
841)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/response/portlet/PortletMarkupChunk.java	2008-02-07 23:34:46 UTC (rev 9=
842)
@@ -1,33 +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.response.portlet;
-
-import org.jboss.portal.portlet.test.jsp.response.Chunk;
-
-/**
- * @author Julien Viet
- * @version $Revision: 630 $
- */
-public class PortletMarkupChunk extends Chunk
-{
-}

Deleted: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/=
test/jsp/response/portlet/PortletURLChunk.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/response/portlet/PortletURLChunk.java	2008-02-07 22:34:26 UTC (rev 9841)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/response/portlet/PortletURLChunk.java	2008-02-07 23:34:46 UTC (rev 9842)
@@ -1,68 +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.response.portlet;
-
-import org.jboss.portal.portlet.test.jsp.response.Chunk;
-import org.jboss.portal.Mode;
-import org.jboss.portal.WindowState;
-
-import java.util.Map;
-
-/**
- * @author Julien Viet
- * @version $Revision: 630 $
- */
-public class PortletURLChunk extends Chunk
-{
-
-   /** . */
-   private final Mode mode;
-
-   /** . */
-   private final WindowState windowState;
-
-   /** . */
-   private final Map params;
-
-   public PortletURLChunk(Mode mode, WindowState windowState, Map params)
-   {
-      this.mode =3D mode;
-      this.windowState =3D windowState;
-      this.params =3D params;
-   }
-
-   public Mode getMode()
-   {
-      return mode;
-   }
-
-   public WindowState getWindowState()
-   {
-      return windowState;
-   }
-
-   public Map getParams()
-   {
-      return params;
-   }
-}

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/response/portlet/StartPortletChunk.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/response/portlet/StartPortletChunk.java	2008-02-07 22:34:26 UTC (rev 98=
41)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/response/portlet/StartPortletChunk.java	2008-02-07 23:34:46 UTC (rev 98=
42)
@@ -24,7 +24,6 @@
 =

 import org.jboss.portal.Mode;
 import org.jboss.portal.WindowState;
-import org.jboss.portal.portlet.test.jsp.response.Chunk;
 import org.jboss.portal.portlet.invocation.response.PortletInvocationRespo=
nse;
 =

 import java.util.Set;
@@ -33,7 +32,7 @@
  * @author Julien Viet
  * @version $Revision: 630 $
  */
-public class StartPortletChunk extends Chunk
+public class StartPortletChunk
 {
 =

    /** . */

Deleted: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/=
test/jsp/response/portlet/StartPortletTitleChunk.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/response/portlet/StartPortletTitleChunk.java	2008-02-07 22:34:26 UTC (r=
ev 9841)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/response/portlet/StartPortletTitleChunk.java	2008-02-07 23:34:46 UTC (r=
ev 9842)
@@ -1,33 +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.response.portlet;
-
-import org.jboss.portal.portlet.test.jsp.response.Chunk;
-
-/**
- * @author Julien Viet
- * @version $Revision: 630 $
- */
-public class StartPortletTitleChunk extends Chunk
-{
-}

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/taglib/AbstractURLTag.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/AbstractURLTag.java	2008-02-07 22:34:26 UTC (rev 9841)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/AbstractURLTag.java	2008-02-07 23:34:46 UTC (rev 9842)
@@ -23,6 +23,7 @@
 package org.jboss.portal.portlet.test.jsp.taglib;
 =

 import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.tagext.BodyTagSupport;
 import java.util.Map;
 import java.util.HashMap;
 =

@@ -30,22 +31,17 @@
  * @author Julien Viet
  * @version $Revision: 630 $
  */
-public class AbstractURLTag extends BodyChunkTagSupport
+public class AbstractURLTag extends BodyTagSupport
 {
 =

    /** . */
-   private Map params =3D new HashMap(=
);
+   protected Map params =3D new HashMap();
 =

    public void setParam(String name, String value)
    {
       params.put(name, new String[]{value});
    }
 =

-   public Map getParams()
-   {
-      return new HashMap(params);
-   }
-
    public void doInitBody() throws JspException
    {
       params.clear();

Deleted: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/=
test/jsp/taglib/BodyChunkTagSupport.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/BodyChunkTagSupport.java	2008-02-07 22:34:26 UTC (rev 9841)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/BodyChunkTagSupport.java	2008-02-07 23:34:46 UTC (rev 9842)
@@ -1,75 +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.taglib;
-
-import org.jboss.portal.portlet.test.jsp.response.BufferingResponse;
-import org.jboss.portal.portlet.test.jsp.response.Chunk;
-import org.jboss.portal.portlet.test.jsp.response.ResponseBuffer;
-
-import javax.servlet.jsp.tagext.BodyTagSupport;
-import javax.servlet.jsp.JspException;
-import java.io.IOException;
-
-/**
- * @author Julien Viet
- * @version $Revision: 630 $
- */
-public class BodyChunkTagSupport extends BodyTagSupport
-{
-
-   protected final ResponseBuffer getBuffer()
-   {
-      BufferingResponse response =3D (BufferingResponse)pageContext.getRes=
ponse();
-      return response.getBuffer();
-   }
-
-   protected void mute(boolean on) throws JspException
-   {
-      try
-      {
-         pageContext.getOut().flush();
-         BufferingResponse response =3D (BufferingResponse)pageContext.get=
Response();
-         ResponseBuffer buffer =3D response.getBuffer();
-         buffer.flush();
-         buffer.setMuted(on);
-      }
-      catch (IOException e)
-      {
-         throw new JspException(e);
-      }
-   }
-
-   protected final void addChunk(Chunk chunk) throws JspException
-   {
-      try
-      {
-         pageContext.getOut().flush();
-         BufferingResponse response =3D (BufferingResponse)pageContext.get=
Response();
-         response.getBuffer().addChunk(chunk);
-      }
-      catch (IOException e)
-      {
-         throw new JspException(e);
-      }
-   }
-}

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/taglib/PageTag.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PageTag.java	2008-02-07 22:34:26 UTC (rev 9841)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PageTag.java	2008-02-07 23:34:46 UTC (rev 9842)
@@ -22,30 +22,24 @@
  *************************************************************************=
*****/
 package org.jboss.portal.portlet.test.jsp.taglib;
 =

-import org.jboss.portal.portlet.test.jsp.response.StartPageChunk;
-import org.jboss.portal.portlet.test.jsp.response.EndPageChunk;
-
 import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.tagext.BodyTagSupport;
 =

 /**
  * @author Julien Viet
  * @version $Revision: 630 $
  */
-public class PageTag extends BodyChunkTagSupport
+public class PageTag extends BodyTagSupport
 {
 =

    public int doStartTag() throws JspException
    {
-      addChunk(new StartPageChunk());
-
       //
       return EVAL_BODY_INCLUDE;
    }
 =

    public int doEndTag() throws JspException
    {
-      addChunk(new EndPageChunk());
-
       //
       return EVAL_PAGE;
    }

Added: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/te=
st/jsp/taglib/PortalSimpleTagSupport.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortalSimpleTagSupport.java	                        (rev 0)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortalSimpleTagSupport.java	2008-02-07 23:34:46 UTC (rev 9842)
@@ -0,0 +1,41 @@
+/*************************************************************************=
*****
+ * 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.taglib;
+
+import org.jboss.portal.portlet.test.jsp.response.BufferingResponse;
+
+import javax.servlet.jsp.tagext.SimpleTagSupport;
+import javax.servlet.jsp.PageContext;
+
+/**
+ * @author Julien Viet
+ * @version $Revision: 630 $
+ */
+public class PortalSimpleTagSupport extends SimpleTagSupport
+{
+   protected final BufferingResponse getPortalResponse()
+   {
+      PageContext pageContext =3D (PageContext)getJspContext();
+      return (BufferingResponse)pageContext.getResponse();
+   }
+}

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/taglib/PortletMarkupTag.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortletMarkupTag.java	2008-02-07 22:34:26 UTC (rev 9841)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortletMarkupTag.java	2008-02-07 23:34:46 UTC (rev 9842)
@@ -22,17 +22,72 @@
  *************************************************************************=
*****/
 package org.jboss.portal.portlet.test.jsp.taglib;
 =

-import org.jboss.portal.portlet.test.jsp.response.Chunk;
-import org.jboss.portal.portlet.test.jsp.response.portlet.PortletMarkupChu=
nk;
+import org.jboss.portal.portlet.test.jsp.response.BufferingResponse;
+import org.jboss.portal.portlet.invocation.response.PortletInvocationRespo=
nse;
+import org.jboss.portal.portlet.invocation.response.FragmentResponse;
+import org.jboss.portal.portlet.controller.state.WindowNavigationalState;
+import org.jboss.portal.WindowState;
 =

+import javax.servlet.jsp.tagext.SimpleTagSupport;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.JspWriter;
+import java.io.IOException;
+
 /**
  * @author Julien Viet
  * @version $Revision: 630 $
  */
-public class PortletMarkupTag extends SimpleChunkTagSupport
+public class PortletMarkupTag extends PortalSimpleTagSupport
 {
-   protected Chunk doChunkTag()
+   public void doTag() throws JspException, IOException
    {
-      return new PortletMarkupChunk();
+
+      BufferingResponse resp =3D getPortalResponse();
+
+      PortletTag portletTag =3D (PortletTag)SimpleTagSupport.findAncestorW=
ithClass(this, PortletTag.class);
+
+      PortletInvocationResponse portletResp =3D portletTag.chunk.getRespon=
se();
+
+      JspWriter out =3D getJspContext().getOut();
+
+      if (portletResp !=3D null)
+      {
+         if (portletResp instanceof FragmentResponse)
+         {
+            FragmentResponse fragment =3D (FragmentResponse)portletResp;
+            WindowNavigationalState windowNS =3D null;
+            if (resp.getPageState() !=3D null)
+            {
+               windowNS =3D resp.getPageState().getWindowNavigationalState=
(portletTag.chunk.getWindowId());
+            }
+            if (windowNS =3D=3D null || !windowNS.getWindowState().equals(=
WindowState.MINIMIZED))
+            {
+               if (fragment.getType() !=3D FragmentResponse.TYPE_EMPTY)
+               {
+                  String frag;
+                  if (fragment.getType() =3D=3D FragmentResponse.TYPE_BYTE=
S)
+                  {
+                     frag =3D fragment.getBytes().toString();
+                  }
+                  else
+                  {
+                     frag =3D fragment.getChars().toString();
+                  }
+
+                  out.write(frag);
+               }
+            }
+         }
+         else
+         {
+            out.write(portletResp.getClass().getSimpleName() + "[" + portl=
etTag.chunk.getPortletName() + "," + portletTag.chunk.getApplicationName() =
+ "]");
+            out.flush();
+         }
+      }
+      else
+      {
+         out.write("Empty[" + portletTag.chunk.getPortletName() + "," + po=
rtletTag.chunk.getApplicationName() + "]");
+         out.flush();
+      }
    }
 }

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/taglib/PortletTag.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortletTag.java	2008-02-07 22:34:26 UTC (rev 9841)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortletTag.java	2008-02-07 23:34:46 UTC (rev 9842)
@@ -23,7 +23,6 @@
 package org.jboss.portal.portlet.test.jsp.taglib;
 =

 import org.jboss.portal.portlet.test.jsp.response.portlet.StartPortletChun=
k;
-import org.jboss.portal.portlet.test.jsp.response.portlet.EndPortletChunk;
 import org.jboss.portal.portlet.test.jsp.response.BufferingResponse;
 import org.jboss.portal.portlet.test.jsp.PagePortletControllerContext;
 import org.jboss.portal.portlet.test.controller.TestInstanceContext;
@@ -47,7 +46,7 @@
 import org.jboss.portal.common.util.ParameterMap;
 =

 import javax.servlet.jsp.JspException;
-import java.io.IOException;
+import javax.servlet.jsp.tagext.BodyTagSupport;
 import java.util.LinkedHashSet;
 import java.util.Set;
 import java.util.Collections;
@@ -56,7 +55,7 @@
  * @author Julien Viet
  * @version $Revision: 630 $
  */
-public class PortletTag extends BodyChunkTagSupport
+public class PortletTag extends BodyTagSupport
 {
 =

    /** . */
@@ -130,35 +129,21 @@
       this.initialModeValue =3D initialMode;
    }
 =

+   StartPortletChunk chunk;
+
    public int doStartTag() throws JspException
    {
-
-      //
       BufferingResponse response =3D (BufferingResponse)pageContext.getRes=
ponse();
-      StartPortletChunk chunk =3D render(response);
-
+      =

       //
-      try
-      {
-         pageContext.getOut().flush();
-      }
-      catch (IOException e)
-      {
-         throw new JspException(e);
-      }
+      chunk =3D render(response);
 =

       //
-      addChunk(chunk);
-
-      //
       return EVAL_BODY_INCLUDE;
    }
 =

    public int doEndTag() throws JspException
    {
-      addChunk(new EndPortletChunk());
-
-      //
       return EVAL_PAGE;
    }
 =


Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/taglib/PortletTitleTag.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortletTitleTag.java	2008-02-07 22:34:26 UTC (rev 9841)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortletTitleTag.java	2008-02-07 23:34:46 UTC (rev 9842)
@@ -22,17 +22,34 @@
  *************************************************************************=
*****/
 package org.jboss.portal.portlet.test.jsp.taglib;
 =

-import org.jboss.portal.portlet.test.jsp.response.Chunk;
-import org.jboss.portal.portlet.test.jsp.response.portlet.StartPortletTitl=
eChunk;
+import org.jboss.portal.portlet.invocation.response.PortletInvocationRespo=
nse;
+import org.jboss.portal.portlet.invocation.response.FragmentResponse;
 =

+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.JspWriter;
+import javax.servlet.jsp.tagext.SimpleTagSupport;
+import java.io.IOException;
+
 /**
  * @author Julien Viet
  * @version $Revision: 630 $
  */
-public class PortletTitleTag extends SimpleChunkTagSupport
+public class PortletTitleTag extends PortalSimpleTagSupport
 {
-   protected Chunk doChunkTag()
+
+   public void doTag() throws JspException, IOException
    {
-      return new StartPortletTitleChunk();
+
+      PortletTag portletTag =3D (PortletTag)SimpleTagSupport.findAncestorW=
ithClass(this, PortletTag.class);
+
+      PortletInvocationResponse portletResp =3D portletTag.chunk.getRespon=
se();
+
+      JspWriter out =3D getJspContext().getOut();
+
+      if (portletResp instanceof FragmentResponse)
+      {
+         FragmentResponse fragment =3D (FragmentResponse)portletResp;
+         out.write(fragment.getTitle());
+      }
    }
 }

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/taglib/PortletURLTag.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortletURLTag.java	2008-02-07 22:34:26 UTC (rev 9841)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortletURLTag.java	2008-02-07 23:34:46 UTC (rev 9842)
@@ -24,9 +24,19 @@
 =

 import org.jboss.portal.Mode;
 import org.jboss.portal.WindowState;
-import org.jboss.portal.portlet.test.jsp.response.portlet.PortletURLChunk;
+import org.jboss.portal.portlet.test.jsp.response.BufferingResponse;
+import org.jboss.portal.portlet.test.jsp.PagePortletControllerContext;
+import org.jboss.portal.portlet.test.controller.PortletURLRenderer;
+import org.jboss.portal.portlet.invocation.response.PortletInvocationRespo=
nse;
+import org.jboss.portal.portlet.controller.impl.state.StateControllerConte=
xtImpl;
+import org.jboss.portal.portlet.RenderURL;
+import org.jboss.portal.portlet.StateString;
 =

 import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.JspWriter;
+import javax.servlet.jsp.tagext.SimpleTagSupport;
+import java.util.Map;
+import java.io.IOException;
 =

 /**
  * @author Julien Viet
@@ -63,20 +73,24 @@
 =

    public int doStartTag() throws JspException
    {
-      mute(true);
-
-      //
       return EVAL_BODY_BUFFERED;
    }
 =

    public int doEndTag() throws JspException
    {
+      BufferingResponse response =3D (BufferingResponse)pageContext.getRes=
ponse();
+      PagePortletControllerContext context =3D response.getPortletControll=
erContext();
+      PortletTag portletTag =3D (PortletTag)SimpleTagSupport.findAncestorW=
ithClass(this, PortletTag.class);
+
       Mode mode =3D null;
       if (modeValue !=3D null)
       {
          mode =3D Mode.create(modeValue.trim());
       }
 =

+      PortletInvocationResponse portletResp =3D portletTag.chunk.getRespon=
se();
+
+
       //
       WindowState windowState =3D null;
       if (windowStateValue !=3D null)
@@ -84,13 +98,53 @@
          windowState =3D WindowState.create(windowStateValue.trim());
       }
 =

-      //
-      addChunk(new PortletURLChunk(mode, windowState, getParams()));
+      PortletURLRenderer renderer =3D new PortletURLRenderer(
+         (StateControllerContextImpl)context.getStateControllerContext(),
+         response.getPageState(),
+         context.getClientRequest(),
+         context.getClientResponse());
 =

-      //
-      mute(false);
+      final WindowState ws =3D windowState;
+      final Mode md =3D mode;
 =

+      RenderURL url =3D new RenderURL()
+      {
+
+
+         public StateString getNavigationalState()
+         {
+            return null;
+         }
+
+         public Map getPublicNavigationalStateChanges()
+         {
+            return params;
+         }
+
+         public Mode getMode()
+         {
+            return md;
+         }
+
+         public WindowState getWindowState()
+         {
+            return ws;
+         }
+      };
+
+      try
+      {
+         JspWriter out =3D pageContext.getOut();
+         String renderedURL =3D renderer.renderURL(portletTag.chunk.getWin=
dowId(), url, null, null, true);
+         out.write(renderedURL);
+      }
+      catch (IOException e)
+      {
+         throw new JspException(e);
+      }
+
       //
       return EVAL_PAGE;
    }
+
 }

Deleted: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/=
test/jsp/taglib/SimpleChunkTagSupport.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/SimpleChunkTagSupport.java	2008-02-07 22:34:26 UTC (rev 9841)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/SimpleChunkTagSupport.java	2008-02-07 23:34:46 UTC (rev 9842)
@@ -1,56 +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.taglib;
-
-import org.jboss.portal.portlet.test.jsp.response.Chunk;
-import org.jboss.portal.portlet.test.jsp.response.BufferingResponse;
-
-import javax.servlet.jsp.tagext.SimpleTagSupport;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
-import java.io.IOException;
-
-/**
- * @author Julien Viet
- * @version $Revision: 630 $
- */
-public abstract class SimpleChunkTagSupport extends SimpleTagSupport
-{
-
-   public final void doTag() throws JspException, IOException
-   {
-      Chunk chunk =3D doChunkTag();
-
-      //
-      if (chunk !=3D null)
-      {
-         PageContext pageCtx =3D (PageContext)getJspContext();
-         pageCtx.getOut().flush();
-         BufferingResponse response =3D (BufferingResponse)pageCtx.getResp=
onse();
-         response.getBuffer().addChunk(chunk);
-      }
-   }
-
-   protected abstract Chunk doChunkTag();
-
-}


--===============8067131162679662602==--

From portal-commits at lists.jboss.org Thu Feb  7 18:42:17 2008
Content-Type: multipart/mixed; boundary="===============6852198828506213117=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9843 - in
 modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp:
 taglib and 1 other directory.
Date: Thu, 07 Feb 2008 18:42:17 -0500
Message-ID: 

--===============6852198828506213117==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-07 18:42:16 -0500 (Thu, 07 Feb 2008)
New Revision: 9843

Added:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/PortalResponse.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/PortletResult.java
Modified:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/ControllerFilter.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/PortalSimpleTagSupport.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/PortletMarkupTag.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/PortletTag.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/PortletTitleTag.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/PortletURLTag.java
Log:
rename old classes to new classes (concepts)

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/ControllerFilter.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/ControllerFilter.java	2008-02-07 23:34:46 UTC (rev 9842)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/ControllerFilter.java	2008-02-07 23:42:16 UTC (rev 9843)
@@ -22,7 +22,7 @@
  *************************************************************************=
*****/
 package org.jboss.portal.portlet.test.jsp;
 =

-import org.jboss.portal.portlet.test.jsp.response.BufferingResponse;
+import org.jboss.portal.portlet.test.jsp.PortalResponse;
 import org.jboss.portal.portlet.test.controller.PortletURLRenderer;
 import org.jboss.portal.portlet.PortletInvoker;
 import org.jboss.portal.portlet.PortletInvokerException;
@@ -207,10 +207,10 @@
       }
 =

       //
-      BufferingResponse bufferingResponse =3D new BufferingResponse(resp, =
context, pageState);
+      PortalResponse portalResponse =3D new PortalResponse(resp, context, =
pageState);
 =

       //
-      chain.doFilter(req, bufferingResponse);
+      chain.doFilter(req, portalResponse);
    }
 =

    public void destroy()
@@ -218,7 +218,7 @@
       this.config =3D null;
    }
 =

-   protected void render(HttpServletRequest req, BufferingResponse resp) t=
hrows ServletException, IOException, ClassNotFoundException
+   protected void render(HttpServletRequest req, PortalResponse resp) thro=
ws ServletException, IOException, ClassNotFoundException
    {
 =

       //

Copied: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/t=
est/jsp/PortalResponse.java (from rev 9842, modules/portlet/trunk/test/src/=
main/java/org/jboss/portal/portlet/test/jsp/response/BufferingResponse.java)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/PortalResponse.java	                        (rev 0)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/PortalResponse.java	2008-02-07 23:42:16 UTC (rev 9843)
@@ -0,0 +1,145 @@
+/*************************************************************************=
*****
+ * 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.test.jsp.PagePortletControllerContext;
+import org.jboss.portal.portlet.controller.state.PageNavigationalState;
+import org.jboss.portal.portlet.controller.state.WindowNavigationalState;
+import org.jboss.portal.WindowState;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletResponseWrapper;
+
+/**
+ * @author Julien Viet
+ * @version $Revision: 630 $
+ */
+public class PortalResponse extends HttpServletResponseWrapper
+{
+
+   /** . */
+//   private final ResponseBuffer buffer =3D new ResponseBuffer();
+
+   /** . */
+   private final PagePortletControllerContext portletControllerContext;
+
+   /** . */
+   private final PageNavigationalState pageState;
+
+   /** . */
+   private int count =3D 0;
+
+   public PortalResponse(
+      HttpServletResponse response,
+      PagePortletControllerContext portletControllerContext,
+      PageNavigationalState pageState)
+   {
+      super(response);
+
+      //
+      this.portletControllerContext =3D portletControllerContext;
+      this.pageState =3D pageState;
+   }
+
+   /**
+    * The page state for the rendering.
+    *
+    * @return the page state
+    */
+   public PageNavigationalState getPageState()
+   {
+      return pageState;
+   }
+
+   public String getMaximizedWindowId()
+   {
+      if (pageState !=3D null)
+      {
+         for (String windowId : pageState.getWindowIds())
+         {
+            WindowNavigationalState windowNS =3D pageState.getWindowNaviga=
tionalState(windowId);
+            if (WindowState.MAXIMIZED.equals(windowNS.getWindowState()))
+            {
+               return windowId;
+            }
+         }
+      }
+
+      //
+      return null;
+   }
+
+   public boolean isRenderable(String windowId)
+   {
+      if (windowId =3D=3D null)
+      {
+         throw new IllegalArgumentException();
+      }
+
+      //
+      if (pageState =3D=3D null)
+      {
+         return false;
+      }
+
+      //
+      String maximizedWindowId =3D getMaximizedWindowId();
+      if (maximizedWindowId !=3D null)
+      {
+         return maximizedWindowId.equals(windowId);
+      }
+
+      //
+      return true;
+   }
+
+   public PagePortletControllerContext getPortletControllerContext()
+   {
+      return portletControllerContext;
+   }
+
+//   public ResponseBuffer getBuffer()
+//   {
+//      return buffer;
+//   }
+//
+//   public ServletOutputStream getOutputStream() throws IOException
+//   {
+//      return buffer.getOutputStream();
+//   }
+//
+//   public PrintWriter getWriter() throws IOException
+//   {
+//      return buffer.getWriter();
+//   }
+//
+//   public void close()
+//   {
+//      buffer.close();
+//   }
+
+   public String nextId()
+   {
+      return "" + count++;
+   }
+}

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/taglib/PortalSimpleTagSupport.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortalSimpleTagSupport.java	2008-02-07 23:34:46 UTC (rev 9842)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortalSimpleTagSupport.java	2008-02-07 23:42:16 UTC (rev 9843)
@@ -22,7 +22,7 @@
  *************************************************************************=
*****/
 package org.jboss.portal.portlet.test.jsp.taglib;
 =

-import org.jboss.portal.portlet.test.jsp.response.BufferingResponse;
+import org.jboss.portal.portlet.test.jsp.PortalResponse;
 =

 import javax.servlet.jsp.tagext.SimpleTagSupport;
 import javax.servlet.jsp.PageContext;
@@ -33,9 +33,9 @@
  */
 public class PortalSimpleTagSupport extends SimpleTagSupport
 {
-   protected final BufferingResponse getPortalResponse()
+   protected final PortalResponse getPortalResponse()
    {
       PageContext pageContext =3D (PageContext)getJspContext();
-      return (BufferingResponse)pageContext.getResponse();
+      return (PortalResponse)pageContext.getResponse();
    }
 }

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/taglib/PortletMarkupTag.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortletMarkupTag.java	2008-02-07 23:34:46 UTC (rev 9842)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortletMarkupTag.java	2008-02-07 23:42:16 UTC (rev 9843)
@@ -22,7 +22,7 @@
  *************************************************************************=
*****/
 package org.jboss.portal.portlet.test.jsp.taglib;
 =

-import org.jboss.portal.portlet.test.jsp.response.BufferingResponse;
+import org.jboss.portal.portlet.test.jsp.PortalResponse;
 import org.jboss.portal.portlet.invocation.response.PortletInvocationRespo=
nse;
 import org.jboss.portal.portlet.invocation.response.FragmentResponse;
 import org.jboss.portal.portlet.controller.state.WindowNavigationalState;
@@ -42,11 +42,11 @@
    public void doTag() throws JspException, IOException
    {
 =

-      BufferingResponse resp =3D getPortalResponse();
+      PortalResponse resp =3D getPortalResponse();
 =

       PortletTag portletTag =3D (PortletTag)SimpleTagSupport.findAncestorW=
ithClass(this, PortletTag.class);
 =

-      PortletInvocationResponse portletResp =3D portletTag.chunk.getRespon=
se();
+      PortletInvocationResponse portletResp =3D portletTag.result.getRespo=
nse();
 =

       JspWriter out =3D getJspContext().getOut();
 =

@@ -58,7 +58,7 @@
             WindowNavigationalState windowNS =3D null;
             if (resp.getPageState() !=3D null)
             {
-               windowNS =3D resp.getPageState().getWindowNavigationalState=
(portletTag.chunk.getWindowId());
+               windowNS =3D resp.getPageState().getWindowNavigationalState=
(portletTag.result.getWindowId());
             }
             if (windowNS =3D=3D null || !windowNS.getWindowState().equals(=
WindowState.MINIMIZED))
             {
@@ -80,13 +80,13 @@
          }
          else
          {
-            out.write(portletResp.getClass().getSimpleName() + "[" + portl=
etTag.chunk.getPortletName() + "," + portletTag.chunk.getApplicationName() =
+ "]");
+            out.write(portletResp.getClass().getSimpleName() + "[" + portl=
etTag.result.getPortletName() + "," + portletTag.result.getApplicationName(=
) + "]");
             out.flush();
          }
       }
       else
       {
-         out.write("Empty[" + portletTag.chunk.getPortletName() + "," + po=
rtletTag.chunk.getApplicationName() + "]");
+         out.write("Empty[" + portletTag.result.getPortletName() + "," + p=
ortletTag.result.getApplicationName() + "]");
          out.flush();
       }
    }

Copied: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/t=
est/jsp/taglib/PortletResult.java (from rev 9842, modules/portlet/trunk/tes=
t/src/main/java/org/jboss/portal/portlet/test/jsp/response/portlet/StartPor=
tletChunk.java)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortletResult.java	                        (rev 0)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortletResult.java	2008-02-07 23:42:16 UTC (rev 9843)
@@ -0,0 +1,114 @@
+/*************************************************************************=
*****
+ * 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.taglib;
+
+import org.jboss.portal.Mode;
+import org.jboss.portal.WindowState;
+import org.jboss.portal.portlet.invocation.response.PortletInvocationRespo=
nse;
+
+import java.util.Set;
+
+/**
+ * Combines the invocation of a portlet and the info on the portlet JSP ta=
g. It does
+ * not need to be exposed out of this package.
+ *
+ * @author Julien Viet
+ * @version $Revision: 630 $
+ */
+class PortletResult
+{
+
+   /** . */
+   private final String portletName;
+
+   /** . */
+   private final String applicationName;
+
+   /** . */
+   private final String windowId;
+
+   /** . */
+   private final PortletInvocationResponse response;
+
+   /** . */
+   private final Mode initialMode;
+
+   /** . */
+   private final Set supportedModes;
+
+   /** . */
+   private final Set supportedWindowStates;
+
+   public PortletResult(
+      String portletName,
+      String applicationName,
+      String windowId,
+      PortletInvocationResponse response,
+      Mode initialMode,
+      Set supportedModes,
+      Set supportedWindowStates)
+   {
+      this.portletName =3D portletName;
+      this.applicationName =3D applicationName;
+      this.windowId =3D windowId;
+      this.response =3D response;
+      this.initialMode =3D initialMode;
+      this.supportedModes =3D supportedModes;
+      this.supportedWindowStates =3D supportedWindowStates;
+   }
+
+   public String getPortletName()
+   {
+      return portletName;
+   }
+
+   public String getApplicationName()
+   {
+      return applicationName;
+   }
+
+   public String getWindowId()
+   {
+      return windowId;
+   }
+
+   public PortletInvocationResponse getResponse()
+   {
+      return response;
+   }
+
+   public Mode getInitialMode()
+   {
+      return initialMode;
+   }
+
+   public Set getSupportedModes()
+   {
+      return supportedModes;
+   }
+
+   public Set getSupportedWindowStates()
+   {
+      return supportedWindowStates;
+   }
+}

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/taglib/PortletTag.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortletTag.java	2008-02-07 23:34:46 UTC (rev 9842)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortletTag.java	2008-02-07 23:42:16 UTC (rev 9843)
@@ -22,8 +22,8 @@
  *************************************************************************=
*****/
 package org.jboss.portal.portlet.test.jsp.taglib;
 =

-import org.jboss.portal.portlet.test.jsp.response.portlet.StartPortletChun=
k;
-import org.jboss.portal.portlet.test.jsp.response.BufferingResponse;
+import org.jboss.portal.portlet.test.jsp.taglib.PortletResult;
+import org.jboss.portal.portlet.test.jsp.PortalResponse;
 import org.jboss.portal.portlet.test.jsp.PagePortletControllerContext;
 import org.jboss.portal.portlet.test.controller.TestInstanceContext;
 import org.jboss.portal.portlet.test.controller.TestPortalContext;
@@ -129,14 +129,14 @@
       this.initialModeValue =3D initialMode;
    }
 =

-   StartPortletChunk chunk;
+   PortletResult result;
 =

    public int doStartTag() throws JspException
    {
-      BufferingResponse response =3D (BufferingResponse)pageContext.getRes=
ponse();
+      PortalResponse response =3D (PortalResponse)pageContext.getResponse(=
);
       =

       //
-      chunk =3D render(response);
+      result =3D render(response);
 =

       //
       return EVAL_BODY_INCLUDE;
@@ -147,7 +147,7 @@
       return EVAL_PAGE;
    }
 =

-   public StartPortletChunk render(BufferingResponse response)
+   public PortletResult render(PortalResponse response)
    {
       Set supportedModes =3D new LinkedHashSet();
       if (supportedModeValues !=3D null)
@@ -264,7 +264,7 @@
       }
 =

       //
-      return new StartPortletChunk(
+      return new PortletResult(
          name,
          applicationName,
          windowId,

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/taglib/PortletTitleTag.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortletTitleTag.java	2008-02-07 23:34:46 UTC (rev 9842)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortletTitleTag.java	2008-02-07 23:42:16 UTC (rev 9843)
@@ -42,7 +42,7 @@
 =

       PortletTag portletTag =3D (PortletTag)SimpleTagSupport.findAncestorW=
ithClass(this, PortletTag.class);
 =

-      PortletInvocationResponse portletResp =3D portletTag.chunk.getRespon=
se();
+      PortletInvocationResponse portletResp =3D portletTag.result.getRespo=
nse();
 =

       JspWriter out =3D getJspContext().getOut();
 =


Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/taglib/PortletURLTag.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortletURLTag.java	2008-02-07 23:34:46 UTC (rev 9842)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortletURLTag.java	2008-02-07 23:42:16 UTC (rev 9843)
@@ -24,7 +24,7 @@
 =

 import org.jboss.portal.Mode;
 import org.jboss.portal.WindowState;
-import org.jboss.portal.portlet.test.jsp.response.BufferingResponse;
+import org.jboss.portal.portlet.test.jsp.PortalResponse;
 import org.jboss.portal.portlet.test.jsp.PagePortletControllerContext;
 import org.jboss.portal.portlet.test.controller.PortletURLRenderer;
 import org.jboss.portal.portlet.invocation.response.PortletInvocationRespo=
nse;
@@ -78,7 +78,7 @@
 =

    public int doEndTag() throws JspException
    {
-      BufferingResponse response =3D (BufferingResponse)pageContext.getRes=
ponse();
+      PortalResponse response =3D (PortalResponse)pageContext.getResponse(=
);
       PagePortletControllerContext context =3D response.getPortletControll=
erContext();
       PortletTag portletTag =3D (PortletTag)SimpleTagSupport.findAncestorW=
ithClass(this, PortletTag.class);
 =

@@ -88,9 +88,6 @@
          mode =3D Mode.create(modeValue.trim());
       }
 =

-      PortletInvocationResponse portletResp =3D portletTag.chunk.getRespon=
se();
-
-
       //
       WindowState windowState =3D null;
       if (windowStateValue !=3D null)
@@ -135,7 +132,7 @@
       try
       {
          JspWriter out =3D pageContext.getOut();
-         String renderedURL =3D renderer.renderURL(portletTag.chunk.getWin=
dowId(), url, null, null, true);
+         String renderedURL =3D renderer.renderURL(portletTag.result.getWi=
ndowId(), url, null, null, true);
          out.write(renderedURL);
       }
       catch (IOException e)


--===============6852198828506213117==--

From portal-commits at lists.jboss.org Thu Feb  7 18:42:33 2008
Content-Type: multipart/mixed; boundary="===============7664424009820635508=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9844 - in
 modules/portlet/trunk/test/src/test/resources/simple-portal-war: WEB-INF and
 5 other directories.
Date: Thu, 07 Feb 2008 18:42:33 -0500
Message-ID: 

--===============7664424009820635508==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: wesleyhales
Date: 2008-02-07 18:42:33 -0500 (Thu, 07 Feb 2008)
New Revision: 9844

Added:
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/=
tags/
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/=
tags/portal/
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/=
tags/portal/portlet.tag
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/css/
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/css/mast=
er.css
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/images/
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/images/a=
ctive-button-bg.gif
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/images/i=
con-maximize.gif
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/images/i=
con-minimize.gif
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/images/i=
con-normal.gif
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/images/i=
nactive-button-bg.gif
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/images/l=
ogo-header.gif
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/images/n=
av-bg.gif
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/images/p=
c20.gif
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/images/p=
ortal-bg.gif
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/images/p=
ortlet-title-rt-bg.gif
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/images/p=
ortlet-titlebg.gif
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/=
default.jsp
Modified:
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/index.jsp
Log:
Initial layout

Added: modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-=
INF/tags/portal/portlet.tag
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF=
/tags/portal/portlet.tag	                        (rev 0)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF=
/tags/portal/portlet.tag	2008-02-07 23:42:33 UTC (rev 9844)
@@ -0,0 +1,29 @@
+<%@ tag body-content=3D"scriptless" %>
+<%@ attribute name=3D"name" required=3D"true" %>
+<%@ attribute name=3D"applicationName" required=3D"true" %>
+<%@ attribute name=3D"content" fragment=3D"true" required=3D"false" %> =

+<%@ taglib uri=3D"/WEB-INF/portal.tld" prefix=3D"portal" %>
+
+
+
+   
+   
+      
+         =

+         
+            ">
+            ">
+            ">
+            ">=
Edit
+         
+      
+   
+   
+
+   
+
+
+
+
\ No newline at end of file

Added: modules/portlet/trunk/test/src/test/resources/simple-portal-war/css/=
master.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/css/mas=
ter.css	                        (rev 0)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/css/mas=
ter.css	2008-02-07 23:42:33 UTC (rev 9844)
@@ -0,0 +1,235 @@
+body {
+   font: normal 12px Lucida Sans, Trebuchet, tahoma, sans-serif;
+}
+
+.align-center {
+   text-align: center;
+}
+
+.align-left {
+   text-align: left;
+}
+
+.align-center-margin {
+   margin: 0 auto 0 auto;
+}
+
+.float-left {
+   float: left;
+}
+
+.float-right {
+   float: right;
+}
+
+.align-left {
+   text-align: left;
+}
+
+.align-right {
+   text-align: right;
+}
+
+.half-width {
+   width: 49%;
+}
+
+.quarter-width {
+   width: 24.9%;
+}
+
+.three-quarter-width {
+   width: 74.9%;
+}
+
+.full-width {
+   width: 100%;
+}
+
+.third-width {
+   width: 32.9%;
+}
+
+.two-third-width {
+   width: 65.5%;
+}
+
+.tenpx-top-bottom {
+   margin: 10px 0 10px 0;
+}
+
+.relative {
+   position: relative
+}
+
+.absolute {
+   position: absolute
+}
+
+p.white-padded {
+   color: #fff;
+   padding: 5px;
+}
+
+.clear {
+   clear: both;
+}
+
+img {
+   margin: 0;
+   padding: 0;
+   border: 0;
+}
+
+body,
+div,
+form,
+ul,
+li {
+   margin: 0;
+   padding: 0;
+}
+
+ul {
+
+}
+
+/*--------------------------------Decoration*/
+
+h2 {
+   font-size: 1.9em;
+   color: #fff;
+   margin: 0;
+   padding: 0;
+}
+
+h3 {
+   font-size: 1.0em;
+   color: #fff;
+   margin: 0;
+   padding: 0;
+}
+
+a {
+   color: #e1d77e;
+}
+
+p {
+   margin: 0;
+   padding: 0;
+}
+
+
+/*-------------------------------Container Decoration*/
+
+div#container>div.header {
+   height: 40px;
+   background-color: #000;
+}
+
+div#container div.header div.logo {
+   background-image: url( /simple/images/logo-header.gif );
+   background-repeat: no-repeat;
+   background-position: top left;
+   height:40px;
+}
+
+div#container div.header div.pc20 {
+    text-align: right;
+}
+
+div#container div.header div.pc20 img {
+    margin: 5px 10px 0 0;
+}
+
+div#container div.nav {
+   background-image: url( /simple/images/nav-bg.gif );
+   background-repeat: repeat-x;
+   background-position: top left;
+   border-top: 1px solid #878787;
+   border-bottom: 1px solid #383838;
+   height:23px;
+}
+
+div#container div.nav ul {
+   height:23px;
+   margin: 0 0 0 10px;
+}
+
+div#container div.nav ul li {
+   display: inline;
+   float: left;
+   text-align: center;
+   height: 21px;
+   border: 1px solid #929292;
+}
+
+div#container div.nav ul li a,
+div#container div.nav ul li a:hover {
+   display: block;
+   padding: 4px 12px 4px 12px;
+   background-repeat: repeat-x;
+   background-position: top left;
+   text-decoration:none;
+   font: bold 11px Lucida Sans, Trebuchet, tahoma, sans-serif;
+}
+
+div#container div.nav ul li a{
+   color: #353535;
+   background-image: url( /simple/images/inactive-button-bg.gif );
+}
+
+div#container div.nav ul li a:hover,
+div#container div.nav ul li a.selected{
+   color: #000;
+   background-image: url( /simple/images/active-button-bg.gif );
+}
+
+div#container div#content {
+   background-image: url( /simple/images/portal-bg.gif );
+   background-repeat: repeat-x;
+   background-position: top left;
+   min-height: 600px;
+   padding: 10px;
+}
+
+/*-------------------------------Portlet Decoration*/
+
+div#container div#content div.portlet{
+   /*width: 800px;*/
+   border: 1px solid #969696;
+   background-color: #e2e2e2;
+   padding: 2px;
+   float:left;
+}
+
+div#container div#content div.portlet-frame{
+   background-color: #fff;
+   border: 1px solid #fff;
+      /*height: 500px;*/
+}
+
+div#container div#content div.portlet div.header {
+   background-image: url( /simple/images/portlet-titlebg.gif );
+   background-repeat: repeat-x;
+   background-position: top left;
+   height:20px;
+}
+
+div#container div#content div.portlet div.header div.header-layer {
+   background-image: url( /simple/images/portlet-title-rt-bg.gif );
+   background-repeat: no-repeat;
+   background-position: top right;
+   height:20px;
+}
+
+div#container div#content div.portlet div.header div.header-layer div.titl=
e{
+   font: bold 12px Lucida Sans, Trebuchet, tahoma, sans-serif;
+   color: #fff;
+   padding: 2px;
+}
+
+div#container div#content div.portlet div.header div.header-layer div.cont=
rols{
+   text-align: right;
+   padding: 3px 3px 0 0;
+}
\ No newline at end of file

Added: modules/portlet/trunk/test/src/test/resources/simple-portal-war/imag=
es/active-button-bg.gif
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: modules/portlet/trunk/test/src/test/resources/simple-p=
ortal-war/images/active-button-bg.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: modules/portlet/trunk/test/src/test/resources/simple-portal-war/imag=
es/icon-maximize.gif
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: modules/portlet/trunk/test/src/test/resources/simple-p=
ortal-war/images/icon-maximize.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: modules/portlet/trunk/test/src/test/resources/simple-portal-war/imag=
es/icon-minimize.gif
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: modules/portlet/trunk/test/src/test/resources/simple-p=
ortal-war/images/icon-minimize.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: modules/portlet/trunk/test/src/test/resources/simple-portal-war/imag=
es/icon-normal.gif
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: modules/portlet/trunk/test/src/test/resources/simple-p=
ortal-war/images/icon-normal.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: modules/portlet/trunk/test/src/test/resources/simple-portal-war/imag=
es/inactive-button-bg.gif
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: modules/portlet/trunk/test/src/test/resources/simple-p=
ortal-war/images/inactive-button-bg.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: modules/portlet/trunk/test/src/test/resources/simple-portal-war/imag=
es/logo-header.gif
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: modules/portlet/trunk/test/src/test/resources/simple-p=
ortal-war/images/logo-header.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: modules/portlet/trunk/test/src/test/resources/simple-portal-war/imag=
es/nav-bg.gif
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: modules/portlet/trunk/test/src/test/resources/simple-p=
ortal-war/images/nav-bg.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: modules/portlet/trunk/test/src/test/resources/simple-portal-war/imag=
es/pc20.gif
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: modules/portlet/trunk/test/src/test/resources/simple-p=
ortal-war/images/pc20.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: modules/portlet/trunk/test/src/test/resources/simple-portal-war/imag=
es/portal-bg.gif
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: modules/portlet/trunk/test/src/test/resources/simple-p=
ortal-war/images/portal-bg.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: modules/portlet/trunk/test/src/test/resources/simple-portal-war/imag=
es/portlet-title-rt-bg.gif
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: modules/portlet/trunk/test/src/test/resources/simple-p=
ortal-war/images/portlet-title-rt-bg.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: modules/portlet/trunk/test/src/test/resources/simple-portal-war/imag=
es/portlet-titlebg.gif
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: modules/portlet/trunk/test/src/test/resources/simple-p=
ortal-war/images/portlet-titlebg.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/i=
ndex.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/index.j=
sp	2008-02-07 23:42:16 UTC (rev 9843)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/index.j=
sp	2008-02-07 23:42:33 UTC (rev 9844)
@@ -3,59 +3,6 @@
 <%@ page isELIgnored=3D"false" %>
 
 
-
-   
-      
-         
-            
-            
-               ">M
-               ">n
-               ">m
-               ">Edit
-            
-         
-         
-            
-         
-      
-   
-
-
-   
-      
-         
-            
-            
-               ">M
-               ">n
-               ">m
-               ">Edit
-            
-         
-         
-            
-         
-      
-   
-
-   

-   
-      
-         
-            
-            
-               ">M
-               ">n
-               ">m
-               ">Edit
-            
-         
-         
-            
-         
-      
-   
-
+
 
 

Added: modules/portlet/trunk/test/src/test/resources/simple-portal-war/layo=
uts/default.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts=
/default.jsp	                        (rev 0)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts=
/default.jsp	2008-02-07 23:42:33 UTC (rev 9844)
@@ -0,0 +1,52 @@
+<%@ page contentType=3D"text/html" %>
+<%@ page language=3D"java" %>
+<%@ taglib prefix=3D"jbp" tagdir=3D"/WEB-INF/tags/portal" %>
+<%@ taglib uri=3D"/WEB-INF/portal.tld" prefix=3D"portal" %>
+<%@ page isELIgnored=3D"false" %>
+
+
+
+
+Portlet Container 2.0
+
+
+
+
+
+   
+      
+      
+         
+      
+      

+   
+   
+      
+         
+            option1
+         
+         
+            option2
+         
+         
+            option3
+         
+      
+      

+   
+   
+    
+       
+           ">Derwood
+       
+       
+       
+    
+   
+   

+
+
+
+
\ No newline at end of file


--===============7664424009820635508==--

From portal-commits at lists.jboss.org Thu Feb  7 19:00:02 2008
Content-Type: multipart/mixed; boundary="===============7197296201172504538=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9845 -
 modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts.
Date: Thu, 07 Feb 2008 19:00:01 -0500
Message-ID: 

--===============7197296201172504538==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-07 19:00:01 -0500 (Thu, 07 Feb 2008)
New Revision: 9845

Modified:
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/=
default.jsp
Log:
make work commented a tag that was making break (npe)

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/l=
ayouts/default.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts=
/default.jsp	2008-02-07 23:42:33 UTC (rev 9844)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts=
/default.jsp	2008-02-08 00:00:01 UTC (rev 9845)
@@ -39,7 +39,9 @@
    
     
        
+<%--
            ">Derwood
+--%>
        
        
        


--===============7197296201172504538==--

From portal-commits at lists.jboss.org Thu Feb  7 19:01:30 2008
Content-Type: multipart/mixed; boundary="===============3218557548049359682=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9846 - in
 modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/response:
 portlet and 1 other directory.
Date: Thu, 07 Feb 2008 19:01:29 -0500
Message-ID: 

--===============3218557548049359682==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-07 19:01:29 -0500 (Thu, 07 Feb 2008)
New Revision: 9846

Removed:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/response/BufferingResponse.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/response/portlet/StartPortletChunk.java
Log:
remove class that should have been removed

Deleted: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/=
test/jsp/response/BufferingResponse.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/response/BufferingResponse.java	2008-02-08 00:00:01 UTC (rev 9845)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/response/BufferingResponse.java	2008-02-08 00:01:29 UTC (rev 9846)
@@ -1,145 +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.response;
-
-import org.jboss.portal.portlet.test.jsp.PagePortletControllerContext;
-import org.jboss.portal.portlet.controller.state.PageNavigationalState;
-import org.jboss.portal.portlet.controller.state.WindowNavigationalState;
-import org.jboss.portal.WindowState;
-
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletResponseWrapper;
-
-/**
- * @author Julien Viet
- * @version $Revision: 630 $
- */
-public class BufferingResponse extends HttpServletResponseWrapper
-{
-
-   /** . */
-//   private final ResponseBuffer buffer =3D new ResponseBuffer();
-
-   /** . */
-   private final PagePortletControllerContext portletControllerContext;
-
-   /** . */
-   private final PageNavigationalState pageState;
-
-   /** . */
-   private int count =3D 0;
-
-   public BufferingResponse(
-      HttpServletResponse response,
-      PagePortletControllerContext portletControllerContext,
-      PageNavigationalState pageState)
-   {
-      super(response);
-
-      //
-      this.portletControllerContext =3D portletControllerContext;
-      this.pageState =3D pageState;
-   }
-
-   /**
-    * The page state for the rendering.
-    *
-    * @return the page state
-    */
-   public PageNavigationalState getPageState()
-   {
-      return pageState;
-   }
-
-   public String getMaximizedWindowId()
-   {
-      if (pageState !=3D null)
-      {
-         for (String windowId : pageState.getWindowIds())
-         {
-            WindowNavigationalState windowNS =3D pageState.getWindowNaviga=
tionalState(windowId);
-            if (WindowState.MAXIMIZED.equals(windowNS.getWindowState()))
-            {
-               return windowId;
-            }
-         }
-      }
-
-      //
-      return null;
-   }
-
-   public boolean isRenderable(String windowId)
-   {
-      if (windowId =3D=3D null)
-      {
-         throw new IllegalArgumentException();
-      }
-
-      //
-      if (pageState =3D=3D null)
-      {
-         return false;
-      }
-
-      //
-      String maximizedWindowId =3D getMaximizedWindowId();
-      if (maximizedWindowId !=3D null)
-      {
-         return maximizedWindowId.equals(windowId);
-      }
-
-      //
-      return true;
-   }
-
-   public PagePortletControllerContext getPortletControllerContext()
-   {
-      return portletControllerContext;
-   }
-
-//   public ResponseBuffer getBuffer()
-//   {
-//      return buffer;
-//   }
-//
-//   public ServletOutputStream getOutputStream() throws IOException
-//   {
-//      return buffer.getOutputStream();
-//   }
-//
-//   public PrintWriter getWriter() throws IOException
-//   {
-//      return buffer.getWriter();
-//   }
-//
-//   public void close()
-//   {
-//      buffer.close();
-//   }
-
-   public String nextId()
-   {
-      return "" + count++;
-   }
-}

Deleted: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/=
test/jsp/response/portlet/StartPortletChunk.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/response/portlet/StartPortletChunk.java	2008-02-08 00:00:01 UTC (rev 98=
45)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/response/portlet/StartPortletChunk.java	2008-02-08 00:01:29 UTC (rev 98=
46)
@@ -1,111 +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.response.portlet;
-
-import org.jboss.portal.Mode;
-import org.jboss.portal.WindowState;
-import org.jboss.portal.portlet.invocation.response.PortletInvocationRespo=
nse;
-
-import java.util.Set;
-
-/**
- * @author Julien Viet
- * @version $Revision: 630 $
- */
-public class StartPortletChunk
-{
-
-   /** . */
-   private final String portletName;
-
-   /** . */
-   private final String applicationName;
-
-   /** . */
-   private final String windowId;
-
-   /** . */
-   private final PortletInvocationResponse response;
-
-   /** . */
-   private final Mode initialMode;
-
-   /** . */
-   private final Set supportedModes;
-
-   /** . */
-   private final Set supportedWindowStates;
-
-   public StartPortletChunk(
-      String portletName,
-      String applicationName,
-      String windowId,
-      PortletInvocationResponse response,
-      Mode initialMode,
-      Set supportedModes,
-      Set supportedWindowStates)
-   {
-      this.portletName =3D portletName;
-      this.applicationName =3D applicationName;
-      this.windowId =3D windowId;
-      this.response =3D response;
-      this.initialMode =3D initialMode;
-      this.supportedModes =3D supportedModes;
-      this.supportedWindowStates =3D supportedWindowStates;
-   }
-
-   public String getPortletName()
-   {
-      return portletName;
-   }
-
-   public String getApplicationName()
-   {
-      return applicationName;
-   }
-
-   public String getWindowId()
-   {
-      return windowId;
-   }
-
-   public PortletInvocationResponse getResponse()
-   {
-      return response;
-   }
-
-   public Mode getInitialMode()
-   {
-      return initialMode;
-   }
-
-   public Set getSupportedModes()
-   {
-      return supportedModes;
-   }
-
-   public Set getSupportedWindowStates()
-   {
-      return supportedWindowStates;
-   }
-}


--===============3218557548049359682==--

From portal-commits at lists.jboss.org Thu Feb  7 20:38:25 2008
Content-Type: multipart/mixed; boundary="===============7785195852171756654=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9847 - in
 modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp:
 taglib and 1 other directory.
Date: Thu, 07 Feb 2008 20:34:25 -0500
Message-ID: 

--===============7785195852171756654==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-07 20:34:25 -0500 (Thu, 07 Feb 2008)
New Revision: 9847

Modified:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/PortalResponse.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/AbstractURLTag.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/PageTag.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/PortletTag.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/PortletURLTag.java
Log:
support for maximized with new design

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/PortalResponse.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/PortalResponse.java	2008-02-08 00:01:29 UTC (rev 9846)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/PortalResponse.java	2008-02-08 01:34:25 UTC (rev 9847)
@@ -29,6 +29,9 @@
 =

 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponseWrapper;
+import javax.servlet.ServletOutputStream;
+import java.io.IOException;
+import java.io.PrintWriter;
 =

 /**
  * @author Julien Viet
@@ -49,6 +52,9 @@
    /** . */
    private int count =3D 0;
 =

+   /** . */
+   private final MutableOut out;
+
    public PortalResponse(
       HttpServletResponse response,
       PagePortletControllerContext portletControllerContext,
@@ -59,6 +65,7 @@
       //
       this.portletControllerContext =3D portletControllerContext;
       this.pageState =3D pageState;
+      this.out =3D new MutableOut(this);
    }
 =

    /**
@@ -138,8 +145,28 @@
 //      buffer.close();
 //   }
 =

+   public void setMuted(boolean muted)
+   {
+      out.setMuted(muted);
+   }
+
+   public boolean isMuted()
+   {
+      return out.isMuted();
+   }
+
    public String nextId()
    {
       return "" + count++;
    }
+
+//   public ServletOutputStream getOutputStream() throws IOException
+//   {
+//      return out.getOutputStream();
+//   }
+//
+//   public PrintWriter getWriter() throws IOException
+//   {
+//      return out.getWriter();
+//   }
 }

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/taglib/AbstractURLTag.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/AbstractURLTag.java	2008-02-08 00:01:29 UTC (rev 9846)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/AbstractURLTag.java	2008-02-08 01:34:25 UTC (rev 9847)
@@ -23,7 +23,6 @@
 package org.jboss.portal.portlet.test.jsp.taglib;
 =

 import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.BodyTagSupport;
 import java.util.Map;
 import java.util.HashMap;
 =

@@ -31,7 +30,7 @@
  * @author Julien Viet
  * @version $Revision: 630 $
  */
-public class AbstractURLTag extends BodyTagSupport
+public class AbstractURLTag extends PortalBodyTagSupport
 {
 =

    /** . */

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/taglib/PageTag.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PageTag.java	2008-02-08 00:01:29 UTC (rev 9846)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PageTag.java	2008-02-08 01:34:25 UTC (rev 9847)
@@ -22,25 +22,54 @@
  *************************************************************************=
*****/
 package org.jboss.portal.portlet.test.jsp.taglib;
 =

+import org.jboss.portal.portlet.test.jsp.PortalResponse;
+
 import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.BodyTagSupport;
+import java.io.IOException;
 =

 /**
  * @author Julien Viet
  * @version $Revision: 630 $
  */
-public class PageTag extends BodyTagSupport
+public class PageTag extends PortalBodyTagSupport
 {
 =

+   String maximizedId;
+
+   String content;
+
    public int doStartTag() throws JspException
    {
+      PortalResponse response =3D getPortalResponse();
+
       //
-      return EVAL_BODY_INCLUDE;
+      maximizedId =3D response.getMaximizedWindowId();
+
+      //
+      if (maximizedId !=3D null)
+      {
+         return EVAL_BODY_BUFFERED;
+      }
+      else
+      {
+         return EVAL_BODY_INCLUDE;
+      }
    }
 =

    public int doEndTag() throws JspException
    {
-      //
+      if (maximizedId !=3D null)
+      {
+         try
+         {
+            pageContext.getOut().write(content);
+         }
+         catch (IOException e)
+         {
+            throw new JspException(e);
+         }
+      }
+
       return EVAL_PAGE;
    }
 }

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/taglib/PortletTag.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortletTag.java	2008-02-08 00:01:29 UTC (rev 9846)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortletTag.java	2008-02-08 01:34:25 UTC (rev 9847)
@@ -46,19 +46,28 @@
 import org.jboss.portal.common.util.ParameterMap;
 =

 import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.BodyTagSupport;
 import java.util.LinkedHashSet;
 import java.util.Set;
 import java.util.Collections;
+import java.io.IOException;
 =

 /**
  * @author Julien Viet
  * @version $Revision: 630 $
  */
-public class PortletTag extends BodyTagSupport
+public class PortletTag extends PortalBodyTagSupport
 {
 =

    /** . */
+   private static final int SKIPPED =3D 0;
+
+   /** . */
+   private static final int BUFFERED =3D 1;
+
+   /** . */
+   private static final int RENDERED =3D 2;
+
+   /** . */
    private static final Set DEFAULT_MODES =3D Collections.unmodifiab=
leSet(Tools.toSet(Mode.VIEW, Mode.EDIT, Mode.HELP));
 =

    /** . */
@@ -79,6 +88,12 @@
    /** . */
    private String initialModeValue;
 =

+   /** . */
+   private int status;
+
+   /** . */
+   PortletResult result;
+
    public String getName()
    {
       return name;
@@ -129,26 +144,84 @@
       this.initialModeValue =3D initialMode;
    }
 =

-   PortletResult result;
-
    public int doStartTag() throws JspException
    {
-      PortalResponse response =3D (PortalResponse)pageContext.getResponse(=
);
-      =

+      PortalResponse response =3D getPortalResponse();
+      PagePortletControllerContext context =3D response.getPortletControll=
erContext();
+      PageTag pageTag =3D (PageTag)findAncestorWithClass(this, PageTag.cla=
ss);
+
       //
-      result =3D render(response);
+      Portlet portlet =3D context.findPortlet(applicationName, name);
 =

+      // Compute window id
+      String windowId =3D portlet.getContext().getId() + "." + response.ne=
xtId();
+
       //
-      return EVAL_BODY_INCLUDE;
+
+      //
+      if (pageTag.maximizedId !=3D null)
+      {
+         if (windowId.equals(pageTag.maximizedId))
+         {
+            result =3D render(response, portlet, windowId);
+            status =3D BUFFERED;
+         }
+         else
+         {
+            status =3D SKIPPED;
+         }
+      }
+      else
+      {
+         result =3D render(response, portlet, windowId);
+         status =3D RENDERED;
+      }
+
+      //
+      switch (status)
+      {
+         case SKIPPED:
+            return SKIP_BODY;
+         case RENDERED:
+            return EVAL_BODY_INCLUDE;
+         case BUFFERED:
+            return EVAL_BODY_BUFFERED;
+         default:
+            throw new AssertionError();
+      }
    }
 =

    public int doEndTag() throws JspException
    {
+      result =3D null;
+
+      //
+      switch (status)
+      {
+         case SKIPPED:
+            break;
+         case RENDERED:
+            break;
+         case BUFFERED:
+            PageTag pageTag =3D (PageTag)findAncestorWithClass(this, PageT=
ag.class);
+            pageTag.content =3D bodyContent.getString();
+            break;
+         default:
+            throw new AssertionError();
+      }
+
+      //
       return EVAL_PAGE;
    }
 =

-   public PortletResult render(PortalResponse response)
+   public PortletResult render(
+      PortalResponse response,
+      Portlet portlet,
+      String windowId)
    {
+      PagePortletControllerContext context =3D response.getPortletControll=
erContext();
+
+      //
       Set supportedModes =3D new LinkedHashSet();
       if (supportedModeValues !=3D null)
       {
@@ -186,13 +259,6 @@
       }
 =

       //
-      PagePortletControllerContext context =3D response.getPortletControll=
erContext();
-
-      //
-      Portlet portlet =3D context.findPortlet(applicationName, name);
-
-      //
-      String windowId =3D portlet.getContext().getId() + "." + response.ne=
xtId();
       PageNavigationalState pageNS =3D response.getPageState();
 =

       //

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/taglib/PortletURLTag.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortletURLTag.java	2008-02-08 00:01:29 UTC (rev 9846)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortletURLTag.java	2008-02-08 01:34:25 UTC (rev 9847)
@@ -27,7 +27,6 @@
 import org.jboss.portal.portlet.test.jsp.PortalResponse;
 import org.jboss.portal.portlet.test.jsp.PagePortletControllerContext;
 import org.jboss.portal.portlet.test.controller.PortletURLRenderer;
-import org.jboss.portal.portlet.invocation.response.PortletInvocationRespo=
nse;
 import org.jboss.portal.portlet.controller.impl.state.StateControllerConte=
xtImpl;
 import org.jboss.portal.portlet.RenderURL;
 import org.jboss.portal.portlet.StateString;
@@ -78,7 +77,7 @@
 =

    public int doEndTag() throws JspException
    {
-      PortalResponse response =3D (PortalResponse)pageContext.getResponse(=
);
+      PortalResponse response =3D getPortalResponse();
       PagePortletControllerContext context =3D response.getPortletControll=
erContext();
       PortletTag portletTag =3D (PortletTag)SimpleTagSupport.findAncestorW=
ithClass(this, PortletTag.class);
 =



--===============7785195852171756654==--

From portal-commits at lists.jboss.org Thu Feb  7 20:39:21 2008
Content-Type: multipart/mixed; boundary="===============8908948462044201958=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9848 -
 modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/tags/portal.
Date: Thu, 07 Feb 2008 20:35:21 -0500
Message-ID: 

--===============8908948462044201958==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: wesleyhales
Date: 2008-02-07 20:35:21 -0500 (Thu, 07 Feb 2008)
New Revision: 9848

Modified:
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/=
tags/portal/portlet.tag
Log:
dynamic portlet

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/W=
EB-INF/tags/portal/portlet.tag
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF=
/tags/portal/portlet.tag	2008-02-08 01:34:25 UTC (rev 9847)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF=
/tags/portal/portlet.tag	2008-02-08 01:35:21 UTC (rev 9848)
@@ -5,8 +5,8 @@
 <%@ taglib uri=3D"/WEB-INF/portal.tld" prefix=3D"portal" %>
 =

 
+         name=3D"${name}"
+         applicationName=3D"${applicationName}">
 
    
    


--===============8908948462044201958==--

From portal-commits at lists.jboss.org Thu Feb  7 20:55:33 2008
Content-Type: multipart/mixed; boundary="===============0887506646578955334=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9849 - in
 branches/JBoss_Portal_Branch_2_6:
 wsrp/src/main/org/jboss/portal/test/wsrp/consumer and 1 other directories.
Date: Thu, 07 Feb 2008 20:51:33 -0500
Message-ID: 

--===============0887506646578955334==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: chris.laprun(a)jboss.com
Date: 2008-02-07 20:51:33 -0500 (Thu, 07 Feb 2008)
New Revision: 9849

Modified:
   branches/JBoss_Portal_Branch_2_6/core-wsrp/src/main/org/jboss/portal/wsr=
p/admin/ui/ConsumerBean.java
   branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsr=
p/consumer/ConsumerRegistryTestCase.java
   branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/con=
sumer/ConsumerRegistryService.java
Log:
- JBPORTAL-1877: ConsumerRegistryService was not properly updated when the =
producer info id was updated.

Modified: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/main/org/jboss/por=
tal/wsrp/admin/ui/ConsumerBean.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/JBoss_Portal_Branch_2_6/core-wsrp/src/main/org/jboss/portal/ws=
rp/admin/ui/ConsumerBean.java	2008-02-08 01:35:21 UTC (rev 9848)
+++ branches/JBoss_Portal_Branch_2_6/core-wsrp/src/main/org/jboss/portal/ws=
rp/admin/ui/ConsumerBean.java	2008-02-08 01:51:33 UTC (rev 9849)
@@ -113,13 +113,20 @@
       else
       {
          consumer =3D registry.getConsumer(id);
-         EndpointConfigurationInfo endpoint =3D getProducerInfo().getEndpo=
intConfigurationInfo();
-         serviceDescription =3D endpoint.getServiceDescriptionURL();
-         markup =3D endpoint.getMarkupURL();
-         portletManagement =3D endpoint.getPortletManagementURL();
-         registration =3D endpoint.getRegistrationURL();
-         wsdl =3D endpoint.getWsdlDefinitionURL();
-         useWSDL =3D endpoint.usesWSDL();
+         if (consumer !=3D null)
+         {
+            EndpointConfigurationInfo endpoint =3D getProducerInfo().getEn=
dpointConfigurationInfo();
+            serviceDescription =3D endpoint.getServiceDescriptionURL();
+            markup =3D endpoint.getMarkupURL();
+            portletManagement =3D endpoint.getPortletManagementURL();
+            registration =3D endpoint.getRegistrationURL();
+            wsdl =3D endpoint.getWsdlDefinitionURL();
+            useWSDL =3D endpoint.usesWSDL();
+         }
+         else
+         {
+            beanContext.createErrorMessage("Couldn't find consumer '" + id=
 + "'!");
+         }
       }
    }
 =


Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/t=
est/wsrp/consumer/ConsumerRegistryTestCase.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/ws=
rp/consumer/ConsumerRegistryTestCase.java	2008-02-08 01:35:21 UTC (rev 9848)
+++ branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/ws=
rp/consumer/ConsumerRegistryTestCase.java	2008-02-08 01:51:33 UTC (rev 9849)
@@ -113,8 +113,22 @@
       TransactionAssert.commitTransaction();
    }
 =

-   public void testPersist()
+   public void testUpdateProducerInfo()
    {
-//      registry.persistConsumer();
+      // create a foo consumer
+      TransactionAssert.beginTransaction();
+      String id =3D "foo";
+      WSRPConsumer consumer =3D registry.createConsumer(id, null);
+      ProducerInfo info =3D consumer.getProducerInfo();
+      TransactionAssert.commitTransaction();
+
+      TransactionAssert.beginTransaction();
+      // change the id on the consumer's producer info and save it
+      info.setId("bar");
+      registry.updateProducerInfo(info);
+
+      assertNull(registry.getConsumer(id));
+      assertEquals(consumer, registry.getConsumer("bar"));
+      TransactionAssert.commitTransaction();
    }
 }

Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/w=
srp/consumer/ConsumerRegistryService.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/co=
nsumer/ConsumerRegistryService.java	2008-02-08 01:35:21 UTC (rev 9848)
+++ branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/co=
nsumer/ConsumerRegistryService.java	2008-02-08 01:51:33 UTC (rev 9849)
@@ -233,7 +233,28 @@
       Session session =3D sessionFactory.getCurrentSession();
       try
       {
-         session.update(producerInfo);
+
+         // Retrieve the previous id of the given ProducerInfo to update l=
ocal consumers map if needed
+         String oldId =3D null;
+         ProducerInfo old =3D (ProducerInfo)session.get(ProducerInfo.class=
, producerInfo.getKey());
+         if (old !=3D null)
+         {
+            oldId =3D old.getId();
+            if (producerInfo.getId().equals(oldId))
+            {
+               oldId =3D null; // reset oldId as the ProducerInfo's id has=
n't been modified
+            }
+         }
+
+         // merge old producer info with new data
+         session.merge(producerInfo);
+
+         // if we updated and oldId is not null, we need to update the loc=
al consumers map
+         if (oldId !=3D null)
+         {
+            WSRPConsumer consumer =3D consumers.remove(oldId);
+            consumers.put(producerInfo.getId(), consumer);
+         }
       }
       catch (HibernateException e)
       {


--===============0887506646578955334==--

From portal-commits at lists.jboss.org Thu Feb  7 20:55:40 2008
Content-Type: multipart/mixed; boundary="===============1766017993006326014=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9850 - in
 tags/JBoss_Portal_2_6_4: wsrp/src/main/org/jboss/portal/test/wsrp/consumer
 and 1 other directories.
Date: Thu, 07 Feb 2008 20:51:40 -0500
Message-ID: 

--===============1766017993006326014==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: chris.laprun(a)jboss.com
Date: 2008-02-07 20:51:39 -0500 (Thu, 07 Feb 2008)
New Revision: 9850

Modified:
   tags/JBoss_Portal_2_6_4/core-wsrp/src/main/org/jboss/portal/wsrp/admin/u=
i/ConsumerBean.java
   tags/JBoss_Portal_2_6_4/wsrp/src/main/org/jboss/portal/test/wsrp/consume=
r/ConsumerRegistryTestCase.java
   tags/JBoss_Portal_2_6_4/wsrp/src/main/org/jboss/portal/wsrp/consumer/Con=
sumerRegistryService.java
Log:
- JBPORTAL-1877: ConsumerRegistryService was not properly updated when the =
producer info id was updated.

Modified: tags/JBoss_Portal_2_6_4/core-wsrp/src/main/org/jboss/portal/wsrp/=
admin/ui/ConsumerBean.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- tags/JBoss_Portal_2_6_4/core-wsrp/src/main/org/jboss/portal/wsrp/admin/=
ui/ConsumerBean.java	2008-02-08 01:51:33 UTC (rev 9849)
+++ tags/JBoss_Portal_2_6_4/core-wsrp/src/main/org/jboss/portal/wsrp/admin/=
ui/ConsumerBean.java	2008-02-08 01:51:39 UTC (rev 9850)
@@ -113,13 +113,20 @@
       else
       {
          consumer =3D registry.getConsumer(id);
-         EndpointConfigurationInfo endpoint =3D getProducerInfo().getEndpo=
intConfigurationInfo();
-         serviceDescription =3D endpoint.getServiceDescriptionURL();
-         markup =3D endpoint.getMarkupURL();
-         portletManagement =3D endpoint.getPortletManagementURL();
-         registration =3D endpoint.getRegistrationURL();
-         wsdl =3D endpoint.getWsdlDefinitionURL();
-         useWSDL =3D endpoint.usesWSDL();
+         if (consumer !=3D null)
+         {
+            EndpointConfigurationInfo endpoint =3D getProducerInfo().getEn=
dpointConfigurationInfo();
+            serviceDescription =3D endpoint.getServiceDescriptionURL();
+            markup =3D endpoint.getMarkupURL();
+            portletManagement =3D endpoint.getPortletManagementURL();
+            registration =3D endpoint.getRegistrationURL();
+            wsdl =3D endpoint.getWsdlDefinitionURL();
+            useWSDL =3D endpoint.usesWSDL();
+         }
+         else
+         {
+            beanContext.createErrorMessage("Couldn't find consumer '" + id=
 + "'!");
+         }
       }
    }
 =

@@ -469,4 +476,4 @@
          registrationLocallyModified =3D isOldAndNewEqual(event.getOldValu=
e(), event.getNewValue());
       }
    }
-}
\ No newline at end of file
+}

Modified: tags/JBoss_Portal_2_6_4/wsrp/src/main/org/jboss/portal/test/wsrp/=
consumer/ConsumerRegistryTestCase.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- tags/JBoss_Portal_2_6_4/wsrp/src/main/org/jboss/portal/test/wsrp/consum=
er/ConsumerRegistryTestCase.java	2008-02-08 01:51:33 UTC (rev 9849)
+++ tags/JBoss_Portal_2_6_4/wsrp/src/main/org/jboss/portal/test/wsrp/consum=
er/ConsumerRegistryTestCase.java	2008-02-08 01:51:39 UTC (rev 9850)
@@ -113,8 +113,22 @@
       TransactionAssert.commitTransaction();
    }
 =

-   public void testPersist()
+   public void testUpdateProducerInfo()
    {
-//      registry.persistConsumer();
+      // create a foo consumer
+      TransactionAssert.beginTransaction();
+      String id =3D "foo";
+      WSRPConsumer consumer =3D registry.createConsumer(id, null);
+      ProducerInfo info =3D consumer.getProducerInfo();
+      TransactionAssert.commitTransaction();
+
+      TransactionAssert.beginTransaction();
+      // change the id on the consumer's producer info and save it
+      info.setId("bar");
+      registry.updateProducerInfo(info);
+
+      assertNull(registry.getConsumer(id));
+      assertEquals(consumer, registry.getConsumer("bar"));
+      TransactionAssert.commitTransaction();
    }
 }

Modified: tags/JBoss_Portal_2_6_4/wsrp/src/main/org/jboss/portal/wsrp/consu=
mer/ConsumerRegistryService.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- tags/JBoss_Portal_2_6_4/wsrp/src/main/org/jboss/portal/wsrp/consumer/Co=
nsumerRegistryService.java	2008-02-08 01:51:33 UTC (rev 9849)
+++ tags/JBoss_Portal_2_6_4/wsrp/src/main/org/jboss/portal/wsrp/consumer/Co=
nsumerRegistryService.java	2008-02-08 01:51:39 UTC (rev 9850)
@@ -233,7 +233,28 @@
       Session session =3D sessionFactory.getCurrentSession();
       try
       {
-         session.update(producerInfo);
+
+         // Retrieve the previous id of the given ProducerInfo to update l=
ocal consumers map if needed
+         String oldId =3D null;
+         ProducerInfo old =3D (ProducerInfo)session.get(ProducerInfo.class=
, producerInfo.getKey());
+         if (old !=3D null)
+         {
+            oldId =3D old.getId();
+            if (producerInfo.getId().equals(oldId))
+            {
+               oldId =3D null; // reset oldId as the ProducerInfo's id has=
n't been modified
+            }
+         }
+
+         // merge old producer info with new data
+         session.merge(producerInfo);
+
+         // if we updated and oldId is not null, we need to update the loc=
al consumers map
+         if (oldId !=3D null)
+         {
+            WSRPConsumer consumer =3D consumers.remove(oldId);
+            consumers.put(producerInfo.getId(), consumer);
+         }
       }
       catch (HibernateException e)
       {


--===============1766017993006326014==--

From portal-commits at lists.jboss.org Thu Feb  7 21:31:53 2008
Content-Type: multipart/mixed; boundary="===============0097791822883450035=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9851 -
 modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF.
Date: Thu, 07 Feb 2008 21:31:53 -0500
Message-ID: 

--===============0097791822883450035==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-07 21:31:52 -0500 (Thu, 07 Feb 2008)
New Revision: 9851

Modified:
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/=
portal.tld
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/=
web.xml
Log:
make EL work

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/W=
EB-INF/portal.tld
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF=
/portal.tld	2008-02-08 01:51:39 UTC (rev 9850)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF=
/portal.tld	2008-02-08 02:31:52 UTC (rev 9851)
@@ -21,23 +21,28 @@
       
          name
          true
+         true
          java.lang.String
       
       
          applicationName
          true
+         true
          java.lang.String
       
       
          initialMode
+         true
          java.lang.String
       
       
          supportedModes
+         true
          java.lang.String
       
       
          supportedWindowStates
+         true
          java.lang.String
       
    
@@ -60,10 +65,12 @@
       JSP
       
          mode
+         true
          java.lang.String
       
       
          windowState
+         true
          java.lang.String
       
    
@@ -74,10 +81,12 @@
       empty
       
          name
+         true
          java.lang.String
       
       
          value
+         true
          java.lang.String
       
    

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/W=
EB-INF/web.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF=
/web.xml	2008-02-08 01:51:39 UTC (rev 9850)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF=
/web.xml	2008-02-08 02:31:52 UTC (rev 9851)
@@ -22,10 +22,10 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.              =
    ~
   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~=
~~~-->
 =

-
-
+
    
       ControllerFilter
       org.jboss.portal.portlet.test.jsp.ControllerFilter


--===============0097791822883450035==--

From portal-commits at lists.jboss.org Thu Feb  7 21:36:14 2008
Content-Type: multipart/mixed; boundary="===============2960913114639833241=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9852 - in
 modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp:
 taglib and 1 other directory.
Date: Thu, 07 Feb 2008 21:36:13 -0500
Message-ID: 

--===============2960913114639833241==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-07 21:36:13 -0500 (Thu, 07 Feb 2008)
New Revision: 9852

Added:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/PortalBodyTagSupport.java
Modified:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/PortalResponse.java
Log:
forgot to check in a class

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/PortalResponse.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/PortalResponse.java	2008-02-08 02:31:52 UTC (rev 9851)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/PortalResponse.java	2008-02-08 02:36:13 UTC (rev 9852)
@@ -52,9 +52,6 @@
    /** . */
    private int count =3D 0;
 =

-   /** . */
-   private final MutableOut out;
-
    public PortalResponse(
       HttpServletResponse response,
       PagePortletControllerContext portletControllerContext,
@@ -65,7 +62,6 @@
       //
       this.portletControllerContext =3D portletControllerContext;
       this.pageState =3D pageState;
-      this.out =3D new MutableOut(this);
    }
 =

    /**
@@ -145,16 +141,6 @@
 //      buffer.close();
 //   }
 =

-   public void setMuted(boolean muted)
-   {
-      out.setMuted(muted);
-   }
-
-   public boolean isMuted()
-   {
-      return out.isMuted();
-   }
-
    public String nextId()
    {
       return "" + count++;

Added: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/te=
st/jsp/taglib/PortalBodyTagSupport.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortalBodyTagSupport.java	                        (rev 0)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortalBodyTagSupport.java	2008-02-08 02:36:13 UTC (rev 9852)
@@ -0,0 +1,39 @@
+/*************************************************************************=
*****
+ * 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.taglib;
+
+import org.jboss.portal.portlet.test.jsp.PortalResponse;
+
+import javax.servlet.jsp.tagext.BodyTagSupport;
+
+/**
+ * @author Julien Viet
+ * @version $Revision: 630 $
+ */
+public class PortalBodyTagSupport extends BodyTagSupport
+{
+   protected final PortalResponse getPortalResponse()
+   {
+      return (PortalResponse)pageContext.getResponse();
+   }
+}


--===============2960913114639833241==--

From portal-commits at lists.jboss.org Thu Feb  7 21:40:25 2008
Content-Type: multipart/mixed; boundary="===============6625633805180404495=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9853 -
 modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller.
Date: Thu, 07 Feb 2008 21:40:24 -0500
Message-ID: 

--===============6625633805180404495==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-07 21:40:24 -0500 (Thu, 07 Feb 2008)
New Revision: 9853

Modified:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/c=
ontroller/PortletURLRenderer.java
Log:
fix bug with page state in PAGE resource serving

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/controller/PortletURLRenderer.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
controller/PortletURLRenderer.java	2008-02-08 02:36:13 UTC (rev 9852)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
controller/PortletURLRenderer.java	2008-02-08 02:40:24 UTC (rev 9853)
@@ -267,7 +267,7 @@
                parameters.put(WINDOW_STATE, resourceURL.getWindowState().t=
oString());
             }
 =

-            if (cacheability =3D=3D CacheLevel.PAGE)
+            if (cacheability =3D=3D CacheLevel.PAGE && pageState !=3D null)
             {
                parameters.put(PAGE_STATE, pageState);
             }


--===============6625633805180404495==--

From portal-commits at lists.jboss.org Thu Feb  7 22:24:10 2008
Content-Type: multipart/mixed; boundary="===============2527997229451006291=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9854 - in
 modules/portlet/trunk/test/src/test/resources/simple-portal-war: css and 1
 other directories.
Date: Thu, 07 Feb 2008 22:24:10 -0500
Message-ID: 

--===============2527997229451006291==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: wesleyhales
Date: 2008-02-07 22:24:09 -0500 (Thu, 07 Feb 2008)
New Revision: 9854

Modified:
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/=
tags/portal/portlet.tag
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/css/mast=
er.css
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/=
default.jsp
Log:
layout changes

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/W=
EB-INF/tags/portal/portlet.tag
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF=
/tags/portal/portlet.tag	2008-02-08 02:40:24 UTC (rev 9853)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF=
/tags/portal/portlet.tag	2008-02-08 03:24:09 UTC (rev 9854)
@@ -1,6 +1,6 @@
 <%@ tag body-content=3D"scriptless" %>
-<%@ attribute name=3D"name" required=3D"true" %>
-<%@ attribute name=3D"applicationName" required=3D"true" %>
+<%@ attribute name=3D"name" rtexprvalue=3D"true" required=3D"true" %>
+<%@ attribute name=3D"applicationName" rtexprvalue=3D"true" required=3D"tr=
ue" %>
 <%@ attribute name=3D"content" fragment=3D"true" required=3D"false" %> =

 <%@ taglib uri=3D"/WEB-INF/portal.tld" prefix=3D"portal" %>
 =

@@ -11,12 +11,20 @@
    
    
       
-         =

-         
+         
+         
+            
             ">
+            
+            
             ">
+            
+            
             ">
+            
+            
             ">=
Edit
+            
          
       
    
@@ -26,4 +34,4 @@
 =

 
 
-
\ No newline at end of file
+

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/c=
ss/master.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/css/mas=
ter.css	2008-02-08 02:40:24 UTC (rev 9853)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/css/mas=
ter.css	2008-02-08 03:24:09 UTC (rev 9854)
@@ -201,6 +201,7 @@
    background-color: #e2e2e2;
    padding: 2px;
    float:left;
+   margin:10px;
 }
 =

 div#container div#content div.portlet-frame{
@@ -223,7 +224,7 @@
    height:20px;
 }
 =

-div#container div#content div.portlet div.header div.header-layer div.titl=
e{
+div#container div#content div.portlet div.header div.header-layer div.titl=
e h2{
    font: bold 12px Lucida Sans, Trebuchet, tahoma, sans-serif;
    color: #fff;
    padding: 2px;
@@ -231,5 +232,10 @@
 =

 div#container div#content div.portlet div.header div.header-layer div.cont=
rols{
    text-align: right;
-   padding: 3px 3px 0 0;
+   padding: 3px 0 0 0;
+}
+
+div#container div#content div.portlet div.header div.header-layer div.cont=
rols span.mode-button{
+   text-align: right;
+   padding: 0 5px 0 0;
 }
\ No newline at end of file

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/l=
ayouts/default.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts=
/default.jsp	2008-02-08 02:40:24 UTC (rev 9853)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts=
/default.jsp	2008-02-08 03:24:09 UTC (rev 9854)
@@ -38,13 +38,14 @@
    
    
     
-       
-<%--
-           ">Derwood
---%>
-       
-       
-       
+       
+          
+       
+       
+          
+          
+       
+
     
    
    



--===============2527997229451006291==--

From portal-commits at lists.jboss.org Thu Feb  7 22:32:17 2008
Content-Type: multipart/mixed; boundary="===============3983498195555895175=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9855 -
 docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
Date: Thu, 07 Feb 2008 22:32:17 -0500
Message-ID: 

--===============3983498195555895175==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mmcallis
Date: 2008-02-07 22:32:17 -0500 (Thu, 07 Feb 2008)
New Revision: 9855

Modified:
   docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorial=
s.xml
Log:
trying to commit changes for 5.2.1.2. Package Structure and
5.2.1.3. Portlet Class after running tutorials.xml through
unix2dos line break fixing...


Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/t=
utorials.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutoria=
ls.xml	2008-02-08 03:24:09 UTC (rev 9854)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutoria=
ls.xml	2008-02-08 03:32:17 UTC (rev 9855)
@@ -100,7 +100,7 @@
       Tutorials
       
          The tutorials contained in this chapter are targetted toward port=
let developers. Although they are a good
-         starting and reference point, it is heavily recommend that portle=
t developers read and understand the
+         starting and reference point, it is highly recommend that portlet=
 developers read and understand the
 	 JSR-168 Portlet=
 Specification. Use the JBoss Portal User Forums=
 for user-to-user help.
       
       
-]]>
-         
-         These files are found in jboss-portal.sar/[module]=
/conf/hibernate/[directory]/hibernate.cfg.xml
-            where [module] is a module name and [directory] is a directory that
-            may or may not be present.
-         
+]]>
+	
+	
+		Note: this example is for a PostgreSQL database. If you use another data=
base, you will need to modify org.hibernate.dialect.Postgre=
SQLDialect to reflect the correct database. For a list of =
supported dialects, refer to the dialects list on the Hibernate website.
+	
       
       
-         DB Dialect settings for the CMS component
-         Modify jboss-portal.sar/portal-cms.sar/conf/hibern=
ate/cms/hibernate.cfg.xml by
-            uncommenting the following line in these files and using the a=
ppropriate dialect (see
-            here
-             for a list of supported dialects in Hibernate 3):
-            DB Dialect Settings for the CMS Component
+	 
+		 To modify the DB dialect setting for the JBoss Portal CMS component:
+	 
+	 
+		 
+			 
+				 
+					 Open the jboss-portal.sar/portal-cms.sar/conf/hibernate/cm=
s/hibernate.cfg.xml file.
+				 
+			 
+			 
+				 
+					 Un-comment the following line, so that it looks like the following:
+				 
+				 
+
-]]>
-         
+]]>
+				
+			
+		
+	
+	
+		Note: this example is for a PostgreSQL database. If you use another data=
base, you will need to modify org.hibernate.dialect.Postgre=
SQLDialect to reflect the correct database. For a list of =
supported dialects, refer to the dialects list on the Hibernate website.
+	
       
    
    
-      Setting up the email service
-      To be able to use the email service (for example to verify use=
r emails when someone subscribes or for CMS
-      workflow notifications) it has to be configured correctly. To config=
ure it, go to
-      jboss-portal.sar/portal-core.sar/META-INF/jboss-service.xml=
.
-      In this file, the mail module is configured like this:
-      
-      
-      jboss:service=3DMail
-      portal:service=3DModule,type=3DIdentityServiceController
-      -1
-      localhost
-      
-      
-      false
-      100000
-      10000
-      java:portal/MailModule
-]]>
-         Here you can specify a different SMTP server than localhost, then=
 precise the SMTP username and SMTP password to
-         use to send emails.
-      For example, to use GMail's SMTP server:
-      
-      
-      jboss:service=3DMail
-      portal:service=3DModule,type=3DIdentityServiceController
-      -1
-      smtp.gmail.com
-      username(a)gmail.com
-      myPassword
-      false
-      100000
-      10000
-      java:portal/MailModule
-]]>
+      Setting up the Email Service
+      
+	      If you have a standard setup and a mail server installed, the email=
 service should work without any extra configuration. Most Linux distributi=
ons have a mail server installed by default. The email service, for example=
, can be used to verify a user's email address when a user subscribes, or f=
or CMS workflow notifications.
       
-      If you have a 'standard' setup and a mail server install=
ed
-      (That's the case on most Linux distribution out of the box), it will=
 work out of the box.
-   
+      
+	      The email service is configured using the $JBOSS_HOME/ser=
ver/default/deploy/jboss-portal.sar/META-INF/jboss-service.xml f=
ile. The following is an example of the section which is used to configure =
the email service:
+      
+      
+
+
+jboss:service=3DMail
+portal:service=3DModule,type=3DIdentityServiceController
+-1
+localhost
+
+
+false
+100000
+10000
+java:portal/MailModule
+]]>
+
+	
+	
+		A different SMTP server (other than localhost) can be configured, along =
with a SMTP username and an SMTP password. The following is an example conf=
iguration that uses the Gmail SMTP server:
+	
+	
+
+
+jboss:service=3DMail
+portal:service=3DModule,type=3DIdentityServiceController
+-1
+smtp.gmail.com
+username(a)gmail.com
+myPassword
+false
+100000
+10000
+java:portal/MailModule
+]]>
+
+	
+	
+		Using this example, replace username(a)gmail.com and myPassword with your correct=
 Gmail username and password.
+	
+
    
-      Setting up proxy settings
+      Configuring proxy settings
       There are a couple of scenarios where you will need your proxy=
 to be correctly defined at the JVM
       level so that you can access documents from Internet. It could be to=
 get the thirdparty libraries if you
       decided to build JBoss Portal from the sources, to access RSS feeds =
or weather information in the samples
@@ -219,19 +261,24 @@
       is enough.
    
    
-      Disabling dynamic proxy unwrapping
-         JBoss Portal use the JBoss Microkernel for the service infr=
astructure. The JBoss Microkernel provides
-         injection of services into other services, also known as wiring. =
Unfortunately it is only possible to inject
-         dynamic proxies that talks to the MBeanServer due to the fact the=
 Microkernel is JMX based. The overhead
-         at runtime is minimal since the Microkernel implementation is hig=
hly optimized, however when it is used
-         with Java 5 a noticeable bottleneck appears due to the fact that =
the implementation
-         of the JMX API classes javax.management.* pr=
ovided by the Java Platform performs synchronization. This does
-         not happen under JDK 1.4 since those classes are implemented by J=
Boss MX.
-         JBoss Portal services use a special kind of Model MBean cal=
led JBossServiceModelMBean which allows to
-         unwrap the injected dynamic proxies and replace them by the real =
POJO services. This allows to remove the
-         bottleneck with Java 5 and provide an extra boost of performances=
 on JDK 1.4. By default that feature
-         is enabled but it is possible to disabled it using command line a=
rguments.
-         run.sh -Dportal.kernel.no_proxies=3Dfalse]]>
+      Disabling Dynamic Proxy Un-wrapping
+      JBoss Portal uses the JBoss Microkernel for the service infras=
tructure. The JBoss Microkernel provides injection of services into other s=
ervices, otherwise known as wiring. Due to the Microkernel being JMX based,=
 it is only possible to inject dynamic proxies that talk to the MBeanServer=
. The overhead at runtime is minimal since the Microkernel implementation i=
s highly optimized; however, when it is used with Java 5, a noticeable bott=
leneck occurs due to the fact that the implementation of the JMX API classe=
s, javax.management.*, provided by the Java Platform, =
perform synchronization. This does not occur under JDK 1.4, since those cla=
sses are implemented by JBoss MX.
+ 	
+         
+		 JBoss Portal services use a special kind of Model MBean called JBossServiceModelMBean, which allows the un-wrapping of inject=
ed dynamic proxies, and replaces them with plain old java object (POJO) ser=
vices. This removes the bottleneck when using Java 5, and also provides a p=
erformance boost on JDK 1.4. By default this feature is enabled, but it is =
possible to disable. To do this on Linux systems, change into the $JBOSS_HOME/bin/ directory and run the following command:
+	 
+	 
+
+./run.sh -Dportal.kernel.no_proxies=3Dfalse
+
+
+
+	On Microsoft Windows systems, run the following command:
+
+
+
+run.bat -Dportal.kernel.no_proxies=3Dfalse
+
+
    
 

Modified: docs/tags/JBoss_Portal_2_6_4/referenceGuide/en/modules/installati=
on.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- docs/tags/JBoss_Portal_2_6_4/referenceGuide/en/modules/installation.xml=
	2008-02-08 10:45:01 UTC (rev 9868)
+++ docs/tags/JBoss_Portal_2_6_4/referenceGuide/en/modules/installation.xml=
	2008-02-08 10:56:20 UTC (rev 9869)
@@ -25,7 +25,7 @@
 	      
 	      
 		      
-			      Start the server: change into =
the JBOSS_PORTAL_INSTALLATION_DIRECTORY/bin/ directory=
. On Microsoft Windows, execute run.bat. On Linux, run t=
he ./run.sh command.
+			      Start the server: change into =
the JBOSS_PORTAL_INSTALLATION_DIRECTORY/bin/ directory=
. On Microsoft Windows, execute run.bat. On Linux, run t=
he ./run.sh command. To specify a configuration to use, =
for example, the default configuration, append the  -c default option to the run.bat or ./run.sh commands.
 		      
 	      
 	      
@@ -125,7 +125,7 @@
 			
                
 	       
-		       Copy the Datasource descriptor that matches your database into th=
e $JBOSS_HOME/server/configuration/dep=
loy/ directory, where configuration i=
s either all, default or minimal. For example, if you are using the all con=
figuration, copy the Datasource descriptor into the $JBOSS_HOME/s=
erver/all/deploy/ directory.
+		       Copy the Datasource descriptor that matches your database into th=
e $JBOSS_HOME/server/configuration/dep=
loy/ directory, where configuration i=
s either all, default, minimal or production. The production configuration =
only exists on JBoss EAP, and not JBoss AS. For example, if you are using t=
he all configuration, copy the Datasource descriptor into the $JB=
OSS_HOME/server/all/deploy/ directory.
 	       
 	       
 		       After the Datasource descriptor has been copied into the deploy directory, make sure the username, password, connection=
-url, and driver-class are correct for your chosen database. Datasource des=
criptor files can be deployed to test before being used in production. The =
following is an example Datasource descriptor for the PostgreSQL database:
@@ -161,7 +161,7 @@
 	  	
 		
 			
-				Start the server: change into the <=
filename>$JBOSS_HOME/bin/ directory. On Microsoft Windows, execu=
te run.bat. On Linux, run the ./run.sh command.
+				Start the server: change into the <=
filename>$JBOSS_HOME/bin/ directory. On Microsoft Windows, execu=
te run.bat. On Linux, run the ./run.sh command. To specify a configuration to use, for example, the default conf=
iguration, append the  -c default option to the run.bat or ./run.sh commands.
 			
 		
 		
@@ -348,7 +348,7 @@
 	 
 		 Replace proxy-hostname with the proxy server=
's hostname, and proxy-port with the correct pro=
xy server port number.
 	
-	 To build and deploy JBoss Portal from the sources, change into the=
  JBOSS_PORTAL_HOME_DIRECTORY/build/ directory. Then, =
Microsoft Windows users need to run the build.bat deploy=
 command, and Linux users need to run the ./build.sh deploy command.
+	To build and deploy JBoss Portal from the sources, change into the =
 JBOSS_PORTAL_SOURCE_DIRECTORY/build/ directory, where=
 JBOSS_PORTAL_SOURCE_DIRECTORY is the directory where =
the JBoss Portal source code was downloaded to. Then, Microsoft Windows use=
rs need to run the build.bat deploy command, and Linux u=
sers need to run the ./build.sh deploy command.
 	 
 	
 		At the end of the build process, the jboss-portal.sar file is copied into the $JBOSS_HOME/server/default/deploy/ directory:
@@ -375,7 +375,7 @@
 		
 			
 				
-					Change into the JBOSS_PORTAL_HOME_DIRECTORY/build/ directory, and run the following command:
+					Change into the JBOSS_PORTAL_SOURCE_DIRECTORY/build/ directory, and run the following command:
 				
 				
 
@@ -385,7 +385,7 @@
 			
 			
 				
-					Change into the JBOSS_PORTAL_HOME_DIRECTORY/core/ directory, and run the following command:
+					Change into the JBOSS_PORTAL_SOURCE_DIRECTORY/core/ directory, and run the following command:
 				
 				
 
@@ -441,7 +441,7 @@
 			 
 		 
 		 
-			 Copy the Datasource descriptor that matches your database into the $JBOSS_HOME/server/configuration/deploy/<=
/filename> directory, where configuration is eit=
her all, default, minimal, or production. For example, if you are using the=
 production configuration, copy the Datasource descriptor into the $JBOSS_HOME/server/production/deploy/ directory.
+			 Copy the Datasource descriptor that matches your database into the $JBOSS_HOME/server/configuration/deploy/<=
/filename> directory, where configuration is eit=
her all, default, minimal, or production. For example, if you are using the=
 production configuration, copy the Datasource descriptor into the $JBOSS_HOME/server/production/deploy/ directory. The productio=
n configuration only exists on JBoss EAP installations, and not JBoss AS.
 		 
 		 
 			 After the Datasource descriptor has been copied into the dep=
loy directory, make sure the username, password, connection-url,=
 and driver-class are correct for your chosen database. Datasource descript=
or files can be deployed to test before being used in production. The follo=
wing is an example Datasource descriptor for the PostgreSQL database:
@@ -477,7 +477,7 @@
 		       
 		       
 			       
-				       Start the server: change int=
o the $JBOSS_HOME/bin/ directory. On Microsoft Windows=
, execute run.bat. On Linux, run the ./run.sh command.
+				       Start the server: change int=
o the $JBOSS_HOME/bin/ directory. On Microsoft Windows=
, execute run.bat. On Linux, run the ./run.sh command. To specify a configuration to use, for example, the defau=
lt configuration, append the  -c default option to the <=
command>run.bat or ./run.sh commands.
 			       
 		       
 		       

Modified: docs/tags/JBoss_Portal_2_6_4/referenceGuide/en/modules/migration.=
xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- docs/tags/JBoss_Portal_2_6_4/referenceGuide/en/modules/migration.xml	20=
08-02-08 10:45:01 UTC (rev 9868)
+++ docs/tags/JBoss_Portal_2_6_4/referenceGuide/en/modules/migration.xml	20=
08-02-08 10:56:20 UTC (rev 9869)
@@ -11,124 +11,134 @@
          boleslaw dot dawidowicz at redhat dot com
       
    
-   Upgrading 2.4 - 2.6
+   Upgrading JBoss Portal 2.4 to 2.6
+   
    
-      Before performing any instructions or operations mentioned below rem=
ember to backup your database content and
-      the whole application server directory!
+	   
+		Before performing any instructions or operations in this chapter, back u=
p your database content and
+		the entire JBoss EAP or JBoss AS directory!
+	   
    
+   
    
-      Manual upgrade
+      Manual Upgrade
       
-         Although database schema remains the same in JBoss Portal 2.6 the=
re are several differences that prevent from simple deployment
-         of newest portal version using JBoss Portal 2.4 database. In this=
 chapter we will list major ones and give
-         instructions on how to manually update proper data.
+         Although the database schema remains the same in JBoss Portal 2.6=
, there are several differences that prevent simply deploying the latest ve=
rsion of JBoss Portal, when using a database created for JBoss Portal 2.4. =
This chapter describes updating a JBoss Portal 2.4 MySQL database for use w=
ith JBoss Portal 2.6.
       
       
-         Upgrading procedure can be quite straightforward:
-         
+	      The upgrade procedure can be straightforward:
+      
+      
+         
             
-               Remove $JBOSS_HOME/server/default/d=
eploy/jboss-portal.sar file.
+		    
+			If you are using the JBoss Portal binary, remove the $JBOSS_H=
OME/server/default/deploy/jboss-portal.sar/ directory. If JBoss =
Portal was built from source, remove the $JBOSS_HOME/server/defau=
lt/deploy/jboss-portal.sar file.
+		    
             
             
             
-               Update data in portal database like described in following =
sections of this chapter
+		    
+			    Update the data in the JBoss Portal database, as described in .
+		    
             
             
-               Deploy JBoss Portal 2.6
+		    
+			    Deploy JBoss Portal 2.6.
+		    
             
-         
+         
       
       
-         Theme
+         Themes
+	 
+		 Themes in JBoss Portal 2.6 have changed since the Portal pages now cont=
ain additional areas, such as the Login, Admin<=
/guiicon>, and Dashboard links, on the top right-hand co=
rner:
+	 
+	 
          
             
                
             
          
+ 	
          
-            Themes in 2.6 version changed as now they
-            contain additional areas - the best example is upper right cor=
ner where links like "Login", "Admin", "My Dashboard"
-            are visable. If you use default theme like "renaissance" that =
is present in 2.6, you shouldn't need to do anything. To update your custom=
 themes please
-            refer to those bundled with portal as an example.
-         
-         If you stay with old theme files you may find JBP 2.6 unusa=
ble to the point that you may not even be able to log in
+		 If you use a default theme that exists in JBoss Portal 2.6, such as ren=
aissance, no configuration should be necessary. Using old themes from JBoss=
 Portal 2.4 may make JBoss Portal 2.6 unusable, for example, not being able=
 to log in. To update custom themes, please refer to those bundled with JBo=
ss Portal as an example.
+    	
       
-      
-         Database
-         All things described in this section can be done using Admi=
nPortlet. Treat this directions more as guideline
-         if you need to automate migration for big portal deployment.
+      
+         Updating the Database
          
-            Database schema wasn't changed between 2.4 and 2.6 releases, b=
ut still content that is kept in it
-            changed slightly in few areas. You can easily update the data =
manually by using tools proper for your
-            RDBMS. If you use MySQL you can use MySQL Query Browser that can
-            be downloaded from MySQL website.
+		 All procedures described in the following sections can performed using =
the AdminPortlet. Treat the directions as guidelines if you need to automat=
e the migration of a large JBoss Portal deployment.
+	 
+	 
+		 Database schema has not changed between the JBoss Portal 2.4 and 2.6 re=
leases, but certain content that is kept in the databases has changed. Data=
 can be updated manually by using the correct tools for your RDBMS. For exa=
mple, if you are using a MySQL database, you can use the MySQL Query Browser.
          
-         
-            Instructions below refer to standard JBoss Portal 2.4 deployme=
nt. If you named core portlets, portlet instances
-            or portlet windows differently you will need to make proper mo=
difications in those steps.
-         
+	 
+		 The following instructions refer to a standard JBoss Portal 2.4 deploym=
ent. If you named core portlets, portlet instances, or portlet windows diff=
erently, you will need to make the appropriate modifications. The following=
 is an example of using the MySQL Query Browser:
+         
+	 
          
             
                
             
          
-         
-            Portlet names
-            Names of few core bundled portlets changed. To update th=
em you need to:
+ 	
+
+         
+            Portlet Names
             
-               In JBP_INSTANCES table:
-               
-                  Change "local.portal.CMSPorlet" in PORTLET_REF column to
-                     "local./portal-cms.CMSPortlet"
-                  
-                  Change "local.portal.CMSAdminPorlet<=
/emphasis>" in PORTLET_REF column to
-                     "local./portal-cms.CMSAdminPortlet"
-                  
-                  Change "local.portal.ManagementPorle=
t" in PORTLET_REF column to
-                     "local./portal-admin.AdminPortlet"
-                  
-               
-            
-            Instead of editing database you can destroy those instan=
ces in AdminPortlet and recreate them.
+		    Names of certain core bundled portlets have changed. Destroy the fol=
lowing instances and use the AdminPortlet to recreate them, or, edit the JBP_INSTANCES table as follows:
+	    
+	    
+		    
+			    
+				    
+					    Change local.portal.CMSPorlet in the  PORTLET_REF column to local./portal-cms.CMSPortlet=
.
+				    
+			    
+			    
+				    
+					    Change local.portal.CMSAdminPorlet in the PORTLET_REF column to local./portal-cms.CMSAdm=
inPortlet.
+				    
+			    
+			    
+				    
+					    Change local.portal.ManagementPorlet in the =
PORTLET_REF column to local./portal-admin.Ad=
minPortlet.
+				    
+			    
+		    
+	    
             
-               NavigationPortlet from JBP 2.4 is not =
present anymore. Its functionality is now realized by
-               PageCustomizerInterceptor so all refer=
ences to NavigationPortlet should
-               be removed from all portal pages. You can do it either by c=
leaning up database content or by using
-               AdminPortlet in Portal interface. In d=
atabase you should remove:
-               
-                  
-                     Rows containing "local.portal.NavigationPor=
tlet" in
-                     "PORTLET_REF" column in
-                     "JBP_INSTANCES" table.
-                  
-                  
-                     Rows containing "NavigationPortletInstance<=
/emphasis>" in
-                     "INSTANCE_REF" column in
-                     "JBP_WINDOW" table.
-                  
-                  
-                     Rows containing "NavigationPortletWindow" in
-                     "NAME" column in
-                     "JBP_OBJECT" table.
-                  
-               
-            
-            Instead of editing database you can just remove Navigati=
onPortletInstance using AdminPortlet.
-         
-         
+		    The NavigationPortlet from JBoss Portal 2.4 has=
 been removed, and its functionality is now replaced by PageCusto=
mizerInterceptor. All references to the NavigationPort=
let should be removed from all portal pages. Remove Na=
vigationPortletInstance using the AdminPortlet, or edit the data=
base as follows:
+	    
+	     
+		     
+			     
+				     
+					     In the JBP_INSTANCES table, rows containing=
 local.portal.NavigationPortlet in the PORTL=
ET_REF column.
+				     
+			     
+			     
+				     
+					     In the JBP_WINDOW table, rows containing NavigationPortletInstance in the INSTANCE_REF<=
/emphasis> column.
+				     
+			     
+			     
+				     
+					     In the JBP_OBJECT table, rows containing NavigationPortletWindow in the NAME=
 column.
+				     
+			     
+		     
+	     
+         
+         
             CMS
             
-               This is probably the less trival part to do directly in dat=
abase. In JBP 2.6 version the way that CMS
-               content is being displayed changed significantly. Please re=
fer to
-               Content Integration and CMS Portlet
-               chapters for more information. Basically currently there is=
 no need to have more than one instance of
-               CMSPortlet and the portlet window disp=
lays CMS content not by referring to that portlet instance
-               but by having proper content-type defi=
ned. In "default-object.xml
-               you will find following configuration:
-               
-                   and . Currently th=
ere is no need to have more than one instance of the CMSPortlet. The portlet window displays CMS content, not by referring to tha=
t portlet instance, but by having the proper content-type defined. The following configuration is in the jboss-portal.s=
ar/conf/data/default-object.xml file:
+	    
+	    
+
    CMSWindow
    
@@ -137,53 +147,53 @@
    
    center
    0
-
-                  ]]>
-               
+]]>
+
+
+            
+		    The following example uses the MySQL Query Browser. Open the JBP_OBJECT_NODE table in your database schema. =
Look at the PATH column to identify any =
occurrences of CMS in your JBoss Portal deployment. Identify any row referr=
ing to CMSPortletWindow, and remember the number in PK column. The PK<=
/emphasis> number is needed in the following steps:
             
             
-               Open JBP_OBJECT_NODE tab=
le in your database schema. By looking at
-               PATH column you will eas=
ily find any occurances of CMS in your portal
-               deployment
-            
             
                
                   
                
             
+           
             
-               For any row you will identify as referring to CMS=
PortletWindow in your system remember
-               the number in PK column.=
 It will be needed in next steps
+		    Go to the JBP_WINDOW table and fi=
nd a row with the same
+		    PK value from the JBP_OBJECT_NODE table. In such a row, replace CMSPortletInstance with a path to your CMS resource. For examp=
le, by default, JBoss Portal displays /default/index.html.
             
-             Go to JBP_WINDOW tab=
le and find row with the same
-               PK value like the one fr=
om
-               JBP_OBJECT_NODE table. I=
n such row replace
-               "CMSPortletInstance" with a path to yo=
ur CMS resource. For example by default
-               portal is displaying "/default/index.html".
-            
-             Go to JBP_PORTAL_OBJECT_PROPS table and add a row containing:
+             Go to the JBP_PORTAL_OBJECT_PRO=
PS table and add a row containing:
                
                   
-                     The number you remembered in "OBJECT_KEY" column.
-                  
-                  
-                     "portal.windowContentType" in "<=
emphasis>NAME" column.
-                  
-                  
-                     "cms" in "jbp_VALUE" column.
-                  
-               
-            
+			  
+				  The PK number remembered from the=
 OBJECT_KEY column.
+			  
+		  
+		  
+			  
+				  portal.windowContentType in the NAME<=
/emphasis> column.
+			  
+		  
+		  
+			  
+				  cms in the jbp_VALUE colum=
n.
+			  
+		  
+	    
+          
             
-            Remember that you can also change portlet window content=
 type and configure path to CMS resource
-               using AdminPortlet
+            
+		    Portlet Content Type and Path to the CMS Resource
+		    
+				You can change the portlet window content type and configure the path =
to the CMS resource
+			using the AdminPortlet.
+		    
+	    
             
-         
-      
-
-
-
-   
+         
+
    
 =

       
-         Deploying your first portlet
+         Deploying your First Portlet
          
             Introduction
-            This section will introduce the reader to deploying his =
first portlet in JBoss Portal. It requires you
-               download the HelloWorldPortlet from PortletSwap.com, using =
this
-               link.
-            
+            
+		    This section details deploying your first portlet in JBoss Portal. B=
efore proceeding, download the HelloWorldPorlet from JBoss PortletSwap.
+	    
          
          
             Package Structure
             
-               Portlets are packaged in WAR files, just like other JEE app=
lications. A typical portlet WAR file can also
-               include servlets, resource bundles, images, HTML, JSPs, and=
 other static or dynamic files you would
-               commonly include.
+               Like other Java EE applications, portlets are packaged in W=
AR files. A typical portlet WAR file can include servlets, resource bundles=
, images, HTML, JSPs, and other static or dynamic files. The following is a=
n example of the directory structure of the HelloWorldPortlet portlet:
             
             
                
@@ -141,15 +159,16 @@
             
          
          
-            Portlet Class
+            Portlet Classes
             
-               Included in the
-               
-                  download bundle you should have one java source =
file:
-               HelloWorldPortlet\src\main\org\jboss\portlet\hello=
\HelloWorldPortlet.java, and it
-               should contain the following:
-               HelloWorldPortlet/src/main/org/jboss/=
portlet/hello/HelloWorldPortlet.java java source file, which com=
es bundled with the HelloWorldPortlet:
+	    
+	    
+
-               
-               Now let's dissect our simplest of portlets:
-               
-                  
-                     
-                        public class HelloWorldPortlet ext=
ends GenericPortlet
-                        All Portlets MUST implement the javax.por=
tlet.Portlet interface. The Portlet
-                        API also provides a convenience implementation of =
this interface in the form of the
-                        javax.portlet.GenericPortlet cl=
ass which, among other things, implements
+	protected void doView(RenderRequest rRequest, RenderResponse rResponse) =

+	throws PortletException, IOException, UnavailableException
+
+	{
+		rResponse.setContentType("text/html");
+		PrintWriter writer =3D rResponse.getWriter();
+		writer.write("Hello World!");
+		writer.close();
+	}
+
+} ]]>
+
+	
+	
+         
+		 
+public class HelloWorldPortlet extends GenericPortlet
+			 
+				 
+                        All portlets must implement the javax.por=
tlet.Portlet interface. The portlet
+                        API provides a convenient implementation of this i=
nterface, in the form of the
+                        javax.portlet.GenericPortlet cl=
ass, which among other things, implements
                         the Portlet render method to di=
spatch to abstract mode-specific methods to
-                        make it easier to support the standard portlet mod=
es. It also provides
-                        a default implementation for processActio=
n, init and
-                        destory methods. It is recommen=
ded to extend GenericPortlet
+                        make it easier to support the standard portlet mod=
es. As well, it provides
+                        a default implementation for the processA=
ction, init and
+                        destroy methods. It is recommen=
ded to extend GenericPortlet
                         for most cases.
-                     
-                  
-                  
-                     
-                        protected void doView(RenderReques=
t rRequest, RenderResponse rResponse) throws
-                           PortletException, IOException, UnavailableExcep=
tion
-                        As we extend from GenericPortlet and we are only interested in supported the
-                        VIEW mode, we only need to impl=
ement the doView method,
-                        and GenericPortlet's r=
ender implementation will call our
-                        implementation when the VIEW mo=
de is requested.
-                     
-                  
-                  
-                     
-                        rResponse.setContentType("text/htm=
l");
-                        Just like in the servlet-world, you must declare w=
hat content-type the portlet will be
-                        responding in. You need to do this before starting=
 to write content or the portlet will throw
-                        an exception.
-                     
-                  
-                  
-                     
-                        
-                        Here we output the text
-                        Hello World!
-                        in our portlet window.
-                        
-                           Portlets are responsible for generating markup =
fragments, as they are included on a page and
-                           surrounded by other portlets. In particular, th=
is means that a portlet outputting HTML MUST
-                           not output any markup that cannot be found in a=
 body element.
-                        
-                     
-                  
-               
-            
+                    		 
+                  	
+		
+		
+protected void doView(RenderRequest rRequest, RenderResponse rResponse) =

+throws PortletException, IOException, UnavailableException
+			
+				
+					As we extend from GenericPortlet, and are only int=
erested in supporting the VIEW mode, only the d=
oView method needs to be implemented, and the GenericPor=
tlet render implemention calls our implementat=
ion when the VIEW mode is requested.
+				
+			
+		
+		
+rResponse.setContentType("text/html");
+			
+				
+					As in the servlet-world, you must declare what content-type the portl=
et will be
+					responding in. Do this before starting to write content, or the portl=
et will throw an exception.
+				
+			
+		
+		
+PrintWriter writer =3D rResponse.getWriter(); =

+writer.write("Hello World!"); =

+writer.close();
+			
+				
+					This produces the Hello World! text in our portlet=
 window.
+				
+			
+		
+	
+
+
+	
+		
+			Portlets are responsible for generating markup fragments, as they are i=
ncluded on a page and are
+			surrounded by other portlets. In particular, this means that a portlet =
outputting HTML must
+			not output any markup that cannot be found in a <body> element.
+		 
+        
+
          
          
             Application Descriptors
             
-               JBoss Portal requires certain descriptors be included in yo=
ur portlet WAR, for different reasons. Some of
-               these descriptors are defined by the Portlet Specification,=
 some are specific to JBoss Portal.
+               JBoss Portal requires certain descriptors to be included in=
 a portlet WAR file. Some of
+	       these descriptors are defined by the JSR-168 Portlet Specification=
, and others are specific to JBoss Portal. The following is an example of t=
he directory structure of the HelloWorldPortlet portlet:
+           
+	   
                
                   
                      
                   
                
-               Now let's explain what each of these does:
-               
-                  
-                     portlet.xml
-
+           
+           
+		   The following is an example of the HelloWorldPortlet/WEB-IN=
F/portlet.xml file. Note: in order to create the WEB-I=
NF and META-INF directories, extract the helloworldportlet.war file:
+	   
+	   
+
 HelloWorld Portlet
       
    
-]]>
-                        This file must adhere to its definition in the Por=
tlet Specification. You may define more than
-                        one portlet application in this file.
-                        
-                           
-                              
-                                 He=
lloWorldPortlet]]>
-                                 Define your portlet name. It does not hav=
e to be the Class name.
-                              
-                           
-                           
-                              
-                                 o=
rg.jboss.portlet.hello.HelloWorldPortlet]]>
-                                 The Fully Qualified Name (FQN) of your po=
rtlet class must be declared here.
-                              
-                           
-                           
-                              
-                                 
-   text/html
-   VIEW
-]]>
-                                 The supports element a=
llows you to declare all the markup types your
-                                 portlet supports in the render method. This is accomplish via the
-                                 mime-type element, whi=
ch is required for every
-                                 portlet. Of course, the declared MIME typ=
es must match the capability of the portlet.
-
-                                 It also allows you to pair
-                                 which modes and window states are support=
ed for each markup type. In out case, as all
-                                 portlets must support the VIEW portlet mo=
de, we didn't have to declare it. We did need
-                                 to declare that our portlet supports the =
text/html markup type.
-                                 Hence, we are letting the portal know tha=
t it will be outputting text/html and
-                                 only support a VIEW mode.
-                              
-                           
-                           
-                              
-                                 
-   HelloWorld Portlet
-
-]]>
-                                 The portlet's title will be displayed as =
the header in the portlet window, when
-                                 rendered, unless it is overridden program=
matically.
-                              
-                           
-                        
-                     
-                  
-                  
-                     portlet-instances.xml
-
+]]>
+
+	
+	
+		This file must adhere to its definition in the JSR-168 Portlet Specifica=
tion. You may define more than one portlet application in this file.
+	
+	
+		
+			HelloWorldPortlet]]>
+
+	
+		Define the portlet name. It does not have to be the Class name.
+	
+
+
+org.jboss.portlet.hello.HelloWorldPortlet]]=
>
+
+	
+		The Fully Qualified Name (FQN) of your portlet class must be declared he=
re.
+	
+
+
+
+    text/html
+    VIEW
+]]>
+
+	
+		The <supports> element allows you to declare al=
l the markup types your
+		portlet supports in the render method. This is accomp=
lished via the
+		<mime-type> element, which is required for ever=
y portlet. The declared MIME types must match the capability of the portlet.
+	
+	
+		As well, it allows you to pair which modes and window states are support=
ed for each markup type. All portlets must support the VIEW portlet mode, s=
o this does not have to be decared. Define which markup type your porlet su=
pports, which in this examepl is text/html. This section=
 tells the portal that it will only output text and HTML, and that it only =
supports the VIEW mode.
+	
+
+
+
+    HelloWorld Portlet
+]]>
+
+	
+		When rendered, the portlet's title will be displayed as the header in th=
e portlet window, unless it is overridden programmatically. In this example=
, the title would be HelloWorld Portlet.
+	
+
+
+
+
+
+	The following is an example of the HelloWorldPortlet/WEB-INF/po=
rtlet-instances.xml file:
+
+
+
 
@@ -314,17 +353,21 @@
          HelloWorldPortlet
       
    
-]]>
-                        This is a JBoss Portal specific descriptor that al=
lows you to create instances of portlets. The
-                        portlet-ref value must match th=
e portlet-name value
-                        given in the packaged portlet.xml. The instance-id
-                        value can be named anything, but it must match instance-ref values given
-                        in *-object.xml files as we sha=
ll below.
-                     
-                  
-                  
-                     helloworld-object.xml
-
+]]>
+
+
+
+	This is a JBoss Portal specific descriptor that allows you to create inst=
ances of portlets. The
+	<portlet-ref> value must match the <=
portlet-name> value
+	given in the HelloWorldPortlet/WEB-INF/portlet.xml f=
ile. The <instance-id>
+	value can be named anything, but it must match the instance-ref<=
/literal> values given
+	in *-object.xml files as we shall below.
+
+
+	The following is an example helloworld-object.xml fi=
le:
+
+
+
 
@@ -339,14 +382,18 @@
          1
       
    
-]]>
+]]>
+
+
+
+*-object.xml files are JBoss Portal specific descriptor=
s and allow users to
+define the structure of their portal instances as well as create/configure=
 their windows and
+pages. In our example, we create a portlet window, specify that it will di=
splay the markup
+generated by the HelloWorldPortletInstance portlet inst=
ance, assign it to the
+default.default page, and specify where it should appea=
r on that page.
+
+
 =

-                        *-object.xml files are JBoss Po=
rtal specific descriptors and allow users to
-                        define the structure of their portal instances as =
well as create/configure their windows and
-                        pages. In our example, we create a portlet window,=
 specify that it will display the markup
-                        generated by the HelloWorldPortletInstanc=
e portlet instance, assign it to the
-                        default.default page, and speci=
fy where it should appear on that page.
-
                         
                            
                               
@@ -389,9 +436,7 @@
                            
                         
                      
-                  
-               
-            
+
             
                To illustrate the relationship between the descriptors, we =
have provided this simple diagram
                
@@ -426,6 +471,8 @@
       
    
 ]]>
+
+
 =

                This declaration is equivalent to the previous example. We =
specify that the content being displayed by
                the HelloWorldPortletWindow is a portlet content. The content URI
@@ -433,7 +480,7 @@
                It is possible to declare windows with a cms content type and use directly the path to
                the file in the CMS to make the window show the content of =
the associated file. That behavior is
                pluggable and it is possible to plug virtually any kind of =
content.
-            
+             =

          
          
             Building your portlet


--===============1411257210204365064==--

From portal-commits at lists.jboss.org Fri Feb  8 06:52:53 2008
Content-Type: multipart/mixed; boundary="===============4029735380142401431=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9870 - in
 branches/JBoss_Portal_Branch_2_6/core-cms/src:
 resources/portal-cms-war/WEB-INF/jsp/cms/admin and 1 other directory.
Date: Fri, 08 Feb 2008 06:52:53 -0500
Message-ID: 

--===============4029735380142401431==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: thomas.heute(a)jboss.com
Date: 2008-02-08 06:52:53 -0500 (Fri, 08 Feb 2008)
New Revision: 9870

Modified:
   branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/core=
/cms/ui/admin/CMSAdminPortlet.java
   branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/W=
EB-INF/jsp/cms/admin/main.jsp
   branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/W=
EB-INF/jsp/cms/admin/viewfile.jsp
Log:
JBPORTAL-1878: CMS admin GUI flow improvement

Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/port=
al/core/cms/ui/admin/CMSAdminPortlet.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/cor=
e/cms/ui/admin/CMSAdminPortlet.java	2008-02-08 10:56:20 UTC (rev 9869)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/cor=
e/cms/ui/admin/CMSAdminPortlet.java	2008-02-08 11:52:53 UTC (rev 9870)
@@ -1215,14 +1215,15 @@
             {
                aRes.setRenderParameter("confirm", "An error occurred while=
 setting the permissions.(" + e.toString() + ")");
                success =3D false;
+               aRes.setRenderParameter("op", CMSAdminConstants.OP_CONFIRMS=
ECURE);
             }
 =

             if (success)
             {
                aRes.setRenderParameter("confirm", "Security settings updat=
ed successfully.");
+               aRes.setRenderParameter("op", aReq.getParameter("returnOp")=
);
             }
 =

-            aRes.setRenderParameter("op", CMSAdminConstants.OP_CONFIRMSECU=
RE);
             aRes.setRenderParameter("path", aReq.getParameter("path"));
             aRes.setRenderParameter("returnOp", aReq.getParameter("returnO=
p"));
          }

Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cm=
s-war/WEB-INF/jsp/cms/admin/main.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/=
WEB-INF/jsp/cms/admin/main.jsp	2008-02-08 10:56:20 UTC (rev 9869)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/=
WEB-INF/jsp/cms/admin/main.jsp	2008-02-08 11:52:53 UTC (rev 9870)
@@ -14,6 +14,7 @@
 =

 
 <%
+   String sConfirm =3D renderRequest.getParameter("confirm");
    String sCurrPath =3D (String)request.getAttribute("currpath");
    List folders =3D (List)request.getAttribute("folders");
    List files =3D (List)request.getAttribute("files");
@@ -73,6 +74,17 @@
 

 
 
+<%
+   if (sConfirm !=3D null && !"".equals(sConfirm))
+   {
+%>
+   <%=3D sConfirm %>
+   

+<%
+   }
+%>
+
+
    
       


--===============4029735380142401431==--

From portal-commits at lists.jboss.org Fri Feb  8 06:57:12 2008
Content-Type: multipart/mixed; boundary="===============7220149348659750389=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9871 - in
 tags/JBoss_Portal_2_6_4/core-cms/src:
 resources/portal-cms-war/WEB-INF/jsp/cms/admin and 1 other directory.
Date: Fri, 08 Feb 2008 06:57:12 -0500
Message-ID: 

--===============7220149348659750389==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: thomas.heute(a)jboss.com
Date: 2008-02-08 06:57:11 -0500 (Fri, 08 Feb 2008)
New Revision: 9871

Modified:
   tags/JBoss_Portal_2_6_4/core-cms/src/main/org/jboss/portal/core/cms/ui/a=
dmin/CMSAdminPortlet.java
   tags/JBoss_Portal_2_6_4/core-cms/src/resources/portal-cms-war/WEB-INF/js=
p/cms/admin/main.jsp
   tags/JBoss_Portal_2_6_4/core-cms/src/resources/portal-cms-war/WEB-INF/js=
p/cms/admin/viewfile.jsp
Log:
JBPORTAL-1878: CMS admin GUI flow improvement


Modified: tags/JBoss_Portal_2_6_4/core-cms/src/main/org/jboss/portal/core/c=
ms/ui/admin/CMSAdminPortlet.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- tags/JBoss_Portal_2_6_4/core-cms/src/main/org/jboss/portal/core/cms/ui/=
admin/CMSAdminPortlet.java	2008-02-08 11:52:53 UTC (rev 9870)
+++ tags/JBoss_Portal_2_6_4/core-cms/src/main/org/jboss/portal/core/cms/ui/=
admin/CMSAdminPortlet.java	2008-02-08 11:57:11 UTC (rev 9871)
@@ -1215,14 +1215,15 @@
             {
                aRes.setRenderParameter("confirm", "An error occurred while=
 setting the permissions.(" + e.toString() + ")");
                success =3D false;
+               aRes.setRenderParameter("op", CMSAdminConstants.OP_CONFIRMS=
ECURE);
             }
 =

             if (success)
             {
                aRes.setRenderParameter("confirm", "Security settings updat=
ed successfully.");
+               aRes.setRenderParameter("op", aReq.getParameter("returnOp")=
);
             }
 =

-            aRes.setRenderParameter("op", CMSAdminConstants.OP_CONFIRMSECU=
RE);
             aRes.setRenderParameter("path", aReq.getParameter("path"));
             aRes.setRenderParameter("returnOp", aReq.getParameter("returnO=
p"));
          }

Modified: tags/JBoss_Portal_2_6_4/core-cms/src/resources/portal-cms-war/WEB=
-INF/jsp/cms/admin/main.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- tags/JBoss_Portal_2_6_4/core-cms/src/resources/portal-cms-war/WEB-INF/j=
sp/cms/admin/main.jsp	2008-02-08 11:52:53 UTC (rev 9870)
+++ tags/JBoss_Portal_2_6_4/core-cms/src/resources/portal-cms-war/WEB-INF/j=
sp/cms/admin/main.jsp	2008-02-08 11:57:11 UTC (rev 9871)
@@ -14,6 +14,7 @@
 =

 
 <%
+   String sConfirm =3D renderRequest.getParameter("confirm");
    String sCurrPath =3D (String)request.getAttribute("currpath");
    List folders =3D (List)request.getAttribute("folders");
    List files =3D (List)request.getAttribute("files");
@@ -73,6 +74,17 @@
 

 
 
+<%
+   if (sConfirm !=3D null && !"".equals(sConfirm))
+   {
+%>
+   <%=3D sConfirm %>
+   

+<%
+   }
+%>
+
+
    
       


--===============7220149348659750389==--

From portal-commits at lists.jboss.org Fri Feb  8 13:30:25 2008
Content-Type: multipart/mixed; boundary="===============5474040999801574158=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9872 - in
 modules/portlet/trunk/test/src: test/resources/simple-portal-war/WEB-INF and
 3 other directories.
Date: Fri, 08 Feb 2008 13:30:25 -0500
Message-ID: 

--===============5474040999801574158==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-08 13:30:24 -0500 (Fri, 08 Feb 2008)
New Revision: 9872

Added:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/Constants.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/JspWriterResponse.java
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/=
jsp/
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/=
jsp/error.jsp
Modified:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/PageTag.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/ParamTag.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/PortalBodyTagSupport.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/PortalSimpleTagSupport.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/PortletMarkupTag.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/PortletTag.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/PortletTitleTag.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/PortletURLTag.java
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/=
portal.tld
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/=
tags/portal/portlet.tag
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/=
default.jsp
Log:
start to handle errors (for now portlet not found)

Added: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/te=
st/jsp/taglib/Constants.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/Constants.java	                        (rev 0)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/Constants.java	2008-02-08 18:30:24 UTC (rev 9872)
@@ -0,0 +1,53 @@
+/*************************************************************************=
*****
+ * 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.taglib;
+
+/**
+ * @author Julien Viet
+ * @version $Revision: 630 $
+ */
+public final class Constants
+{
+
+   private Constants()
+   {
+   }
+
+   /** . */
+   public static final String ERROR_STATUS =3D "org.jboss.portal.portlet.p=
ortal.error.status";
+
+   /** . */
+   public static final String ERROR_EXCEPTION =3D "org.jboss.portal.portle=
t.portal.error.exception";
+
+   /** . */
+   public static final String ERROR_PORTLET_NAME =3D "org.jboss.portal.por=
tlet.portal.error.portlet_name";
+
+   /** . */
+   public static final String ERROR_APPLICATION_NAME =3D "org.jboss.portal=
.portlet.portal.error.application_name";
+
+   /** . */
+   public static final String ERROR_WINDOW_ID =3D "org.jboss.portal.portle=
t.portal.error.window_id";
+
+   /** . */
+   public static final String NOT_FOUND =3D "not_found";
+}

Added: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/te=
st/jsp/taglib/JspWriterResponse.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/JspWriterResponse.java	                        (rev 0)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/JspWriterResponse.java	2008-02-08 18:30:24 UTC (rev 9872)
@@ -0,0 +1,75 @@
+/*************************************************************************=
*****
+ * 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.taglib;
+
+import org.jboss.portal.portlet.test.jsp.PortalResponse;
+
+import javax.servlet.http.HttpServletResponseWrapper;
+import javax.servlet.jsp.JspWriter;
+import javax.servlet.ServletOutputStream;
+import java.io.PrintWriter;
+import java.io.IOException;
+
+/**
+ * @author Julien Viet
+ * @version $Revision: 630 $
+ */
+public class JspWriterResponse extends HttpServletResponseWrapper
+{
+
+   /** . */
+   private final JspWriter delegate;
+
+   /** . */
+   private final PrintWriter writer;
+
+   public JspWriterResponse(PortalResponse portalResponse, JspWriter deleg=
ate)
+   {
+      super(portalResponse);
+
+      //
+      this.delegate =3D delegate;
+      this.writer =3D new PrintWriter(delegate);
+   }
+
+   public PrintWriter getWriter() throws IOException
+   {
+      return writer;
+   }
+
+   public ServletOutputStream getOutputStream() throws IOException
+   {
+      throw new IllegalArgumentException();
+   }
+
+   public void resetBuffer()
+   {
+      try
+      {
+         delegate.clearBuffer();
+      }
+      catch (IOException ignore)
+      {
+      }
+   }
+}

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/taglib/PageTag.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PageTag.java	2008-02-08 11:57:11 UTC (rev 9871)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PageTag.java	2008-02-08 18:30:24 UTC (rev 9872)
@@ -34,30 +34,58 @@
 public class PageTag extends PortalBodyTagSupport
 {
 =

+   enum Status
+   {
+      INACTIVE, ACTIVE, SUSPENDED
+   }
+
    String maximizedId;
 =

    String content;
 =

+   Status status =3D Status.INACTIVE;
+
    public int doStartTag() throws JspException
    {
-      PortalResponse response =3D getPortalResponse();
+      if (status =3D=3D Status.INACTIVE)
+      {
+         PortalResponse response =3D getPortalResponse();
 =

-      //
-      maximizedId =3D response.getMaximizedWindowId();
+         //
+         status =3D Status.ACTIVE;
 =

-      //
-      if (maximizedId !=3D null)
-      {
-         return EVAL_BODY_BUFFERED;
+         //
+         maximizedId =3D response.getMaximizedWindowId();
+
+         //
+         if (maximizedId !=3D null)
+         {
+            return EVAL_BODY_BUFFERED;
+         }
+         else
+         {
+            return EVAL_BODY_INCLUDE;
+         }
       }
       else
       {
-         return EVAL_BODY_INCLUDE;
+         return SKIP_BODY;
       }
    }
 =

    public int doEndTag() throws JspException
    {
+      switch (status)
+      {
+         case SUSPENDED:
+            break;
+         case INACTIVE:
+            break;
+         case ACTIVE:
+            status =3D Status.INACTIVE;
+      }
+
+      //
       if (maximizedId !=3D null)
       {
          try
@@ -70,6 +98,7 @@
          }
       }
 =

+      //
       return EVAL_PAGE;
    }
 }

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/taglib/ParamTag.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/ParamTag.java	2008-02-08 11:57:11 UTC (rev 9871)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/ParamTag.java	2008-02-08 18:30:24 UTC (rev 9872)
@@ -30,7 +30,7 @@
  * @author Julien Viet
  * @version $Revision: 630 $
  */
-public class ParamTag extends SimpleTagSupport
+public class ParamTag extends PortalSimpleTagSupport
 {
 =

    /** . */
@@ -59,7 +59,7 @@
       this.value =3D value;
    }
 =

-   public void doTag() throws JspException, IOException
+   public void internalDoTag() throws JspException, IOException
    {
       AbstractURLTag urlTag =3D (AbstractURLTag)SimpleTagSupport.findAnces=
torWithClass(this, AbstractURLTag.class);
       urlTag.setParam(name, value);

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/taglib/PortalBodyTagSupport.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortalBodyTagSupport.java	2008-02-08 11:57:11 UTC (rev 9871)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortalBodyTagSupport.java	2008-02-08 18:30:24 UTC (rev 9872)
@@ -25,6 +25,7 @@
 import org.jboss.portal.portlet.test.jsp.PortalResponse;
 =

 import javax.servlet.jsp.tagext.BodyTagSupport;
+import javax.servlet.jsp.JspException;
 =

 /**
  * @author Julien Viet
@@ -36,4 +37,44 @@
    {
       return (PortalResponse)pageContext.getResponse();
    }
+
+   public int doStartTag() throws JspException
+   {
+      PageTag pageTag =3D (PageTag)findAncestorWithClass(this, PageTag.cla=
ss);
+
+      //
+      if (pageTag =3D=3D null || pageTag.status !=3D PageTag.Status.ACTIVE)
+      {
+         return SKIP_BODY;
+      }
+      else
+      {
+         return internalDoStartTag();
+      }
+   }
+
+   public int doEndTag() throws JspException
+   {
+      PageTag pageTag =3D (PageTag)findAncestorWithClass(this, PageTag.cla=
ss);
+
+      //
+      if (pageTag !=3D null && pageTag.status =3D=3D PageTag.Status.ACTIVE)
+      {
+         return internalDoEndTag();
+      }
+      else
+      {
+         return EVAL_PAGE;
+      }
+   }
+
+   public int internalDoStartTag() throws JspException
+   {
+      return super.doStartTag();
+   }
+
+   public int internalDoEndTag() throws JspException
+   {
+      return super.doEndTag();
+   }
 }

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/taglib/PortalSimpleTagSupport.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortalSimpleTagSupport.java	2008-02-08 11:57:11 UTC (rev 9871)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortalSimpleTagSupport.java	2008-02-08 18:30:24 UTC (rev 9872)
@@ -26,6 +26,8 @@
 =

 import javax.servlet.jsp.tagext.SimpleTagSupport;
 import javax.servlet.jsp.PageContext;
+import javax.servlet.jsp.JspException;
+import java.io.IOException;
 =

 /**
  * @author Julien Viet
@@ -38,4 +40,20 @@
       PageContext pageContext =3D (PageContext)getJspContext();
       return (PortalResponse)pageContext.getResponse();
    }
+
+   public void doTag() throws JspException, IOException
+   {
+      PageTag pageTag =3D (PageTag)findAncestorWithClass(this, PageTag.cla=
ss);
+
+      //
+      if (pageTag !=3D null && pageTag.status =3D=3D PageTag.Status.ACTIVE)
+      {
+         internalDoTag();
+      }
+   }
+
+   public void internalDoTag() throws JspException, IOException
+   {
+      super.doTag();
+   }
 }

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/taglib/PortletMarkupTag.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortletMarkupTag.java	2008-02-08 11:57:11 UTC (rev 9871)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortletMarkupTag.java	2008-02-08 18:30:24 UTC (rev 9872)
@@ -39,9 +39,8 @@
  */
 public class PortletMarkupTag extends PortalSimpleTagSupport
 {
-   public void doTag() throws JspException, IOException
+   public void internalDoTag() throws JspException, IOException
    {
-
       PortalResponse resp =3D getPortalResponse();
 =

       PortletTag portletTag =3D (PortletTag)SimpleTagSupport.findAncestorW=
ithClass(this, PortletTag.class);

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/taglib/PortletTag.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortletTag.java	2008-02-08 11:57:11 UTC (rev 9871)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortletTag.java	2008-02-08 18:30:24 UTC (rev 9872)
@@ -46,6 +46,10 @@
 import org.jboss.portal.common.util.ParameterMap;
 =

 import javax.servlet.jsp.JspException;
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.http.HttpServletRequest;
 import java.util.LinkedHashSet;
 import java.util.Set;
 import java.util.Collections;
@@ -74,125 +78,241 @@
    private static final Set DEFAULT_WINDOW_STATES =3D Collect=
ions.unmodifiableSet(Tools.toSet(WindowState.NORMAL, WindowState.MAXIMIZED,=
 WindowState.MINIMIZED));
 =

    /** . */
-   private String name;
+   private String nameAttr;
 =

    /** . */
-   private String applicationName;
+   private String applicationNameAttr;
 =

    /** . */
-   private String supportedWindowStateValues;
+   private String supportedWindowStatesAttr;
 =

    /** . */
-   private String supportedModeValues;
+   private String supportedModesAttr;
 =

    /** . */
-   private String initialModeValue;
+   private String initialModeAttr;
 =

    /** . */
+   private String errorPageAttr;
+
+   /** . */
    private int status;
 =

    /** . */
+   private Set supportedWindowStates;
+
+   /** . */
+   private Set supportedModes;
+
+   /** . */
+   private Mode initialMode;
+
+   /** . */
    PortletResult result;
 =

    public String getName()
    {
-      return name;
+      return nameAttr;
    }
 =

    public void setName(String name)
    {
-      this.name =3D name;
+      this.nameAttr =3D name;
    }
 =

    public String getApplicationName()
    {
-      return applicationName;
+      return applicationNameAttr;
    }
 =

    public void setApplicationName(String applicationName)
    {
-      this.applicationName =3D applicationName;
+      this.applicationNameAttr =3D applicationName;
    }
 =

    public String getSupportedWindowStates()
    {
-      return supportedWindowStateValues;
+      return supportedWindowStatesAttr;
    }
 =

    public void setSupportedWindowStates(String supportedWindowStates)
    {
-      this.supportedWindowStateValues =3D supportedWindowStates;
+      this.supportedWindowStatesAttr =3D supportedWindowStates;
    }
 =

    public String getSupportedModes()
    {
-      return supportedModeValues;
+      return supportedModesAttr;
    }
 =

    public void setSupportedModes(String supportedModes)
    {
-      this.supportedModeValues =3D supportedModes;
+      this.supportedModesAttr =3D supportedModes;
    }
 =

    public String getInitialMode()
    {
-      return initialModeValue;
+      return initialModeAttr;
    }
 =

    public void setInitialMode(String initialMode)
    {
-      this.initialModeValue =3D initialMode;
+      this.initialModeAttr =3D initialMode;
    }
 =

-   public int doStartTag() throws JspException
+   public String getErrorPage()
    {
-      PortalResponse response =3D getPortalResponse();
-      PagePortletControllerContext context =3D response.getPortletControll=
erContext();
-      PageTag pageTag =3D (PageTag)findAncestorWithClass(this, PageTag.cla=
ss);
+      return errorPageAttr;
+   }
 =

-      //
-      Portlet portlet =3D context.findPortlet(applicationName, name);
+   public void setErrorPage(String errorPage)
+   {
+      this.errorPageAttr =3D errorPage;
+   }
 =

-      // Compute window id
-      String windowId =3D portlet.getContext().getId() + "." + response.ne=
xtId();
-
+   private void updateInternalState()
+   {
       //
+      Set supportedModes =3D new LinkedHashSet();
+      if (supportedModesAttr !=3D null)
+      {
+         for (String supportedModeValue : supportedModesAttr.split(","))
+         {
+            Mode mode =3D Mode.create(supportedModeValue.trim());
+            supportedModes.add(mode);
+         }
+      }
+      else
+      {
+         supportedModes =3D DEFAULT_MODES;
+      }
 =

       //
-      if (pageTag.maximizedId !=3D null)
+      Set supportedWindowStates =3D new LinkedHashSet();
+      if (supportedWindowStatesAttr !=3D null)
       {
-         if (windowId.equals(pageTag.maximizedId))
+         for (String supportedWindowStateValue : supportedWindowStatesAttr=
.split(","))
          {
-            result =3D render(response, portlet, windowId);
-            status =3D BUFFERED;
+            WindowState windowState =3D WindowState.create(supportedWindow=
StateValue.trim());
+            supportedWindowStates.add(windowState);
          }
-         else
-         {
-            status =3D SKIPPED;
-         }
       }
       else
       {
-         result =3D render(response, portlet, windowId);
-         status =3D RENDERED;
+         supportedWindowStates =3D DEFAULT_WINDOW_STATES;
       }
 =

       //
-      switch (status)
+      Mode initialMode =3D Mode.VIEW;
+      if (initialModeAttr !=3D null)
       {
-         case SKIPPED:
-            return SKIP_BODY;
-         case RENDERED:
-            return EVAL_BODY_INCLUDE;
-         case BUFFERED:
-            return EVAL_BODY_BUFFERED;
-         default:
-            throw new AssertionError();
+         initialMode =3D Mode.create(initialModeAttr.trim());
       }
+
+      //
+      this.initialMode =3D initialMode;
+      this.supportedModes =3D supportedModes;
+      this.supportedWindowStates =3D supportedWindowStates;
    }
 =

-   public int doEndTag() throws JspException
+//   private void handleError
+
+   public int internalDoStartTag() throws JspException
    {
+      updateInternalState();
+
+      //
+      PortalResponse response =3D getPortalResponse();
+      PagePortletControllerContext context =3D response.getPortletControll=
erContext();
+      PageTag pageTag =3D (PageTag)findAncestorWithClass(this, PageTag.cla=
ss);
+
+      //
+      Portlet portlet =3D context.findPortlet(applicationNameAttr, nameAtt=
r);
+
+      //
+      if (portlet =3D=3D null)
+      {
+         if (errorPageAttr !=3D null)
+         {
+            RequestDispatcher rd =3D pageContext.getServletContext().getRe=
questDispatcher(errorPageAttr);
+            if (rd !=3D null)
+            {
+               ServletRequest request=3D pageContext.getRequest();
+
+               //
+               try
+               {
+                  pageTag.status =3D PageTag.Status.SUSPENDED;
+                  request.setAttribute(Constants.ERROR_STATUS, Constants.N=
OT_FOUND);
+                  request.setAttribute(Constants.ERROR_APPLICATION_NAME, a=
pplicationNameAttr);
+                  request.setAttribute(Constants.ERROR_PORTLET_NAME, nameA=
ttr);
+
+                  //
+                  rd.include(pageContext.getRequest(), new JspWriterRespon=
se(response, pageContext.getOut()));
+               }
+               catch (ServletException e)
+               {
+                  // Shall we do smth else ?
+                  e.printStackTrace();
+               }
+               catch (IOException e)
+               {
+                  // Shall we do smth else ?
+                  e.printStackTrace();
+               }
+               finally
+               {
+                  pageTag.status =3D PageTag.Status.ACTIVE;
+                  request.removeAttribute(Constants.ERROR_STATUS);
+                  request.removeAttribute(Constants.ERROR_APPLICATION_NAME=
);
+                  request.removeAttribute(Constants.ERROR_PORTLET_NAME);
+               }
+            }
+         }
+
+         // We cannot show an absent portlet, no meta data
+         return SKIP_BODY;
+      }
+      else
+      {
+         String windowId =3D portlet.getContext().getId() + "." + response=
.nextId();
+
+         //
+         if (pageTag.maximizedId !=3D null)
+         {
+            if (windowId.equals(pageTag.maximizedId))
+            {
+               result =3D render(response, portlet, windowId);
+               status =3D BUFFERED;
+            }
+            else
+            {
+               status =3D SKIPPED;
+            }
+         }
+         else
+         {
+            result =3D render(response, portlet, windowId);
+            status =3D RENDERED;
+         }
+
+         //
+         switch (status)
+         {
+            case SKIPPED:
+               return SKIP_BODY;
+            case RENDERED:
+               return EVAL_BODY_INCLUDE;
+            case BUFFERED:
+               return EVAL_BODY_BUFFERED;
+            default:
+               throw new AssertionError();
+         }
+      }
+   }
+
+   public int internalDoEndTag() throws JspException
+   {
       result =3D null;
 =

       //
@@ -222,43 +342,6 @@
       PagePortletControllerContext context =3D response.getPortletControll=
erContext();
 =

       //
-      Set supportedModes =3D new LinkedHashSet();
-      if (supportedModeValues !=3D null)
-      {
-         for (String supportedModeValue : supportedModeValues.split(","))
-         {
-            Mode mode =3D Mode.create(supportedModeValue.trim());
-            supportedModes.add(mode);
-         }
-      }
-      else
-      {
-         supportedModes =3D DEFAULT_MODES;
-      }
-
-      //
-      Set supportedWindowStates =3D new LinkedHashSet();
-      if (supportedWindowStateValues !=3D null)
-      {
-         for (String supportedWindowStateValue : supportedWindowStateValue=
s.split(","))
-         {
-            WindowState windowState =3D WindowState.create(supportedWindow=
StateValue.trim());
-            supportedWindowStates.add(windowState);
-         }
-      }
-      else
-      {
-         supportedWindowStates =3D DEFAULT_WINDOW_STATES;
-      }
-
-      //
-      Mode initialMode =3D Mode.VIEW;
-      if (initialModeValue !=3D null)
-      {
-         initialMode =3D Mode.create(initialModeValue.trim());
-      }
-
-      //
       PageNavigationalState pageNS =3D response.getPageState();
 =

       //
@@ -297,7 +380,6 @@
          }
       }
 =

-
       //
       PortletInvocationContext renderContext =3D context.createPortletInvo=
cationContext(windowId, pageNS);
       RenderInvocation render =3D new RenderInvocation(renderContext);
@@ -331,8 +413,8 @@
 =

       //
       return new PortletResult(
-         name,
-         applicationName,
+         nameAttr,
+         applicationNameAttr,
          windowId,
          portletResponse,
          initialMode,

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/taglib/PortletTitleTag.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortletTitleTag.java	2008-02-08 11:57:11 UTC (rev 9871)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortletTitleTag.java	2008-02-08 18:30:24 UTC (rev 9872)
@@ -37,7 +37,7 @@
 public class PortletTitleTag extends PortalSimpleTagSupport
 {
 =

-   public void doTag() throws JspException, IOException
+   public void internalDoTag() throws JspException, IOException
    {
 =

       PortletTag portletTag =3D (PortletTag)SimpleTagSupport.findAncestorW=
ithClass(this, PortletTag.class);

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/taglib/PortletURLTag.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortletURLTag.java	2008-02-08 11:57:11 UTC (rev 9871)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortletURLTag.java	2008-02-08 18:30:24 UTC (rev 9872)
@@ -70,12 +70,12 @@
       this.windowStateValue =3D windowState;
    }
 =

-   public int doStartTag() throws JspException
+   public int internalDoStartTag() throws JspException
    {
       return EVAL_BODY_BUFFERED;
    }
 =

-   public int doEndTag() throws JspException
+   public int internalDoEndTag() throws JspException
    {
       PortalResponse response =3D getPortalResponse();
       PagePortletControllerContext context =3D response.getPortletControll=
erContext();

Added: modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-=
INF/jsp/error.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF=
/jsp/error.jsp	                        (rev 0)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF=
/jsp/error.jsp	2008-02-08 18:30:24 UTC (rev 9872)
@@ -0,0 +1,7 @@
+<%@ page language=3D"java" %>
+Portlet was not rendered

+<%=3D request.getAttribute("org.jboss.portal.portlet.portal.error.status")=
%>

+<%=3D request.getAttribute("org.jboss.portal.portlet.portal.error.portlet_=
name")%>

+<%=3D request.getAttribute("org.jboss.portal.portlet.portal.error.applicat=
ion_name")%>

+<%=3D request.getAttribute("org.jboss.portal.portlet.portal.error.exceptio=
n")%>

+<%=3D request.getAttribute("org.jboss.portal.portlet.portal.error.window_i=
d")%>


Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/W=
EB-INF/portal.tld
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF=
/portal.tld	2008-02-08 11:57:11 UTC (rev 9871)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF=
/portal.tld	2008-02-08 18:30:24 UTC (rev 9872)
@@ -45,6 +45,11 @@
          true
          java.lang.String
       
+      
+         errorPage
+         true
+         java.lang.String
+      
    
 =

    

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/W=
EB-INF/tags/portal/portlet.tag
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF=
/tags/portal/portlet.tag	2008-02-08 11:57:11 UTC (rev 9871)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF=
/tags/portal/portlet.tag	2008-02-08 18:30:24 UTC (rev 9872)
@@ -6,7 +6,8 @@
 =

 
+         applicationName=3D"${applicationName}"
+         errorPage=3D"/WEB-INF/jsp/error.jsp">
 
    
    
@@ -23,7 +24,7 @@
             ">
             
             
-            ">=
Edit
+               ">Edit
             
          
       

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/l=
ayouts/default.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts=
/default.jsp	2008-02-08 11:57:11 UTC (rev 9871)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts=
/default.jsp	2008-02-08 18:30:24 UTC (rev 9872)
@@ -29,6 +29,7 @@
       
        
           
+          
        
        
           


--===============5474040999801574158==--

From portal-commits at lists.jboss.org Fri Feb  8 15:30:53 2008
Content-Type: multipart/mixed; boundary="===============1894069041830098626=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9873 -
 modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/samples.
Date: Fri, 08 Feb 2008 15:30:51 -0500
Message-ID: 

--===============1894069041830098626==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: chris.laprun(a)jboss.com
Date: 2008-02-08 15:30:51 -0500 (Fri, 08 Feb 2008)
New Revision: 9873

Modified:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/samples=
/GoogleClippingPortlet.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/samples=
/GoogleWeatherClippingPortlet.java
Log:
- Removed change location link (handled by edit mode).
- Improved processing of HTML.

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/=
samples/GoogleClippingPortlet.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/sample=
s/GoogleClippingPortlet.java	2008-02-08 18:30:24 UTC (rev 9872)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/sample=
s/GoogleClippingPortlet.java	2008-02-08 20:30:51 UTC (rev 9873)
@@ -29,7 +29,6 @@
 import javax.portlet.PortletException;
 import javax.portlet.PortletMode;
 import javax.portlet.PortletPreferences;
-import javax.portlet.PortletURL;
 import javax.portlet.RenderRequest;
 import javax.portlet.RenderResponse;
 import java.io.BufferedInputStream;
@@ -85,10 +84,6 @@
          renderResponse.setContentType("text/html");
          PrintWriter printWriter =3D renderResponse.getWriter();
          printWriter.print(html);
-
-         PortletURL edit =3D renderResponse.createRenderURL();
-         edit.setPortletMode(PortletMode.EDIT);
-         printWriter.print("Change location
");
       }
    }
 =

@@ -141,19 +136,17 @@
 =

    protected String postProcessHTML(String html)
    {
-      String tmp =3D new String(html);
-
       // links should open in new windows
-      tmp =3D tmp.replaceAll(A, A_TARGET_BLANK);
+      html =3D html.replaceAll(A, A_TARGET_BLANK);
 =

       // src attributes should be absolute
-      tmp =3D tmp.replaceAll("src=3D/", "src=3Dhttp://google.com/");
-      tmp =3D tmp.replaceAll("src=3D\"/", "src=3D\"http://google.com/");
+      html =3D html.replaceAll("src=3D/", "src=3Dhttp://google.com/");
+      html =3D html.replaceAll("src=3D\"/", "src=3D\"http://google.com/");
 =

       // forms should open in new windows and have an absolute action URL
-      tmp =3D tmp.replaceAll("action=3D\"/", "target=3D'_blank' action=3D\=
"http://google.com/");
+      html =3D html.replaceAll("action=3D\"/", "target=3D'_blank' action=
=3D\"http://google.com/");
 =

-      return tmp;
+      return html;
    }
 =

    protected String getQueryString(String zip)

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/=
samples/GoogleWeatherClippingPortlet.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/sample=
s/GoogleWeatherClippingPortlet.java	2008-02-08 18:30:24 UTC (rev 9872)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/sample=
s/GoogleWeatherClippingPortlet.java	2008-02-08 20:30:51 UTC (rev 9873)
@@ -42,16 +42,14 @@
       int begIndex;
       int endIndex;
 =

-      String tmp =3D new String(html);
-
       // remove add to iGoogle link
       begIndex =3D html.indexOf(A);
       if (begIndex !=3D -1)
       {
          endIndex =3D html.indexOf(A_END, begIndex);
-         tmp =3D tmp.substring(0, begIndex) + html.substring(endIndex + A_=
END.length());
+         html =3D html.substring(0, begIndex) + html.substring(endIndex + =
A_END.length());
       }
 =

-      return super.postProcessHTML(tmp);
+      return super.postProcessHTML(html);
    }
 }


--===============1894069041830098626==--

From portal-commits at lists.jboss.org Fri Feb  8 16:53:07 2008
Content-Type: multipart/mixed; boundary="===============6408539377951877236=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9874 - in
 modules/portlet/trunk/test/src: main/java/org/jboss/portal/portlet/portal and
 11 other directories.
Date: Fri, 08 Feb 2008 16:53:07 -0500
Message-ID: 

--===============6408539377951877236==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-08 16:53:06 -0500 (Fri, 08 Feb 2008)
New Revision: 9874

Added:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/portal/
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/portal=
/samples/
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/portal=
/samples/basic/
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/portal=
/samples/basic/ErrorPortlet.java
   modules/portlet/trunk/test/src/test/resources/portal/
   modules/portlet/trunk/test/src/test/resources/portal/samples/
   modules/portlet/trunk/test/src/test/resources/portal/samples/basic-war/
   modules/portlet/trunk/test/src/test/resources/portal/samples/basic-war/W=
EB-INF/
   modules/portlet/trunk/test/src/test/resources/portal/samples/basic-war/W=
EB-INF/portlet.xml
   modules/portlet/trunk/test/src/test/resources/portal/samples/basic-war/W=
EB-INF/web.xml
Modified:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/Constants.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/PortletTag.java
   modules/portlet/trunk/test/src/test/build.xml
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/=
jsp/error.jsp
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/=
default.jsp
Log:
handle error return code in the jsp error

Added: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/po=
rtal/samples/basic/ErrorPortlet.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/porta=
l/samples/basic/ErrorPortlet.java	                        (rev 0)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/porta=
l/samples/basic/ErrorPortlet.java	2008-02-08 21:53:06 UTC (rev 9874)
@@ -0,0 +1,41 @@
+/*************************************************************************=
*****
+ * 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.portal.samples.basic;
+
+import javax.portlet.GenericPortlet;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+import javax.portlet.PortletException;
+import java.io.IOException;
+
+/**
+ * @author Julien Viet
+ * @version $Revision: 630 $
+ */
+public class ErrorPortlet extends GenericPortlet
+{
+   protected void doView(RenderRequest renderRequest, RenderResponse rende=
rResponse) throws PortletException, IOException
+   {
+      throw new PortletException("Some exception");
+   }
+}

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/taglib/Constants.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/Constants.java	2008-02-08 20:30:51 UTC (rev 9873)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/Constants.java	2008-02-08 21:53:06 UTC (rev 9874)
@@ -37,9 +37,12 @@
    public static final String ERROR_STATUS =3D "org.jboss.portal.portlet.p=
ortal.error.status";
 =

    /** . */
-   public static final String ERROR_EXCEPTION =3D "org.jboss.portal.portle=
t.portal.error.exception";
+   public static final String ERROR_CAUSE =3D "org.jboss.portal.portlet.po=
rtal.error.cause";
 =

    /** . */
+   public static final String ERROR_MESSAGE =3D "org.jboss.portal.portlet.=
portal.error.message";
+
+   /** . */
    public static final String ERROR_PORTLET_NAME =3D "org.jboss.portal.por=
tlet.portal.error.portlet_name";
 =

    /** . */
@@ -50,4 +53,13 @@
 =

    /** . */
    public static final String NOT_FOUND =3D "not_found";
+
+   /** . */
+   public static final String PORTLET_ERROR =3D "portlet_error";
+
+   /** . */
+   public static final String INTERNAL_ERROR =3D "internal_error";
+
+   /** . */
+   public static final String UNAVAILABLE =3D "unavailable";
 }

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/taglib/PortletTag.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortletTag.java	2008-02-08 20:30:51 UTC (rev 9873)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortletTag.java	2008-02-08 21:53:06 UTC (rev 9874)
@@ -22,12 +22,14 @@
  *************************************************************************=
*****/
 package org.jboss.portal.portlet.test.jsp.taglib;
 =

-import org.jboss.portal.portlet.test.jsp.taglib.PortletResult;
 import org.jboss.portal.portlet.test.jsp.PortalResponse;
 import org.jboss.portal.portlet.test.jsp.PagePortletControllerContext;
 import org.jboss.portal.portlet.test.controller.TestInstanceContext;
 import org.jboss.portal.portlet.test.controller.TestPortalContext;
 import org.jboss.portal.portlet.invocation.response.PortletInvocationRespo=
nse;
+import org.jboss.portal.portlet.invocation.response.FragmentResponse;
+import org.jboss.portal.portlet.invocation.response.ErrorResponse;
+import org.jboss.portal.portlet.invocation.response.UnavailableResponse;
 import org.jboss.portal.portlet.invocation.RenderInvocation;
 import org.jboss.portal.portlet.controller.state.PageNavigationalState;
 import org.jboss.portal.portlet.controller.state.WindowNavigationalState;
@@ -49,7 +51,6 @@
 import javax.servlet.RequestDispatcher;
 import javax.servlet.ServletException;
 import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpServletRequest;
 import java.util.LinkedHashSet;
 import java.util.Set;
 import java.util.Collections;
@@ -95,17 +96,12 @@
    /** . */
    private String errorPageAttr;
 =

-   /** . */
    private int status;
-
-   /** . */
    private Set supportedWindowStates;
-
-   /** . */
    private Set supportedModes;
-
-   /** . */
    private Mode initialMode;
+   private PageTag pageTag;
+   private PortalResponse response;
 =

    /** . */
    PortletResult result;
@@ -213,18 +209,16 @@
       this.initialMode =3D initialMode;
       this.supportedModes =3D supportedModes;
       this.supportedWindowStates =3D supportedWindowStates;
+      this.pageTag =3D (PageTag)findAncestorWithClass(this, PageTag.class);
+      this.response =3D getPortalResponse();
    }
 =

-//   private void handleError
-
    public int internalDoStartTag() throws JspException
    {
       updateInternalState();
 =

       //
-      PortalResponse response =3D getPortalResponse();
       PagePortletControllerContext context =3D response.getPortletControll=
erContext();
-      PageTag pageTag =3D (PageTag)findAncestorWithClass(this, PageTag.cla=
ss);
 =

       //
       Portlet portlet =3D context.findPortlet(applicationNameAttr, nameAtt=
r);
@@ -232,44 +226,8 @@
       //
       if (portlet =3D=3D null)
       {
-         if (errorPageAttr !=3D null)
-         {
-            RequestDispatcher rd =3D pageContext.getServletContext().getRe=
questDispatcher(errorPageAttr);
-            if (rd !=3D null)
-            {
-               ServletRequest request=3D pageContext.getRequest();
+         handleError(null, Constants.NOT_FOUND, null, null);
 =

-               //
-               try
-               {
-                  pageTag.status =3D PageTag.Status.SUSPENDED;
-                  request.setAttribute(Constants.ERROR_STATUS, Constants.N=
OT_FOUND);
-                  request.setAttribute(Constants.ERROR_APPLICATION_NAME, a=
pplicationNameAttr);
-                  request.setAttribute(Constants.ERROR_PORTLET_NAME, nameA=
ttr);
-
-                  //
-                  rd.include(pageContext.getRequest(), new JspWriterRespon=
se(response, pageContext.getOut()));
-               }
-               catch (ServletException e)
-               {
-                  // Shall we do smth else ?
-                  e.printStackTrace();
-               }
-               catch (IOException e)
-               {
-                  // Shall we do smth else ?
-                  e.printStackTrace();
-               }
-               finally
-               {
-                  pageTag.status =3D PageTag.Status.ACTIVE;
-                  request.removeAttribute(Constants.ERROR_STATUS);
-                  request.removeAttribute(Constants.ERROR_APPLICATION_NAME=
);
-                  request.removeAttribute(Constants.ERROR_PORTLET_NAME);
-               }
-            }
-         }
-
          // We cannot show an absent portlet, no meta data
          return SKIP_BODY;
       }
@@ -282,39 +240,37 @@
          {
             if (windowId.equals(pageTag.maximizedId))
             {
-               result =3D render(response, portlet, windowId);
                status =3D BUFFERED;
+
+               //
+               return render(portlet, windowId, EVAL_BODY_BUFFERED);
             }
             else
             {
                status =3D SKIPPED;
+               return SKIP_BODY;
             }
          }
          else
          {
-            result =3D render(response, portlet, windowId);
             status =3D RENDERED;
-         }
 =

-         //
-         switch (status)
-         {
-            case SKIPPED:
-               return SKIP_BODY;
-            case RENDERED:
-               return EVAL_BODY_INCLUDE;
-            case BUFFERED:
-               return EVAL_BODY_BUFFERED;
-            default:
-               throw new AssertionError();
+            //
+            return render(portlet, windowId, EVAL_BODY_INCLUDE);
          }
       }
    }
 =

    public int internalDoEndTag() throws JspException
    {
+      if (bodyContent !=3D null)
+      {
+         pageTag.content =3D bodyContent.getString();
+      }
+
       result =3D null;
 =

+/*
       //
       switch (status)
       {
@@ -324,20 +280,17 @@
             break;
          case BUFFERED:
             PageTag pageTag =3D (PageTag)findAncestorWithClass(this, PageT=
ag.class);
-            pageTag.content =3D bodyContent.getString();
             break;
          default:
             throw new AssertionError();
       }
 =

+*/
       //
       return EVAL_PAGE;
    }
 =

-   public PortletResult render(
-      PortalResponse response,
-      Portlet portlet,
-      String windowId)
+   public int render(Portlet portlet, String windowId, int rt)
    {
       PagePortletControllerContext context =3D response.getPortletControll=
erContext();
 =

@@ -397,28 +350,104 @@
       render.setPublicNavigationalState(publicNS);
 =

       //
-      PortletInvocationResponse portletResponse =3D null;
       try
       {
-         portletResponse =3D context.invoke(render);
+         PortletInvocationResponse portletResponse =3D context.invoke(rend=
er);
 =

+         //
+         if (portletResponse instanceof FragmentResponse)
+         {
+            result =3D new PortletResult(
+               nameAttr,
+               applicationNameAttr,
+               windowId,
+               portletResponse,
+               initialMode,
+               supportedModes,
+               supportedWindowStates);
 =

+            //
+            return rt;
+         }
+         else if (portletResponse instanceof ErrorResponse)
+         {
+            ErrorResponse error =3D (ErrorResponse)portletResponse;
+
+            //
+            handleError(windowId, Constants.PORTLET_ERROR, error.getCause(=
), error.getMessage());
+
+            //
+            return SKIP_BODY;
+         }
+         else if (portletResponse instanceof UnavailableResponse)
+         {
+            handleError(windowId, Constants.UNAVAILABLE, null, null);
+
+            //
+            return SKIP_BODY;
+         }
+         else
+         {
+            handleError(windowId, Constants.INTERNAL_ERROR, null, null);
+
+            //
+            return SKIP_BODY;
+         }
       }
       catch (PortletInvokerException e)
       {
-         e.printStackTrace();
+         handleError(windowId, Constants.INTERNAL_ERROR, e, e.getMessage()=
);
 =

-         // todo
+         //
+         return SKIP_BODY;
       }
+   }
 =

-      //
-      return new PortletResult(
-         nameAttr,
-         applicationNameAttr,
-         windowId,
-         portletResponse,
-         initialMode,
-         supportedModes,
-         supportedWindowStates);
+   private void handleError(String windowId, String errorStatus, Throwable=
 cause, String message)
+   {
+      if (errorPageAttr !=3D null)
+      {
+         RequestDispatcher rd =3D pageContext.getServletContext().getReque=
stDispatcher(errorPageAttr);
+         if (rd !=3D null)
+         {
+            ServletRequest request=3D pageContext.getRequest();
+
+            //
+            try
+            {
+               pageTag.status =3D PageTag.Status.SUSPENDED;
+               request.setAttribute(Constants.ERROR_STATUS, errorStatus);
+               request.setAttribute(Constants.ERROR_CAUSE, cause);
+               request.setAttribute(Constants.ERROR_MESSAGE, message);
+               request.setAttribute(Constants.ERROR_WINDOW_ID, windowId);
+               request.setAttribute(Constants.ERROR_APPLICATION_NAME, appl=
icationNameAttr);
+               request.setAttribute(Constants.ERROR_PORTLET_NAME, nameAttr=
);
+
+               //
+               rd.include(pageContext.getRequest(), new JspWriterResponse(=
response, pageContext.getOut()));
+            }
+            catch (ServletException e)
+            {
+               // Shall we do smth else ?
+               e.printStackTrace();
+            }
+            catch (IOException e)
+            {
+               // Shall we do smth else ?
+               e.printStackTrace();
+            }
+            finally
+            {
+               pageTag.status =3D PageTag.Status.ACTIVE;
+               request.removeAttribute(Constants.ERROR_STATUS);
+               request.removeAttribute(Constants.ERROR_CAUSE);
+               request.removeAttribute(Constants.ERROR_MESSAGE);
+               request.removeAttribute(Constants.ERROR_WINDOW_ID);
+               request.removeAttribute(Constants.ERROR_APPLICATION_NAME);
+               request.removeAttribute(Constants.ERROR_PORTLET_NAME);
+            }
+         }
+      }
    }
+
 }

Modified: modules/portlet/trunk/test/src/test/build.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/build.xml	2008-02-08 20:30:51 UTC (=
rev 9873)
+++ modules/portlet/trunk/test/src/test/build.xml	2008-02-08 21:53:06 UTC (=
rev 9874)
@@ -762,12 +762,23 @@
 =

       
          
-         
+         
       
       
          
       
+
+      
+      
+      
+         
+         
+      
+      
+      
+         
+      
+
    
 =

 
\ No newline at end of file

Added: modules/portlet/trunk/test/src/test/resources/portal/samples/basic-w=
ar/WEB-INF/portlet.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/portal/samples/basic-war/=
WEB-INF/portlet.xml	                        (rev 0)
+++ modules/portlet/trunk/test/src/test/resources/portal/samples/basic-war/=
WEB-INF/portlet.xml	2008-02-08 21:53:06 UTC (rev 9874)
@@ -0,0 +1,41 @@
+
+
+
+
+
+   
+      ErrorPortlet
+      org.jboss.portal.portlet.portal.samples.basic.ErrorPo=
rtlet
+      
+        text/html
+      
+      
+         
+      
+   
+
+

Added: modules/portlet/trunk/test/src/test/resources/portal/samples/basic-w=
ar/WEB-INF/web.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/portal/samples/basic-war/=
WEB-INF/web.xml	                        (rev 0)
+++ modules/portlet/trunk/test/src/test/resources/portal/samples/basic-war/=
WEB-INF/web.xml	2008-02-08 21:53:06 UTC (rev 9874)
@@ -0,0 +1,29 @@
+
+
+
+
+

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/W=
EB-INF/jsp/error.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF=
/jsp/error.jsp	2008-02-08 20:30:51 UTC (rev 9873)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF=
/jsp/error.jsp	2008-02-08 21:53:06 UTC (rev 9874)
@@ -1,7 +1,19 @@
 <%@ page language=3D"java" %>
-Portlet was not rendered

+
+
+   
+   
+      
+         Error
+         
+         
+      
+   
 <%=3D request.getAttribute("org.jboss.portal.portlet.portal.error.status")=
%>

 <%=3D request.getAttribute("org.jboss.portal.portlet.portal.error.portlet_=
name")%>

 <%=3D request.getAttribute("org.jboss.portal.portlet.portal.error.applicat=
ion_name")%>

-<%=3D request.getAttribute("org.jboss.portal.portlet.portal.error.exceptio=
n")%>

+<%=3D request.getAttribute("org.jboss.portal.portlet.portal.error.cause")%=
>

+<%=3D request.getAttribute("org.jboss.portal.portlet.portal.error.message"=
)%>

 <%=3D request.getAttribute("org.jboss.portal.portlet.portal.error.window_i=
d")%>

+
+

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/l=
ayouts/default.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts=
/default.jsp	2008-02-08 20:30:51 UTC (rev 9873)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts=
/default.jsp	2008-02-08 21:53:06 UTC (rev 9874)
@@ -30,6 +30,7 @@
        
           
           
+          
        
        
           


--===============6408539377951877236==--

From portal-commits at lists.jboss.org Fri Feb  8 16:59:09 2008
Content-Type: multipart/mixed; boundary="===============5708294049934566268=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9875 -
 modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib.
Date: Fri, 08 Feb 2008 16:59:09 -0500
Message-ID: 

--===============5708294049934566268==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-08 16:59:09 -0500 (Fri, 08 Feb 2008)
New Revision: 9875

Modified:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/Constants.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/JspWriterResponse.java
Log:
don't need to be exposed outside of the package

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/taglib/Constants.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/Constants.java	2008-02-08 21:53:06 UTC (rev 9874)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/Constants.java	2008-02-08 21:59:09 UTC (rev 9875)
@@ -26,7 +26,7 @@
  * @author Julien Viet
  * @version $Revision: 630 $
  */
-public final class Constants
+final class Constants
 {
 =

    private Constants()

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/taglib/JspWriterResponse.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/JspWriterResponse.java	2008-02-08 21:53:06 UTC (rev 9874)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/JspWriterResponse.java	2008-02-08 21:59:09 UTC (rev 9875)
@@ -34,7 +34,7 @@
  * @author Julien Viet
  * @version $Revision: 630 $
  */
-public class JspWriterResponse extends HttpServletResponseWrapper
+class JspWriterResponse extends HttpServletResponseWrapper
 {
 =

    /** . */


--===============5708294049934566268==--

From portal-commits at lists.jboss.org Fri Feb  8 17:18:30 2008
Content-Type: multipart/mixed; boundary="===============4252667916816066485=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9876 -
 modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib.
Date: Fri, 08 Feb 2008 17:18:30 -0500
Message-ID: 

--===============4252667916816066485==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-08 17:18:30 -0500 (Fri, 08 Feb 2008)
New Revision: 9876

Modified:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/PortletTag.java
Log:
just make sure we clean state on tag

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/taglib/PortletTag.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortletTag.java	2008-02-08 21:59:09 UTC (rev 9875)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortletTag.java	2008-02-08 22:18:30 UTC (rev 9876)
@@ -166,7 +166,7 @@
       this.errorPageAttr =3D errorPage;
    }
 =

-   private void updateInternalState()
+   private void initState()
    {
       //
       Set supportedModes =3D new LinkedHashSet();
@@ -213,9 +213,18 @@
       this.response =3D getPortalResponse();
    }
 =

+   private void destroyState()
+   {
+      this.initialMode =3D null;
+      this.supportedModes =3D null;
+      this.supportedWindowStates =3D null;
+      this.pageTag =3D null;
+      this.response =3D null;
+   }
+
    public int internalDoStartTag() throws JspException
    {
-      updateInternalState();
+      initState();
 =

       //
       PagePortletControllerContext context =3D response.getPortletControll=
erContext();
@@ -268,24 +277,9 @@
          pageTag.content =3D bodyContent.getString();
       }
 =

-      result =3D null;
-
-/*
       //
-      switch (status)
-      {
-         case SKIPPED:
-            break;
-         case RENDERED:
-            break;
-         case BUFFERED:
-            PageTag pageTag =3D (PageTag)findAncestorWithClass(this, PageT=
ag.class);
-            break;
-         default:
-            throw new AssertionError();
-      }
+      destroyState();
 =

-*/
       //
       return EVAL_PAGE;
    }


--===============4252667916816066485==--

From portal-commits at lists.jboss.org Fri Feb  8 18:32:02 2008
Content-Type: multipart/mixed; boundary="===============2265758652467481418=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9877 - in
 modules/portlet/trunk/test/src:
 main/java/org/jboss/portal/portlet/test/jsp/taglib and 2 other directories.
Date: Fri, 08 Feb 2008 18:32:02 -0500
Message-ID: 

--===============2265758652467481418==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-08 18:32:02 -0500 (Fri, 08 Feb 2008)
New Revision: 9877

Added:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/PageParamTag.java
Modified:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/PortalResponse.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/PageTag.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/PortletTag.java
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/=
portal.tld
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/=
default.jsp
Log:
add page param that allow to set public render param on page before renderi=
ng has occured

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/PortalResponse.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/PortalResponse.java	2008-02-08 22:18:30 UTC (rev 9876)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/PortalResponse.java	2008-02-08 23:32:02 UTC (rev 9877)
@@ -22,16 +22,28 @@
  *************************************************************************=
*****/
 package org.jboss.portal.portlet.test.jsp;
 =

-import org.jboss.portal.portlet.test.jsp.PagePortletControllerContext;
+import org.jboss.portal.portlet.test.controller.TestInstanceContext;
+import org.jboss.portal.portlet.test.controller.TestPortalContext;
 import org.jboss.portal.portlet.controller.state.PageNavigationalState;
 import org.jboss.portal.portlet.controller.state.WindowNavigationalState;
+import org.jboss.portal.portlet.invocation.response.PortletInvocationRespo=
nse;
+import org.jboss.portal.portlet.invocation.RenderInvocation;
+import org.jboss.portal.portlet.PortletInvokerException;
+import org.jboss.portal.portlet.Portlet;
+import org.jboss.portal.portlet.StateString;
+import org.jboss.portal.portlet.impl.spi.AbstractClientContext;
+import org.jboss.portal.portlet.impl.spi.AbstractServerContext;
+import org.jboss.portal.portlet.impl.spi.AbstractUserContext;
+import org.jboss.portal.portlet.impl.spi.AbstractWindowContext;
+import org.jboss.portal.portlet.impl.spi.AbstractSecurityContext;
+import org.jboss.portal.portlet.spi.PortletInvocationContext;
 import org.jboss.portal.WindowState;
+import org.jboss.portal.Mode;
+import org.jboss.portal.common.util.ParameterMap;
 =

 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponseWrapper;
-import javax.servlet.ServletOutputStream;
-import java.io.IOException;
-import java.io.PrintWriter;
+import javax.xml.namespace.QName;
 =

 /**
  * @author Julien Viet
@@ -41,17 +53,17 @@
 {
 =

    /** . */
-//   private final ResponseBuffer buffer =3D new ResponseBuffer();
-
-   /** . */
    private final PagePortletControllerContext portletControllerContext;
 =

    /** . */
-   private final PageNavigationalState pageState;
+   private PageNavigationalState pageState;
 =

    /** . */
    private int count =3D 0;
 =

+   /** Wether or not the page state can be modified. */
+   private boolean pageStateModifiable;
+
    public PortalResponse(
       HttpServletResponse response,
       PagePortletControllerContext portletControllerContext,
@@ -62,6 +74,7 @@
       //
       this.portletControllerContext =3D portletControllerContext;
       this.pageState =3D pageState;
+      this.pageStateModifiable =3D true;
    }
 =

    /**
@@ -74,46 +87,108 @@
       return pageState;
    }
 =

-   public String getMaximizedWindowId()
+   public PortletInvocationResponse render(Portlet portlet, String windowI=
d) throws PortletInvokerException
    {
+      WindowNavigationalState windowNS =3D null;
       if (pageState !=3D null)
       {
-         for (String windowId : pageState.getWindowIds())
+         windowNS =3D pageState.getWindowNavigationalState(windowId);
+      }
+
+      //
+      ParameterMap publicNS =3D null;
+      if (pageState !=3D null)
+      {
+         publicNS =3D pageState.getPublicNavigationalState(windowId);
+      }
+
+      //
+      Mode mode =3D Mode.VIEW;
+      WindowState windowState =3D WindowState.NORMAL;
+      StateString portletNS =3D null;
+
+      //
+      if (windowNS !=3D null)
+      {
+         if (windowNS.getMode() !=3D null)
          {
-            WindowNavigationalState windowNS =3D pageState.getWindowNaviga=
tionalState(windowId);
-            if (WindowState.MAXIMIZED.equals(windowNS.getWindowState()))
-            {
-               return windowId;
-            }
+            mode =3D windowNS.getMode();
          }
+         if (windowNS.getWindowState() !=3D null)
+         {
+            windowState =3D windowNS.getWindowState();
+         }
+         if (windowNS.getPortletNavigationalState() !=3D null)
+         {
+            portletNS =3D windowNS.getPortletNavigationalState();
+         }
       }
 =

       //
-      return null;
+      PortletInvocationContext renderContext =3D portletControllerContext.=
createPortletInvocationContext(windowId, pageState);
+      RenderInvocation render =3D new RenderInvocation(renderContext);
+      render.setClientContext(new AbstractClientContext(portletControllerC=
ontext.getClientRequest()));
+      render.setServerContext(new AbstractServerContext(portletControllerC=
ontext.getClientRequest(), portletControllerContext.getClientResponse()));
+      render.setInstanceContext(new TestInstanceContext(portletControllerC=
ontext.getClientRequest(), portlet.getContext(), false));
+      render.setUserContext(new AbstractUserContext(portletControllerConte=
xt.getClientRequest()));
+      render.setWindowContext(new AbstractWindowContext(windowId));
+      render.setPortalContext(new TestPortalContext());
+      render.setSecurityContext(new AbstractSecurityContext(portletControl=
lerContext.getClientRequest()));
+      render.setTarget(portlet.getContext());
+      render.setMode(mode);
+      render.setWindowState(windowState);
+      render.setNavigationalState(portletNS);
+      render.setPublicNavigationalState(publicNS);
+
+      //
+      pageStateModifiable =3D false;
+
+      //
+      return portletControllerContext.invoke(render);
    }
 =

-   public boolean isRenderable(String windowId)
+   public boolean isPageStateModifiable()
    {
-      if (windowId =3D=3D null)
+      return pageStateModifiable;
+   }
+
+   public String getPageParameter(QName name)
+   {
+      return pageState !=3D null ? pageState.getPublicNavigationalState(na=
me)[0] : null;
+   }
+
+   public void setPageParameter(QName name, String value)
+   {
+      if (pageStateModifiable)
       {
-         throw new IllegalArgumentException();
+         if (pageState =3D=3D null)
+         {
+            pageState =3D portletControllerContext.getStateControllerConte=
xt().createPageState(true);
+         }
+         pageState.setPublicNavigationalState(name, new String[]{value});
       }
-
-      //
-      if (pageState =3D=3D null)
+      else
       {
-         return false;
+         throw new IllegalStateException("Page state cannot be modified");
       }
+   }
 =

-      //
-      String maximizedWindowId =3D getMaximizedWindowId();
-      if (maximizedWindowId !=3D null)
+   public String getMaximizedWindowId()
+   {
+      if (pageState !=3D null)
       {
-         return maximizedWindowId.equals(windowId);
+         for (String windowId : pageState.getWindowIds())
+         {
+            WindowNavigationalState windowNS =3D pageState.getWindowNaviga=
tionalState(windowId);
+            if (WindowState.MAXIMIZED.equals(windowNS.getWindowState()))
+            {
+               return windowId;
+            }
+         }
       }
 =

       //
-      return true;
+      return null;
    }
 =

    public PagePortletControllerContext getPortletControllerContext()
@@ -121,38 +196,8 @@
       return portletControllerContext;
    }
 =

-//   public ResponseBuffer getBuffer()
-//   {
-//      return buffer;
-//   }
-//
-//   public ServletOutputStream getOutputStream() throws IOException
-//   {
-//      return buffer.getOutputStream();
-//   }
-//
-//   public PrintWriter getWriter() throws IOException
-//   {
-//      return buffer.getWriter();
-//   }
-//
-//   public void close()
-//   {
-//      buffer.close();
-//   }
-
    public String nextId()
    {
       return "" + count++;
    }
-
-//   public ServletOutputStream getOutputStream() throws IOException
-//   {
-//      return out.getOutputStream();
-//   }
-//
-//   public PrintWriter getWriter() throws IOException
-//   {
-//      return out.getWriter();
-//   }
 }

Added: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/te=
st/jsp/taglib/PageParamTag.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PageParamTag.java	                        (rev 0)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PageParamTag.java	2008-02-08 23:32:02 UTC (rev 9877)
@@ -0,0 +1,106 @@
+/*************************************************************************=
*****
+ * 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.taglib;
+
+import org.jboss.portal.portlet.test.jsp.PortalResponse;
+
+import javax.servlet.jsp.JspException;
+import javax.xml.namespace.QName;
+import java.io.IOException;
+
+/**
+ * @author Julien Viet
+ * @version $Revision: 630 $
+ */
+public class PageParamTag extends PortalSimpleTagSupport
+{
+
+   /** . */
+   private String namespaceURI;
+
+   /** . */
+   private String localName;
+
+   /** . */
+   private String value;
+
+   /** . */
+   private String frozen;
+
+   public String getNamespaceURI()
+   {
+      return namespaceURI;
+   }
+
+   public void setNamespaceURI(String namespaceURI)
+   {
+      this.namespaceURI =3D namespaceURI;
+   }
+
+   public String getLocalName()
+   {
+      return localName;
+   }
+
+   public void setLocalName(String localName)
+   {
+      this.localName =3D localName;
+   }
+
+   public String getValue()
+   {
+      return value;
+   }
+
+   public void setValue(String value)
+   {
+      this.value =3D value;
+   }
+
+   public String getFrozen()
+   {
+      return frozen;
+   }
+
+   public void setFrozen(String frozen)
+   {
+      this.frozen =3D frozen;
+   }
+
+   public void internalDoTag() throws JspException, IOException
+   {
+      PortalResponse response =3D getPortalResponse();
+
+      //
+      if (response.isPageStateModifiable())
+      {
+         QName name =3D new QName(namespaceURI, localName);
+
+         //
+         if (!"true".equals(frozen) || response.getPageParameter(name) =3D=
=3D null)
+         {
+            response.setPageParameter(name, value);
+         }
+      }
+   }
+}

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/taglib/PageTag.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PageTag.java	2008-02-08 22:18:30 UTC (rev 9876)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PageTag.java	2008-02-08 23:32:02 UTC (rev 9877)
@@ -25,7 +25,9 @@
 import org.jboss.portal.portlet.test.jsp.PortalResponse;
 =

 import javax.servlet.jsp.JspException;
+import javax.xml.namespace.QName;
 import java.io.IOException;
+import java.util.Map;
 =

 /**
  * @author Julien Viet
@@ -39,10 +41,16 @@
       INACTIVE, ACTIVE, SUSPENDED
    }
 =

+   /** . */
+   Map params;
+
+   /** . */
    String maximizedId;
 =

+   /** . */
    String content;
 =

+   /** . */
    Status status =3D Status.INACTIVE;
 =

    public int doStartTag() throws JspException

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/taglib/PortletTag.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortletTag.java	2008-02-08 22:18:30 UTC (rev 9876)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortletTag.java	2008-02-08 23:32:02 UTC (rev 9877)
@@ -24,28 +24,15 @@
 =

 import org.jboss.portal.portlet.test.jsp.PortalResponse;
 import org.jboss.portal.portlet.test.jsp.PagePortletControllerContext;
-import org.jboss.portal.portlet.test.controller.TestInstanceContext;
-import org.jboss.portal.portlet.test.controller.TestPortalContext;
 import org.jboss.portal.portlet.invocation.response.PortletInvocationRespo=
nse;
 import org.jboss.portal.portlet.invocation.response.FragmentResponse;
 import org.jboss.portal.portlet.invocation.response.ErrorResponse;
 import org.jboss.portal.portlet.invocation.response.UnavailableResponse;
-import org.jboss.portal.portlet.invocation.RenderInvocation;
-import org.jboss.portal.portlet.controller.state.PageNavigationalState;
-import org.jboss.portal.portlet.controller.state.WindowNavigationalState;
-import org.jboss.portal.portlet.StateString;
 import org.jboss.portal.portlet.PortletInvokerException;
 import org.jboss.portal.portlet.Portlet;
-import org.jboss.portal.portlet.impl.spi.AbstractClientContext;
-import org.jboss.portal.portlet.impl.spi.AbstractServerContext;
-import org.jboss.portal.portlet.impl.spi.AbstractUserContext;
-import org.jboss.portal.portlet.impl.spi.AbstractWindowContext;
-import org.jboss.portal.portlet.impl.spi.AbstractSecurityContext;
-import org.jboss.portal.portlet.spi.PortletInvocationContext;
 import org.jboss.portal.Mode;
 import org.jboss.portal.WindowState;
 import org.jboss.portal.common.util.Tools;
-import org.jboss.portal.common.util.ParameterMap;
 =

 import javax.servlet.jsp.JspException;
 import javax.servlet.RequestDispatcher;
@@ -64,15 +51,6 @@
 {
 =

    /** . */
-   private static final int SKIPPED =3D 0;
-
-   /** . */
-   private static final int BUFFERED =3D 1;
-
-   /** . */
-   private static final int RENDERED =3D 2;
-
-   /** . */
    private static final Set DEFAULT_MODES =3D Collections.unmodifiab=
leSet(Tools.toSet(Mode.VIEW, Mode.EDIT, Mode.HELP));
 =

    /** . */
@@ -96,7 +74,6 @@
    /** . */
    private String errorPageAttr;
 =

-   private int status;
    private Set supportedWindowStates;
    private Set supportedModes;
    private Mode initialMode;
@@ -249,22 +226,15 @@
          {
             if (windowId.equals(pageTag.maximizedId))
             {
-               status =3D BUFFERED;
-
-               //
                return render(portlet, windowId, EVAL_BODY_BUFFERED);
             }
             else
             {
-               status =3D SKIPPED;
                return SKIP_BODY;
             }
          }
          else
          {
-            status =3D RENDERED;
-
-            //
             return render(portlet, windowId, EVAL_BODY_INCLUDE);
          }
       }
@@ -286,67 +256,9 @@
 =

    public int render(Portlet portlet, String windowId, int rt)
    {
-      PagePortletControllerContext context =3D response.getPortletControll=
erContext();
-
-      //
-      PageNavigationalState pageNS =3D response.getPageState();
-
-      //
-      WindowNavigationalState windowNS =3D null;
-      if (pageNS !=3D null)
-      {
-         windowNS =3D pageNS.getWindowNavigationalState(windowId);
-      }
-
-      //
-      ParameterMap publicNS =3D null;
-      if (pageNS !=3D null)
-      {
-         publicNS =3D pageNS.getPublicNavigationalState(windowId);
-      }
-
-      //
-      Mode mode =3D Mode.VIEW;
-      WindowState windowState =3D WindowState.NORMAL;
-      StateString portletNS =3D null;
-
-      //
-      if (windowNS !=3D null)
-      {
-         if (windowNS.getMode() !=3D null)
-         {
-            mode =3D windowNS.getMode();
-         }
-         if (windowNS.getWindowState() !=3D null)
-         {
-            windowState =3D windowNS.getWindowState();
-         }
-         if (windowNS.getPortletNavigationalState() !=3D null)
-         {
-            portletNS =3D windowNS.getPortletNavigationalState();
-         }
-      }
-
-      //
-      PortletInvocationContext renderContext =3D context.createPortletInvo=
cationContext(windowId, pageNS);
-      RenderInvocation render =3D new RenderInvocation(renderContext);
-      render.setClientContext(new AbstractClientContext(context.getClientR=
equest()));
-      render.setServerContext(new AbstractServerContext(context.getClientR=
equest(), context.getClientResponse()));
-      render.setInstanceContext(new TestInstanceContext(context.getClientR=
equest(), portlet.getContext(), false));
-      render.setUserContext(new AbstractUserContext(context.getClientReque=
st()));
-      render.setWindowContext(new AbstractWindowContext(windowId));
-      render.setPortalContext(new TestPortalContext());
-      render.setSecurityContext(new AbstractSecurityContext(context.getCli=
entRequest()));
-      render.setTarget(portlet.getContext());
-      render.setMode(mode);
-      render.setWindowState(windowState);
-      render.setNavigationalState(portletNS);
-      render.setPublicNavigationalState(publicNS);
-
-      //
       try
       {
-         PortletInvocationResponse portletResponse =3D context.invoke(rend=
er);
+         PortletInvocationResponse portletResponse =3D response.render(por=
tlet, windowId);
 =

          //
          if (portletResponse instanceof FragmentResponse)

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/W=
EB-INF/portal.tld
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF=
/portal.tld	2008-02-08 22:18:30 UTC (rev 9876)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF=
/portal.tld	2008-02-08 23:32:02 UTC (rev 9877)
@@ -86,14 +86,45 @@
       empty
       
          name
+         true
          true
          java.lang.String
       
       
          value
+         true
          true
          java.lang.String
       
    
 =

+   
+      pageparam
+      org.jboss.portal.portlet.test.jsp.taglib.PageParamTag
+      empty
+      
+         namespaceURI
+         true
+         true
+         java.lang.String
+      
+      
+         localName
+         true
+         true
+         java.lang.String
+      
+      
+         value
+         true
+         true
+         java.lang.String
+      
+      
+         frozen
+         true
+         java.lang.String
+      
+   
+
 

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/l=
ayouts/default.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts=
/default.jsp	2008-02-08 22:18:30 UTC (rev 9876)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts=
/default.jsp	2008-02-08 23:32:02 UTC (rev 9877)
@@ -26,6 +26,9 @@
   =

    
       
+
+         
+
       
        
           


--===============2265758652467481418==--

From portal-commits at lists.jboss.org Fri Feb  8 18:45:47 2008
Content-Type: multipart/mixed; boundary="===============1526683501781291556=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9878 - in
 modules/portlet/trunk/test/src: test/resources/simple-portal-war/WEB-INF/jsp
 and 1 other directories.
Date: Fri, 08 Feb 2008 18:45:46 -0500
Message-ID: 

--===============1526683501781291556==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: chris.laprun(a)jboss.com
Date: 2008-02-08 18:45:46 -0500 (Fri, 08 Feb 2008)
New Revision: 9878

Modified:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/samples=
/RemoteControlResourcePortlet.java
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/=
jsp/error.jsp
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/=
tags/portal/portlet.tag
Log:
- Minor improvements.

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/=
samples/RemoteControlResourcePortlet.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/sample=
s/RemoteControlResourcePortlet.java	2008-02-08 23:32:02 UTC (rev 9877)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/sample=
s/RemoteControlResourcePortlet.java	2008-02-08 23:45:46 UTC (rev 9878)
@@ -45,20 +45,20 @@
       writer.print("");
       PortletURL url =3D resourceResponse.createRenderURL();
       url.setWindowState(WindowState.MINIMIZED);
-      writer.print("minimize");
+      writer.print("minimize parent portlet");
       url.setWindowState(WindowState.MAXIMIZED);
-      writer.print("maximize");
+      writer.print("maximize parent portlet");
       url.setWindowState(WindowState.NORMAL);
-      writer.print("normal");
+      writer.print("make parent portlet normal");
       writer.print("'zipcode' public render parameter value: " +=
 resourceRequest.getParameter(ZIPCODE) + "
");
-      writer.print("
Set value of 'zipcode' public render paramet=
er to:");
+      writer.print("Set value of 'zipcode' public render parameter =
to:");
       url.setParameter(ZIPCODE, "80201");
-      writer.print("
Denver");
+      writer.print("Denver");
       url.setParameter(ZIPCODE, "94102");
       writer.print("
San Francisco");
       url.setParameter(ZIPCODE, "20001");
       writer.print("
Washington, DC");
-      writer.print("
");
+      writer.print("");
    }
 =

    private String createParentURL(PortletURL url)

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/W=
EB-INF/jsp/error.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF=
/jsp/error.jsp	2008-02-08 23:32:02 UTC (rev 9877)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF=
/jsp/error.jsp	2008-02-08 23:45:46 UTC (rev 9878)
@@ -2,18 +2,20 @@
 =

 
    
-   
-      
-         Error
-         
+      
+         
+            
+               <%=3D request.getAttribute("org.jboss.portal.portlet.po=
rtal.error.portlet_name")%>
+               
+            
          
       
+      Portlet was not rendered
+      Error status: <%=3D request.getAttribute("org.jboss.portal.po=
rtlet.portal.error.status")%>

+      Portlet name: <%=3D request.getAttribute("org.jboss.portal.po=
rtlet.portal.error.portlet_name")%>

+      Portlet application
+         name: <%=3D request.getAttribute("org.jboss.portal.portlet.po=
rtal.error.application_name")%>

+      Exception: <%=3D request.getAttribute("org.jboss.portal.portl=
et.portal.error.exception")%>

+      Window id: <%=3D request.getAttribute("org.jboss.portal.portl=
et.portal.error.window_id")%>

    
-<%=3D request.getAttribute("org.jboss.portal.portlet.portal.error.status")=
%>

-<%=3D request.getAttribute("org.jboss.portal.portlet.portal.error.portlet_=
name")%>

-<%=3D request.getAttribute("org.jboss.portal.portlet.portal.error.applicat=
ion_name")%>

-<%=3D request.getAttribute("org.jboss.portal.portlet.portal.error.cause")%=
>

-<%=3D request.getAttribute("org.jboss.portal.portlet.portal.error.message"=
)%>

-<%=3D request.getAttribute("org.jboss.portal.portlet.portal.error.window_i=
d")%>

 
-

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/W=
EB-INF/tags/portal/portlet.tag
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF=
/tags/portal/portlet.tag	2008-02-08 23:32:02 UTC (rev 9877)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF=
/tags/portal/portlet.tag	2008-02-08 23:45:46 UTC (rev 9878)
@@ -1,38 +1,36 @@
 <%@ tag body-content=3D"scriptless" %>
 <%@ attribute name=3D"name" rtexprvalue=3D"true" required=3D"true" %>
 <%@ attribute name=3D"applicationName" rtexprvalue=3D"true" required=3D"tr=
ue" %>
-<%@ attribute name=3D"content" fragment=3D"true" required=3D"false" %> =

+<%@ attribute name=3D"content" fragment=3D"true" required=3D"false" %>
 <%@ taglib uri=3D"/WEB-INF/portal.tld" prefix=3D"portal" %>
 =

-
-
-   
-   
-      
-         
-         
-            
-            ">
-            
-            
-            ">=

-            
-            
-            ">
-            
-            
-               ">Edit
-            
+
+   
+      
+         
+            
+               
+               
+                  
+                     ">
+                  
+                  
+                     ">
+                  
+                  
+                     ">
+                  
+                  
+                     ">Edit
+                  
+               
+            
          
+         
+         
       
    
-   
-
-   
-
-
-
 


--===============1526683501781291556==--

From portal-commits at lists.jboss.org Fri Feb  8 19:11:22 2008
Content-Type: multipart/mixed; boundary="===============4833134717961173181=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9879 - in
 modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts: nav
 and 1 other directory.
Date: Fri, 08 Feb 2008 19:11:22 -0500
Message-ID: 

--===============4833134717961173181==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: chris.laprun(a)jboss.com
Date: 2008-02-08 19:11:22 -0500 (Fri, 08 Feb 2008)
New Revision: 9879

Modified:
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/=
default.jsp
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/=
nav/main.jsp
Log:
- Minor fixes.

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/l=
ayouts/default.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts=
/default.jsp	2008-02-08 23:45:46 UTC (rev 9878)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts=
/default.jsp	2008-02-09 00:11:22 UTC (rev 9879)
@@ -5,41 +5,37 @@
 <%@ page isELIgnored=3D"false" %>
 
 
+PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
 
-Portlet Container 2.0
-
+   Portlet Container 2.0
+   
 
 
 =

 
    
       
-      
-         
-      
+      
       

    
    <%@ include file=3D"nav/main.jsp" %>
-  =

+
    
       
-
          
-
-      
-       
-          
-          
-          
-       
-       
-          
-          
-       
-      
+         
+            
+               
+               
+               
+            
+            
+               
+               
+            
+         
       
    
    


Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/l=
ayouts/nav/main.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts=
/nav/main.jsp	2008-02-08 23:45:46 UTC (rev 9878)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts=
/nav/main.jsp	2008-02-09 00:11:22 UTC (rev 9879)
@@ -5,20 +5,20 @@
 <%@ page isELIgnored=3D"false" %>
 
 
+PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 =

-   
-      
-         
-            Home
-         
-         
-            Wikipedia
-         
-         
-            option3
-         
-      
-      

-   
+
+   
+      
+         Home
+      
+      
+         Wikipedia
+      
+      
+         option3
+      
+   
+   

+


--===============4833134717961173181==--

From portal-commits at lists.jboss.org Fri Feb  8 21:34:48 2008
Content-Type: multipart/mixed; boundary="===============0389458796471606909=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9880 - in
 modules/portlet/trunk/test/src/test/resources/simple-portal-war: css and 2
 other directories.
Date: Fri, 08 Feb 2008 21:34:46 -0500
Message-ID: 

--===============0389458796471606909==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: wesleyhales
Date: 2008-02-08 21:34:45 -0500 (Fri, 08 Feb 2008)
New Revision: 9880

Added:
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/=
demo.jsp
Modified:
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/=
tags/portal/layout1.tag
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/css/mast=
er.css
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/=
default.jsp
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/=
nav/main.jsp
Log:
home page changes and cleanup, new page layout

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/W=
EB-INF/tags/portal/layout1.tag
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF=
/tags/portal/layout1.tag	2008-02-09 00:11:22 UTC (rev 9879)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF=
/tags/portal/layout1.tag	2008-02-09 02:34:45 UTC (rev 9880)
@@ -4,15 +4,14 @@
 =

 <%@ taglib uri=3D"/WEB-INF/portal.tld" prefix=3D"portal" %>
 =

+ 
+    
+ 
+ 
+    
+ 
 =

-    
-       
-    
-    
-       
-    
 =

 =

 =

 =

-

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/c=
ss/master.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/css/mas=
ter.css	2008-02-09 00:11:22 UTC (rev 9879)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/css/mas=
ter.css	2008-02-09 02:34:45 UTC (rev 9880)
@@ -103,6 +103,13 @@
    padding: 0;
 }
 =

+h2.title {
+   font-size: 1.9em;
+   color: #fff;
+   margin: 0;
+   padding: 0;
+}
+
 h3 {
    font-size: 1.0em;
    color: #fff;

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/l=
ayouts/default.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts=
/default.jsp	2008-02-09 00:11:22 UTC (rev 9879)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts=
/default.jsp	2008-02-09 02:34:45 UTC (rev 9880)
@@ -5,12 +5,12 @@
 <%@ page isELIgnored=3D"false" %>
 
 
+   PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
 
-   Portlet Container 2.0
-   
+Portlet Container 2.0
+
 
 
 =

@@ -24,18 +24,79 @@
 =

    
       
-         
-         
-            
-               
-               
-               
-            
-            
-               
-               
-            
-         
+          
+             
+               
+            
+             Demo Page Title
+             Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed=
 do eiusmod tempor incididunt ut labore et
+             dolore magna aliqua. Ut enim ad minim veniam, quis nostrud ex=
ercitation ullamco laboris nisi ut aliquip
+             ex ea commodo consequat. Duis aute irure dolor in reprehender=
it in voluptate velit esse cillum dolore eu
+             fugiat nulla pariatur. Excepteur sint occaecat cupidatat non =
proident, sunt in culpa qui officia deserunt
+             mollit anim id est laborum.
+             

+             Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed=
 do eiusmod tempor incididunt ut labore et
+             dolore magna aliqua. Ut enim ad minim veniam, quis nostrud ex=
ercitation ullamco laboris nisi ut aliquip
+             ex ea commodo consequat. Duis aute irure dolor in reprehender=
it in voluptate velit esse cillum dolore eu
+             fugiat nulla pariatur. Excepteur sint occaecat cupidatat non =
proident, sunt in culpa qui officia deserunt
+             mollit anim id est laborum.
+             

+             Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed=
 do eiusmod tempor incididunt ut labore et
+             dolore magna aliqua. Ut enim ad minim veniam, quis nostrud ex=
ercitation ullamco laboris nisi ut aliquip
+             ex ea commodo consequat. Duis aute irure dolor in reprehender=
it in voluptate velit esse cillum dolore eu
+             fugiat nulla pariatur. Excepteur sint occaecat cupidatat non =
proident, sunt in culpa qui officia deserunt
+             mollit anim id est laborum.
+             

+             Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed=
 do eiusmod tempor incididunt ut labore et
+             dolore magna aliqua. Ut enim ad minim veniam, quis nostrud ex=
ercitation ullamco laboris nisi ut aliquip
+             ex ea commodo consequat. Duis aute irure dolor in reprehender=
it in voluptate velit esse cillum dolore eu
+             fugiat nulla pariatur. Excepteur sint occaecat cupidatat non =
proident, sunt in culpa qui officia deserunt
+             mollit anim id est laborum.
+             

+             Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed=
 do eiusmod tempor incididunt ut labore et
+             dolore magna aliqua. Ut enim ad minim veniam, quis nostrud ex=
ercitation ullamco laboris nisi ut aliquip
+             ex ea commodo consequat. Duis aute irure dolor in reprehender=
it in voluptate velit esse cillum dolore eu
+             fugiat nulla pariatur. Excepteur sint occaecat cupidatat non =
proident, sunt in culpa qui officia deserunt
+             mollit anim id est laborum.
+             

+             Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed=
 do eiusmod tempor incididunt ut labore et
+             dolore magna aliqua. Ut enim ad minim veniam, quis nostrud ex=
ercitation ullamco laboris nisi ut aliquip
+             ex ea commodo consequat. Duis aute irure dolor in reprehender=
it in voluptate velit esse cillum dolore eu
+             fugiat nulla pariatur. Excepteur sint occaecat cupidatat non =
proident, sunt in culpa qui officia deserunt
+             mollit anim id est laborum.
+             

+             Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed=
 do eiusmod tempor incididunt ut labore et
+             dolore magna aliqua. Ut enim ad minim veniam, quis nostrud ex=
ercitation ullamco laboris nisi ut aliquip
+             ex ea commodo consequat. Duis aute irure dolor in reprehender=
it in voluptate velit esse cillum dolore eu
+             fugiat nulla pariatur. Excepteur sint occaecat cupidatat non =
proident, sunt in culpa qui officia deserunt
+             mollit anim id est laborum.
+             

+             Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed=
 do eiusmod tempor incididunt ut labore et
+             dolore magna aliqua. Ut enim ad minim veniam, quis nostrud ex=
ercitation ullamco laboris nisi ut aliquip
+             ex ea commodo consequat. Duis aute irure dolor in reprehender=
it in voluptate velit esse cillum dolore eu
+             fugiat nulla pariatur. Excepteur sint occaecat cupidatat non =
proident, sunt in culpa qui officia deserunt
+             mollit anim id est laborum.
+             

+             Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed=
 do eiusmod tempor incididunt ut labore et
+             dolore magna aliqua. Ut enim ad minim veniam, quis nostrud ex=
ercitation ullamco laboris nisi ut aliquip
+             ex ea commodo consequat. Duis aute irure dolor in reprehender=
it in voluptate velit esse cillum dolore eu
+             fugiat nulla pariatur. Excepteur sint occaecat cupidatat non =
proident, sunt in culpa qui officia deserunt
+             mollit anim id est laborum.
+             

+             Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed=
 do eiusmod tempor incididunt ut labore et
+             dolore magna aliqua. Ut enim ad minim veniam, quis nostrud ex=
ercitation ullamco laboris nisi ut aliquip
+             ex ea commodo consequat. Duis aute irure dolor in reprehender=
it in voluptate velit esse cillum dolore eu
+             fugiat nulla pariatur. Excepteur sint occaecat cupidatat non =
proident, sunt in culpa qui officia deserunt
+             mollit anim id est laborum.
+             

+             Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed=
 do eiusmod tempor incididunt ut labore et
+             dolore magna aliqua. Ut enim ad minim veniam, quis nostrud ex=
ercitation ullamco laboris nisi ut aliquip
+             ex ea commodo consequat. Duis aute irure dolor in reprehender=
it in voluptate velit esse cillum dolore eu
+             fugiat nulla pariatur. Excepteur sint occaecat cupidatat non =
proident, sunt in culpa qui officia deserunt
+             mollit anim id est laborum.
+             

+          
+
       
    
    


Copied: modules/portlet/trunk/test/src/test/resources/simple-portal-war/lay=
outs/demo.jsp (from rev 9874, modules/portlet/trunk/test/src/test/resources=
/simple-portal-war/layouts/default.jsp)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts=
/demo.jsp	                        (rev 0)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts=
/demo.jsp	2008-02-09 02:34:45 UTC (rev 9880)
@@ -0,0 +1,47 @@
+<%@ page contentType=3D"text/html" %>
+<%@ page language=3D"java" %>
+<%@ taglib prefix=3D"jbp" tagdir=3D"/WEB-INF/tags/portal" %>
+<%@ taglib uri=3D"/WEB-INF/portal.tld" prefix=3D"portal" %>
+<%@ page isELIgnored=3D"false" %>
+
+
+
+
+Portlet Container 2.0
+
+
+
+
+
+   
+      
+      
+         
+      
+      

+   
+   <%@ include file=3D"nav/main.jsp" %>
+  =

+   
+      
+      
+         
+            
+               
+               
+               
+            
+            
+               
+               
+            
+         
+      
+   
+   

+
+
+
+
\ No newline at end of file

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/l=
ayouts/nav/main.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts=
/nav/main.jsp	2008-02-09 00:11:22 UTC (rev 9879)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts=
/nav/main.jsp	2008-02-09 02:34:45 UTC (rev 9880)
@@ -5,20 +5,17 @@
 <%@ page isELIgnored=3D"false" %>
 
 
+   PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 =

-
-   
-      
-         Home
-      
-      
-         Wikipedia
-      
-      
-         option3
-      
-   
-   

-
+   
+      
+         
+            Home
+         
+         
+            Demo Portlets
+         
+      
+      

+   


--===============0389458796471606909==--

From portal-commits at lists.jboss.org Fri Feb  8 22:13:22 2008
Content-Type: multipart/mixed; boundary="===============0561074776783888766=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9881 - in
 modules/portlet/trunk/test/src/test/resources/simple-portal-war: demo and 2
 other directories.
Date: Fri, 08 Feb 2008 22:13:22 -0500
Message-ID: 

--===============0561074776783888766==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: wesleyhales
Date: 2008-02-08 22:13:21 -0500 (Fri, 08 Feb 2008)
New Revision: 9881

Added:
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/dem=
o.jsp
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/hom=
e.jsp
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/=
footer.jsp
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/=
header.jsp
Modified:
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/index.jsp
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/=
nav/main.jsp
Log:
nav changes and cleanup

Copied: modules/portlet/trunk/test/src/test/resources/simple-portal-war/dem=
o/demo.jsp (from rev 9880, modules/portlet/trunk/test/src/test/resources/si=
mple-portal-war/layouts/demo.jsp)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/de=
mo.jsp	                        (rev 0)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/de=
mo.jsp	2008-02-09 03:13:21 UTC (rev 9881)
@@ -0,0 +1,25 @@
+<%@ page contentType=3D"text/html" %>
+<%@ page language=3D"java" %>
+<%@ taglib prefix=3D"jbp" tagdir=3D"/WEB-INF/tags/portal" %>
+<%@ taglib uri=3D"/WEB-INF/portal.tld" prefix=3D"portal" %>
+<%@ page isELIgnored=3D"false" %>
+
+   <%@ include file=3D"/layouts/header.jsp" %>
+  =

+   
+      
+      
+         
+            
+               
+               
+               
+            
+            
+               
+               
+            
+         
+      
+
+   <%@ include file=3D"/layouts/footer.jsp" %>
\ No newline at end of file

Copied: modules/portlet/trunk/test/src/test/resources/simple-portal-war/dem=
o/home.jsp (from rev 9880, modules/portlet/trunk/test/src/test/resources/si=
mple-portal-war/layouts/default.jsp)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/ho=
me.jsp	                        (rev 0)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/ho=
me.jsp	2008-02-09 03:13:21 UTC (rev 9881)
@@ -0,0 +1,86 @@
+<%@ page contentType=3D"text/html" %>
+<%@ page language=3D"java" %>
+<%@ taglib prefix=3D"jbp" tagdir=3D"/WEB-INF/tags/portal" %>
+<%@ taglib uri=3D"/WEB-INF/portal.tld" prefix=3D"portal" %>
+<%@ page isELIgnored=3D"false" %>
+
+   <%@ include file=3D"/layouts/header.jsp" %>
+
+   
+      
+          
+             
+               
+            
+             Demo Page Title
+             Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed=
 do eiusmod tempor incididunt ut labore et
+             dolore magna aliqua. Ut enim ad minim veniam, quis nostrud ex=
ercitation ullamco laboris nisi ut aliquip
+             ex ea commodo consequat. Duis aute irure dolor in reprehender=
it in voluptate velit esse cillum dolore eu
+             fugiat nulla pariatur. Excepteur sint occaecat cupidatat non =
proident, sunt in culpa qui officia deserunt
+             mollit anim id est laborum.
+             

+             Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed=
 do eiusmod tempor incididunt ut labore et
+             dolore magna aliqua. Ut enim ad minim veniam, quis nostrud ex=
ercitation ullamco laboris nisi ut aliquip
+             ex ea commodo consequat. Duis aute irure dolor in reprehender=
it in voluptate velit esse cillum dolore eu
+             fugiat nulla pariatur. Excepteur sint occaecat cupidatat non =
proident, sunt in culpa qui officia deserunt
+             mollit anim id est laborum.
+             

+             Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed=
 do eiusmod tempor incididunt ut labore et
+             dolore magna aliqua. Ut enim ad minim veniam, quis nostrud ex=
ercitation ullamco laboris nisi ut aliquip
+             ex ea commodo consequat. Duis aute irure dolor in reprehender=
it in voluptate velit esse cillum dolore eu
+             fugiat nulla pariatur. Excepteur sint occaecat cupidatat non =
proident, sunt in culpa qui officia deserunt
+             mollit anim id est laborum.
+             

+             Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed=
 do eiusmod tempor incididunt ut labore et
+             dolore magna aliqua. Ut enim ad minim veniam, quis nostrud ex=
ercitation ullamco laboris nisi ut aliquip
+             ex ea commodo consequat. Duis aute irure dolor in reprehender=
it in voluptate velit esse cillum dolore eu
+             fugiat nulla pariatur. Excepteur sint occaecat cupidatat non =
proident, sunt in culpa qui officia deserunt
+             mollit anim id est laborum.
+             

+             Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed=
 do eiusmod tempor incididunt ut labore et
+             dolore magna aliqua. Ut enim ad minim veniam, quis nostrud ex=
ercitation ullamco laboris nisi ut aliquip
+             ex ea commodo consequat. Duis aute irure dolor in reprehender=
it in voluptate velit esse cillum dolore eu
+             fugiat nulla pariatur. Excepteur sint occaecat cupidatat non =
proident, sunt in culpa qui officia deserunt
+             mollit anim id est laborum.
+             

+             Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed=
 do eiusmod tempor incididunt ut labore et
+             dolore magna aliqua. Ut enim ad minim veniam, quis nostrud ex=
ercitation ullamco laboris nisi ut aliquip
+             ex ea commodo consequat. Duis aute irure dolor in reprehender=
it in voluptate velit esse cillum dolore eu
+             fugiat nulla pariatur. Excepteur sint occaecat cupidatat non =
proident, sunt in culpa qui officia deserunt
+             mollit anim id est laborum.
+             

+             Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed=
 do eiusmod tempor incididunt ut labore et
+             dolore magna aliqua. Ut enim ad minim veniam, quis nostrud ex=
ercitation ullamco laboris nisi ut aliquip
+             ex ea commodo consequat. Duis aute irure dolor in reprehender=
it in voluptate velit esse cillum dolore eu
+             fugiat nulla pariatur. Excepteur sint occaecat cupidatat non =
proident, sunt in culpa qui officia deserunt
+             mollit anim id est laborum.
+             

+             Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed=
 do eiusmod tempor incididunt ut labore et
+             dolore magna aliqua. Ut enim ad minim veniam, quis nostrud ex=
ercitation ullamco laboris nisi ut aliquip
+             ex ea commodo consequat. Duis aute irure dolor in reprehender=
it in voluptate velit esse cillum dolore eu
+             fugiat nulla pariatur. Excepteur sint occaecat cupidatat non =
proident, sunt in culpa qui officia deserunt
+             mollit anim id est laborum.
+             

+             Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed=
 do eiusmod tempor incididunt ut labore et
+             dolore magna aliqua. Ut enim ad minim veniam, quis nostrud ex=
ercitation ullamco laboris nisi ut aliquip
+             ex ea commodo consequat. Duis aute irure dolor in reprehender=
it in voluptate velit esse cillum dolore eu
+             fugiat nulla pariatur. Excepteur sint occaecat cupidatat non =
proident, sunt in culpa qui officia deserunt
+             mollit anim id est laborum.
+             

+             Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed=
 do eiusmod tempor incididunt ut labore et
+             dolore magna aliqua. Ut enim ad minim veniam, quis nostrud ex=
ercitation ullamco laboris nisi ut aliquip
+             ex ea commodo consequat. Duis aute irure dolor in reprehender=
it in voluptate velit esse cillum dolore eu
+             fugiat nulla pariatur. Excepteur sint occaecat cupidatat non =
proident, sunt in culpa qui officia deserunt
+             mollit anim id est laborum.
+             

+             Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed=
 do eiusmod tempor incididunt ut labore et
+             dolore magna aliqua. Ut enim ad minim veniam, quis nostrud ex=
ercitation ullamco laboris nisi ut aliquip
+             ex ea commodo consequat. Duis aute irure dolor in reprehender=
it in voluptate velit esse cillum dolore eu
+             fugiat nulla pariatur. Excepteur sint occaecat cupidatat non =
proident, sunt in culpa qui officia deserunt
+             mollit anim id est laborum.
+             

+          
+
+      
+
+   <%@ include file=3D"/layouts/footer.jsp" %>
\ No newline at end of file

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/i=
ndex.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/index.j=
sp	2008-02-09 02:34:45 UTC (rev 9880)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/index.j=
sp	2008-02-09 03:13:21 UTC (rev 9881)
@@ -3,6 +3,8 @@
 <%@ page isELIgnored=3D"false" %>
 
 
-
+
+   
+
 
 

Added: modules/portlet/trunk/test/src/test/resources/simple-portal-war/layo=
uts/footer.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts=
/footer.jsp	                        (rev 0)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts=
/footer.jsp	2008-02-09 03:13:21 UTC (rev 9881)
@@ -0,0 +1,6 @@
+
+   

+
+
+
+
\ No newline at end of file

Added: modules/portlet/trunk/test/src/test/resources/simple-portal-war/layo=
uts/header.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts=
/header.jsp	                        (rev 0)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts=
/header.jsp	2008-02-09 03:13:21 UTC (rev 9881)
@@ -0,0 +1,18 @@
+
+
+
+
+Portlet Container 2.0
+
+
+
+
+
+   
+      
+      
+      

+   
+   <%@ include file=3D"nav/main.jsp" %>
\ No newline at end of file

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/l=
ayouts/nav/main.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts=
/nav/main.jsp	2008-02-09 02:34:45 UTC (rev 9880)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts=
/nav/main.jsp	2008-02-09 03:13:21 UTC (rev 9881)
@@ -3,6 +3,7 @@
 <%@ taglib prefix=3D"jbp" tagdir=3D"/WEB-INF/tags/portal" %>
 <%@ taglib uri=3D"/WEB-INF/portal.tld" prefix=3D"portal" %>
 <%@ page isELIgnored=3D"false" %>
+<%@ taglib prefix=3D"fn" uri=3D"http://java.sun.com/jsp/jstl/functions" %>
 
 
       
          
-            Home
+
+            Home
          
          
-            Demo Portlets
+            Demo Portlets
          
       
       



--===============0561074776783888766==--

From portal-commits at lists.jboss.org Fri Feb  8 22:22:01 2008
Content-Type: multipart/mixed; boundary="===============9202173049097477338=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9882 - in
 modules/portlet/trunk/test/src/test/resources/simple-portal-war: layouts and
 1 other directory.
Date: Fri, 08 Feb 2008 22:22:01 -0500
Message-ID: 

--===============9202173049097477338==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: wesleyhales
Date: 2008-02-08 22:22:01 -0500 (Fri, 08 Feb 2008)
New Revision: 9882

Modified:
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/dem=
o.jsp
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/hom=
e.jsp
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/=
header.jsp
Log:
cleanup

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/d=
emo/demo.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/de=
mo.jsp	2008-02-09 03:13:21 UTC (rev 9881)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/de=
mo.jsp	2008-02-09 03:22:01 UTC (rev 9882)
@@ -6,7 +6,6 @@
 =

    <%@ include file=3D"/layouts/header.jsp" %>
   =

-   
       
       
          

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/d=
emo/home.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/ho=
me.jsp	2008-02-09 03:13:21 UTC (rev 9881)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/ho=
me.jsp	2008-02-09 03:22:01 UTC (rev 9882)
@@ -6,7 +6,6 @@
 =

    <%@ include file=3D"/layouts/header.jsp" %>
 =

-   
       
           
              

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/l=
ayouts/header.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts=
/header.jsp	2008-02-09 03:13:21 UTC (rev 9881)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts=
/header.jsp	2008-02-09 03:22:01 UTC (rev 9882)
@@ -15,4 +15,5 @@
       
       

    
-   <%@ include file=3D"nav/main.jsp" %>
\ No newline at end of file
+   <%@ include file=3D"nav/main.jsp" %>
+   
\ No newline at end of file


--===============9202173049097477338==--

From portal-commits at lists.jboss.org Fri Feb  8 23:57:27 2008
Content-Type: multipart/mixed; boundary="===============1333866106275691248=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9883 - in modules/portlet/trunk:
 test/src/main/java/org/jboss/portal/portlet/test/jsp and 9 other directories.
Date: Fri, 08 Feb 2008 23:57:27 -0500
Message-ID: 

--===============1333866106275691248==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: chris.laprun(a)jboss.com
Date: 2008-02-08 23:57:27 -0500 (Fri, 08 Feb 2008)
New Revision: 9883

Added:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/samples=
/event/
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/samples=
/event/CartEvent.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/samples=
/event/CartPortlet.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/samples=
/event/Catalog.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/samples=
/event/CatalogItem.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/samples=
/event/CatalogPortlet.java
   modules/portlet/trunk/test/src/test/resources/cart-event-portlet-war/
   modules/portlet/trunk/test/src/test/resources/cart-event-portlet-war/WEB=
-INF/
   modules/portlet/trunk/test/src/test/resources/cart-event-portlet-war/WEB=
-INF/portlet.xml
   modules/portlet/trunk/test/src/test/resources/cart-event-portlet-war/WEB=
-INF/web.xml
Modified:
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/imp=
l/jsr168/api/StateAwareResponseImpl.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/PagePortletControllerContext.java
   modules/portlet/trunk/test/src/test/build.xml
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/dem=
o.jsp
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/index.jsp
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/=
default.jsp
Log:
- Added event demo portlets: a catalog and a cart. Does not currently work =
as there seems to be problem with the event processing.
- Modified PagePortletControllerContext.getPortlet as the given parameter i=
s not always a windowId (in particular, it's a portlet id when processing e=
vents).
  The current fix is probably a hack and indicative of a more serious issue=
 (as evidenced with further problems down the stream).
- Fixed incorrect forward in index.jsp.

Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/port=
let/impl/jsr168/api/StateAwareResponseImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/jsr168/api/StateAwareResponseImpl.java	2008-02-09 03:22:01 UTC (rev 9882)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/jsr168/api/StateAwareResponseImpl.java	2008-02-09 04:57:27 UTC (rev 9883)
@@ -283,11 +283,11 @@
          // Check jaxb annotation
          if (requiresJAXBAnnotation(valueType))
          {
-            for (Annotation a : value.getClass().getAnnotations())
+            for (Annotation a : valueType.getAnnotations())
             {
                System.out.println("a =3D " + a);
             }
-            boolean b =3D value.getClass().isAnnotationPresent(XmlRootElem=
ent.class);
+            boolean b =3D valueType.isAnnotationPresent(XmlRootElement.cla=
ss);
             if (!b)
             {
                throw new IllegalArgumentException("The provided event valu=
e type " + value.getClass().getName() +

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/PagePortletControllerContext.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/PagePortletControllerContext.java	2008-02-09 03:22:01 UTC (rev 9882)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/PagePortletControllerContext.java	2008-02-09 04:57:27 UTC (rev 9883)
@@ -22,25 +22,25 @@
  *************************************************************************=
*****/
 package org.jboss.portal.portlet.test.jsp;
 =

-import org.jboss.portal.portlet.test.controller.AbstractPortletControllerC=
ontext;
 import org.jboss.portal.portlet.Portlet;
+import org.jboss.portal.portlet.PortletContext;
+import org.jboss.portal.portlet.PortletInvoker;
 import org.jboss.portal.portlet.PortletInvokerException;
-import org.jboss.portal.portlet.PortletInvoker;
-import org.jboss.portal.portlet.PortletContext;
-import org.jboss.portal.portlet.info.PortletInfo;
 import org.jboss.portal.portlet.controller.event.EventControllerContext;
 import org.jboss.portal.portlet.controller.impl.event.EventControllerConte=
xtImpl;
+import org.jboss.portal.portlet.info.PortletInfo;
+import org.jboss.portal.portlet.invocation.PortletInvocation;
 import org.jboss.portal.portlet.invocation.response.PortletInvocationRespo=
nse;
-import org.jboss.portal.portlet.invocation.PortletInvocation;
+import org.jboss.portal.portlet.test.controller.AbstractPortletControllerC=
ontext;
 import org.jboss.portal.web.IllegalRequestException;
 =

+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
 import java.io.IOException;
+import java.util.HashMap;
 import java.util.Map;
-import java.util.HashMap;
 =

 /**
  * @author Julien Viet
@@ -93,6 +93,14 @@
    {
       int index =3D windowId.lastIndexOf('.');
       String portletId =3D windowId.substring(0, index);
+
+      // in the case of an event propagation, the given 'windowId' is actu=
ally the portlet id already so need to check
+      // for that case (portletId should still have a '.', if not it means=
 that the windowId was really a portlet id)
+      if (portletId.indexOf('.') =3D=3D -1)
+      {
+         portletId =3D windowId;
+      }
+
       PortletContext portletContext =3D PortletContext.createPortletContex=
t(portletId);
       return invoker.getPortlet(portletContext);
    }

Added: modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/sam=
ples/event/CartEvent.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/sample=
s/event/CartEvent.java	                        (rev 0)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/sample=
s/event/CartEvent.java	2008-02-09 04:57:27 UTC (rev 9883)
@@ -0,0 +1,50 @@
+/*************************************************************************=
*****
+ * 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.simple.samples.event;
+
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.namespace.QName;
+import java.io.Serializable;
+
+/**
+ * @author Chris Laprun
+ * @version $Revision$
+ */
+(a)XmlRootElement
+public class CartEvent implements Serializable
+{
+   private String id;
+
+   public static final QName QNAME =3D new QName("urn:jboss:portal:samples=
:event", "CartEvent");
+
+   public CartEvent(String id)
+   {
+      this.id =3D id;
+   }
+
+   public String getId()
+   {
+      return id;
+   }
+}


Property changes on: modules/portlet/trunk/test/src/main/java/org/jboss/por=
tal/simple/samples/event/CartEvent.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Added: modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/sam=
ples/event/CartPortlet.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/sample=
s/event/CartPortlet.java	                        (rev 0)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/sample=
s/event/CartPortlet.java	2008-02-09 04:57:27 UTC (rev 9883)
@@ -0,0 +1,82 @@
+/*************************************************************************=
*****
+ * 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.simple.samples.event;
+
+import javax.portlet.Event;
+import javax.portlet.EventRequest;
+import javax.portlet.EventResponse;
+import javax.portlet.GenericPortlet;
+import javax.portlet.PortletException;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+import java.io.IOException;
+import java.io.Writer;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author Chris Laprun
+ * @version $Revision$
+ */
+public class CartPortlet extends GenericPortlet
+{
+   List items =3D new ArrayList(7);
+
+   @Override
+   protected void doView(RenderRequest renderRequest, RenderResponse rende=
rResponse) throws PortletException, IOException
+   {
+      renderResponse.setContentType("text/html");
+      Writer writer =3D renderResponse.getWriter();
+
+
+      if (!items.isEmpty())
+      {
+         writer.append("");
+         int total =3D 0;
+         for (CatalogItem item : items)
+         {
+            int price =3D item.getPrice();
+            total +=3D price;
+            writer.append("");
+         }
+         writer.append("Description Price
").append(item.getDescription()).append=
(" $").append("" + price)
+               .append("
").append("$=
" + total).append("");
+      }
+      else
+      {
+         writer.append("Cart is empty.");
+      }
+   }
+
+   @Override
+   public void processEvent(EventRequest eventRequest, EventResponse event=
Response) throws PortletException, IOException
+   {
+      Event event =3D eventRequest.getEvent();
+      if (event.getName().equals("CartEvent"))
+      {
+         CartEvent cartEvent =3D (CartEvent)event.getValue();
+         items.add(Catalog.get(cartEvent.getId()));
+      }
+   }
+}


Property changes on: modules/portlet/trunk/test/src/main/java/org/jboss/por=
tal/simple/samples/event/CartPortlet.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Added: modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/sam=
ples/event/Catalog.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/sample=
s/event/Catalog.java	                        (rev 0)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/sample=
s/event/Catalog.java	2008-02-09 04:57:27 UTC (rev 9883)
@@ -0,0 +1,63 @@
+/*************************************************************************=
*****
+ * 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.simple.samples.event;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author Chris Laprun
+ * @version $Revision$
+ */
+public class Catalog
+{
+   private static Map items;
+
+   static
+   {
+      items =3D new HashMap(7);
+      items.put("1", new CatalogItem("1", 800, "Bike"));
+      items.put("2", new CatalogItem("2", 450, "Snowboard"));
+      items.put("3", new CatalogItem("3", 225, "Tent"));
+      items.put("4", new CatalogItem("4", 75, "Backpack"));
+      items.put("5", new CatalogItem("5", 119, "Skateboard"));
+      items.put("6", new CatalogItem("6", 333, "Surfboard"));
+      items.put("7", new CatalogItem("7", 90, "Sneakers"));
+   }
+
+   private Catalog()
+   {
+   }
+
+   public static CatalogItem get(String id)
+   {
+      return items.get(id);
+   }
+
+   public static Collection getAll()
+   {
+      return items.values();
+   }
+}


Property changes on: modules/portlet/trunk/test/src/main/java/org/jboss/por=
tal/simple/samples/event/Catalog.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Added: modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/sam=
ples/event/CatalogItem.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/sample=
s/event/CatalogItem.java	                        (rev 0)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/sample=
s/event/CatalogItem.java	2008-02-09 04:57:27 UTC (rev 9883)
@@ -0,0 +1,57 @@
+/*************************************************************************=
*****
+ * 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.simple.samples.event;
+
+/**
+ * @author Chris Laprun
+ * @version $Revision$
+ */
+public class CatalogItem
+{
+   private String id;
+   private int price;
+   private String description;
+
+   public CatalogItem(String id, int price, String description)
+   {
+      this.id =3D id;
+      this.price =3D price;
+      this.description =3D description;
+   }
+
+   public String getId()
+   {
+      return id;
+   }
+
+   public int getPrice()
+   {
+      return price;
+   }
+
+   public String getDescription()
+   {
+      return description;
+   }
+}


Property changes on: modules/portlet/trunk/test/src/main/java/org/jboss/por=
tal/simple/samples/event/CatalogItem.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Added: modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/sam=
ples/event/CatalogPortlet.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/sample=
s/event/CatalogPortlet.java	                        (rev 0)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/sample=
s/event/CatalogPortlet.java	2008-02-09 04:57:27 UTC (rev 9883)
@@ -0,0 +1,71 @@
+/*************************************************************************=
*****
+ * 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.simple.samples.event;
+
+import javax.portlet.ActionRequest;
+import javax.portlet.ActionResponse;
+import javax.portlet.GenericPortlet;
+import javax.portlet.PortletException;
+import javax.portlet.PortletURL;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+import java.io.IOException;
+import java.io.Writer;
+import java.util.Collection;
+
+/**
+ * @author Chris Laprun
+ * @version $Revision$
+ */
+public class CatalogPortlet extends GenericPortlet
+{
+   @Override
+   protected void doView(RenderRequest renderRequest, RenderResponse rende=
rResponse) throws PortletException, IOException
+   {
+      renderResponse.setContentType("text/html");
+      Writer writer =3D renderResponse.getWriter();
+
+      writer.append("<=
th>Actions");
+
+      PortletURL addURL =3D renderResponse.createActionURL();
+      addURL.setParameter("op", "add");
+
+      Collection items =3D Catalog.getAll();
+      for (CatalogItem item : items)
+      {
+         addURL.setParameter("id", item.getId());
+         writer.append("");
+      }
+
+      writer.append("Description Price
").append(item.getDescription()).append("<=
/td> $").append("" + item.getPrice())
+            .append(" Add to cart");
+   }
+
+   @Override
+   public void processAction(ActionRequest actionRequest, ActionResponse a=
ctionResponse) throws PortletException, IOException
+   {
+      String value =3D actionRequest.getParameter("id");
+      actionResponse.setEvent(CartEvent.QNAME, new CartEvent(value));
+   }
+}


Property changes on: modules/portlet/trunk/test/src/main/java/org/jboss/por=
tal/simple/samples/event/CatalogPortlet.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: modules/portlet/trunk/test/src/test/build.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/build.xml	2008-02-09 03:22:01 UTC (=
rev 9882)
+++ modules/portlet/trunk/test/src/test/build.xml	2008-02-09 04:57:27 UTC (=
rev 9883)
@@ -698,7 +698,6 @@
          
 =

          
-         
 =

          
          
@@ -711,13 +710,13 @@
          
          
          
-         
 =

          
          
             
             
             
+            
          
 =

       
@@ -762,12 +761,21 @@
 =

       
          
-         
+         
       
       
          
       
 =

+      
+         
+         
+      
+      
+         
+      
+
       
       
       

Copied: modules/portlet/trunk/test/src/test/resources/cart-event-portlet-wa=
r/WEB-INF/portlet.xml (from rev 9878, modules/portlet/trunk/test/src/test/r=
esources/google-map-portlet-war/WEB-INF/portlet.xml)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/cart-event-portlet-war/WE=
B-INF/portlet.xml	                        (rev 0)
+++ modules/portlet/trunk/test/src/test/resources/cart-event-portlet-war/WE=
B-INF/portlet.xml	2008-02-09 04:57:27 UTC (rev 9883)
@@ -0,0 +1,70 @@
+
+
+
+
+   
+      Catalog Portlet
+      Catalog
+      Catalog Portlet
+      org.jboss.portal.simple.samples.event.CatalogPortlet<=
/portlet-class>
+      
+         text/html
+         VIEW
+      
+      
+         Catalog Portlet
+         sample,event,catalog
+      
+      
+         jbp:CartEvent=

+      
+   
+
+   
+      Cart Portlet
+      Cart
+      Cart Portlet
+      org.jboss.portal.simple.samples.event.CartPortlet
+      
+         text/html
+         VIEW
+      
+      
+         Cart Portlet
+         sample,event,cart
+      
+      
+         jbp:CartEvent=

+      
+   
+
+   
+      jbp:CartEvent
+      org.jboss.portal.simple.samples.event.CartEvent
+   
+
+

Copied: modules/portlet/trunk/test/src/test/resources/cart-event-portlet-wa=
r/WEB-INF/web.xml (from rev 9878, modules/portlet/trunk/test/src/test/resou=
rces/google-map-portlet-war/WEB-INF/web.xml)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/cart-event-portlet-war/WE=
B-INF/web.xml	                        (rev 0)
+++ modules/portlet/trunk/test/src/test/resources/cart-event-portlet-war/WE=
B-INF/web.xml	2008-02-09 04:57:27 UTC (rev 9883)
@@ -0,0 +1,27 @@
+
+
+
+
+

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/d=
emo/demo.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/de=
mo.jsp	2008-02-09 03:22:01 UTC (rev 9882)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/de=
mo.jsp	2008-02-09 04:57:27 UTC (rev 9883)
@@ -4,21 +4,23 @@
 <%@ taglib uri=3D"/WEB-INF/portal.tld" prefix=3D"portal" %>
 <%@ page isELIgnored=3D"false" %>
 =

-   <%@ include file=3D"/layouts/header.jsp" %>
-  =

-      
-      
-         
+<%@ include file=3D"/layouts/header.jsp" %>
+
+
+   
+   
             
                
                
                
+               
             
             
                
                
+               
             
-         
-      
+   
+
 =

-   <%@ include file=3D"/layouts/footer.jsp" %>
\ No newline at end of file
+<%@ include file=3D"/layouts/footer.jsp" %>
\ No newline at end of file

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/i=
ndex.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/index.j=
sp	2008-02-09 03:22:01 UTC (rev 9882)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/index.j=
sp	2008-02-09 04:57:27 UTC (rev 9883)
@@ -3,8 +3,8 @@
 <%@ page isELIgnored=3D"false" %>
 
 
-
-   
+
+   
 
 
 

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/l=
ayouts/default.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts=
/default.jsp	2008-02-09 03:22:01 UTC (rev 9882)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts=
/default.jsp	2008-02-09 04:57:27 UTC (rev 9883)
@@ -5,97 +5,98 @@
 <%@ page isELIgnored=3D"false" %>
 
 
+PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
 
-Portlet Container 2.0
-
+   Portlet Container 2.0
+   
 
 
 =

 
    
       
-      
+      
       

    
    <%@ include file=3D"nav/main.jsp" %>
 =

    
       
-          
-             
-               
+         
+            
+               
             
-             Demo Page Title
-             Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed=
 do eiusmod tempor incididunt ut labore et
-             dolore magna aliqua. Ut enim ad minim veniam, quis nostrud ex=
ercitation ullamco laboris nisi ut aliquip
-             ex ea commodo consequat. Duis aute irure dolor in reprehender=
it in voluptate velit esse cillum dolore eu
-             fugiat nulla pariatur. Excepteur sint occaecat cupidatat non =
proident, sunt in culpa qui officia deserunt
-             mollit anim id est laborum.
-             

-             Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed=
 do eiusmod tempor incididunt ut labore et
-             dolore magna aliqua. Ut enim ad minim veniam, quis nostrud ex=
ercitation ullamco laboris nisi ut aliquip
-             ex ea commodo consequat. Duis aute irure dolor in reprehender=
it in voluptate velit esse cillum dolore eu
-             fugiat nulla pariatur. Excepteur sint occaecat cupidatat non =
proident, sunt in culpa qui officia deserunt
-             mollit anim id est laborum.
-             

-             Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed=
 do eiusmod tempor incididunt ut labore et
-             dolore magna aliqua. Ut enim ad minim veniam, quis nostrud ex=
ercitation ullamco laboris nisi ut aliquip
-             ex ea commodo consequat. Duis aute irure dolor in reprehender=
it in voluptate velit esse cillum dolore eu
-             fugiat nulla pariatur. Excepteur sint occaecat cupidatat non =
proident, sunt in culpa qui officia deserunt
-             mollit anim id est laborum.
-             

-             Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed=
 do eiusmod tempor incididunt ut labore et
-             dolore magna aliqua. Ut enim ad minim veniam, quis nostrud ex=
ercitation ullamco laboris nisi ut aliquip
-             ex ea commodo consequat. Duis aute irure dolor in reprehender=
it in voluptate velit esse cillum dolore eu
-             fugiat nulla pariatur. Excepteur sint occaecat cupidatat non =
proident, sunt in culpa qui officia deserunt
-             mollit anim id est laborum.
-             

-             Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed=
 do eiusmod tempor incididunt ut labore et
-             dolore magna aliqua. Ut enim ad minim veniam, quis nostrud ex=
ercitation ullamco laboris nisi ut aliquip
-             ex ea commodo consequat. Duis aute irure dolor in reprehender=
it in voluptate velit esse cillum dolore eu
-             fugiat nulla pariatur. Excepteur sint occaecat cupidatat non =
proident, sunt in culpa qui officia deserunt
-             mollit anim id est laborum.
-             

-             Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed=
 do eiusmod tempor incididunt ut labore et
-             dolore magna aliqua. Ut enim ad minim veniam, quis nostrud ex=
ercitation ullamco laboris nisi ut aliquip
-             ex ea commodo consequat. Duis aute irure dolor in reprehender=
it in voluptate velit esse cillum dolore eu
-             fugiat nulla pariatur. Excepteur sint occaecat cupidatat non =
proident, sunt in culpa qui officia deserunt
-             mollit anim id est laborum.
-             

-             Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed=
 do eiusmod tempor incididunt ut labore et
-             dolore magna aliqua. Ut enim ad minim veniam, quis nostrud ex=
ercitation ullamco laboris nisi ut aliquip
-             ex ea commodo consequat. Duis aute irure dolor in reprehender=
it in voluptate velit esse cillum dolore eu
-             fugiat nulla pariatur. Excepteur sint occaecat cupidatat non =
proident, sunt in culpa qui officia deserunt
-             mollit anim id est laborum.
-             

-             Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed=
 do eiusmod tempor incididunt ut labore et
-             dolore magna aliqua. Ut enim ad minim veniam, quis nostrud ex=
ercitation ullamco laboris nisi ut aliquip
-             ex ea commodo consequat. Duis aute irure dolor in reprehender=
it in voluptate velit esse cillum dolore eu
-             fugiat nulla pariatur. Excepteur sint occaecat cupidatat non =
proident, sunt in culpa qui officia deserunt
-             mollit anim id est laborum.
-             

-             Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed=
 do eiusmod tempor incididunt ut labore et
-             dolore magna aliqua. Ut enim ad minim veniam, quis nostrud ex=
ercitation ullamco laboris nisi ut aliquip
-             ex ea commodo consequat. Duis aute irure dolor in reprehender=
it in voluptate velit esse cillum dolore eu
-             fugiat nulla pariatur. Excepteur sint occaecat cupidatat non =
proident, sunt in culpa qui officia deserunt
-             mollit anim id est laborum.
-             

-             Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed=
 do eiusmod tempor incididunt ut labore et
-             dolore magna aliqua. Ut enim ad minim veniam, quis nostrud ex=
ercitation ullamco laboris nisi ut aliquip
-             ex ea commodo consequat. Duis aute irure dolor in reprehender=
it in voluptate velit esse cillum dolore eu
-             fugiat nulla pariatur. Excepteur sint occaecat cupidatat non =
proident, sunt in culpa qui officia deserunt
-             mollit anim id est laborum.
-             

-             Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed=
 do eiusmod tempor incididunt ut labore et
-             dolore magna aliqua. Ut enim ad minim veniam, quis nostrud ex=
ercitation ullamco laboris nisi ut aliquip
-             ex ea commodo consequat. Duis aute irure dolor in reprehender=
it in voluptate velit esse cillum dolore eu
-             fugiat nulla pariatur. Excepteur sint occaecat cupidatat non =
proident, sunt in culpa qui officia deserunt
-             mollit anim id est laborum.
-             

-          
+            Demo Page Title
+            Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed =
do eiusmod tempor incididunt ut labore et
+            dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exe=
rcitation ullamco laboris nisi ut aliquip
+            ex ea commodo consequat. Duis aute irure dolor in reprehenderi=
t in voluptate velit esse cillum dolore eu
+            fugiat nulla pariatur. Excepteur sint occaecat cupidatat non p=
roident, sunt in culpa qui officia deserunt
+            mollit anim id est laborum.
+            

+            Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed =
do eiusmod tempor incididunt ut labore et
+            dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exe=
rcitation ullamco laboris nisi ut aliquip
+            ex ea commodo consequat. Duis aute irure dolor in reprehenderi=
t in voluptate velit esse cillum dolore eu
+            fugiat nulla pariatur. Excepteur sint occaecat cupidatat non p=
roident, sunt in culpa qui officia deserunt
+            mollit anim id est laborum.
+            

+            Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed =
do eiusmod tempor incididunt ut labore et
+            dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exe=
rcitation ullamco laboris nisi ut aliquip
+            ex ea commodo consequat. Duis aute irure dolor in reprehenderi=
t in voluptate velit esse cillum dolore eu
+            fugiat nulla pariatur. Excepteur sint occaecat cupidatat non p=
roident, sunt in culpa qui officia deserunt
+            mollit anim id est laborum.
+            

+            Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed =
do eiusmod tempor incididunt ut labore et
+            dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exe=
rcitation ullamco laboris nisi ut aliquip
+            ex ea commodo consequat. Duis aute irure dolor in reprehenderi=
t in voluptate velit esse cillum dolore eu
+            fugiat nulla pariatur. Excepteur sint occaecat cupidatat non p=
roident, sunt in culpa qui officia deserunt
+            mollit anim id est laborum.
+            

+            Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed =
do eiusmod tempor incididunt ut labore et
+            dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exe=
rcitation ullamco laboris nisi ut aliquip
+            ex ea commodo consequat. Duis aute irure dolor in reprehenderi=
t in voluptate velit esse cillum dolore eu
+            fugiat nulla pariatur. Excepteur sint occaecat cupidatat non p=
roident, sunt in culpa qui officia deserunt
+            mollit anim id est laborum.
+            

+            Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed =
do eiusmod tempor incididunt ut labore et
+            dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exe=
rcitation ullamco laboris nisi ut aliquip
+            ex ea commodo consequat. Duis aute irure dolor in reprehenderi=
t in voluptate velit esse cillum dolore eu
+            fugiat nulla pariatur. Excepteur sint occaecat cupidatat non p=
roident, sunt in culpa qui officia deserunt
+            mollit anim id est laborum.
+            

+            Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed =
do eiusmod tempor incididunt ut labore et
+            dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exe=
rcitation ullamco laboris nisi ut aliquip
+            ex ea commodo consequat. Duis aute irure dolor in reprehenderi=
t in voluptate velit esse cillum dolore eu
+            fugiat nulla pariatur. Excepteur sint occaecat cupidatat non p=
roident, sunt in culpa qui officia deserunt
+            mollit anim id est laborum.
+            

+            Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed =
do eiusmod tempor incididunt ut labore et
+            dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exe=
rcitation ullamco laboris nisi ut aliquip
+            ex ea commodo consequat. Duis aute irure dolor in reprehenderi=
t in voluptate velit esse cillum dolore eu
+            fugiat nulla pariatur. Excepteur sint occaecat cupidatat non p=
roident, sunt in culpa qui officia deserunt
+            mollit anim id est laborum.
+            

+            Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed =
do eiusmod tempor incididunt ut labore et
+            dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exe=
rcitation ullamco laboris nisi ut aliquip
+            ex ea commodo consequat. Duis aute irure dolor in reprehenderi=
t in voluptate velit esse cillum dolore eu
+            fugiat nulla pariatur. Excepteur sint occaecat cupidatat non p=
roident, sunt in culpa qui officia deserunt
+            mollit anim id est laborum.
+            

+            Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed =
do eiusmod tempor incididunt ut labore et
+            dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exe=
rcitation ullamco laboris nisi ut aliquip
+            ex ea commodo consequat. Duis aute irure dolor in reprehenderi=
t in voluptate velit esse cillum dolore eu
+            fugiat nulla pariatur. Excepteur sint occaecat cupidatat non p=
roident, sunt in culpa qui officia deserunt
+            mollit anim id est laborum.
+            

+            Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed =
do eiusmod tempor incididunt ut labore et
+            dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exe=
rcitation ullamco laboris nisi ut aliquip
+            ex ea commodo consequat. Duis aute irure dolor in reprehenderi=
t in voluptate velit esse cillum dolore eu
+            fugiat nulla pariatur. Excepteur sint occaecat cupidatat non p=
roident, sunt in culpa qui officia deserunt
+            mollit anim id est laborum.
+            

+         
 =

       
    


--===============1333866106275691248==--

From portal-commits at lists.jboss.org Sat Feb  9 06:05:41 2008
Content-Type: multipart/mixed; boundary="===============1154568933613607944=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9884 -
 modules/common/trunk/common/src/main/java/org/jboss/portal/common/io.
Date: Sat, 09 Feb 2008 06:05:31 -0500
Message-ID: 

--===============1154568933613607944==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-09 06:05:31 -0500 (Sat, 09 Feb 2008)
New Revision: 9884

Added:
   modules/common/trunk/common/src/main/java/org/jboss/portal/common/io/Ser=
ializationFilter.java
Modified:
   modules/common/trunk/common/src/main/java/org/jboss/portal/common/io/IOT=
ools.java
Log:
make serialization stuff more reusable

Modified: modules/common/trunk/common/src/main/java/org/jboss/portal/common=
/io/IOTools.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/common/trunk/common/src/main/java/org/jboss/portal/common/io/IO=
Tools.java	2008-02-09 04:57:27 UTC (rev 9883)
+++ modules/common/trunk/common/src/main/java/org/jboss/portal/common/io/IO=
Tools.java	2008-02-09 11:05:31 UTC (rev 9884)
@@ -388,6 +388,11 @@
 =

    public static  byte[] serialize(Serialization serialization, T t)
    {
+      return serialize(serialization, SerializationFilter.TRIVIAL, t);
+   }
+
+   public static  byte[] serialize(Serialization serialization, Seri=
alizationFilter filter, T t)
+   {
       if (serialization =3D=3D null)
       {
          throw new IllegalArgumentException();
@@ -399,7 +404,7 @@
       try
       {
          ByteArrayOutputStream baos =3D new ByteArrayOutputStream();
-         serialization.serialize(t, baos);
+         filter.serialize(serialization, t, baos);
          return baos.toByteArray();
       }
       catch (IOException e)
@@ -410,6 +415,11 @@
 =

    public static  T unserialize(Serialization serialization, byte[] =
bytes)
    {
+      return unserialize(serialization, SerializationFilter.TRIVIAL, bytes=
);
+   }
+
+   public static  T unserialize(Serialization serialization, Seriali=
zationFilter filter, byte[] bytes)
+   {
       if (serialization =3D=3D null)
       {
          throw new IllegalArgumentException();
@@ -421,7 +431,7 @@
       try
       {
          ByteArrayInputStream bais =3D new ByteArrayInputStream(bytes);
-         return serialization.unserialize(bais);
+         return filter.unserialize(serialization, bais);
       }
       catch (IOException e)
       {

Added: modules/common/trunk/common/src/main/java/org/jboss/portal/common/io=
/SerializationFilter.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/common/trunk/common/src/main/java/org/jboss/portal/common/io/Se=
rializationFilter.java	                        (rev 0)
+++ modules/common/trunk/common/src/main/java/org/jboss/portal/common/io/Se=
rializationFilter.java	2008-02-09 11:05:31 UTC (rev 9884)
@@ -0,0 +1,75 @@
+/*************************************************************************=
*****
+ * 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.common.io;
+
+import java.io.OutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.zip.GZIPOutputStream;
+import java.util.zip.GZIPInputStream;
+
+/**
+ * Filters a stream for serialize/unserialize operations.
+ *
+ * @author Julien Viet
+ * @version $Revision: 630 $
+ */
+public interface SerializationFilter
+{
+
+   SerializationFilter TRIVIAL =3D new SerializationFilter()
+   {
+      public  void serialize(Serialization serialization, T t, Outpu=
tStream out) throws IllegalArgumentException, IOException
+      {
+         serialization.serialize(t, out);
+      }
+
+      public  T unserialize(Serialization serialization, InputStream=
 in) throws IllegalArgumentException, IOException
+      {
+         return serialization.unserialize(in);
+      }
+   };
+
+   /**
+    * Use GZIP streams. =

+    */
+   SerializationFilter COMPRESSOR =3D new SerializationFilter()
+   {
+      public  void serialize(Serialization serialization, T t, Outpu=
tStream out) throws IllegalArgumentException, IOException
+      {
+         GZIPOutputStream zos =3D new GZIPOutputStream(out);
+         serialization.serialize(t, zos);
+      }
+
+      public  T unserialize(Serialization serialization, InputStream=
 in) throws IllegalArgumentException, IOException
+      {
+         GZIPInputStream zis =3D new GZIPInputStream(in);
+         return serialization.unserialize(zis);
+      }
+   };
+
+    void serialize(Serialization serialization, T t, OutputStream ou=
t) throws IllegalArgumentException, IOException;
+
+    T unserialize(Serialization serialization, InputStream in) throw=
s IllegalArgumentException, IOException;
+
+}


--===============1154568933613607944==--

From portal-commits at lists.jboss.org Sat Feb  9 06:37:51 2008
Content-Type: multipart/mixed; boundary="===============0045200948856198920=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9885 - in modules/portlet/trunk:
 portlet-controller and 11 other directories.
Date: Sat, 09 Feb 2008 06:37:48 -0500
Message-ID: 

--===============0045200948856198920==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: bdaw
Date: 2008-02-09 06:37:47 -0500 (Sat, 09 Feb 2008)
New Revision: 9885

Added:
   modules/portlet/trunk/portlet-controller/
   modules/portlet/trunk/portlet-controller/pom.xml
   modules/portlet/trunk/portlet-controller/src/
   modules/portlet/trunk/portlet-controller/src/main/
   modules/portlet/trunk/portlet-controller/src/main/java/
   modules/portlet/trunk/portlet-controller/src/main/java/org/
   modules/portlet/trunk/portlet-controller/src/main/java/org/jboss/
   modules/portlet/trunk/portlet-controller/src/main/java/org/jboss/portal/
   modules/portlet/trunk/portlet-controller/src/main/java/org/jboss/portal/=
portlet/
   modules/portlet/trunk/portlet-controller/src/test/
   modules/portlet/trunk/portlet-controller/src/test/java/
   modules/portlet/trunk/portlet-controller/src/test/java/org/
   modules/portlet/trunk/portlet-controller/src/test/java/org/jboss/
   modules/portlet/trunk/portlet-controller/src/test/java/org/jboss/portal/
   modules/portlet/trunk/portlet-controller/src/test/java/org/jboss/portal/=
portlet/
   modules/portlet/trunk/portlet-controller/src/test/resources/
Log:
initial import of empty structure

Added: modules/portlet/trunk/portlet-controller/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet-controller/pom.xml	                      =
  (rev 0)
+++ modules/portlet/trunk/portlet-controller/pom.xml	2008-02-09 11:37:47 UT=
C (rev 9885)
@@ -0,0 +1,195 @@
+
+   
+      org.jboss.portal.portlet
+      module-parent
+      2.0-SNAPSHOT
+      ../build/pom.xml
+   
+   4.0.0
+   portlet-controller
+   jar
+   Portlet controller
+
+   
+
+      
+         org.jboss.portal.portlet
+         portlet-portlet
+         ${project.version}
+         test-jar
+      
+
+      
+      
+      
+      
+
+   
+
+


--===============0045200948856198920==--

From portal-commits at lists.jboss.org Sat Feb  9 07:00:40 2008
Content-Type: multipart/mixed; boundary="===============4054904207372275275=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9886 - in modules/test/trunk:
 build and 14 other directories.
Date: Sat, 09 Feb 2008 07:00:40 -0500
Message-ID: 

--===============4054904207372275275==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: bdaw
Date: 2008-02-09 07:00:40 -0500 (Sat, 09 Feb 2008)
New Revision: 9886

Modified:
   modules/test/trunk/build/pom.xml
   modules/test/trunk/mc/pom.xml
   modules/test/trunk/pom.xml
   modules/test/trunk/remote/pom.xml
   modules/test/trunk/test/agent/pom.xml
   modules/test/trunk/test/core/pom.xml
   modules/test/trunk/test/generic/pom.xml
   modules/test/trunk/test/jboss/pom.xml
   modules/test/trunk/test/opends/pom.xml
   modules/test/trunk/tooling/ant/pom.xml
   modules/test/trunk/tooling/core/pom.xml
   modules/test/trunk/tooling/examples/maven2/pom.xml
   modules/test/trunk/tooling/maven2/pom.xml
   modules/test/trunk/tooling/maven2/src/main/java/org/jboss/unit/tooling/m=
aven2/UnitMojo.java
   modules/test/trunk/tooling/pom.xml
   modules/test/trunk/unit/pom.xml
Log:
- rename to artifacts
- version update to 1.2.0-Beta1

Modified: modules/test/trunk/build/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/test/trunk/build/pom.xml	2008-02-09 11:37:47 UTC (rev 9885)
+++ modules/test/trunk/build/pom.xml	2008-02-09 12:00:40 UTC (rev 9886)
@@ -17,8 +17,8 @@
    
    4.0.0
    org.jboss.unit
-   jboss-portal-modules-test
-   1.2.0-SNAPSHOT
+   module-parent
+   1.2.0-Beta1
    pom
    JBoss Portal Test Module
    http://www.jboss.com/products/jbossmc

Modified: modules/test/trunk/mc/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/test/trunk/mc/pom.xml	2008-02-09 11:37:47 UTC (rev 9885)
+++ modules/test/trunk/mc/pom.xml	2008-02-09 12:00:40 UTC (rev 9886)
@@ -2,8 +2,8 @@
          xsi:schemaLocation=3D"http://maven.apache.org/POM/4.0.0 http://ma=
ven.apache.org/maven-v4_0_0.xsd">
    
       org.jboss.unit
-      jboss-portal-modules-test
-      1.2.0-SNAPSHOT
+      module-parent
+      1.2.0-Beta1
       ../build/pom.xml
    
    4.0.0

Modified: modules/test/trunk/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/test/trunk/pom.xml	2008-02-09 11:37:47 UTC (rev 9885)
+++ modules/test/trunk/pom.xml	2008-02-09 12:00:40 UTC (rev 9886)
@@ -2,10 +2,10 @@
          xsi:schemaLocation=3D"http://maven.apache.org/POM/4.0.0 http://ma=
ven.apache.org/maven-v4_0_0.xsd">
    4.0.0
    org.jboss.unit
-   jboss-portal-modules-test-aggregator
+   module-aggregator
    pom
    JBoss Portal Modules Test
-   1.2.0-SNAPSHOT
+   1.2.0-Beta1
    http://labs.jboss.com/jbossportal
 =

    

Modified: modules/test/trunk/remote/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/test/trunk/remote/pom.xml	2008-02-09 11:37:47 UTC (rev 9885)
+++ modules/test/trunk/remote/pom.xml	2008-02-09 12:00:40 UTC (rev 9886)
@@ -2,8 +2,8 @@
          xsi:schemaLocation=3D"http://maven.apache.org/POM/4.0.0 http://ma=
ven.apache.org/maven-v4_0_0.xsd">
    
       org.jboss.unit
-      jboss-portal-modules-test
-      1.2.0-SNAPSHOT
+      module-parent
+      1.2.0-Beta1
       ../build/pom.xml
    
    4.0.0

Modified: modules/test/trunk/test/agent/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/test/trunk/test/agent/pom.xml	2008-02-09 11:37:47 UTC (rev 9885)
+++ modules/test/trunk/test/agent/pom.xml	2008-02-09 12:00:40 UTC (rev 9886)
@@ -2,8 +2,8 @@
          xsi:schemaLocation=3D"http://maven.apache.org/POM/4.0.0 http://ma=
ven.apache.org/maven-v4_0_0.xsd">
    
       org.jboss.unit
-      jboss-portal-modules-test
-      1.2.0-SNAPSHOT
+      module-parent
+      1.2.0-Beta1
       ../../build/pom.xml
    
    4.0.0

Modified: modules/test/trunk/test/core/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/test/trunk/test/core/pom.xml	2008-02-09 11:37:47 UTC (rev 9885)
+++ modules/test/trunk/test/core/pom.xml	2008-02-09 12:00:40 UTC (rev 9886)
@@ -2,8 +2,8 @@
          xsi:schemaLocation=3D"http://maven.apache.org/POM/4.0.0 http://ma=
ven.apache.org/maven-v4_0_0.xsd">
    
       org.jboss.unit
-      jboss-portal-modules-test
-      1.2.0-SNAPSHOT
+      module-parent
+      1.2.0-Beta1
       ../../build/pom.xml
    
    4.0.0

Modified: modules/test/trunk/test/generic/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/test/trunk/test/generic/pom.xml	2008-02-09 11:37:47 UTC (rev 98=
85)
+++ modules/test/trunk/test/generic/pom.xml	2008-02-09 12:00:40 UTC (rev 98=
86)
@@ -2,8 +2,8 @@
          xsi:schemaLocation=3D"http://maven.apache.org/POM/4.0.0 http://ma=
ven.apache.org/maven-v4_0_0.xsd">
    
       org.jboss.unit
-      jboss-portal-modules-test
-      1.2.0-SNAPSHOT
+      module-parent
+      1.2.0-Beta1
       ../../build/pom.xml
    
    4.0.0

Modified: modules/test/trunk/test/jboss/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/test/trunk/test/jboss/pom.xml	2008-02-09 11:37:47 UTC (rev 9885)
+++ modules/test/trunk/test/jboss/pom.xml	2008-02-09 12:00:40 UTC (rev 9886)
@@ -2,8 +2,8 @@
          xsi:schemaLocation=3D"http://maven.apache.org/POM/4.0.0 http://ma=
ven.apache.org/maven-v4_0_0.xsd">
    
       org.jboss.unit
-      jboss-portal-modules-test
-      1.2.0-SNAPSHOT
+      module-parent
+      1.2.0-Beta1
       ../../build/pom.xml
    
    4.0.0

Modified: modules/test/trunk/test/opends/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/test/trunk/test/opends/pom.xml	2008-02-09 11:37:47 UTC (rev 988=
5)
+++ modules/test/trunk/test/opends/pom.xml	2008-02-09 12:00:40 UTC (rev 988=
6)
@@ -2,8 +2,8 @@
          xsi:schemaLocation=3D"http://maven.apache.org/POM/4.0.0 http://ma=
ven.apache.org/maven-v4_0_0.xsd">
    
       org.jboss.unit
-      jboss-portal-modules-test
-      1.2.0-SNAPSHOT
+      module-parent
+      1.2.0-Beta1
       ../../build/pom.xml
    
    4.0.0

Modified: modules/test/trunk/tooling/ant/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/test/trunk/tooling/ant/pom.xml	2008-02-09 11:37:47 UTC (rev 988=
5)
+++ modules/test/trunk/tooling/ant/pom.xml	2008-02-09 12:00:40 UTC (rev 988=
6)
@@ -2,8 +2,8 @@
          xsi:schemaLocation=3D"http://maven.apache.org/POM/4.0.0 http://ma=
ven.apache.org/maven-v4_0_0.xsd">
    
       org.jboss.unit
-      jboss-portal-modules-test
-      1.2.0-SNAPSHOT
+      module-parent
+      1.2.0-Beta1
       ../../build/pom.xml
    
    4.0.0

Modified: modules/test/trunk/tooling/core/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/test/trunk/tooling/core/pom.xml	2008-02-09 11:37:47 UTC (rev 98=
85)
+++ modules/test/trunk/tooling/core/pom.xml	2008-02-09 12:00:40 UTC (rev 98=
86)
@@ -2,8 +2,8 @@
          xsi:schemaLocation=3D"http://maven.apache.org/POM/4.0.0 http://ma=
ven.apache.org/maven-v4_0_0.xsd">
    
       org.jboss.unit
-      jboss-portal-modules-test
-      1.2.0-SNAPSHOT
+      module-parent
+      1.2.0-Beta1
       ../../build/pom.xml
    
    4.0.0

Modified: modules/test/trunk/tooling/examples/maven2/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/test/trunk/tooling/examples/maven2/pom.xml	2008-02-09 11:37:47 =
UTC (rev 9885)
+++ modules/test/trunk/tooling/examples/maven2/pom.xml	2008-02-09 12:00:40 =
UTC (rev 9886)
@@ -11,7 +11,7 @@
       
          org.jboss.unit
          jboss-unit
-         1.2.0-SNAPSHOT
+         1.2.0-Beta1
       
    
 =

@@ -39,7 +39,7 @@
          
             org.jboss.unit
             jboss-unit-tooling-maven2
-            1.2.0-SNAPSHOT
+            1.2.0-Beta1
             
                
                   test

Modified: modules/test/trunk/tooling/maven2/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/test/trunk/tooling/maven2/pom.xml	2008-02-09 11:37:47 UTC (rev =
9885)
+++ modules/test/trunk/tooling/maven2/pom.xml	2008-02-09 12:00:40 UTC (rev =
9886)
@@ -2,8 +2,8 @@
          xsi:schemaLocation=3D"http://maven.apache.org/POM/4.0.0 http://ma=
ven.apache.org/maven-v4_0_0.xsd">
    
       org.jboss.unit
-      jboss-portal-modules-test
-      1.2.0-SNAPSHOT
+      module-parent
+      1.2.0-Beta1
       ../../build/pom.xml
    
    4.0.0

Modified: modules/test/trunk/tooling/maven2/src/main/java/org/jboss/unit/to=
oling/maven2/UnitMojo.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/test/trunk/tooling/maven2/src/main/java/org/jboss/unit/tooling/=
maven2/UnitMojo.java	2008-02-09 11:37:47 UTC (rev 9885)
+++ modules/test/trunk/tooling/maven2/src/main/java/org/jboss/unit/tooling/=
maven2/UnitMojo.java	2008-02-09 12:00:40 UTC (rev 9886)
@@ -61,9 +61,9 @@
    /**
     * @parameter
     */
-   private String jpdaSuspend;
+   private String jpdaSuspend =3D "true";
 =

-   /**                                            s
+   /**
     * @parameter
     */
    private boolean useJUL =3D true;

Modified: modules/test/trunk/tooling/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/test/trunk/tooling/pom.xml	2008-02-09 11:37:47 UTC (rev 9885)
+++ modules/test/trunk/tooling/pom.xml	2008-02-09 12:00:40 UTC (rev 9886)
@@ -2,8 +2,8 @@
 
    
       org.jboss.unit
-      jboss-portal-modules-test
-      1.2.0-SNAPSHOT
+      module-parent
+      1.2.0-Beta1
       ../build/pom.xml
    
    4.0.0
@@ -11,7 +11,7 @@
    jboss-unit-tooling-aggregator
    pom
    JBoss Unit Tooling (aggregator)
-   1.2.0-SNAPSHOT
+   1.2.0-Beta1
    
       core
       ant

Modified: modules/test/trunk/unit/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/test/trunk/unit/pom.xml	2008-02-09 11:37:47 UTC (rev 9885)
+++ modules/test/trunk/unit/pom.xml	2008-02-09 12:00:40 UTC (rev 9886)
@@ -2,8 +2,8 @@
          xsi:schemaLocation=3D"http://maven.apache.org/POM/4.0.0 http://ma=
ven.apache.org/maven-v4_0_0.xsd">
    
       org.jboss.unit
-      jboss-portal-modules-test
-      1.2.0-SNAPSHOT
+      module-parent
+      1.2.0-Beta1
       ../build/pom.xml
    
    4.0.0


--===============4054904207372275275==--

From portal-commits at lists.jboss.org Sat Feb  9 07:08:12 2008
Content-Type: multipart/mixed; boundary="===============6336228509084995121=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9887 -
 modules/common/trunk/common/src/main/java/org/jboss/portal/common/io.
Date: Sat, 09 Feb 2008 07:08:12 -0500
Message-ID: 

--===============6336228509084995121==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-09 07:08:11 -0500 (Sat, 09 Feb 2008)
New Revision: 9887

Modified:
   modules/common/trunk/common/src/main/java/org/jboss/portal/common/io/Ser=
ializationFilter.java
Log:
use gzip output stream finish instead of flush

Modified: modules/common/trunk/common/src/main/java/org/jboss/portal/common=
/io/SerializationFilter.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/common/trunk/common/src/main/java/org/jboss/portal/common/io/Se=
rializationFilter.java	2008-02-09 12:00:40 UTC (rev 9886)
+++ modules/common/trunk/common/src/main/java/org/jboss/portal/common/io/Se=
rializationFilter.java	2008-02-09 12:08:11 UTC (rev 9887)
@@ -59,6 +59,7 @@
       {
          GZIPOutputStream zos =3D new GZIPOutputStream(out);
          serialization.serialize(t, zos);
+         zos.finish();
       }
 =

       public  T unserialize(Serialization serialization, InputStream=
 in) throws IllegalArgumentException, IOException


--===============6336228509084995121==--

From portal-commits at lists.jboss.org Sat Feb  9 07:14:29 2008
Content-Type: multipart/mixed; boundary="===============3427184136352882990=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9888 - in
 modules/portlet/trunk/test/src:
 main/java/org/jboss/portal/portlet/controller/state and 2 other directories.
Date: Sat, 09 Feb 2008 07:14:28 -0500
Message-ID: 

--===============3427184136352882990==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-09 07:14:27 -0500 (Sat, 09 Feb 2008)
New Revision: 9888

Added:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contro=
ller/state/PageNavigationalStateSerialization.java
Modified:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contro=
ller/impl/state/PageNavigationalStateImpl.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contro=
ller/impl/state/StateControllerContextImpl.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contro=
ller/state/PageNavigationalState.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contro=
ller/state/WindowNavigationalState.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/c=
ontroller/AbstractPortletControllerContext.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/c=
ontroller/PortletURLRenderer.java
   modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/contro=
ller/StateControllerContextTestCase.java
Log:
extract page navigational state serialization for better reusability

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/controller/impl/state/PageNavigationalStateImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr=
oller/impl/state/PageNavigationalStateImpl.java	2008-02-09 12:08:11 UTC (re=
v 9887)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr=
oller/impl/state/PageNavigationalStateImpl.java	2008-02-09 12:14:27 UTC (re=
v 9888)
@@ -43,7 +43,7 @@
 class PageNavigationalStateImpl implements PageNavigationalState, Serializ=
able
 {
 =

-   /** We don't save it. */
+   /** . */
    protected final StateControllerContextImpl context;
 =

    /** . */
@@ -116,6 +116,11 @@
       return publicNavigationalState;
    }
 =

+   public Set getPublicNames()
+   {
+      return page.keySet();
+   }
+
    public String[] getPublicNavigationalState(QName name)
    {
       return page.get(name).clone();

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/controller/impl/state/StateControllerContextImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr=
oller/impl/state/StateControllerContextImpl.java	2008-02-09 12:08:11 UTC (r=
ev 9887)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr=
oller/impl/state/StateControllerContextImpl.java	2008-02-09 12:14:27 UTC (r=
ev 9888)
@@ -25,24 +25,7 @@
 import org.jboss.portal.portlet.controller.PortletControllerContext;
 import org.jboss.portal.portlet.controller.state.PageNavigationalState;
 import org.jboss.portal.portlet.controller.state.StateControllerContext;
-import org.jboss.portal.portlet.controller.state.WindowNavigationalState;
-import org.jboss.portal.portlet.StateString;
-import org.jboss.portal.portlet.ParametersStateString;
-import org.jboss.portal.WindowState;
-import org.jboss.portal.Mode;
-import org.jboss.portal.common.io.UndeclaredIOException;
 =

-import javax.xml.namespace.QName;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.DataOutputStream;
-import java.io.DataInputStream;
-import java.util.zip.GZIPInputStream;
-import java.util.zip.GZIPOutputStream;
-import java.util.Map;
-import java.util.HashMap;
-
 /**
  * @author Julien Viet
  * @version $Revision: 630 $
@@ -50,35 +33,8 @@
 public class StateControllerContextImpl implements StateControllerContext
 {
 =

-   /** . */
-   private static final Map windowStateToCode =3D ne=
w HashMap();
 =

    /** . */
-   private static final Map modeToCode =3D new HashMap();
-
-   /** . */
-   private static final Map codeToWindowState =3D ne=
w HashMap();
-
-   /** . */
-   private static final Map codeToMode =3D new HashMap();
-
-   static
-   {
-      windowStateToCode.put(WindowState.NORMAL, 1);
-      windowStateToCode.put(WindowState.MINIMIZED, 2);
-      windowStateToCode.put(WindowState.MAXIMIZED, 3);
-      codeToWindowState.put(1, WindowState.NORMAL);
-      codeToWindowState.put(2, WindowState.MINIMIZED);
-      codeToWindowState.put(3, WindowState.MAXIMIZED);
-      modeToCode.put(Mode.VIEW, 1);
-      modeToCode.put(Mode.EDIT, 2);
-      modeToCode.put(Mode.HELP, 3);
-      codeToMode.put(1, Mode.VIEW);
-      codeToMode.put(2, Mode.EDIT);
-      codeToMode.put(3, Mode.HELP);
-   }
-
-   /** . */
    protected final PortletControllerContext portletControllerContext;
 =

    public StateControllerContextImpl(PortletControllerContext portletContr=
ollerContext)
@@ -101,167 +57,4 @@
    {
       return new PageNavigationalStateImpl(this, modifiable);
    }
-
-   public byte[] serialize(PageNavigationalState object) =

-   {
-      try
-      {
-         PageNavigationalStateImpl pageState =3D (PageNavigationalStateImp=
l)object;
-         ByteArrayOutputStream baos =3D new ByteArrayOutputStream();
-         GZIPOutputStream zos =3D new GZIPOutputStream(baos);
-         DataOutputStream out =3D new DataOutputStream(zos);
-
-         //
-         out.writeInt(pageState.windows.size());
-         for (Map.Entry entry : pageState=
.windows.entrySet())
-         {
-            out.writeUTF(entry.getKey());
-            WindowNavigationalState windowNS =3D entry.getValue();
-            byte header =3D 0;
-            int decision =3D 0;
-            if (windowNS.getPortletNavigationalState() !=3D null)
-            {
-               header |=3D 1;
-               decision |=3D 1;
-            }
-            if (windowNS.getWindowState() !=3D null)
-            {
-               Integer value =3D windowStateToCode.get(windowNS.getWindowS=
tate());
-               if (value !=3D null)
-               {
-                  header |=3D value << 1;
-               }
-               else
-               {
-                  header |=3D 4 << 1;
-                  decision |=3D 2;
-               }
-            }
-            if (windowNS.getMode() !=3D null)
-            {
-               Integer value =3D modeToCode.get(windowNS.getMode());
-               if (value !=3D null)
-               {
-                  header |=3D value << 4;
-               }
-               else
-               {
-                  header |=3D 4 << 4;
-                  decision |=3D 4;
-               }
-            }
-            out.writeByte(header);
-            if ((decision & 1) !=3D 0)
-            {
-               windowNS.getPortletNavigationalState().writeTo(out);
-            }
-            if ((decision & 2) !=3D 0)
-            {
-               out.writeUTF(windowNS.getWindowState().toString());
-            }
-            if ((decision & 4) !=3D 0)
-            {
-               out.writeUTF(windowNS.getMode().toString());
-            }
-         }
-
-         //
-         Map publicNS =3D pageState.page;
-         out.writeInt(publicNS.size());
-         for (Map.Entry entry : publicNS.entrySet())
-         {
-            QName name =3D entry.getKey();
-            out.writeUTF(name.getNamespaceURI());
-            out.writeUTF(name.getLocalPart());
-            String[] values =3D entry.getValue();
-            int length =3D values.length;
-            out.writeInt(length);
-            for (String value : values)
-            {
-               out.writeUTF(value);
-            }
-         }
-
-         //
-         out.close();
-         return baos.toByteArray();
-      }
-      catch (IOException e)
-      {
-         throw new UndeclaredIOException(e);
-      }
-   }
-
-   public PageNavigationalState unserialize(byte[] bytes, boolean modifiab=
le)
-   {
-      try
-      {
-         ByteArrayInputStream bais =3D new ByteArrayInputStream(bytes);
-         GZIPInputStream zis =3D new GZIPInputStream(bais);
-         DataInputStream in =3D new DataInputStream(zis);
-         PageNavigationalStateImpl pageState =3D new PageNavigationalState=
Impl(this, modifiable);
-
-         //
-         int size =3D in.readInt();
-         while (size-- > 0)
-         {
-            String windowId =3D in.readUTF();
-            byte header =3D in.readByte();
-            StateString portletNS =3D null;
-            if ((header & 1) !=3D 0)
-            {
-               portletNS =3D ParametersStateString.create(in);
-            }
-            WindowState windowState =3D null;
-            int windowStateHeader =3D (header & (7 << 1)) >> 1;
-            switch (windowStateHeader)
-            {
-               case 0:
-                  break;
-               case 4:
-                  windowState =3D WindowState.create(in.readUTF());
-                  break;
-               default:
-                  windowState =3D codeToWindowState.get(windowStateHeader);
-            }
-            Mode mode =3D null;
-            int modeStateHeader =3D (header & (7 << (1 + 3))) >> (1 + 3);
-            switch (modeStateHeader)
-            {
-               case 0:
-                  break;
-               case 4:
-                  mode =3D Mode.create(in.readUTF());
-                  break;
-               default:
-                  mode =3D codeToMode.get(modeStateHeader);
-            }
-            WindowNavigationalState windowNS =3D new WindowNavigationalSta=
te(portletNS, mode, windowState);
-            pageState.windows.put(windowId, windowNS);
-         }
-
-         //
-         size =3D in.readInt();
-         while (size-- > 0)
-         {
-            String namespaceURI =3D in.readUTF();
-            String localName =3D in.readUTF();
-            QName name =3D new QName(namespaceURI, localName);
-            int length =3D in.readInt();
-            String[] values =3D new String[length];
-            for (int i =3D 0;i < length;i++)
-            {
-               values[i] =3D in.readUTF();
-            }
-            pageState.page.put(name, values);
-         }
-
-         //
-         return pageState;
-      }
-      catch (IOException e)
-      {
-         throw new UndeclaredIOException(e);
-      }
-   }
 }

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/controller/state/PageNavigationalState.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr=
oller/state/PageNavigationalState.java	2008-02-09 12:08:11 UTC (rev 9887)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr=
oller/state/PageNavigationalState.java	2008-02-09 12:14:27 UTC (rev 9888)
@@ -77,6 +77,13 @@
    ParameterMap getPublicNavigationalState(String windowId) throws Illegal=
ArgumentException;
 =

    /**
+    * Returns the set of public names.
+    *
+    * @return the public names
+    */
+   Set getPublicNames();
+
+   /**
     * Update the public navigational state of a window. The interpretation=
 of what should be updated is left up to the
     * implementor. An example of implementation would use the mapping betw=
een qname and name provided by the referenced
     * portlet info.

Added: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/co=
ntroller/state/PageNavigationalStateSerialization.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr=
oller/state/PageNavigationalStateSerialization.java	                       =
 (rev 0)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr=
oller/state/PageNavigationalStateSerialization.java	2008-02-09 12:14:27 UTC=
 (rev 9888)
@@ -0,0 +1,234 @@
+/*************************************************************************=
*****
+ * 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.controller.state;
+
+import org.jboss.portal.common.io.Serialization;
+import org.jboss.portal.WindowState;
+import org.jboss.portal.Mode;
+import org.jboss.portal.portlet.StateString;
+import org.jboss.portal.portlet.ParametersStateString;
+
+import javax.xml.namespace.QName;
+import java.io.OutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.DataOutputStream;
+import java.io.DataInputStream;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Set;
+
+/**
+ * Implement serialization of a page navigational state in a compact manne=
r.
+ *
+ * @author Julien Viet
+ * @version $Revision: 630 $
+ */
+public class PageNavigationalStateSerialization implements Serialization
+{
+
+   /** . */
+   private static final Map windowStateToCode =3D ne=
w HashMap();
+
+   /** . */
+   private static final Map modeToCode =3D new HashMap();
+
+   /** . */
+   private static final Map codeToWindowState =3D ne=
w HashMap();
+
+   /** . */
+   private static final Map codeToMode =3D new HashMap();
+
+   static
+   {
+      windowStateToCode.put(WindowState.NORMAL, 1);
+      windowStateToCode.put(WindowState.MINIMIZED, 2);
+      windowStateToCode.put(WindowState.MAXIMIZED, 3);
+      codeToWindowState.put(1, WindowState.NORMAL);
+      codeToWindowState.put(2, WindowState.MINIMIZED);
+      codeToWindowState.put(3, WindowState.MAXIMIZED);
+      modeToCode.put(Mode.VIEW, 1);
+      modeToCode.put(Mode.EDIT, 2);
+      modeToCode.put(Mode.HELP, 3);
+      codeToMode.put(1, Mode.VIEW);
+      codeToMode.put(2, Mode.EDIT);
+      codeToMode.put(3, Mode.HELP);
+   }
+
+   /** . */
+   private final StateControllerContext context;
+
+   public PageNavigationalStateSerialization(StateControllerContext contex=
t)
+   {
+      if (context =3D=3D null)
+      {
+         throw new IllegalArgumentException();
+      }
+      this.context =3D context;
+   }
+
+   public void serialize(PageNavigationalState pageState, OutputStream out=
) throws IOException, IllegalArgumentException
+   {
+      DataOutputStream data =3D out instanceof DataOutputStream ? (DataOut=
putStream)out : new DataOutputStream(out);
+
+      //
+      data.writeInt(pageState.getWindowIds().size());
+      for (String windowId : pageState.getWindowIds())
+      {
+         data.writeUTF(windowId);
+         WindowNavigationalState windowNS =3D pageState.getWindowNavigatio=
nalState(windowId);
+         byte header =3D 0;
+         int decision =3D 0;
+         if (windowNS.getPortletNavigationalState() !=3D null)
+         {
+            header |=3D 1;
+            decision |=3D 1;
+         }
+         if (windowNS.getWindowState() !=3D null)
+         {
+            Integer value =3D windowStateToCode.get(windowNS.getWindowStat=
e());
+            if (value !=3D null)
+            {
+               header |=3D value << 1;
+            }
+            else
+            {
+               header |=3D 4 << 1;
+               decision |=3D 2;
+            }
+         }
+         if (windowNS.getMode() !=3D null)
+         {
+            Integer value =3D modeToCode.get(windowNS.getMode());
+            if (value !=3D null)
+            {
+               header |=3D value << 4;
+            }
+            else
+            {
+               header |=3D 4 << 4;
+               decision |=3D 4;
+            }
+         }
+         data.writeByte(header);
+         if ((decision & 1) !=3D 0)
+         {
+            windowNS.getPortletNavigationalState().writeTo(data);
+         }
+         if ((decision & 2) !=3D 0)
+         {
+            data.writeUTF(windowNS.getWindowState().toString());
+         }
+         if ((decision & 4) !=3D 0)
+         {
+            data.writeUTF(windowNS.getMode().toString());
+         }
+      }
+
+      //
+      Set publicNames =3D pageState.getPublicNames();
+      data.writeInt(publicNames.size());
+      for (QName name : pageState.getPublicNames())
+      {
+         data.writeUTF(name.getNamespaceURI());
+         data.writeUTF(name.getLocalPart());
+         String[] values =3D pageState.getPublicNavigationalState(name);
+         int length =3D values.length;
+         data.writeInt(length);
+         for (String value : values)
+         {
+            data.writeUTF(value);
+         }
+      }
+
+      // Need to flush before returning otherwise bytes may stay in the bu=
ffer when we allocated
+      // a data stream
+      data.flush();
+   }
+
+   public PageNavigationalState unserialize(InputStream in) throws IOExcep=
tion, IllegalArgumentException
+   {
+      DataInputStream data =3D in instanceof DataInputStream ? (DataInputS=
tream)in : new DataInputStream(in);
+
+      //
+      PageNavigationalState pageNS =3D context.createPageState(true);
+
+      //
+      int size =3D data.readInt();
+      while (size-- > 0)
+      {
+         String windowId =3D data.readUTF();
+         byte header =3D data.readByte();
+         StateString portletNS =3D null;
+         if ((header & 1) !=3D 0)
+         {
+            portletNS =3D ParametersStateString.create(data);
+         }
+         WindowState windowState =3D null;
+         int windowStateHeader =3D (header & (7 << 1)) >> 1;
+         switch (windowStateHeader)
+         {
+            case 0:
+               break;
+            case 4:
+               windowState =3D WindowState.create(data.readUTF());
+               break;
+            default:
+               windowState =3D codeToWindowState.get(windowStateHeader);
+         }
+         Mode mode =3D null;
+         int modeStateHeader =3D (header & (7 << (1 + 3))) >> (1 + 3);
+         switch (modeStateHeader)
+         {
+            case 0:
+               break;
+            case 4:
+               mode =3D Mode.create(data.readUTF());
+               break;
+            default:
+               mode =3D codeToMode.get(modeStateHeader);
+         }
+         WindowNavigationalState windowNS =3D new WindowNavigationalState(=
portletNS, mode, windowState);
+         pageNS.setWindowNavigationalState(windowId, windowNS);
+      }
+
+      //
+      size =3D data.readInt();
+      while (size-- > 0)
+      {
+         String namespaceURI =3D data.readUTF();
+         String localName =3D data.readUTF();
+         QName name =3D new QName(namespaceURI, localName);
+         int length =3D data.readInt();
+         String[] values =3D new String[length];
+         for (int i =3D 0;i < length;i++)
+         {
+            values[i] =3D data.readUTF();
+         }
+         pageNS.setPublicNavigationalState(name, values);
+      }
+
+      //
+      return pageNS;
+   }
+}

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/controller/state/WindowNavigationalState.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr=
oller/state/WindowNavigationalState.java	2008-02-09 12:08:11 UTC (rev 9887)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contr=
oller/state/WindowNavigationalState.java	2008-02-09 12:14:27 UTC (rev 9888)
@@ -30,6 +30,7 @@
 =

 /**
  * The navigational state of a window that contains the portlet navigation=
al state, the mode and window state.
+ * This class is immutable.
  *
  * @author Julien Viet
  * @version $Revision: 1.1 $

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/controller/AbstractPortletControllerContext.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
controller/AbstractPortletControllerContext.java	2008-02-09 12:08:11 UTC (r=
ev 9887)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
controller/AbstractPortletControllerContext.java	2008-02-09 12:14:27 UTC (r=
ev 9888)
@@ -27,6 +27,7 @@
 import org.jboss.portal.WindowState;
 import org.jboss.portal.common.io.IOTools;
 import org.jboss.portal.common.io.Serialization;
+import org.jboss.portal.common.io.SerializationFilter;
 import org.jboss.portal.common.util.MarkupInfo;
 import org.jboss.portal.common.util.MediaType;
 import org.jboss.portal.common.util.ParameterMap;
@@ -48,6 +49,7 @@
 import org.jboss.portal.portlet.controller.state.PageNavigationalState;
 import org.jboss.portal.portlet.controller.state.StateControllerContext;
 import org.jboss.portal.portlet.controller.state.WindowNavigationalState;
+import org.jboss.portal.portlet.controller.state.PageNavigationalStateSeri=
alization;
 import org.jboss.portal.portlet.impl.spi.AbstractClientContext;
 import org.jboss.portal.portlet.impl.spi.AbstractRequestContext;
 import org.jboss.portal.portlet.impl.spi.AbstractSecurityContext;
@@ -116,6 +118,9 @@
    {
       StateControllerContextImpl tmp =3D new StateControllerContextImpl(th=
is);
 =

+      //
+      PageNavigationalStateSerialization serialization =3D new PageNavigat=
ionalStateSerialization(tmp);
+
       // The nav state provided with the request
       // Unmarshall portal navigational state if it is provided
       PageNavigationalState pageState =3D null;
@@ -123,7 +128,7 @@
       if (context !=3D null)
       {
          byte[] bytes =3D Base64.decode(context, true);
-         pageState =3D tmp.unserialize(bytes, false);
+         pageState =3D IOTools.unserialize(serialization, SerializationFil=
ter.COMPRESSOR, bytes);
       }
 =

       // The type of invocation
@@ -239,7 +244,7 @@
             else
             {
                byte[] bytes =3D Base64.decode(req.getParameter(PUBLIC_NAVI=
GATIONAL_STATE_CHANGES), true);
-               Map publicNavigationalStateChanges =3D IO=
Tools.unserialize(Serialization.PARAMETER_MAP, bytes);
+               Map publicNavigationalStateChanges =3D IO=
Tools.unserialize(Serialization.PARAMETER_MAP, SerializationFilter.COMPRESS=
OR, bytes);
 =

                //
                request =3D new PortletRenderRequest(

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/controller/PortletURLRenderer.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
controller/PortletURLRenderer.java	2008-02-09 12:08:11 UTC (rev 9887)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
controller/PortletURLRenderer.java	2008-02-09 12:14:27 UTC (rev 9888)
@@ -25,6 +25,7 @@
 =

 import org.jboss.portal.common.io.IOTools;
 import org.jboss.portal.common.io.Serialization;
+import org.jboss.portal.common.io.SerializationFilter;
 import org.jboss.portal.common.text.CharBuffer;
 import org.jboss.portal.common.text.FastURLEncoder;
 import org.jboss.portal.common.util.Base64;
@@ -37,6 +38,7 @@
 import org.jboss.portal.portlet.cache.CacheLevel;
 import org.jboss.portal.portlet.controller.impl.state.StateControllerConte=
xtImpl;
 import org.jboss.portal.portlet.controller.state.PageNavigationalState;
+import org.jboss.portal.portlet.controller.state.PageNavigationalStateSeri=
alization;
 import static org.jboss.portal.portlet.test.URLParameterConstants.*;
 =

 import javax.servlet.http.HttpServletRequest;
@@ -56,6 +58,9 @@
    final StateControllerContextImpl stateContext;
 =

    /** . */
+   final PageNavigationalStateSerialization serialization;
+
+   /** . */
    final HttpServletRequest clientReq;
 =

    /** . */
@@ -74,6 +79,7 @@
       this.pageNS =3D pageNS;
       this.clientReq =3D clientReq;
       this.clientResp =3D clientResp;
+      this.serialization =3D new PageNavigationalStateSerialization(stateC=
ontext);
    }
 =

    private String renderURL(Map parameters, Boolean wantSe=
cure, Boolean wantAuthenticated, boolean relative)
@@ -116,7 +122,7 @@
       String pageState =3D null;
       if (pageNS !=3D null)
       {
-         byte[] bytes =3D stateContext.serialize(pageNS);
+         byte[] bytes =3D IOTools.serialize(serialization, SerializationFi=
lter.COMPRESSOR, pageNS);
          pageState =3D Base64.encodeBytes(bytes, true);
       }
 =

@@ -169,7 +175,7 @@
       String pageState =3D null;
       if (pageNS !=3D null)
       {
-         byte[] bytes =3D stateContext.serialize(pageNS);
+         byte[] bytes =3D IOTools.serialize(serialization, SerializationFi=
lter.COMPRESSOR, pageNS);
          pageState =3D Base64.encodeBytes(bytes, true);
       }
 =

@@ -216,7 +222,7 @@
 =

             //
             Map changes =3D renderURL.getPublicNavigatio=
nalStateChanges();
-            byte[] bytes =3D IOTools.serialize(Serialization.PARAMETER_MAP=
, changes);
+            byte[] bytes =3D IOTools.serialize(Serialization.PARAMETER_MAP=
, SerializationFilter.COMPRESSOR, changes);
             String ns =3D Base64.encodeBytes(bytes, true);
             parameters.put(PUBLIC_NAVIGATIONAL_STATE_CHANGES, ns);
 =


Modified: modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet=
/controller/StateControllerContextTestCase.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/contr=
oller/StateControllerContextTestCase.java	2008-02-09 12:08:11 UTC (rev 9887)
+++ modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/contr=
oller/StateControllerContextTestCase.java	2008-02-09 12:14:27 UTC (rev 9888)
@@ -27,6 +27,7 @@
 import org.jboss.portal.portlet.controller.state.PageNavigationalState;
 import org.jboss.portal.portlet.controller.state.StateControllerContext;
 import org.jboss.portal.portlet.controller.state.WindowNavigationalState;
+import org.jboss.portal.portlet.controller.state.PageNavigationalStateSeri=
alization;
 import org.jboss.portal.portlet.controller.event.EventControllerContext;
 import org.jboss.portal.portlet.info.PortletInfo;
 import org.jboss.portal.portlet.PortletInvokerException;
@@ -38,6 +39,8 @@
 import org.jboss.portal.portlet.invocation.ResourceInvocation;
 import org.jboss.portal.portlet.spi.PortletInvocationContext;
 import org.jboss.portal.common.NotYetImplemented;
+import org.jboss.portal.common.io.IOTools;
+import org.jboss.portal.common.io.SerializationFilter;
 import org.jboss.portal.Mode;
 import org.jboss.portal.WindowState;
 import static org.jboss.unit.api.Assert.*;
@@ -96,8 +99,8 @@
 =

    private void assertMarshallable(PageNavigationalState pageNS)
    {
-      byte[] bytes =3D cc.serialize(pageNS);
-      PageNavigationalState expectedPageNS =3D cc.unserialize(bytes, true);
+      byte[] bytes =3D IOTools.serialize(new PageNavigationalStateSerializ=
ation(cc), /*SerializationFilter.COMPRESSOR, */pageNS);
+      PageNavigationalState expectedPageNS =3D IOTools.unserialize(new Pag=
eNavigationalStateSerialization(cc), /*SerializationFilter.COMPRESSOR, */by=
tes);
       assertEquals(expectedPageNS.getWindowIds(), pageNS.getWindowIds());
       for (String windowId : expectedPageNS.getWindowIds())
       {


--===============3427184136352882990==--

From portal-commits at lists.jboss.org Sat Feb  9 07:42:29 2008
Content-Type: multipart/mixed; boundary="===============2903818137347116360=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9889 -
 modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp.
Date: Sat, 09 Feb 2008 07:42:28 -0500
Message-ID: 

--===============2903818137347116360==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-09 07:42:28 -0500 (Sat, 09 Feb 2008)
New Revision: 9889

Removed:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/response/
Log:
delete empty dir


--===============2903818137347116360==--

From portal-commits at lists.jboss.org Sat Feb  9 08:17:09 2008
Content-Type: multipart/mixed; boundary="===============4872176649274644035=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9890 - in modules/portlet/trunk:
 bridge and 12 other directories.
Date: Sat, 09 Feb 2008 08:17:09 -0500
Message-ID: 

--===============4872176649274644035==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: bdaw
Date: 2008-02-09 08:17:09 -0500 (Sat, 09 Feb 2008)
New Revision: 9890

Added:
   modules/portlet/trunk/portlet-controller/src/main/java/org/jboss/portal/=
portlet/controller/
   modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/unit/report=
s/
   modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/unit/report=
s/TestCaseAPF.java
   modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/unit/report=
s/TestCaseAnnotationProcessor.java
Removed:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/contro=
ller/
Modified:
   modules/portlet/trunk/bridge/pom.xml
   modules/portlet/trunk/build/pom.xml
   modules/portlet/trunk/federation/pom.xml
   modules/portlet/trunk/jsr168api/pom.xml
   modules/portlet/trunk/management/pom.xml
   modules/portlet/trunk/pom.xml
   modules/portlet/trunk/portlet-controller/pom.xml
   modules/portlet/trunk/portlet/pom.xml
   modules/portlet/trunk/test/pom.xml
   modules/portlet/trunk/test/src/test/build.xml
Log:
extracted portlet-controller module and version update to 2.0-SNAPSHOT

Modified: modules/portlet/trunk/bridge/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/bridge/pom.xml	2008-02-09 12:42:28 UTC (rev 9889)
+++ modules/portlet/trunk/bridge/pom.xml	2008-02-09 13:17:09 UTC (rev 9890)
@@ -3,7 +3,7 @@
    
       org.jboss.portal.portlet
       module-parent
-      1.2.0-SNAPSHOT
+      2.0-SNAPSHOT
       ../build/pom.xml
    
    4.0.0

Modified: modules/portlet/trunk/build/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/build/pom.xml	2008-02-09 12:42:28 UTC (rev 9889)
+++ modules/portlet/trunk/build/pom.xml	2008-02-09 13:17:09 UTC (rev 9890)
@@ -18,7 +18,7 @@
   4.0.0
   org.jboss.portal.portlet
   module-parent
-  1.2.0-SNAPSHOT
+  2.0-SNAPSHOT
   pom
   JBoss Portal Portlet Module
   http://www.jboss.com/products/jbossmc
@@ -40,7 +40,7 @@
       2.2.1.GA
       1.2.0-SNAPSHOT
       1.2.0-SNAPSHOT
-      1.2.0-SNAPSHOT
+      1.2.0-Beta1
       1.2.14
       1.1.1
       3.0.1

Modified: modules/portlet/trunk/federation/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/federation/pom.xml	2008-02-09 12:42:28 UTC (rev 9=
889)
+++ modules/portlet/trunk/federation/pom.xml	2008-02-09 13:17:09 UTC (rev 9=
890)
@@ -3,7 +3,7 @@
    
       org.jboss.portal.portlet
       module-parent
-      1.2.0-SNAPSHOT
+      2.0-SNAPSHOT
       ../build/pom.xml
    
    4.0.0

Modified: modules/portlet/trunk/jsr168api/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/jsr168api/pom.xml	2008-02-09 12:42:28 UTC (rev 98=
89)
+++ modules/portlet/trunk/jsr168api/pom.xml	2008-02-09 13:17:09 UTC (rev 98=
90)
@@ -3,7 +3,7 @@
    
       org.jboss.portal.portlet
       module-parent
-      1.2.0-SNAPSHOT
+      2.0-SNAPSHOT
       ../build/pom.xml
    
    4.0.0

Modified: modules/portlet/trunk/management/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/management/pom.xml	2008-02-09 12:42:28 UTC (rev 9=
889)
+++ modules/portlet/trunk/management/pom.xml	2008-02-09 13:17:09 UTC (rev 9=
890)
@@ -3,7 +3,7 @@
    
       org.jboss.portal.portlet
       module-parent
-      1.2.0-SNAPSHOT
+      2.0-SNAPSHOT
       ../build/pom.xml
    
    4.0.0

Modified: modules/portlet/trunk/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/pom.xml	2008-02-09 12:42:28 UTC (rev 9889)
+++ modules/portlet/trunk/pom.xml	2008-02-09 13:17:09 UTC (rev 9890)
@@ -5,7 +5,7 @@
    module-aggregator
    pom
    JBoss Portal Portlet Module Aggregator
-   1.2.0-SNAPSHOT
+   2.0-SNAPSHOT
    http://labs.jboss.com/jbossportal
 =

    
@@ -29,6 +29,7 @@
       build
       jsr168api
       portlet
+      portlet-controller
       bridge
       federation
       management

Modified: modules/portlet/trunk/portlet/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/pom.xml	2008-02-09 12:42:28 UTC (rev 9889)
+++ modules/portlet/trunk/portlet/pom.xml	2008-02-09 13:17:09 UTC (rev 9890)
@@ -3,7 +3,7 @@
    
       org.jboss.portal.portlet
       module-parent
-      1.2.0-SNAPSHOT
+      2.0-SNAPSHOT
       ../build/pom.xml
    
    4.0.0
@@ -40,6 +40,14 @@
          jaxb-api
       
 =

+      
+         sun.jdk
+         tools
+         1.5.0
+         system
+         ${JAVA_HOME}/lib/tools.jar
+      
+
       
       
          org.jboss.unit
@@ -100,6 +108,27 @@
                
             
          
+
+         
+            org.apache.myfaces.tobago
+            maven-apt-plugin
+            
+               
+                  test
+                  
+                     
+                     
+                     1.5
+                     true
+                     true
+                     org.jboss.portal.unit.reports.TestCaseAPF
+                  
+                  
+                     testExecute
+                  
+               
+            
+         
       
    
 =


Added: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/unit/re=
ports/TestCaseAPF.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/unit/repor=
ts/TestCaseAPF.java	                        (rev 0)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/unit/repor=
ts/TestCaseAPF.java	2008-02-09 13:17:09 UTC (rev 9890)
@@ -0,0 +1,65 @@
+/*
+* 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.unit.reports;
+
+import com.sun.mirror.apt.AnnotationProcessorFactory;
+import com.sun.mirror.apt.AnnotationProcessor;
+import com.sun.mirror.apt.AnnotationProcessorEnvironment;
+import com.sun.mirror.apt.AnnotationProcessors;
+import com.sun.mirror.declaration.AnnotationTypeDeclaration;
+
+import java.util.Collection;
+import java.util.Set;
+import java.util.Collections;
+
+/**
+ * @author Boleslaw Dawidowicz
+ * @version : 0.1 $
+ */
+public class TestCaseAPF implements AnnotationProcessorFactory
+{
+   public Collection supportedOptions()
+   {
+      return Collections.emptyList();
+   }
+
+   public Collection supportedAnnotationTypes()
+   {
+      return Collections.singletonList("org.jboss.portal.unit.annotations.=
TestCase");
+   }
+
+   public AnnotationProcessor getProcessorFor(Set annotationTypeDeclarations, AnnotationProcessorEnvironment annotationPro=
cessorEnvironment)
+   {
+      System.out.println("### HERE");
+      AnnotationProcessor result;
+      if(annotationTypeDeclarations.isEmpty()) {
+         result =3D AnnotationProcessors.NO_OP;
+      }
+      else {
+         // Next Step - implement this class:
+         result =3D new TestCaseAnnotationProcessor(annotationProcessorEnv=
ironment);
+      }
+      return result;
+
+   }
+}

Added: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/unit/re=
ports/TestCaseAnnotationProcessor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/unit/repor=
ts/TestCaseAnnotationProcessor.java	                        (rev 0)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/unit/repor=
ts/TestCaseAnnotationProcessor.java	2008-02-09 13:17:09 UTC (rev 9890)
@@ -0,0 +1,114 @@
+/*
+* 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.unit.reports;
+
+import com.sun.mirror.apt.AnnotationProcessor;
+import com.sun.mirror.apt.AnnotationProcessorEnvironment;
+import com.sun.mirror.declaration.AnnotationTypeDeclaration;
+import com.sun.mirror.declaration.Declaration;
+import com.sun.mirror.declaration.AnnotationMirror;
+import com.sun.mirror.declaration.AnnotationTypeElementDeclaration;
+import com.sun.mirror.declaration.AnnotationValue;
+import com.sun.mirror.util.SourcePosition;
+
+import java.util.Collection;
+import java.util.Map;
+import java.io.File;
+import java.io.OutputStream;
+import java.io.FileOutputStream;
+import java.io.PrintStream;
+import java.io.FileNotFoundException;
+
+/**
+ * @author Boleslaw Dawidowicz
+ * @version : 0.1 $
+ */
+public class TestCaseAnnotationProcessor implements AnnotationProcessor
+{
+
+   private AnnotationProcessorEnvironment environment;
+
+	private AnnotationTypeDeclaration testCaseDeclaration;
+
+	public TestCaseAnnotationProcessor(AnnotationProcessorEnvironment env) {
+
+      environment =3D env;
+		testCaseDeclaration =3D (AnnotationTypeDeclaration) environment
+				.getTypeDeclaration("org.jboss.portal.unit.annotations.TestCase");
+	}
+
+   public void process()
+   {
+      Collection declarations =3D environment
+				.getDeclarationsAnnotatedWith(testCaseDeclaration);
+		for (Declaration declaration : declarations) {
+			processAnnotations(declaration);
+		}
+   }
+
+   private void processAnnotations(Declaration declaration) {
+		// Get all of the annotation usage for this declaration.
+		// the annotation mirror is a reflection of what is in the source.
+
+      File f =3D new File("./apt-output.txt");
+
+      PrintStream ps =3D null;
+
+      try
+      {
+         ps =3D new PrintStream(f);
+      }
+      catch (FileNotFoundException e)
+      {
+         e.printStackTrace();  //To change body of catch statement use Fil=
e | Settings | File Templates.
+      }
+
+
+      Collection annotations =3D declaration
+				.getAnnotationMirrors();
+		// iterate over the mirrors.
+		for (AnnotationMirror mirror : annotations) {
+			// if the mirror in this iteration is for our note declaration...
+			if(mirror.getAnnotationType().getDeclaration().equals(
+					testCaseDeclaration)) {
+
+				// print out the goodies.
+				SourcePosition position =3D mirror.getPosition();
+				Map values =3D mirr=
or
+						.getElementValues();
+
+				ps.println("Declaration: " + declaration.toString());
+				ps.println("Position: " + position);
+				ps.println("Values:");
+				for (Map.Entry entr=
y : values
+						.entrySet()) {
+					AnnotationTypeElementDeclaration elemDecl =3D entry.getKey();
+					AnnotationValue value =3D entry.getValue();
+					ps.println("    " + elemDecl + "=3D" + value);
+				}
+			}
+		}
+      ps.close();
+
+   }
+}

Modified: modules/portlet/trunk/portlet-controller/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet-controller/pom.xml	2008-02-09 12:42:28 UT=
C (rev 9889)
+++ modules/portlet/trunk/portlet-controller/pom.xml	2008-02-09 13:17:09 UT=
C (rev 9890)
@@ -17,7 +17,7 @@
          org.jboss.portal.portlet
          portlet-portlet
          ${project.version}
-         test-jar
+         jar
       
 =

       

Copied: modules/portlet/trunk/portlet-controller/src/main/java/org/jboss/po=
rtal/portlet/controller (from rev 9884, modules/portlet/trunk/test/src/main=
/java/org/jboss/portal/portlet/controller)

Modified: modules/portlet/trunk/test/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/pom.xml	2008-02-09 12:42:28 UTC (rev 9889)
+++ modules/portlet/trunk/test/pom.xml	2008-02-09 13:17:09 UTC (rev 9890)
@@ -3,7 +3,7 @@
    
       org.jboss.portal.portlet
       module-parent
-      1.2.0-SNAPSHOT
+      2.0-SNAPSHOT
       ../build/pom.xml
    
    4.0.0
@@ -19,8 +19,14 @@
          ${project.version}
          test-jar
       
+      
+         org.jboss.portal.portlet
+         portlet-controller
+         ${project.version}
+      
 =

-      
+
+
       
          org.jboss.portal.portlet
          portlet-portlet
@@ -355,6 +361,8 @@
                                   value=3D"${maven.dependency.javax.portle=
t.portlet-api.jar.path}"/>
                         
+                        
 			               
                         
          
       
+      
+         
+      
       
          
       
@@ -394,10 +397,14 @@
          
          
 =

+         
+
          
          
          
 =

+
+
          
          
          
@@ -430,6 +437,8 @@
          
          
 =

+         
+
          
          
          
@@ -697,8 +706,11 @@
          
          
 =

+
          
 =

+         
+
          
          
          


--===============4872176649274644035==--

From portal-commits at lists.jboss.org Sat Feb  9 08:33:22 2008
Content-Type: multipart/mixed; boundary="===============5128151684445560589=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9891 -
 modules/portlet/trunk/portlet-controller/src/main/java/org/jboss/portal/portlet.
Date: Sat, 09 Feb 2008 08:33:22 -0500
Message-ID: 

--===============5128151684445560589==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: bdaw
Date: 2008-02-09 08:33:22 -0500 (Sat, 09 Feb 2008)
New Revision: 9891

Removed:
   modules/portlet/trunk/portlet-controller/src/main/java/org/jboss/portal/=
portlet/controller/
Log:
first step: hope it won't make it worse..


--===============5128151684445560589==--

From portal-commits at lists.jboss.org Sat Feb  9 08:41:37 2008
Content-Type: multipart/mixed; boundary="===============0111428706996990469=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9892 - in
 modules/portlet/trunk/test/src/test/resources/simple-portal-war: layouts and
 1 other directory.
Date: Sat, 09 Feb 2008 08:41:36 -0500
Message-ID: 

--===============0111428706996990469==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: wesleyhales
Date: 2008-02-09 08:41:36 -0500 (Sat, 09 Feb 2008)
New Revision: 9892

Removed:
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/=
default.jsp
Modified:
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/hom=
e.jsp
Log:
delete file


Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/d=
emo/home.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/ho=
me.jsp	2008-02-09 13:33:22 UTC (rev 9891)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/ho=
me.jsp	2008-02-09 13:41:36 UTC (rev 9892)
@@ -8,7 +8,7 @@
 =

       
           
-             
+            
                
             
              Demo Page Title

Deleted: modules/portlet/trunk/test/src/test/resources/simple-portal-war/la=
youts/default.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts=
/default.jsp	2008-02-09 13:33:22 UTC (rev 9891)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts=
/default.jsp	2008-02-09 13:41:36 UTC (rev 9892)
@@ -1,107 +0,0 @@
-<%@ page contentType=3D"text/html" %>
-<%@ page language=3D"java" %>
-<%@ taglib prefix=3D"jbp" tagdir=3D"/WEB-INF/tags/portal" %>
-<%@ taglib uri=3D"/WEB-INF/portal.tld" prefix=3D"portal" %>
-<%@ page isELIgnored=3D"false" %>
-
-
-
-
-   Portlet Container 2.0
-   
-
-
-
-
-   
-      
-      
-      

-   
-   <%@ include file=3D"nav/main.jsp" %>
-
-   
-      
-         
-            
-               
-            
-            Demo Page Title
-            Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed =
do eiusmod tempor incididunt ut labore et
-            dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exe=
rcitation ullamco laboris nisi ut aliquip
-            ex ea commodo consequat. Duis aute irure dolor in reprehenderi=
t in voluptate velit esse cillum dolore eu
-            fugiat nulla pariatur. Excepteur sint occaecat cupidatat non p=
roident, sunt in culpa qui officia deserunt
-            mollit anim id est laborum.
-            

-            Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed =
do eiusmod tempor incididunt ut labore et
-            dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exe=
rcitation ullamco laboris nisi ut aliquip
-            ex ea commodo consequat. Duis aute irure dolor in reprehenderi=
t in voluptate velit esse cillum dolore eu
-            fugiat nulla pariatur. Excepteur sint occaecat cupidatat non p=
roident, sunt in culpa qui officia deserunt
-            mollit anim id est laborum.
-            

-            Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed =
do eiusmod tempor incididunt ut labore et
-            dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exe=
rcitation ullamco laboris nisi ut aliquip
-            ex ea commodo consequat. Duis aute irure dolor in reprehenderi=
t in voluptate velit esse cillum dolore eu
-            fugiat nulla pariatur. Excepteur sint occaecat cupidatat non p=
roident, sunt in culpa qui officia deserunt
-            mollit anim id est laborum.
-            

-            Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed =
do eiusmod tempor incididunt ut labore et
-            dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exe=
rcitation ullamco laboris nisi ut aliquip
-            ex ea commodo consequat. Duis aute irure dolor in reprehenderi=
t in voluptate velit esse cillum dolore eu
-            fugiat nulla pariatur. Excepteur sint occaecat cupidatat non p=
roident, sunt in culpa qui officia deserunt
-            mollit anim id est laborum.
-            

-            Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed =
do eiusmod tempor incididunt ut labore et
-            dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exe=
rcitation ullamco laboris nisi ut aliquip
-            ex ea commodo consequat. Duis aute irure dolor in reprehenderi=
t in voluptate velit esse cillum dolore eu
-            fugiat nulla pariatur. Excepteur sint occaecat cupidatat non p=
roident, sunt in culpa qui officia deserunt
-            mollit anim id est laborum.
-            

-            Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed =
do eiusmod tempor incididunt ut labore et
-            dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exe=
rcitation ullamco laboris nisi ut aliquip
-            ex ea commodo consequat. Duis aute irure dolor in reprehenderi=
t in voluptate velit esse cillum dolore eu
-            fugiat nulla pariatur. Excepteur sint occaecat cupidatat non p=
roident, sunt in culpa qui officia deserunt
-            mollit anim id est laborum.
-            

-            Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed =
do eiusmod tempor incididunt ut labore et
-            dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exe=
rcitation ullamco laboris nisi ut aliquip
-            ex ea commodo consequat. Duis aute irure dolor in reprehenderi=
t in voluptate velit esse cillum dolore eu
-            fugiat nulla pariatur. Excepteur sint occaecat cupidatat non p=
roident, sunt in culpa qui officia deserunt
-            mollit anim id est laborum.
-            

-            Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed =
do eiusmod tempor incididunt ut labore et
-            dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exe=
rcitation ullamco laboris nisi ut aliquip
-            ex ea commodo consequat. Duis aute irure dolor in reprehenderi=
t in voluptate velit esse cillum dolore eu
-            fugiat nulla pariatur. Excepteur sint occaecat cupidatat non p=
roident, sunt in culpa qui officia deserunt
-            mollit anim id est laborum.
-            

-            Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed =
do eiusmod tempor incididunt ut labore et
-            dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exe=
rcitation ullamco laboris nisi ut aliquip
-            ex ea commodo consequat. Duis aute irure dolor in reprehenderi=
t in voluptate velit esse cillum dolore eu
-            fugiat nulla pariatur. Excepteur sint occaecat cupidatat non p=
roident, sunt in culpa qui officia deserunt
-            mollit anim id est laborum.
-            

-            Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed =
do eiusmod tempor incididunt ut labore et
-            dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exe=
rcitation ullamco laboris nisi ut aliquip
-            ex ea commodo consequat. Duis aute irure dolor in reprehenderi=
t in voluptate velit esse cillum dolore eu
-            fugiat nulla pariatur. Excepteur sint occaecat cupidatat non p=
roident, sunt in culpa qui officia deserunt
-            mollit anim id est laborum.
-            

-            Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed =
do eiusmod tempor incididunt ut labore et
-            dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exe=
rcitation ullamco laboris nisi ut aliquip
-            ex ea commodo consequat. Duis aute irure dolor in reprehenderi=
t in voluptate velit esse cillum dolore eu
-            fugiat nulla pariatur. Excepteur sint occaecat cupidatat non p=
roident, sunt in culpa qui officia deserunt
-            mollit anim id est laborum.
-            

-         
-
-      
-   
-   

-
-
-
-
\ No newline at end of file


--===============0111428706996990469==--

From portal-commits at lists.jboss.org Sat Feb  9 08:46:21 2008
Content-Type: multipart/mixed; boundary="===============7358312671860255371=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9893 -
 modules/portlet/trunk/portlet-controller/src/main/java/org/jboss/portal/portlet.
Date: Sat, 09 Feb 2008 08:46:21 -0500
Message-ID: 

--===============7358312671860255371==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: bdaw
Date: 2008-02-09 08:46:21 -0500 (Sat, 09 Feb 2008)
New Revision: 9893

Added:
   modules/portlet/trunk/portlet-controller/src/main/java/org/jboss/portal/=
portlet/controller/
Log:
part two: fix what I broke. sorry

Copied: modules/portlet/trunk/portlet-controller/src/main/java/org/jboss/po=
rtal/portlet/controller (from rev 9889, modules/portlet/trunk/test/src/main=
/java/org/jboss/portal/portlet/controller)


--===============7358312671860255371==--

From portal-commits at lists.jboss.org Sat Feb  9 08:53:38 2008
Content-Type: multipart/mixed; boundary="===============6791990377727409350=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9894 -
 modules/portlet/trunk/portlet.
Date: Sat, 09 Feb 2008 08:53:38 -0500
Message-ID: 

--===============6791990377727409350==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: bdaw
Date: 2008-02-09 08:53:38 -0500 (Sat, 09 Feb 2008)
New Revision: 9894

Modified:
   modules/portlet/trunk/portlet/pom.xml
Log:
comment out

Modified: modules/portlet/trunk/portlet/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/pom.xml	2008-02-09 13:46:21 UTC (rev 9893)
+++ modules/portlet/trunk/portlet/pom.xml	2008-02-09 13:53:38 UTC (rev 9894)
@@ -40,13 +40,13 @@
          jaxb-api
       
 =

-      
-         sun.jdk
-         tools
-         1.5.0
-         system
-         ${JAVA_HOME}/lib/tools.jar
-      
+      
+         
+         
+         
+         
+         
+      
 =

       
       
@@ -109,26 +109,26 @@
             
          
 =

-         
-            org.apache.myfaces.tobago
-            maven-apt-plugin
-            
-               
-                  test
-                  
+         
+            
+            
+            
+               
+                  
+                  
                      
                      
-                     1.5
-                     true
-                     true
-                     org.jboss.portal.unit.reports.TestCaseAPF
-                  
-                  
-                     testExecute
-                  
-               
-            
-         
+                     
+                     
+                     
+                     
+                  
+                  
+                     
+                  
+               
+            
+         
       
    
 =



--===============6791990377727409350==--

From portal-commits at lists.jboss.org Sat Feb  9 09:00:35 2008
Content-Type: multipart/mixed; boundary="===============5405909838301021121=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9895 -
 modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/unit.
Date: Sat, 09 Feb 2008 09:00:34 -0500
Message-ID: 

--===============5405909838301021121==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: bdaw
Date: 2008-02-09 09:00:34 -0500 (Sat, 09 Feb 2008)
New Revision: 9895

Removed:
   modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/unit/report=
s/
Log:
cleanup


--===============5405909838301021121==--

From portal-commits at lists.jboss.org Sat Feb  9 09:09:09 2008
Content-Type: multipart/mixed; boundary="===============3039853801613862598=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9896 - in modules/portlet/trunk:
 controller and 2 other directories.
Date: Sat, 09 Feb 2008 09:09:09 -0500
Message-ID: 

--===============3039853801613862598==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-09 09:09:09 -0500 (Sat, 09 Feb 2008)
New Revision: 9896

Added:
   modules/portlet/trunk/controller/
Removed:
   modules/portlet/trunk/portlet-controller/
Modified:
   modules/portlet/trunk/controller/pom.xml
   modules/portlet/trunk/pom.xml
   modules/portlet/trunk/test/pom.xml
   modules/portlet/trunk/test/src/test/build.xml
Log:
renamed portlet-controller module to controller

Copied: modules/portlet/trunk/controller (from rev 9895, modules/portlet/tr=
unk/portlet-controller)

Modified: modules/portlet/trunk/controller/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet-controller/pom.xml	2008-02-09 14:00:34 UT=
C (rev 9895)
+++ modules/portlet/trunk/controller/pom.xml	2008-02-09 14:09:09 UTC (rev 9=
896)
@@ -7,7 +7,7 @@
       ../build/pom.xml
    
    4.0.0
-   portlet-controller
+   controller
    jar
    Portlet controller
 =


Modified: modules/portlet/trunk/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/pom.xml	2008-02-09 14:00:34 UTC (rev 9895)
+++ modules/portlet/trunk/pom.xml	2008-02-09 14:09:09 UTC (rev 9896)
@@ -29,7 +29,7 @@
       build
       jsr168api
       portlet
-      portlet-controller
+      controller
       bridge
       federation
       management

Modified: modules/portlet/trunk/test/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/pom.xml	2008-02-09 14:00:34 UTC (rev 9895)
+++ modules/portlet/trunk/test/pom.xml	2008-02-09 14:09:09 UTC (rev 9896)
@@ -21,7 +21,7 @@
       
       
          org.jboss.portal.portlet
-         portlet-controller
+         controller
          ${project.version}
       
 =

@@ -361,8 +361,8 @@
                                   value=3D"${maven.dependency.javax.portle=
t.portlet-api.jar.path}"/>
                         
-                        
+                        
 			               
                         
 =

-
\ No newline at end of file
+

Modified: modules/portlet/trunk/test/src/test/build.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/build.xml	2008-02-09 14:00:34 UTC (=
rev 9895)
+++ modules/portlet/trunk/test/src/test/build.xml	2008-02-09 14:09:09 UTC (=
rev 9896)
@@ -127,8 +127,8 @@
       
          
       
-      
-         
+      
+         
       
       
          
@@ -397,7 +397,7 @@
          
          
 =

-         
+         
 =

          
          
@@ -437,7 +437,7 @@
          
          
 =

-         
+         
 =

          
          
@@ -709,7 +709,7 @@
 =

          
 =

-         
+         
 =

          
          
@@ -801,4 +801,4 @@
 =

    
 =

-
\ No newline at end of file
+


--===============3039853801613862598==--

From portal-commits at lists.jboss.org Sat Feb  9 09:20:51 2008
Content-Type: multipart/mixed; boundary="===============5480080990265871232=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9897 - in
 modules/portlet/trunk/test/src/test/resources/simple-portal-war: css and 3
 other directories.
Date: Sat, 09 Feb 2008 09:20:51 -0500
Message-ID: 

--===============5480080990265871232==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: wesleyhales
Date: 2008-02-09 09:20:51 -0500 (Sat, 09 Feb 2008)
New Revision: 9897

Added:
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/dem=
o1.jsp
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/dem=
o2.jsp
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/dem=
o3.jsp
Removed:
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/=
demo.jsp
Modified:
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/css/mast=
er.css
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/index.jsp
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/=
nav/main.jsp
Log:
layout changes and new pages

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/c=
ss/master.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/css/mas=
ter.css	2008-02-09 14:09:09 UTC (rev 9896)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/css/mas=
ter.css	2008-02-09 14:20:51 UTC (rev 9897)
@@ -204,12 +204,12 @@
 /*-------------------------------Portlet Decoration*/
 =

 div#container div#content div.portlet{
-   /*width: 800px;*/
    border: 1px solid #969696;
    background-color: #e2e2e2;
    padding: 2px;
    float:left;
    margin:10px;
+   width: 95%;
 }
 =

 div#container div#content div.portlet-frame{

Copied: modules/portlet/trunk/test/src/test/resources/simple-portal-war/dem=
o/demo1.jsp (from rev 9894, modules/portlet/trunk/test/src/test/resources/s=
imple-portal-war/demo/demo.jsp)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/de=
mo1.jsp	                        (rev 0)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/de=
mo1.jsp	2008-02-09 14:20:51 UTC (rev 9897)
@@ -0,0 +1,21 @@
+<%@ page contentType=3D"text/html" %>
+<%@ page language=3D"java" %>
+<%@ taglib prefix=3D"jbp" tagdir=3D"/WEB-INF/tags/portal" %>
+<%@ taglib uri=3D"/WEB-INF/portal.tld" prefix=3D"portal" %>
+<%@ page isELIgnored=3D"false" %>
+
+<%@ include file=3D"/layouts/header.jsp" %>
+
+
+   
+   
+            
+
+            
+            
+
+            
+   
+
+
+<%@ include file=3D"/layouts/footer.jsp" %>
\ No newline at end of file

Added: modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo=
/demo2.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/de=
mo2.jsp	                        (rev 0)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/de=
mo2.jsp	2008-02-09 14:20:51 UTC (rev 9897)
@@ -0,0 +1,21 @@
+<%@ page contentType=3D"text/html" %>
+<%@ page language=3D"java" %>
+<%@ taglib prefix=3D"jbp" tagdir=3D"/WEB-INF/tags/portal" %>
+<%@ taglib uri=3D"/WEB-INF/portal.tld" prefix=3D"portal" %>
+<%@ page isELIgnored=3D"false" %>
+
+<%@ include file=3D"/layouts/header.jsp" %>
+
+
+   
+   
+            
+
+            
+            
+
+            
+   
+
+
+<%@ include file=3D"/layouts/footer.jsp" %>
\ No newline at end of file

Added: modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo=
/demo3.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/de=
mo3.jsp	                        (rev 0)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/de=
mo3.jsp	2008-02-09 14:20:51 UTC (rev 9897)
@@ -0,0 +1,21 @@
+<%@ page contentType=3D"text/html" %>
+<%@ page language=3D"java" %>
+<%@ taglib prefix=3D"jbp" tagdir=3D"/WEB-INF/tags/portal" %>
+<%@ taglib uri=3D"/WEB-INF/portal.tld" prefix=3D"portal" %>
+<%@ page isELIgnored=3D"false" %>
+
+<%@ include file=3D"/layouts/header.jsp" %>
+
+
+   
+   
+            
+
+            
+            
+
+            
+   
+
+
+<%@ include file=3D"/layouts/footer.jsp" %>
\ No newline at end of file

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/i=
ndex.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/index.j=
sp	2008-02-09 14:09:09 UTC (rev 9896)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/index.j=
sp	2008-02-09 14:20:51 UTC (rev 9897)
@@ -3,8 +3,6 @@
 <%@ page isELIgnored=3D"false" %>
 
 
-
-   
-
+
 
 

Deleted: modules/portlet/trunk/test/src/test/resources/simple-portal-war/la=
youts/demo.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts=
/demo.jsp	2008-02-09 14:09:09 UTC (rev 9896)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts=
/demo.jsp	2008-02-09 14:20:51 UTC (rev 9897)
@@ -1,47 +0,0 @@
-<%@ page contentType=3D"text/html" %>
-<%@ page language=3D"java" %>
-<%@ taglib prefix=3D"jbp" tagdir=3D"/WEB-INF/tags/portal" %>
-<%@ taglib uri=3D"/WEB-INF/portal.tld" prefix=3D"portal" %>
-<%@ page isELIgnored=3D"false" %>
-
-
-
-
-Portlet Container 2.0
-
-
-
-
-
-   
-      
-      
-         
-      
-      

-   
-   <%@ include file=3D"nav/main.jsp" %>
-  =

-   
-      
-      
-         
-            
-               
-               
-               
-            
-            
-               
-               
-            
-         
-      
-   
-   

-
-
-
-
\ No newline at end of file

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/l=
ayouts/nav/main.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts=
/nav/main.jsp	2008-02-09 14:09:09 UTC (rev 9896)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts=
/nav/main.jsp	2008-02-09 14:20:51 UTC (rev 9897)
@@ -18,6 +18,15 @@
          

             Demo Portlets
          
+         
+            Demo1
+         
+         
+            Demo2
+         
+         
+            Demo3
+         
       
       

    


--===============5480080990265871232==--

From portal-commits at lists.jboss.org Sat Feb  9 09:21:49 2008
Content-Type: multipart/mixed; boundary="===============6753477833782235661=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9898 - in modules/portlet/trunk:
 test and 1 other directories.
Date: Sat, 09 Feb 2008 09:21:49 -0500
Message-ID: 

--===============6753477833782235661==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-09 09:21:49 -0500 (Sat, 09 Feb 2008)
New Revision: 9898

Modified:
   modules/portlet/trunk/controller/pom.xml
   modules/portlet/trunk/test/pom.xml
   modules/portlet/trunk/test/src/test/build.xml
Log:
revert the rename of artifact id of portlet-controller

Modified: modules/portlet/trunk/controller/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/controller/pom.xml	2008-02-09 14:20:51 UTC (rev 9=
897)
+++ modules/portlet/trunk/controller/pom.xml	2008-02-09 14:21:49 UTC (rev 9=
898)
@@ -7,7 +7,7 @@
       ../build/pom.xml
    
    4.0.0
-   controller
+   portlet-controller
    jar
    Portlet controller
 =


Modified: modules/portlet/trunk/test/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/pom.xml	2008-02-09 14:20:51 UTC (rev 9897)
+++ modules/portlet/trunk/test/pom.xml	2008-02-09 14:21:49 UTC (rev 9898)
@@ -21,7 +21,7 @@
       
       
          org.jboss.portal.portlet
-         controller
+         portlet-controller
          ${project.version}
       
 =

@@ -361,8 +361,8 @@
                                   value=3D"${maven.dependency.javax.portle=
t.portlet-api.jar.path}"/>
                         
-                        
+                        
 			               
                         
 =

-
+
\ No newline at end of file

Modified: modules/portlet/trunk/test/src/test/build.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/build.xml	2008-02-09 14:20:51 UTC (=
rev 9897)
+++ modules/portlet/trunk/test/src/test/build.xml	2008-02-09 14:21:49 UTC (=
rev 9898)
@@ -127,8 +127,8 @@
       
          
       
-      
-         
+      
+         
       
       
          
@@ -397,7 +397,7 @@
          
          
 =

-         
+         
 =

          
          
@@ -437,7 +437,7 @@
          
          
 =

-         
+         
 =

          
          
@@ -709,7 +709,7 @@
 =

          
 =

-         
+         
 =

          
          
@@ -801,4 +801,4 @@
 =

    
 =

-
+
\ No newline at end of file


--===============6753477833782235661==--

From portal-commits at lists.jboss.org Sat Feb  9 09:31:51 2008
Content-Type: multipart/mixed; boundary="===============4956475284897354921=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9899 - in
 modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp:
 taglib and 1 other directory.
Date: Sat, 09 Feb 2008 09:31:50 -0500
Message-ID: 

--===============4956475284897354921==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-09 09:31:49 -0500 (Sat, 09 Feb 2008)
New Revision: 9899

Added:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/PortalRenderResponse.java
Modified:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/ControllerFilter.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/JspWriterResponse.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/PageParamTag.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/PageTag.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/PortalBodyTagSupport.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/PortalSimpleTagSupport.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/PortletMarkupTag.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/PortletTag.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/PortletURLTag.java
Log:
rename PortalResponse to PortalRenderResponse

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/ControllerFilter.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/ControllerFilter.java	2008-02-09 14:21:49 UTC (rev 9898)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/ControllerFilter.java	2008-02-09 14:31:49 UTC (rev 9899)
@@ -22,7 +22,7 @@
  *************************************************************************=
*****/
 package org.jboss.portal.portlet.test.jsp;
 =

-import org.jboss.portal.portlet.test.jsp.PortalResponse;
+import org.jboss.portal.portlet.test.jsp.PortalRenderResponse;
 import org.jboss.portal.portlet.test.controller.PortletURLRenderer;
 import org.jboss.portal.portlet.PortletInvoker;
 import org.jboss.portal.portlet.PortletInvokerException;
@@ -207,10 +207,10 @@
       }
 =

       //
-      PortalResponse portalResponse =3D new PortalResponse(resp, context, =
pageState);
+      PortalRenderResponse renderResponse =3D new PortalRenderResponse(res=
p, context, pageState);
 =

       //
-      chain.doFilter(req, portalResponse);
+      chain.doFilter(req, renderResponse);
    }
 =

    public void destroy()
@@ -218,7 +218,7 @@
       this.config =3D null;
    }
 =

-   protected void render(HttpServletRequest req, PortalResponse resp) thro=
ws ServletException, IOException, ClassNotFoundException
+   protected void render(HttpServletRequest req, PortalRenderResponse resp=
) throws ServletException, IOException, ClassNotFoundException
    {
 =

       //

Copied: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/t=
est/jsp/PortalRenderResponse.java (from rev 9898, modules/portlet/trunk/tes=
t/src/main/java/org/jboss/portal/portlet/test/jsp/PortalResponse.java)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/PortalRenderResponse.java	                        (rev 0)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/PortalRenderResponse.java	2008-02-09 14:31:49 UTC (rev 9899)
@@ -0,0 +1,203 @@
+/*************************************************************************=
*****
+ * 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.test.controller.TestInstanceContext;
+import org.jboss.portal.portlet.test.controller.TestPortalContext;
+import org.jboss.portal.portlet.controller.state.PageNavigationalState;
+import org.jboss.portal.portlet.controller.state.WindowNavigationalState;
+import org.jboss.portal.portlet.invocation.response.PortletInvocationRespo=
nse;
+import org.jboss.portal.portlet.invocation.RenderInvocation;
+import org.jboss.portal.portlet.PortletInvokerException;
+import org.jboss.portal.portlet.Portlet;
+import org.jboss.portal.portlet.StateString;
+import org.jboss.portal.portlet.impl.spi.AbstractClientContext;
+import org.jboss.portal.portlet.impl.spi.AbstractServerContext;
+import org.jboss.portal.portlet.impl.spi.AbstractUserContext;
+import org.jboss.portal.portlet.impl.spi.AbstractWindowContext;
+import org.jboss.portal.portlet.impl.spi.AbstractSecurityContext;
+import org.jboss.portal.portlet.spi.PortletInvocationContext;
+import org.jboss.portal.WindowState;
+import org.jboss.portal.Mode;
+import org.jboss.portal.common.util.ParameterMap;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletResponseWrapper;
+import javax.xml.namespace.QName;
+
+/**
+ * @author Julien Viet
+ * @version $Revision: 630 $
+ */
+public class PortalRenderResponse extends HttpServletResponseWrapper
+{
+
+   /** . */
+   private final PagePortletControllerContext portletControllerContext;
+
+   /** . */
+   private PageNavigationalState pageState;
+
+   /** . */
+   private int count =3D 0;
+
+   /** Wether or not the page state can be modified. */
+   private boolean pageStateModifiable;
+
+   public PortalRenderResponse(
+      HttpServletResponse response,
+      PagePortletControllerContext portletControllerContext,
+      PageNavigationalState pageState)
+   {
+      super(response);
+
+      //
+      this.portletControllerContext =3D portletControllerContext;
+      this.pageState =3D pageState;
+      this.pageStateModifiable =3D true;
+   }
+
+   /**
+    * The page state for the rendering.
+    *
+    * @return the page state
+    */
+   public PageNavigationalState getPageState()
+   {
+      return pageState;
+   }
+
+   public PortletInvocationResponse render(Portlet portlet, String windowI=
d) throws PortletInvokerException
+   {
+      WindowNavigationalState windowNS =3D null;
+      if (pageState !=3D null)
+      {
+         windowNS =3D pageState.getWindowNavigationalState(windowId);
+      }
+
+      //
+      ParameterMap publicNS =3D null;
+      if (pageState !=3D null)
+      {
+         publicNS =3D pageState.getPublicNavigationalState(windowId);
+      }
+
+      //
+      Mode mode =3D Mode.VIEW;
+      WindowState windowState =3D WindowState.NORMAL;
+      StateString portletNS =3D null;
+
+      //
+      if (windowNS !=3D null)
+      {
+         if (windowNS.getMode() !=3D null)
+         {
+            mode =3D windowNS.getMode();
+         }
+         if (windowNS.getWindowState() !=3D null)
+         {
+            windowState =3D windowNS.getWindowState();
+         }
+         if (windowNS.getPortletNavigationalState() !=3D null)
+         {
+            portletNS =3D windowNS.getPortletNavigationalState();
+         }
+      }
+
+      //
+      PortletInvocationContext renderContext =3D portletControllerContext.=
createPortletInvocationContext(windowId, pageState);
+      RenderInvocation render =3D new RenderInvocation(renderContext);
+      render.setClientContext(new AbstractClientContext(portletControllerC=
ontext.getClientRequest()));
+      render.setServerContext(new AbstractServerContext(portletControllerC=
ontext.getClientRequest(), portletControllerContext.getClientResponse()));
+      render.setInstanceContext(new TestInstanceContext(portletControllerC=
ontext.getClientRequest(), portlet.getContext(), false));
+      render.setUserContext(new AbstractUserContext(portletControllerConte=
xt.getClientRequest()));
+      render.setWindowContext(new AbstractWindowContext(windowId));
+      render.setPortalContext(new TestPortalContext());
+      render.setSecurityContext(new AbstractSecurityContext(portletControl=
lerContext.getClientRequest()));
+      render.setTarget(portlet.getContext());
+      render.setMode(mode);
+      render.setWindowState(windowState);
+      render.setNavigationalState(portletNS);
+      render.setPublicNavigationalState(publicNS);
+
+      //
+      pageStateModifiable =3D false;
+
+      //
+      return portletControllerContext.invoke(render);
+   }
+
+   public boolean isPageStateModifiable()
+   {
+      return pageStateModifiable;
+   }
+
+   public String getPageParameter(QName name)
+   {
+      return pageState !=3D null ? pageState.getPublicNavigationalState(na=
me)[0] : null;
+   }
+
+   public void setPageParameter(QName name, String value)
+   {
+      if (pageStateModifiable)
+      {
+         if (pageState =3D=3D null)
+         {
+            pageState =3D portletControllerContext.getStateControllerConte=
xt().createPageState(true);
+         }
+         pageState.setPublicNavigationalState(name, new String[]{value});
+      }
+      else
+      {
+         throw new IllegalStateException("Page state cannot be modified");
+      }
+   }
+
+   public String getMaximizedWindowId()
+   {
+      if (pageState !=3D null)
+      {
+         for (String windowId : pageState.getWindowIds())
+         {
+            WindowNavigationalState windowNS =3D pageState.getWindowNaviga=
tionalState(windowId);
+            if (WindowState.MAXIMIZED.equals(windowNS.getWindowState()))
+            {
+               return windowId;
+            }
+         }
+      }
+
+      //
+      return null;
+   }
+
+   public PagePortletControllerContext getPortletControllerContext()
+   {
+      return portletControllerContext;
+   }
+
+   public String nextId()
+   {
+      return "" + count++;
+   }
+}

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/taglib/JspWriterResponse.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/JspWriterResponse.java	2008-02-09 14:21:49 UTC (rev 9898)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/JspWriterResponse.java	2008-02-09 14:31:49 UTC (rev 9899)
@@ -22,7 +22,7 @@
  *************************************************************************=
*****/
 package org.jboss.portal.portlet.test.jsp.taglib;
 =

-import org.jboss.portal.portlet.test.jsp.PortalResponse;
+import org.jboss.portal.portlet.test.jsp.PortalRenderResponse;
 =

 import javax.servlet.http.HttpServletResponseWrapper;
 import javax.servlet.jsp.JspWriter;
@@ -43,9 +43,9 @@
    /** . */
    private final PrintWriter writer;
 =

-   public JspWriterResponse(PortalResponse portalResponse, JspWriter deleg=
ate)
+   public JspWriterResponse(PortalRenderResponse renderResponse, JspWriter=
 delegate)
    {
-      super(portalResponse);
+      super(renderResponse);
 =

       //
       this.delegate =3D delegate;

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/taglib/PageParamTag.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PageParamTag.java	2008-02-09 14:21:49 UTC (rev 9898)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PageParamTag.java	2008-02-09 14:31:49 UTC (rev 9899)
@@ -22,7 +22,7 @@
  *************************************************************************=
*****/
 package org.jboss.portal.portlet.test.jsp.taglib;
 =

-import org.jboss.portal.portlet.test.jsp.PortalResponse;
+import org.jboss.portal.portlet.test.jsp.PortalRenderResponse;
 =

 import javax.servlet.jsp.JspException;
 import javax.xml.namespace.QName;
@@ -89,17 +89,17 @@
 =

    public void internalDoTag() throws JspException, IOException
    {
-      PortalResponse response =3D getPortalResponse();
+      PortalRenderResponse renderResponse =3D getPortalResponse();
 =

       //
-      if (response.isPageStateModifiable())
+      if (renderResponse.isPageStateModifiable())
       {
          QName name =3D new QName(namespaceURI, localName);
 =

          //
-         if (!"true".equals(frozen) || response.getPageParameter(name) =3D=
=3D null)
+         if (!"true".equals(frozen) || renderResponse.getPageParameter(nam=
e) =3D=3D null)
          {
-            response.setPageParameter(name, value);
+            renderResponse.setPageParameter(name, value);
          }
       }
    }

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/taglib/PageTag.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PageTag.java	2008-02-09 14:21:49 UTC (rev 9898)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PageTag.java	2008-02-09 14:31:49 UTC (rev 9899)
@@ -22,7 +22,7 @@
  *************************************************************************=
*****/
 package org.jboss.portal.portlet.test.jsp.taglib;
 =

-import org.jboss.portal.portlet.test.jsp.PortalResponse;
+import org.jboss.portal.portlet.test.jsp.PortalRenderResponse;
 =

 import javax.servlet.jsp.JspException;
 import javax.xml.namespace.QName;
@@ -57,13 +57,13 @@
    {
       if (status =3D=3D Status.INACTIVE)
       {
-         PortalResponse response =3D getPortalResponse();
+         PortalRenderResponse renderResponse =3D getPortalResponse();
 =

          //
          status =3D Status.ACTIVE;
 =

          //
-         maximizedId =3D response.getMaximizedWindowId();
+         maximizedId =3D renderResponse.getMaximizedWindowId();
 =

          //
          if (maximizedId !=3D null)

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/taglib/PortalBodyTagSupport.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortalBodyTagSupport.java	2008-02-09 14:21:49 UTC (rev 9898)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortalBodyTagSupport.java	2008-02-09 14:31:49 UTC (rev 9899)
@@ -22,7 +22,7 @@
  *************************************************************************=
*****/
 package org.jboss.portal.portlet.test.jsp.taglib;
 =

-import org.jboss.portal.portlet.test.jsp.PortalResponse;
+import org.jboss.portal.portlet.test.jsp.PortalRenderResponse;
 =

 import javax.servlet.jsp.tagext.BodyTagSupport;
 import javax.servlet.jsp.JspException;
@@ -33,9 +33,9 @@
  */
 public class PortalBodyTagSupport extends BodyTagSupport
 {
-   protected final PortalResponse getPortalResponse()
+   protected final PortalRenderResponse getPortalResponse()
    {
-      return (PortalResponse)pageContext.getResponse();
+      return (PortalRenderResponse)pageContext.getResponse();
    }
 =

    public int doStartTag() throws JspException

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/taglib/PortalSimpleTagSupport.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortalSimpleTagSupport.java	2008-02-09 14:21:49 UTC (rev 9898)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortalSimpleTagSupport.java	2008-02-09 14:31:49 UTC (rev 9899)
@@ -22,7 +22,7 @@
  *************************************************************************=
*****/
 package org.jboss.portal.portlet.test.jsp.taglib;
 =

-import org.jboss.portal.portlet.test.jsp.PortalResponse;
+import org.jboss.portal.portlet.test.jsp.PortalRenderResponse;
 =

 import javax.servlet.jsp.tagext.SimpleTagSupport;
 import javax.servlet.jsp.PageContext;
@@ -35,10 +35,10 @@
  */
 public class PortalSimpleTagSupport extends SimpleTagSupport
 {
-   protected final PortalResponse getPortalResponse()
+   protected final PortalRenderResponse getPortalResponse()
    {
       PageContext pageContext =3D (PageContext)getJspContext();
-      return (PortalResponse)pageContext.getResponse();
+      return (PortalRenderResponse)pageContext.getResponse();
    }
 =

    public void doTag() throws JspException, IOException

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/taglib/PortletMarkupTag.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortletMarkupTag.java	2008-02-09 14:21:49 UTC (rev 9898)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortletMarkupTag.java	2008-02-09 14:31:49 UTC (rev 9899)
@@ -22,7 +22,7 @@
  *************************************************************************=
*****/
 package org.jboss.portal.portlet.test.jsp.taglib;
 =

-import org.jboss.portal.portlet.test.jsp.PortalResponse;
+import org.jboss.portal.portlet.test.jsp.PortalRenderResponse;
 import org.jboss.portal.portlet.invocation.response.PortletInvocationRespo=
nse;
 import org.jboss.portal.portlet.invocation.response.FragmentResponse;
 import org.jboss.portal.portlet.controller.state.WindowNavigationalState;
@@ -41,7 +41,7 @@
 {
    public void internalDoTag() throws JspException, IOException
    {
-      PortalResponse resp =3D getPortalResponse();
+      PortalRenderResponse resp =3D getPortalResponse();
 =

       PortletTag portletTag =3D (PortletTag)SimpleTagSupport.findAncestorW=
ithClass(this, PortletTag.class);
 =


Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/taglib/PortletTag.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortletTag.java	2008-02-09 14:21:49 UTC (rev 9898)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortletTag.java	2008-02-09 14:31:49 UTC (rev 9899)
@@ -22,7 +22,7 @@
  *************************************************************************=
*****/
 package org.jboss.portal.portlet.test.jsp.taglib;
 =

-import org.jboss.portal.portlet.test.jsp.PortalResponse;
+import org.jboss.portal.portlet.test.jsp.PortalRenderResponse;
 import org.jboss.portal.portlet.test.jsp.PagePortletControllerContext;
 import org.jboss.portal.portlet.invocation.response.PortletInvocationRespo=
nse;
 import org.jboss.portal.portlet.invocation.response.FragmentResponse;
@@ -78,7 +78,7 @@
    private Set supportedModes;
    private Mode initialMode;
    private PageTag pageTag;
-   private PortalResponse response;
+   private PortalRenderResponse renderResponse;
 =

    /** . */
    PortletResult result;
@@ -187,7 +187,7 @@
       this.supportedModes =3D supportedModes;
       this.supportedWindowStates =3D supportedWindowStates;
       this.pageTag =3D (PageTag)findAncestorWithClass(this, PageTag.class);
-      this.response =3D getPortalResponse();
+      this.renderResponse =3D getPortalResponse();
    }
 =

    private void destroyState()
@@ -196,7 +196,7 @@
       this.supportedModes =3D null;
       this.supportedWindowStates =3D null;
       this.pageTag =3D null;
-      this.response =3D null;
+      this.renderResponse =3D null;
    }
 =

    public int internalDoStartTag() throws JspException
@@ -204,7 +204,7 @@
       initState();
 =

       //
-      PagePortletControllerContext context =3D response.getPortletControll=
erContext();
+      PagePortletControllerContext context =3D renderResponse.getPortletCo=
ntrollerContext();
 =

       //
       Portlet portlet =3D context.findPortlet(applicationNameAttr, nameAtt=
r);
@@ -219,7 +219,7 @@
       }
       else
       {
-         String windowId =3D portlet.getContext().getId() + "." + response=
.nextId();
+         String windowId =3D portlet.getContext().getId() + "." + renderRe=
sponse.nextId();
 =

          //
          if (pageTag.maximizedId !=3D null)
@@ -258,7 +258,7 @@
    {
       try
       {
-         PortletInvocationResponse portletResponse =3D response.render(por=
tlet, windowId);
+         PortletInvocationResponse portletResponse =3D renderResponse.rend=
er(portlet, windowId);
 =

          //
          if (portletResponse instanceof FragmentResponse)
@@ -330,7 +330,7 @@
                request.setAttribute(Constants.ERROR_PORTLET_NAME, nameAttr=
);
 =

                //
-               rd.include(pageContext.getRequest(), new JspWriterResponse(=
response, pageContext.getOut()));
+               rd.include(pageContext.getRequest(), new JspWriterResponse(=
renderResponse, pageContext.getOut()));
             }
             catch (ServletException e)
             {

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/taglib/PortletURLTag.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortletURLTag.java	2008-02-09 14:21:49 UTC (rev 9898)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortletURLTag.java	2008-02-09 14:31:49 UTC (rev 9899)
@@ -24,7 +24,7 @@
 =

 import org.jboss.portal.Mode;
 import org.jboss.portal.WindowState;
-import org.jboss.portal.portlet.test.jsp.PortalResponse;
+import org.jboss.portal.portlet.test.jsp.PortalRenderResponse;
 import org.jboss.portal.portlet.test.jsp.PagePortletControllerContext;
 import org.jboss.portal.portlet.test.controller.PortletURLRenderer;
 import org.jboss.portal.portlet.controller.impl.state.StateControllerConte=
xtImpl;
@@ -77,8 +77,8 @@
 =

    public int internalDoEndTag() throws JspException
    {
-      PortalResponse response =3D getPortalResponse();
-      PagePortletControllerContext context =3D response.getPortletControll=
erContext();
+      PortalRenderResponse renderResponse =3D getPortalResponse();
+      PagePortletControllerContext context =3D renderResponse.getPortletCo=
ntrollerContext();
       PortletTag portletTag =3D (PortletTag)SimpleTagSupport.findAncestorW=
ithClass(this, PortletTag.class);
 =

       Mode mode =3D null;
@@ -96,7 +96,7 @@
 =

       PortletURLRenderer renderer =3D new PortletURLRenderer(
          (StateControllerContextImpl)context.getStateControllerContext(),
-         response.getPageState(),
+         renderResponse.getPageState(),
          context.getClientRequest(),
          context.getClientResponse());
 =



--===============4956475284897354921==--

From portal-commits at lists.jboss.org Sat Feb  9 09:44:32 2008
Content-Type: multipart/mixed; boundary="===============5685819388234788477=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9900 -
 modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo.
Date: Sat, 09 Feb 2008 09:44:32 -0500
Message-ID: 

--===============5685819388234788477==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: wesleyhales
Date: 2008-02-09 09:44:32 -0500 (Sat, 09 Feb 2008)
New Revision: 9900

Modified:
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/dem=
o1.jsp
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/dem=
o2.jsp
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/dem=
o3.jsp
Log:
page updates

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/d=
emo/demo1.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/de=
mo1.jsp	2008-02-09 14:31:49 UTC (rev 9899)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/de=
mo1.jsp	2008-02-09 14:44:32 UTC (rev 9900)
@@ -10,10 +10,10 @@
    
    
             
-
+               
             
             
-
+               
             
    
 

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/d=
emo/demo2.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/de=
mo2.jsp	2008-02-09 14:31:49 UTC (rev 9899)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/de=
mo2.jsp	2008-02-09 14:44:32 UTC (rev 9900)
@@ -10,10 +10,13 @@
    
    
             
+               
 =

             
             
 =

+               
+               =

             
    
 

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/d=
emo/demo3.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/de=
mo3.jsp	2008-02-09 14:31:49 UTC (rev 9899)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/de=
mo3.jsp	2008-02-09 14:44:32 UTC (rev 9900)
@@ -11,9 +11,12 @@
    
             
 =

+               
+
+
             
             
-
+               
             
    
 


--===============5685819388234788477==--

From portal-commits at lists.jboss.org Sat Feb  9 11:11:20 2008
Content-Type: multipart/mixed; boundary="===============5692183945830195710=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9902 -
 modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp.
Date: Sat, 09 Feb 2008 11:11:20 -0500
Message-ID: 

--===============5692183945830195710==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-09 11:11:20 -0500 (Sat, 09 Feb 2008)
New Revision: 9902

Added:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/PortalResponse.java
Log:
PageEventControllerContext that use the page structure to route events (tha=
nks Chris, I totally missed the use case)

Added: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/te=
st/jsp/PortalResponse.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/PortalResponse.java	                        (rev 0)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/PortalResponse.java	2008-02-09 16:11:20 UTC (rev 9902)
@@ -0,0 +1,122 @@
+/*************************************************************************=
*****
+ * 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.Portlet;
+import org.jboss.portal.portlet.PortletInvoker;
+import org.jboss.portal.portlet.PortletInvokerException;
+import org.jboss.portal.portlet.info.PortletInfo;
+
+import javax.servlet.http.HttpServletResponseWrapper;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Map;
+import java.util.HashMap;
+
+/**
+ * @author Julien Viet
+ * @version $Revision: 630 $
+ */
+public class PortalResponse extends HttpServletResponseWrapper
+{
+
+   /** . */
+   private final PortletInvoker invoker;
+
+   /** . */
+   private final Map portlets;
+
+   /** . */
+   private int count =3D 0;
+
+   public PortalResponse(
+      HttpServletResponse response,
+      PortletInvoker invoker) throws PortletInvokerException
+   {
+      super(response);
+
+      //
+      Map portlets =3D new HashMap();
+      for (Portlet portlet : invoker.getPortlets())
+      {
+         PortletInfo portletInfo =3D portlet.getInfo();
+         String portletName =3D portletInfo.getName();
+         String applicationName =3D portletInfo.getApplicationName();
+         Key key =3D new Key(applicationName, portletName);
+         portlets.put(key, portlet);
+      }
+
+      //
+      this.portlets =3D portlets;
+      this.invoker =3D invoker;
+   }
+
+   public PortletInvoker getInvoker()
+   {
+      return invoker;
+   }
+
+   public Portlet findPortlet(String applicationName, String portletName)
+   {
+      return portlets.get(new Key(applicationName, portletName));
+   }
+
+   public String nextId()
+   {
+      return "" + count++;
+   }
+
+   private static class Key
+   {
+
+      /** . */
+      private final String applicationName;
+
+      /** . */
+      private final String portletName;
+
+      private Key(String applicationName, String portletName)
+      {
+         this.applicationName =3D applicationName;
+         this.portletName =3D portletName;
+      }
+
+      public boolean equals(Object obj)
+      {
+         if (obj =3D=3D this)
+         {
+            return true;
+         }
+         if (obj instanceof Key)
+         {
+            Key that =3D (Key)obj;
+            return applicationName.equals(that.applicationName) && portlet=
Name.equals(that.portletName);
+         }
+         return false;
+      }
+
+      public int hashCode()
+      {
+         return applicationName.hashCode() + portletName.hashCode();
+      }
+   }
+}


--===============5692183945830195710==--

From portal-commits at lists.jboss.org Sat Feb  9 11:12:05 2008
Content-Type: multipart/mixed; boundary="===============6295787258521636631=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9901 - in
 modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp:
 taglib and 1 other directory.
Date: Sat, 09 Feb 2008 11:11:01 -0500
Message-ID: 

--===============6295787258521636631==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-09 11:11:00 -0500 (Sat, 09 Feb 2008)
New Revision: 9901

Added:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/PageEventControllerContext.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/PortalActionResponse.java
Removed:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/PortalResponse.java
Modified:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/ControllerFilter.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/PagePortletControllerContext.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/PortalRenderResponse.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/PageParamTag.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/PageTag.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/ParamTag.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/PortalBodyTagSupport.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/PortalSimpleTagSupport.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/PortletMarkupTag.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/PortletTag.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/PortletTitleTag.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/PortletURLTag.java
Log:
PageEventControllerContext that use the page structure to route events (tha=
nks Chris, I totally missed the use case)

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/ControllerFilter.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/ControllerFilter.java	2008-02-09 14:44:32 UTC (rev 9900)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/ControllerFilter.java	2008-02-09 16:11:00 UTC (rev 9901)
@@ -22,7 +22,6 @@
  *************************************************************************=
*****/
 package org.jboss.portal.portlet.test.jsp;
 =

-import org.jboss.portal.portlet.test.jsp.PortalRenderResponse;
 import org.jboss.portal.portlet.test.controller.PortletURLRenderer;
 import org.jboss.portal.portlet.PortletInvoker;
 import org.jboss.portal.portlet.PortletInvokerException;
@@ -72,13 +71,25 @@
 =

    public void doFilter(ServletRequest req, ServletResponse resp, FilterCh=
ain chain) throws IOException, ServletException
    {
-      doFilter((HttpServletRequest)req, (HttpServletResponse)resp, chain);
+      try
+      {
+         doFilter((HttpServletRequest)req, (HttpServletResponse)resp, chai=
n);
+      }
+      catch (PortletInvokerException e)
+      {
+         throw new ServletException(e);
+      }
    }
 =

-   public void doFilter(HttpServletRequest req, HttpServletResponse resp, =
FilterChain chain) throws IOException, ServletException
+   public void doFilter(HttpServletRequest req, HttpServletResponse resp, =
FilterChain chain) throws IOException, ServletException, PortletInvokerExce=
ption
    {
       PortletInvoker invoker =3D (PortletInvoker)getServletContext().getAt=
tribute("ConsumerPortletInvoker");
 =

+
+      PortalActionResponse actionResponse =3D new PortalActionResponse(res=
p, invoker);
+
+      chain.doFilter(req, actionResponse);
+
       //
       PagePortletControllerContext context;
       try
@@ -87,7 +98,7 @@
             req,
             resp,
             getServletContext(),
-            invoker);
+            actionResponse);
       }
       catch (PortletInvokerException e)
       {
@@ -97,6 +108,9 @@
       PageNavigationalState pageState =3D null;
       if (context.getRequest() !=3D null)
       {
+
+
+
          ControllerResponse controllerResponse;
          try
          {
@@ -207,7 +221,7 @@
       }
 =

       //
-      PortalRenderResponse renderResponse =3D new PortalRenderResponse(res=
p, context, pageState);
+      PortalRenderResponse renderResponse =3D new PortalRenderResponse(res=
p, invoker, context, pageState);
 =

       //
       chain.doFilter(req, renderResponse);

Added: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/te=
st/jsp/PageEventControllerContext.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/PageEventControllerContext.java	                        (rev 0)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/PageEventControllerContext.java	2008-02-09 16:11:00 UTC (rev 9901)
@@ -0,0 +1,71 @@
+/*************************************************************************=
*****
+ * 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.controller.event.EventControllerContext;
+import org.jboss.portal.portlet.controller.event.Event;
+import org.jboss.portal.portlet.Portlet;
+import org.jboss.portal.portlet.info.PortletInfo;
+
+import java.util.List;
+import java.util.ArrayList;
+
+/**
+ * @author Julien Viet
+ * @version $Revision: 630 $
+ */
+public class PageEventControllerContext implements EventControllerContext
+{
+
+   /** . */
+   private final PortalActionResponse actionResponse;
+
+   public PageEventControllerContext(PortalActionResponse actionResponse)
+   {
+      this.actionResponse =3D actionResponse;
+   }
+
+   public List getConsumedEvents(Event producedEvent)
+   {
+      ArrayList consumedEvents =3D new ArrayList();
+
+      //
+      for (String windowId : actionResponse.getWindowIds())
+      {
+         Portlet portlet =3D actionResponse.getPortlet(windowId);
+
+         //
+         PortletInfo portletInfo =3D portlet.getInfo();
+
+         //
+         if (portletInfo.getEventing().getConsumedEvents().containsKey(pro=
ducedEvent.getName()))
+         {
+            Event consumedEvent =3D new Event(producedEvent.getName(), pro=
ducedEvent.getPayload(), windowId);
+            consumedEvents.add(consumedEvent);
+         }
+      }
+
+      //
+      return consumedEvents;
+   }
+}

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/PagePortletControllerContext.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/PagePortletControllerContext.java	2008-02-09 14:44:32 UTC (rev 9900)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/PagePortletControllerContext.java	2008-02-09 16:11:00 UTC (rev 9901)
@@ -24,11 +24,8 @@
 =

 import org.jboss.portal.portlet.Portlet;
 import org.jboss.portal.portlet.PortletContext;
-import org.jboss.portal.portlet.PortletInvoker;
 import org.jboss.portal.portlet.PortletInvokerException;
 import org.jboss.portal.portlet.controller.event.EventControllerContext;
-import org.jboss.portal.portlet.controller.impl.event.EventControllerConte=
xtImpl;
-import org.jboss.portal.portlet.info.PortletInfo;
 import org.jboss.portal.portlet.invocation.PortletInvocation;
 import org.jboss.portal.portlet.invocation.response.PortletInvocationRespo=
nse;
 import org.jboss.portal.portlet.test.controller.AbstractPortletControllerC=
ontext;
@@ -39,8 +36,6 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
 =

 /**
  * @author Julien Viet
@@ -50,45 +45,25 @@
 {
 =

    /** . */
-   private final PortletInvoker invoker;
-
-   /** . */
    private final EventControllerContext eventControllerContext;
 =

    /** . */
-   private final Map portlets;
+   private final PortalResponse actionResponse;
 =

    public PagePortletControllerContext(
       HttpServletRequest req,
       HttpServletResponse resp,
       ServletContext servletContext,
-      PortletInvoker invoker)
+      PortalActionResponse actionResponse)
       throws IllegalRequestException, IOException, ServletException, Portl=
etInvokerException
    {
       super(req, resp, servletContext);
 =

       //
-      Map portlets =3D new HashMap();
-      for (Portlet portlet : invoker.getPortlets())
-      {
-         PortletInfo portletInfo =3D portlet.getInfo();
-         String portletName =3D portletInfo.getName();
-         String applicationName =3D portletInfo.getApplicationName();
-         Key key =3D new Key(applicationName, portletName);
-         portlets.put(key, portlet);
-      }
-
-      //
-      this.portlets =3D portlets;
-      this.invoker =3D invoker;
-      this.eventControllerContext =3D new EventControllerContextImpl(invok=
er);
+      this.actionResponse =3D actionResponse;
+      this.eventControllerContext =3D new PageEventControllerContext(actio=
nResponse);
    }
 =

-   public Portlet findPortlet(String applicationName, String portletName)
-   {
-      return portlets.get(new Key(applicationName, portletName));
-   }
-
    protected Portlet getPortlet(String windowId) throws PortletInvokerExce=
ption
    {
       int index =3D windowId.lastIndexOf('.');
@@ -96,58 +71,24 @@
 =

       // in the case of an event propagation, the given 'windowId' is actu=
ally the portlet id already so need to check
       // for that case (portletId should still have a '.', if not it means=
 that the windowId was really a portlet id)
-      if (portletId.indexOf('.') =3D=3D -1)
-      {
-         portletId =3D windowId;
-      }
+//      if (portletId.indexOf('.') =3D=3D -1)
+//      {
+//         portletId =3D windowId;
+//      }
 =

       PortletContext portletContext =3D PortletContext.createPortletContex=
t(portletId);
-      return invoker.getPortlet(portletContext);
+
+      //
+      return actionResponse.getInvoker().getPortlet(portletContext);
    }
 =

    public PortletInvocationResponse invoke(PortletInvocation invocation) t=
hrows PortletInvokerException
    {
-      return invoker.invoke(invocation);
+      return actionResponse.getInvoker().invoke(invocation);
    }
 =

    public EventControllerContext getEventControllerContext()
    {
       return eventControllerContext;
    }
-
-   private static class Key
-   {
-
-      /** . */
-      private final String applicationName;
-
-      /** . */
-      private final String portletName;
-
-      private Key(String applicationName, String portletName)
-      {
-         this.applicationName =3D applicationName;
-         this.portletName =3D portletName;
-      }
-
-      public boolean equals(Object obj)
-      {
-         if (obj =3D=3D this)
-         {
-            return true;
-         }
-         if (obj instanceof Key)
-         {
-            Key that =3D (Key)obj;
-            return applicationName.equals(that.applicationName) && portlet=
Name.equals(that.portletName);
-         }
-         return false;
-      }
-
-      public int hashCode()
-      {
-         return applicationName.hashCode() + portletName.hashCode();
-      }
-   }
-
 }

Added: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/te=
st/jsp/PortalActionResponse.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/PortalActionResponse.java	                        (rev 0)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/PortalActionResponse.java	2008-02-09 16:11:00 UTC (rev 9901)
@@ -0,0 +1,242 @@
+/*************************************************************************=
*****
+ * 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.Portlet;
+import org.jboss.portal.portlet.PortletInvoker;
+import org.jboss.portal.portlet.PortletInvokerException;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.Cookie;
+import javax.servlet.ServletOutputStream;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.Writer;
+import java.util.Locale;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Set;
+
+/**
+ * @author Julien Viet
+ * @version $Revision: 630 $
+ */
+public class PortalActionResponse extends PortalResponse
+{
+
+   /** . */
+   private String contentType;
+
+   /** . */
+   private Locale locale;
+
+   /** . */
+   private String characterEncoding;
+
+   /** . */
+   private int bufferSize;
+
+   /** . */
+   private ServletOutputStream outputStream;
+
+   /** . */
+   private PrintWriter writer;
+
+   /** . */
+   private Map windows;
+
+   public PortalActionResponse(HttpServletResponse response, PortletInvoke=
r invoker) throws PortletInvokerException
+   {
+      super(response, invoker);
+
+      //
+      this.windows =3D new HashMap();
+   }
+
+   public void addWindow(String windowId, Portlet portlet)
+   {
+      windows.put(windowId, portlet);
+   }
+
+   public Set getWindowIds()
+   {
+      return windows.keySet();
+   }
+
+   public Portlet getPortlet(String windowId)
+   {
+      return windows.get(windowId);
+   }
+
+   public ServletOutputStream getOutputStream() throws IOException
+   {
+      if (writer !=3D null)
+      {
+         throw new IllegalStateException();
+      }
+      if (outputStream =3D=3D null)
+      {
+         outputStream =3D new ServletOutputStream()
+         {
+            public void write(int b) throws IOException
+            {
+            }
+         };
+      }
+      return outputStream;
+   }
+
+   public PrintWriter getWriter() throws IOException
+   {
+      if (outputStream !=3D null)
+      {
+         throw new IllegalStateException();
+      }
+      if (writer =3D=3D null)
+      {
+         Writer tmp =3D new Writer()
+         {
+            public void write(char cbuf[], int off, int len) throws IOExce=
ption
+            {
+            }
+            public void flush() throws IOException
+            {
+            }
+            public void close() throws IOException
+            {
+            }
+         };
+         writer =3D new PrintWriter(tmp);
+      }
+      return writer;
+   }
+
+   public void flushBuffer() throws IOException
+   {
+   }
+
+   public boolean isCommitted()
+   {
+      return false;
+   }
+
+   public void reset()
+   {
+   }
+
+   public void resetBuffer()
+   {
+   }
+
+   public void sendError(int i, String s) throws IOException
+   {
+   }
+
+   public void sendError(int i) throws IOException
+   {
+   }
+
+   public void sendRedirect(String s) throws IOException
+   {
+   }
+
+   public void addCookie(Cookie cookie)
+   {
+   }
+
+   public void setDateHeader(String s, long l)
+   {
+   }
+
+   public void addDateHeader(String s, long l)
+   {
+   }
+
+   public void setHeader(String s, String s1)
+   {
+   }
+
+   public void addHeader(String s, String s1)
+   {
+   }
+
+   public void setContentType(String contentType)
+   {
+      this.contentType =3D contentType;
+   }
+
+   public void setContentLength(int i)
+   {
+   }
+
+   public void setCharacterEncoding(String characterEncoding)
+   {
+      this.characterEncoding =3D characterEncoding;
+   }
+
+   public void setIntHeader(String s, int i)
+   {
+   }
+
+   public void addIntHeader(String s, int i)
+   {
+   }
+
+   public void setStatus(int i)
+   {
+   }
+
+   public void setStatus(int i, String s)
+   {
+   }
+
+   public void setLocale(Locale locale)
+   {
+      this.locale =3D locale;
+   }
+
+   public String getContentType()
+   {
+      return contentType;
+   }
+
+   public Locale getLocale()
+   {
+      return locale;
+   }
+
+   public String getCharacterEncoding()
+   {
+      return characterEncoding;
+   }
+
+   public void setBufferSize(int bufferSize)
+   {
+      this.bufferSize =3D bufferSize;
+   }
+
+   public int getBufferSize()
+   {
+      return bufferSize;
+   }
+}

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/PortalRenderResponse.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/PortalRenderResponse.java	2008-02-09 14:44:32 UTC (rev 9900)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/PortalRenderResponse.java	2008-02-09 16:11:00 UTC (rev 9901)
@@ -31,6 +31,7 @@
 import org.jboss.portal.portlet.PortletInvokerException;
 import org.jboss.portal.portlet.Portlet;
 import org.jboss.portal.portlet.StateString;
+import org.jboss.portal.portlet.PortletInvoker;
 import org.jboss.portal.portlet.impl.spi.AbstractClientContext;
 import org.jboss.portal.portlet.impl.spi.AbstractServerContext;
 import org.jboss.portal.portlet.impl.spi.AbstractUserContext;
@@ -42,39 +43,36 @@
 import org.jboss.portal.common.util.ParameterMap;
 =

 import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletResponseWrapper;
 import javax.xml.namespace.QName;
 =

 /**
  * @author Julien Viet
  * @version $Revision: 630 $
  */
-public class PortalRenderResponse extends HttpServletResponseWrapper
+public class PortalRenderResponse extends PortalResponse
 {
 =

    /** . */
-   private final PagePortletControllerContext portletControllerContext;
-
-   /** . */
    private PageNavigationalState pageState;
 =

-   /** . */
-   private int count =3D 0;
-
    /** Wether or not the page state can be modified. */
    private boolean pageStateModifiable;
 =

+   /** . */
+   private PagePortletControllerContext portletControllerContext;
+
    public PortalRenderResponse(
       HttpServletResponse response,
+      PortletInvoker invoker,
       PagePortletControllerContext portletControllerContext,
-      PageNavigationalState pageState)
+      PageNavigationalState pageState) throws PortletInvokerException
    {
-      super(response);
+      super(response, invoker);
 =

       //
-      this.portletControllerContext =3D portletControllerContext;
       this.pageState =3D pageState;
       this.pageStateModifiable =3D true;
+      this.portletControllerContext =3D portletControllerContext;
    }
 =

    /**
@@ -87,6 +85,11 @@
       return pageState;
    }
 =

+   public PagePortletControllerContext getPortletControllerContext()
+   {
+      return portletControllerContext;
+   }
+
    public PortletInvocationResponse render(Portlet portlet, String windowI=
d) throws PortletInvokerException
    {
       WindowNavigationalState windowNS =3D null;
@@ -190,14 +193,4 @@
       //
       return null;
    }
-
-   public PagePortletControllerContext getPortletControllerContext()
-   {
-      return portletControllerContext;
-   }
-
-   public String nextId()
-   {
-      return "" + count++;
-   }
 }

Deleted: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/=
test/jsp/PortalResponse.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/PortalResponse.java	2008-02-09 14:44:32 UTC (rev 9900)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/PortalResponse.java	2008-02-09 16:11:00 UTC (rev 9901)
@@ -1,203 +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.test.controller.TestInstanceContext;
-import org.jboss.portal.portlet.test.controller.TestPortalContext;
-import org.jboss.portal.portlet.controller.state.PageNavigationalState;
-import org.jboss.portal.portlet.controller.state.WindowNavigationalState;
-import org.jboss.portal.portlet.invocation.response.PortletInvocationRespo=
nse;
-import org.jboss.portal.portlet.invocation.RenderInvocation;
-import org.jboss.portal.portlet.PortletInvokerException;
-import org.jboss.portal.portlet.Portlet;
-import org.jboss.portal.portlet.StateString;
-import org.jboss.portal.portlet.impl.spi.AbstractClientContext;
-import org.jboss.portal.portlet.impl.spi.AbstractServerContext;
-import org.jboss.portal.portlet.impl.spi.AbstractUserContext;
-import org.jboss.portal.portlet.impl.spi.AbstractWindowContext;
-import org.jboss.portal.portlet.impl.spi.AbstractSecurityContext;
-import org.jboss.portal.portlet.spi.PortletInvocationContext;
-import org.jboss.portal.WindowState;
-import org.jboss.portal.Mode;
-import org.jboss.portal.common.util.ParameterMap;
-
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletResponseWrapper;
-import javax.xml.namespace.QName;
-
-/**
- * @author Julien Viet
- * @version $Revision: 630 $
- */
-public class PortalResponse extends HttpServletResponseWrapper
-{
-
-   /** . */
-   private final PagePortletControllerContext portletControllerContext;
-
-   /** . */
-   private PageNavigationalState pageState;
-
-   /** . */
-   private int count =3D 0;
-
-   /** Wether or not the page state can be modified. */
-   private boolean pageStateModifiable;
-
-   public PortalResponse(
-      HttpServletResponse response,
-      PagePortletControllerContext portletControllerContext,
-      PageNavigationalState pageState)
-   {
-      super(response);
-
-      //
-      this.portletControllerContext =3D portletControllerContext;
-      this.pageState =3D pageState;
-      this.pageStateModifiable =3D true;
-   }
-
-   /**
-    * The page state for the rendering.
-    *
-    * @return the page state
-    */
-   public PageNavigationalState getPageState()
-   {
-      return pageState;
-   }
-
-   public PortletInvocationResponse render(Portlet portlet, String windowI=
d) throws PortletInvokerException
-   {
-      WindowNavigationalState windowNS =3D null;
-      if (pageState !=3D null)
-      {
-         windowNS =3D pageState.getWindowNavigationalState(windowId);
-      }
-
-      //
-      ParameterMap publicNS =3D null;
-      if (pageState !=3D null)
-      {
-         publicNS =3D pageState.getPublicNavigationalState(windowId);
-      }
-
-      //
-      Mode mode =3D Mode.VIEW;
-      WindowState windowState =3D WindowState.NORMAL;
-      StateString portletNS =3D null;
-
-      //
-      if (windowNS !=3D null)
-      {
-         if (windowNS.getMode() !=3D null)
-         {
-            mode =3D windowNS.getMode();
-         }
-         if (windowNS.getWindowState() !=3D null)
-         {
-            windowState =3D windowNS.getWindowState();
-         }
-         if (windowNS.getPortletNavigationalState() !=3D null)
-         {
-            portletNS =3D windowNS.getPortletNavigationalState();
-         }
-      }
-
-      //
-      PortletInvocationContext renderContext =3D portletControllerContext.=
createPortletInvocationContext(windowId, pageState);
-      RenderInvocation render =3D new RenderInvocation(renderContext);
-      render.setClientContext(new AbstractClientContext(portletControllerC=
ontext.getClientRequest()));
-      render.setServerContext(new AbstractServerContext(portletControllerC=
ontext.getClientRequest(), portletControllerContext.getClientResponse()));
-      render.setInstanceContext(new TestInstanceContext(portletControllerC=
ontext.getClientRequest(), portlet.getContext(), false));
-      render.setUserContext(new AbstractUserContext(portletControllerConte=
xt.getClientRequest()));
-      render.setWindowContext(new AbstractWindowContext(windowId));
-      render.setPortalContext(new TestPortalContext());
-      render.setSecurityContext(new AbstractSecurityContext(portletControl=
lerContext.getClientRequest()));
-      render.setTarget(portlet.getContext());
-      render.setMode(mode);
-      render.setWindowState(windowState);
-      render.setNavigationalState(portletNS);
-      render.setPublicNavigationalState(publicNS);
-
-      //
-      pageStateModifiable =3D false;
-
-      //
-      return portletControllerContext.invoke(render);
-   }
-
-   public boolean isPageStateModifiable()
-   {
-      return pageStateModifiable;
-   }
-
-   public String getPageParameter(QName name)
-   {
-      return pageState !=3D null ? pageState.getPublicNavigationalState(na=
me)[0] : null;
-   }
-
-   public void setPageParameter(QName name, String value)
-   {
-      if (pageStateModifiable)
-      {
-         if (pageState =3D=3D null)
-         {
-            pageState =3D portletControllerContext.getStateControllerConte=
xt().createPageState(true);
-         }
-         pageState.setPublicNavigationalState(name, new String[]{value});
-      }
-      else
-      {
-         throw new IllegalStateException("Page state cannot be modified");
-      }
-   }
-
-   public String getMaximizedWindowId()
-   {
-      if (pageState !=3D null)
-      {
-         for (String windowId : pageState.getWindowIds())
-         {
-            WindowNavigationalState windowNS =3D pageState.getWindowNaviga=
tionalState(windowId);
-            if (WindowState.MAXIMIZED.equals(windowNS.getWindowState()))
-            {
-               return windowId;
-            }
-         }
-      }
-
-      //
-      return null;
-   }
-
-   public PagePortletControllerContext getPortletControllerContext()
-   {
-      return portletControllerContext;
-   }
-
-   public String nextId()
-   {
-      return "" + count++;
-   }
-}

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/taglib/PageParamTag.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PageParamTag.java	2008-02-09 14:44:32 UTC (rev 9900)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PageParamTag.java	2008-02-09 16:11:00 UTC (rev 9901)
@@ -87,11 +87,8 @@
       this.frozen =3D frozen;
    }
 =

-   public void internalDoTag() throws JspException, IOException
+   public void doRenderTag(PortalRenderResponse renderResponse) throws Jsp=
Exception, IOException
    {
-      PortalRenderResponse renderResponse =3D getPortalResponse();
-
-      //
       if (renderResponse.isPageStateModifiable())
       {
          QName name =3D new QName(namespaceURI, localName);
@@ -103,4 +100,8 @@
          }
       }
    }
+
+   public void doActionTag() throws JspException, IOException
+   {
+   }
 }

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/taglib/PageTag.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PageTag.java	2008-02-09 14:44:32 UTC (rev 9900)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PageTag.java	2008-02-09 16:11:00 UTC (rev 9901)
@@ -23,6 +23,7 @@
 package org.jboss.portal.portlet.test.jsp.taglib;
 =

 import org.jboss.portal.portlet.test.jsp.PortalRenderResponse;
+import org.jboss.portal.portlet.test.jsp.PortalResponse;
 =

 import javax.servlet.jsp.JspException;
 import javax.xml.namespace.QName;
@@ -38,7 +39,7 @@
 =

    enum Status
    {
-      INACTIVE, ACTIVE, SUSPENDED
+      ACTIVE, SUSPENDED
    }
 =

    /** . */
@@ -51,49 +52,25 @@
    String content;
 =

    /** . */
-   Status status =3D Status.INACTIVE;
+   Status status =3D Status.ACTIVE;
 =

-   public int doStartTag() throws JspException
+   public int doStartRenderTag(PortalRenderResponse renderResponse) throws=
 JspException
    {
-      if (status =3D=3D Status.INACTIVE)
-      {
-         PortalRenderResponse renderResponse =3D getPortalResponse();
+      maximizedId =3D renderResponse.getMaximizedWindowId();
 =

-         //
-         status =3D Status.ACTIVE;
-
-         //
-         maximizedId =3D renderResponse.getMaximizedWindowId();
-
-         //
-         if (maximizedId !=3D null)
-         {
-            return EVAL_BODY_BUFFERED;
-         }
-         else
-         {
-            return EVAL_BODY_INCLUDE;
-         }
+      //
+      if (maximizedId !=3D null)
+      {
+         return EVAL_BODY_BUFFERED;
       }
       else
       {
-         return SKIP_BODY;
+         return EVAL_BODY_INCLUDE;
       }
    }
 =

-   public int doEndTag() throws JspException
+   public int doEndRenderTag(PortalRenderResponse renderResponse) throws J=
spException
    {
-      switch (status)
-      {
-         case SUSPENDED:
-            break;
-         case INACTIVE:
-            break;
-         case ACTIVE:
-            status =3D Status.INACTIVE;
-      }
-
-      //
       if (maximizedId !=3D null)
       {
          try
@@ -109,4 +86,14 @@
       //
       return EVAL_PAGE;
    }
+
+   public int doStartTag(PortalResponse portalResponse) throws JspException
+   {
+      return EVAL_BODY_INCLUDE;
+   }
+
+   public int doEndTag(PortalResponse portalResponse) throws JspException
+   {
+      return EVAL_PAGE;
+   }
 }

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/taglib/ParamTag.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/ParamTag.java	2008-02-09 14:44:32 UTC (rev 9900)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/ParamTag.java	2008-02-09 16:11:00 UTC (rev 9901)
@@ -22,6 +22,8 @@
  *************************************************************************=
*****/
 package org.jboss.portal.portlet.test.jsp.taglib;
 =

+import org.jboss.portal.portlet.test.jsp.PortalRenderResponse;
+
 import javax.servlet.jsp.tagext.SimpleTagSupport;
 import javax.servlet.jsp.JspException;
 import java.io.IOException;
@@ -59,7 +61,7 @@
       this.value =3D value;
    }
 =

-   public void internalDoTag() throws JspException, IOException
+   public void doRenderTag(PortalRenderResponse renderResponse) throws Jsp=
Exception, IOException
    {
       AbstractURLTag urlTag =3D (AbstractURLTag)SimpleTagSupport.findAnces=
torWithClass(this, AbstractURLTag.class);
       urlTag.setParam(name, value);

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/taglib/PortalBodyTagSupport.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortalBodyTagSupport.java	2008-02-09 14:44:32 UTC (rev 9900)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortalBodyTagSupport.java	2008-02-09 16:11:00 UTC (rev 9901)
@@ -23,6 +23,9 @@
 package org.jboss.portal.portlet.test.jsp.taglib;
 =

 import org.jboss.portal.portlet.test.jsp.PortalRenderResponse;
+import org.jboss.portal.portlet.test.jsp.PortalActionResponse;
+import org.jboss.portal.portlet.test.jsp.PortalResponse;
+import org.jboss.portal.common.NotYetImplemented;
 =

 import javax.servlet.jsp.tagext.BodyTagSupport;
 import javax.servlet.jsp.JspException;
@@ -33,34 +36,74 @@
  */
 public class PortalBodyTagSupport extends BodyTagSupport
 {
-   protected final PortalRenderResponse getPortalResponse()
+
+   private PortalResponse getPortalResponse()
    {
-      return (PortalRenderResponse)pageContext.getResponse();
+      return (PortalResponse)pageContext.getResponse();
    }
 =

-   public int doStartTag() throws JspException
+   public final int doStartTag() throws JspException
    {
+      return doStartTag(getPortalResponse());
+   }
+
+   public final int doEndTag() throws JspException
+   {
+      return doEndTag(getPortalResponse());
+   }
+
+   public int doStartTag(PortalResponse portalResponse) throws JspException
+   {
       PageTag pageTag =3D (PageTag)findAncestorWithClass(this, PageTag.cla=
ss);
 =

       //
+      if (pageTag =3D=3D null && this instanceof PageTag)
+      {
+         pageTag =3D (PageTag)this;
+
+         //
+         pageTag.status =3D PageTag.Status.ACTIVE;
+      }
+
+      //
       if (pageTag =3D=3D null || pageTag.status !=3D PageTag.Status.ACTIVE)
       {
          return SKIP_BODY;
       }
       else
       {
-         return internalDoStartTag();
+         if (portalResponse instanceof PortalActionResponse)
+         {
+            return doStartActionTag((PortalActionResponse)portalResponse);
+         }
+         else
+         {
+            return doStartRenderTag((PortalRenderResponse)portalResponse);
+         }
       }
    }
 =

-   public int doEndTag() throws JspException
+   public int doEndTag(PortalResponse portalResponse) throws JspException
    {
       PageTag pageTag =3D (PageTag)findAncestorWithClass(this, PageTag.cla=
ss);
 =

       //
+      if (pageTag =3D=3D null && this instanceof PageTag)
+      {
+         pageTag =3D (PageTag)this;
+      }
+
+      //
       if (pageTag !=3D null && pageTag.status =3D=3D PageTag.Status.ACTIVE)
       {
-         return internalDoEndTag();
+         if (portalResponse instanceof PortalActionResponse)
+         {
+            return doEndActionTag((PortalActionResponse)portalResponse);
+         }
+         else
+         {
+            return doEndRenderTag((PortalRenderResponse)portalResponse);
+         }
       }
       else
       {
@@ -68,12 +111,22 @@
       }
    }
 =

-   public int internalDoStartTag() throws JspException
+   public int doStartActionTag(PortalActionResponse actionResponse) throws=
 JspException
    {
+      throw new NotYetImplemented();
+   }
+
+   public int doEndActionTag(PortalActionResponse actionResponse) throws J=
spException
+   {
+      throw new NotYetImplemented();
+   }
+
+   public int doStartRenderTag(PortalRenderResponse renderResponse) throws=
 JspException
+   {
       return super.doStartTag();
    }
 =

-   public int internalDoEndTag() throws JspException
+   public int doEndRenderTag(PortalRenderResponse renderResponse) throws J=
spException
    {
       return super.doEndTag();
    }

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/taglib/PortalSimpleTagSupport.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortalSimpleTagSupport.java	2008-02-09 14:44:32 UTC (rev 9900)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortalSimpleTagSupport.java	2008-02-09 16:11:00 UTC (rev 9901)
@@ -23,6 +23,9 @@
 package org.jboss.portal.portlet.test.jsp.taglib;
 =

 import org.jboss.portal.portlet.test.jsp.PortalRenderResponse;
+import org.jboss.portal.portlet.test.jsp.PortalResponse;
+import org.jboss.portal.portlet.test.jsp.PortalActionResponse;
+import org.jboss.portal.common.NotYetImplemented;
 =

 import javax.servlet.jsp.tagext.SimpleTagSupport;
 import javax.servlet.jsp.PageContext;
@@ -35,25 +38,37 @@
  */
 public class PortalSimpleTagSupport extends SimpleTagSupport
 {
-   protected final PortalRenderResponse getPortalResponse()
+   private PortalResponse getPortalResponse()
    {
       PageContext pageContext =3D (PageContext)getJspContext();
-      return (PortalRenderResponse)pageContext.getResponse();
+      return (PortalResponse)pageContext.getResponse();
    }
 =

-   public void doTag() throws JspException, IOException
+   public final void doTag() throws JspException, IOException
    {
       PageTag pageTag =3D (PageTag)findAncestorWithClass(this, PageTag.cla=
ss);
 =

       //
       if (pageTag !=3D null && pageTag.status =3D=3D PageTag.Status.ACTIVE)
       {
-         internalDoTag();
+         if (getPortalResponse() instanceof PortalActionResponse)
+         {
+            doActionTag();
+         }
+         else
+         {
+            doRenderTag((PortalRenderResponse)getPortalResponse());
+         }
       }
    }
 =

-   public void internalDoTag() throws JspException, IOException
+   public void doActionTag() throws JspException, IOException
    {
+      throw new NotYetImplemented();
+   }
+
+   public void doRenderTag(PortalRenderResponse renderResponse) throws Jsp=
Exception, IOException
+   {
       super.doTag();
    }
 }

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/taglib/PortletMarkupTag.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortletMarkupTag.java	2008-02-09 14:44:32 UTC (rev 9900)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortletMarkupTag.java	2008-02-09 16:11:00 UTC (rev 9901)
@@ -39,10 +39,8 @@
  */
 public class PortletMarkupTag extends PortalSimpleTagSupport
 {
-   public void internalDoTag() throws JspException, IOException
+   public void doRenderTag(PortalRenderResponse renderResponse) throws Jsp=
Exception, IOException
    {
-      PortalRenderResponse resp =3D getPortalResponse();
-
       PortletTag portletTag =3D (PortletTag)SimpleTagSupport.findAncestorW=
ithClass(this, PortletTag.class);
 =

       PortletInvocationResponse portletResp =3D portletTag.result.getRespo=
nse();
@@ -55,9 +53,9 @@
          {
             FragmentResponse fragment =3D (FragmentResponse)portletResp;
             WindowNavigationalState windowNS =3D null;
-            if (resp.getPageState() !=3D null)
+            if (renderResponse.getPageState() !=3D null)
             {
-               windowNS =3D resp.getPageState().getWindowNavigationalState=
(portletTag.result.getWindowId());
+               windowNS =3D renderResponse.getPageState().getWindowNavigat=
ionalState(portletTag.result.getWindowId());
             }
             if (windowNS =3D=3D null || !windowNS.getWindowState().equals(=
WindowState.MINIMIZED))
             {

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/taglib/PortletTag.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortletTag.java	2008-02-09 14:44:32 UTC (rev 9900)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortletTag.java	2008-02-09 16:11:00 UTC (rev 9901)
@@ -23,7 +23,8 @@
 package org.jboss.portal.portlet.test.jsp.taglib;
 =

 import org.jboss.portal.portlet.test.jsp.PortalRenderResponse;
-import org.jboss.portal.portlet.test.jsp.PagePortletControllerContext;
+import org.jboss.portal.portlet.test.jsp.PortalActionResponse;
+import org.jboss.portal.portlet.test.jsp.PortalResponse;
 import org.jboss.portal.portlet.invocation.response.PortletInvocationRespo=
nse;
 import org.jboss.portal.portlet.invocation.response.FragmentResponse;
 import org.jboss.portal.portlet.invocation.response.ErrorResponse;
@@ -78,7 +79,8 @@
    private Set supportedModes;
    private Mode initialMode;
    private PageTag pageTag;
-   private PortalRenderResponse renderResponse;
+   private Portlet portlet;
+   private String windowId;
 =

    /** . */
    PortletResult result;
@@ -143,7 +145,7 @@
       this.errorPageAttr =3D errorPage;
    }
 =

-   private void initState()
+   private void initState(PortalResponse portalResponse)
    {
       //
       Set supportedModes =3D new LinkedHashSet();
@@ -183,11 +185,22 @@
       }
 =

       //
+      Portlet portlet =3D portalResponse.findPortlet(applicationNameAttr, =
nameAttr);
+
+      //
+      String windowId =3D null;
+      if (portlet !=3D null)
+      {
+         windowId =3D portlet.getContext().getId() + "." + portalResponse.=
nextId();
+      }
+
+      //
       this.initialMode =3D initialMode;
       this.supportedModes =3D supportedModes;
       this.supportedWindowStates =3D supportedWindowStates;
       this.pageTag =3D (PageTag)findAncestorWithClass(this, PageTag.class);
-      this.renderResponse =3D getPortalResponse();
+      this.portlet =3D portlet;
+      this.windowId =3D windowId;
    }
 =

    private void destroyState()
@@ -196,37 +209,51 @@
       this.supportedModes =3D null;
       this.supportedWindowStates =3D null;
       this.pageTag =3D null;
-      this.renderResponse =3D null;
+      this.portlet =3D null;
+      this.windowId =3D null;
    }
 =

-   public int internalDoStartTag() throws JspException
+   public int doStartActionTag(PortalActionResponse actionResponse) throws=
 JspException
    {
-      initState();
+      initState(actionResponse);
 =

       //
-      PagePortletControllerContext context =3D renderResponse.getPortletCo=
ntrollerContext();
+      if (portlet !=3D null)
+      {
+         actionResponse.addWindow(windowId, portlet);
+      }
 =

       //
-      Portlet portlet =3D context.findPortlet(applicationNameAttr, nameAtt=
r);
+      return SKIP_BODY;
+   }
 =

+   public int doEndActionTag(PortalActionResponse actionResponse) throws J=
spException
+   {
+      destroyState();
+
       //
+      return EVAL_PAGE;
+   }
+
+   public int doStartRenderTag(PortalRenderResponse renderResponse) throws=
 JspException
+   {
+      initState(renderResponse);
+
+      //
       if (portlet =3D=3D null)
       {
-         handleError(null, Constants.NOT_FOUND, null, null);
+         handleError(renderResponse, Constants.NOT_FOUND, null, null);
 =

          // We cannot show an absent portlet, no meta data
          return SKIP_BODY;
       }
       else
       {
-         String windowId =3D portlet.getContext().getId() + "." + renderRe=
sponse.nextId();
-
-         //
          if (pageTag.maximizedId !=3D null)
          {
             if (windowId.equals(pageTag.maximizedId))
             {
-               return render(portlet, windowId, EVAL_BODY_BUFFERED);
+               return render(renderResponse, EVAL_BODY_BUFFERED);
             }
             else
             {
@@ -235,12 +262,12 @@
          }
          else
          {
-            return render(portlet, windowId, EVAL_BODY_INCLUDE);
+            return render(renderResponse, EVAL_BODY_INCLUDE);
          }
       }
    }
 =

-   public int internalDoEndTag() throws JspException
+   public int doEndRenderTag(PortalRenderResponse renderResponse) throws J=
spException
    {
       if (bodyContent !=3D null)
       {
@@ -254,7 +281,7 @@
       return EVAL_PAGE;
    }
 =

-   public int render(Portlet portlet, String windowId, int rt)
+   public int render(PortalRenderResponse renderResponse, int rt)
    {
       try
       {
@@ -280,21 +307,21 @@
             ErrorResponse error =3D (ErrorResponse)portletResponse;
 =

             //
-            handleError(windowId, Constants.PORTLET_ERROR, error.getCause(=
), error.getMessage());
+            handleError(renderResponse, Constants.PORTLET_ERROR, error.get=
Cause(), error.getMessage());
 =

             //
             return SKIP_BODY;
          }
          else if (portletResponse instanceof UnavailableResponse)
          {
-            handleError(windowId, Constants.UNAVAILABLE, null, null);
+            handleError(renderResponse, Constants.UNAVAILABLE, null, null);
 =

             //
             return SKIP_BODY;
          }
          else
          {
-            handleError(windowId, Constants.INTERNAL_ERROR, null, null);
+            handleError(renderResponse, Constants.INTERNAL_ERROR, null, nu=
ll);
 =

             //
             return SKIP_BODY;
@@ -302,14 +329,14 @@
       }
       catch (PortletInvokerException e)
       {
-         handleError(windowId, Constants.INTERNAL_ERROR, e, e.getMessage()=
);
+         handleError(renderResponse, Constants.INTERNAL_ERROR, e, e.getMes=
sage());
 =

          //
          return SKIP_BODY;
       }
    }
 =

-   private void handleError(String windowId, String errorStatus, Throwable=
 cause, String message)
+   private void handleError(PortalRenderResponse renderResponse, String er=
rorStatus, Throwable cause, String message)
    {
       if (errorPageAttr !=3D null)
       {

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/taglib/PortletTitleTag.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortletTitleTag.java	2008-02-09 14:44:32 UTC (rev 9900)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortletTitleTag.java	2008-02-09 16:11:00 UTC (rev 9901)
@@ -24,6 +24,7 @@
 =

 import org.jboss.portal.portlet.invocation.response.PortletInvocationRespo=
nse;
 import org.jboss.portal.portlet.invocation.response.FragmentResponse;
+import org.jboss.portal.portlet.test.jsp.PortalRenderResponse;
 =

 import javax.servlet.jsp.JspException;
 import javax.servlet.jsp.JspWriter;
@@ -37,7 +38,7 @@
 public class PortletTitleTag extends PortalSimpleTagSupport
 {
 =

-   public void internalDoTag() throws JspException, IOException
+   public void doRenderTag(PortalRenderResponse renderResponse) throws Jsp=
Exception, IOException
    {
 =

       PortletTag portletTag =3D (PortletTag)SimpleTagSupport.findAncestorW=
ithClass(this, PortletTag.class);

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/taglib/PortletURLTag.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortletURLTag.java	2008-02-09 14:44:32 UTC (rev 9900)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortletURLTag.java	2008-02-09 16:11:00 UTC (rev 9901)
@@ -70,14 +70,13 @@
       this.windowStateValue =3D windowState;
    }
 =

-   public int internalDoStartTag() throws JspException
+   public int doStartRenderTag(PortalRenderResponse renderResponse) throws=
 JspException
    {
       return EVAL_BODY_BUFFERED;
    }
 =

-   public int internalDoEndTag() throws JspException
+   public int doEndRenderTag(PortalRenderResponse renderResponse) throws J=
spException
    {
-      PortalRenderResponse renderResponse =3D getPortalResponse();
       PagePortletControllerContext context =3D renderResponse.getPortletCo=
ntrollerContext();
       PortletTag portletTag =3D (PortletTag)SimpleTagSupport.findAncestorW=
ithClass(this, PortletTag.class);
 =



--===============6295787258521636631==--

From portal-commits at lists.jboss.org Sat Feb  9 11:18:37 2008
Content-Type: multipart/mixed; boundary="===============0606336371721316154=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9903 - in
 modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp:
 taglib and 1 other directory.
Date: Sat, 09 Feb 2008 11:18:37 -0500
Message-ID: 

--===============0606336371721316154==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-09 11:18:37 -0500 (Sat, 09 Feb 2008)
New Revision: 9903

Modified:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/ControllerFilter.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/PagePortletControllerContext.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/PortletTag.java
Log:
no need to use the window id that contains the portlet context id marshalle=
d in since we always have a map of window id -> Portlet

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/ControllerFilter.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/ControllerFilter.java	2008-02-09 16:11:20 UTC (rev 9902)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/ControllerFilter.java	2008-02-09 16:18:37 UTC (rev 9903)
@@ -85,32 +85,18 @@
    {
       PortletInvoker invoker =3D (PortletInvoker)getServletContext().getAt=
tribute("ConsumerPortletInvoker");
 =

-
+      //
       PortalActionResponse actionResponse =3D new PortalActionResponse(res=
p, invoker);
 =

+      // Discover existing portlets on the page
       chain.doFilter(req, actionResponse);
 =

-      //
-      PagePortletControllerContext context;
-      try
-      {
-         context =3D new PagePortletControllerContext(
-            req,
-            resp,
-            getServletContext(),
-            actionResponse);
-      }
-      catch (PortletInvokerException e)
-      {
-         throw new ServletException(e);
-      }
+      // Now we can create a populated context
+      PagePortletControllerContext context =3D new PagePortletControllerCo=
ntext(req, resp, getServletContext(), actionResponse);
 =

       PageNavigationalState pageState =3D null;
       if (context.getRequest() !=3D null)
       {
-
-
-
          ControllerResponse controllerResponse;
          try
          {

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/PagePortletControllerContext.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/PagePortletControllerContext.java	2008-02-09 16:11:20 UTC (rev 9902)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/PagePortletControllerContext.java	2008-02-09 16:18:37 UTC (rev 9903)
@@ -23,7 +23,6 @@
 package org.jboss.portal.portlet.test.jsp;
 =

 import org.jboss.portal.portlet.Portlet;
-import org.jboss.portal.portlet.PortletContext;
 import org.jboss.portal.portlet.PortletInvokerException;
 import org.jboss.portal.portlet.controller.event.EventControllerContext;
 import org.jboss.portal.portlet.invocation.PortletInvocation;
@@ -48,7 +47,7 @@
    private final EventControllerContext eventControllerContext;
 =

    /** . */
-   private final PortalResponse actionResponse;
+   private final PortalActionResponse actionResponse;
 =

    public PagePortletControllerContext(
       HttpServletRequest req,
@@ -66,20 +65,7 @@
 =

    protected Portlet getPortlet(String windowId) throws PortletInvokerExce=
ption
    {
-      int index =3D windowId.lastIndexOf('.');
-      String portletId =3D windowId.substring(0, index);
-
-      // in the case of an event propagation, the given 'windowId' is actu=
ally the portlet id already so need to check
-      // for that case (portletId should still have a '.', if not it means=
 that the windowId was really a portlet id)
-//      if (portletId.indexOf('.') =3D=3D -1)
-//      {
-//         portletId =3D windowId;
-//      }
-
-      PortletContext portletContext =3D PortletContext.createPortletContex=
t(portletId);
-
-      //
-      return actionResponse.getInvoker().getPortlet(portletContext);
+      return actionResponse.getPortlet(windowId);
    }
 =

    public PortletInvocationResponse invoke(PortletInvocation invocation) t=
hrows PortletInvokerException

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/taglib/PortletTag.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortletTag.java	2008-02-09 16:11:20 UTC (rev 9902)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortletTag.java	2008-02-09 16:18:37 UTC (rev 9903)
@@ -188,11 +188,7 @@
       Portlet portlet =3D portalResponse.findPortlet(applicationNameAttr, =
nameAttr);
 =

       //
-      String windowId =3D null;
-      if (portlet !=3D null)
-      {
-         windowId =3D portlet.getContext().getId() + "." + portalResponse.=
nextId();
-      }
+      String windowId =3D portalResponse.nextId();
 =

       //
       this.initialMode =3D initialMode;


--===============0606336371721316154==--

From portal-commits at lists.jboss.org Sat Feb  9 11:22:50 2008
Content-Type: multipart/mixed; boundary="===============7351108453469408379=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9904 -
 modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp.
Date: Sat, 09 Feb 2008 11:22:50 -0500
Message-ID: 

--===============7351108453469408379==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-09 11:22:50 -0500 (Sat, 09 Feb 2008)
New Revision: 9904

Modified:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/ControllerFilter.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/PageEventControllerContext.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/PortalResponse.java
Log:
some basic javadoc

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/ControllerFilter.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/ControllerFilter.java	2008-02-09 16:18:37 UTC (rev 9903)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/ControllerFilter.java	2008-02-09 16:22:50 UTC (rev 9904)
@@ -88,12 +88,13 @@
       //
       PortalActionResponse actionResponse =3D new PortalActionResponse(res=
p, invoker);
 =

-      // Discover existing portlets on the page
+      // Discover existing portlets on the page (introspection phase)
       chain.doFilter(req, actionResponse);
 =

       // Now we can create a populated context
       PagePortletControllerContext context =3D new PagePortletControllerCo=
ntext(req, resp, getServletContext(), actionResponse);
 =

+      //
       PageNavigationalState pageState =3D null;
       if (context.getRequest() !=3D null)
       {
@@ -217,79 +218,4 @@
    {
       this.config =3D null;
    }
-
-   protected void render(HttpServletRequest req, PortalRenderResponse resp=
) throws ServletException, IOException, ClassNotFoundException
-   {
-
-      //
-//      PagePortletControllerContext context =3D resp.getPortletController=
Context();
-
-      //
-
-      // Look if we need to handle maxmized rendering
-/*
-      for (Window window : page.getWindows())
-      {
-         WindowNavigationalState windowState =3D pageState.getWindowNaviga=
tionalState(window.getId());
-         if (windowState !=3D null && WindowState.MAXIMIZED.equals(windowS=
tate.getWindowState()))
-         {
-            List chunks =3D new LinkedList();
-            int mode =3D 0;
-            int count =3D 0;
-            Map windows =3D Collections.emptyMa=
p();
-            for (Iterator i =3D page.getChunks().iterator();i.hasNe=
xt();)
-            {
-               Chunk chunk =3D i.next();
-
-               switch (mode)
-               {
-                  case 0:
-                     if (chunk instanceof StartPageChunk)
-                     {
-                        mode =3D 1;
-                        chunks.add(chunk);
-                     }
-                     break;
-                  case 1:
-                     if (chunk instanceof StartPortletChunk)
-                     {
-                        StartPortletChunk startPortletChunk =3D (StartPort=
letChunk)chunk;
-                        String windowId =3D "" + count;
-                        if (window.getId().equals(windowId))
-                        {
-                           mode =3D 2;
-                           chunks.add(startPortletChunk);
-                           windows =3D Collections.singletonMap(startPortl=
etChunk, window);
-                        }
-                     }
-                     else if (chunk instanceof EndPageChunk)
-                     {
-                        mode =3D 0;
-                        chunks.add(chunk);
-                     }
-                     break;
-                  case 2:
-                     if (chunk instanceof EndPortletChunk)
-                     {
-                        mode =3D 1;
-                     }
-
-                     //
-                     chunks.add(chunk);
-                     break;
-               }
-
-               //
-               if (chunk instanceof EndPortletChunk)
-               {
-                  count++;
-               }
-            }
-
-            // New page
-            page =3D new Page(chunks, windows);
-         }
-      }
-*/
-   }
 }

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/PageEventControllerContext.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/PageEventControllerContext.java	2008-02-09 16:18:37 UTC (rev 9903)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/PageEventControllerContext.java	2008-02-09 16:22:50 UTC (rev 9904)
@@ -31,6 +31,9 @@
 import java.util.ArrayList;
 =

 /**
+ * Route events according to the portlets discovered on the page. For now =
it is pretty trivial.
+ * We could leverage JSP tags to 'wire' portlets on the same page for inst=
ance.
+ *
  * @author Julien Viet
  * @version $Revision: 630 $
  */

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/PortalResponse.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/PortalResponse.java	2008-02-09 16:18:37 UTC (rev 9903)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/PortalResponse.java	2008-02-09 16:22:50 UTC (rev 9904)
@@ -33,6 +33,8 @@
 import java.util.HashMap;
 =

 /**
+ * Expose stuff common to action and render response.
+ *
  * @author Julien Viet
  * @version $Revision: 630 $
  */
@@ -80,6 +82,10 @@
       return portlets.get(new Key(applicationName, portletName));
    }
 =

+   /**
+    * todo : add on JSP portlet tag a notion of 'id', because this id gene=
ration relies on the portlet
+    * rendering order on the page which could not be the same between 2 re=
quests.
+    */
    public String nextId()
    {
       return "" + count++;


--===============7351108453469408379==--

From portal-commits at lists.jboss.org Sat Feb  9 11:39:08 2008
Content-Type: multipart/mixed; boundary="===============5568442042429425730=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9905 -
 modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib.
Date: Sat, 09 Feb 2008 11:39:07 -0500
Message-ID: 

--===============5568442042429425730==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-09 11:39:07 -0500 (Sat, 09 Feb 2008)
New Revision: 9905

Modified:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/PageParamTag.java
Log:
fix issue with shared render param update overwritten by JSP page param

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/taglib/PageParamTag.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PageParamTag.java	2008-02-09 16:22:50 UTC (rev 9904)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PageParamTag.java	2008-02-09 16:39:07 UTC (rev 9905)
@@ -94,8 +94,12 @@
          QName name =3D new QName(namespaceURI, localName);
 =

          //
-         if (!"true".equals(frozen) || renderResponse.getPageParameter(nam=
e) =3D=3D null)
+         if ("true".equals(frozen))
          {
+            //
+         }
+         else if (renderResponse.getPageParameter(name) =3D=3D null)
+         {
             renderResponse.setPageParameter(name, value);
          }
       }


--===============5568442042429425730==--

From portal-commits at lists.jboss.org Sat Feb  9 11:58:20 2008
Content-Type: multipart/mixed; boundary="===============6601856647574129984=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9906 - in
 modules/portlet/trunk/test/src:
 test/resources/portal/samples/basic-war/WEB-INF and 2 other directories.
Date: Sat, 09 Feb 2008 11:58:20 -0500
Message-ID: 

--===============6601856647574129984==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-09 11:58:19 -0500 (Sat, 09 Feb 2008)
New Revision: 9906

Added:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/portal=
/samples/basic/ExceptionPortlet.java
Modified:
   modules/portlet/trunk/test/src/test/resources/portal/samples/basic-war/W=
EB-INF/portlet.xml
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/=
jsp/error.jsp
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/dem=
o.jsp
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/dem=
o2.jsp
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/dem=
o3.jsp
Log:
minor updates

Copied: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/p=
ortal/samples/basic/ExceptionPortlet.java (from rev 9905, modules/portlet/t=
runk/test/src/main/java/org/jboss/portal/portlet/portal/samples/basic/Error=
Portlet.java)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/porta=
l/samples/basic/ExceptionPortlet.java	                        (rev 0)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/porta=
l/samples/basic/ExceptionPortlet.java	2008-02-09 16:58:19 UTC (rev 9906)
@@ -0,0 +1,113 @@
+/*************************************************************************=
*****
+ * 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.portal.samples.basic;
+
+import javax.portlet.GenericPortlet;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+import javax.portlet.PortletException;
+import javax.portlet.PortletURL;
+import javax.portlet.PortletRequest;
+import javax.portlet.ActionRequest;
+import javax.portlet.PortletSecurityException;
+import javax.portlet.ActionResponse;
+import java.io.IOException;
+import java.io.PrintWriter;
+
+/**
+ * @author Julien Viet
+ * @version $Revision: 630 $
+ */
+public class ExceptionPortlet extends GenericPortlet
+{
+
+   public void processAction(ActionRequest req, ActionResponse resp) throw=
s PortletException, PortletSecurityException, IOException
+   {
+      throwException(req);
+   }
+
+   protected void doView(RenderRequest req, RenderResponse resp) throws Po=
rtletException, PortletSecurityException, IOException
+   {
+      throwException(req);
+
+      //
+      resp.setContentType("text/html");
+      PrintWriter writer =3D resp.getWriter();
+      PortletURL renderURL =3D resp.createRenderURL();
+      PortletURL actionURL =3D resp.createActionURL();
+
+      //
+      writer.write("");
+      writer.write("
Throw :"=
);
+      writer.write("");
+      renderURL.setParameter("op", "portletexception");
+      writer.write("render PortletExc=
eption");
+      renderURL.setParameter("op", "portletsecurityexception");
+      writer.write("render PortletSec=
urityException");
+      renderURL.setParameter("op", "ioexception");
+      writer.write("render IOExceptio=
n");
+      renderURL.setParameter("op", "runtimeexception");
+      writer.write("render RuntimeExc=
eption");
+      actionURL.setParameter("op", "error");
+      writer.write("render Error<=
/div>");
+      actionURL.setParameter("op", "portletexception");
+      writer.write("action PortletExc=
eption");
+      actionURL.setParameter("op", "portletsecurityexception");
+      writer.write("action PortletSec=
urityException");
+      actionURL.setParameter("op", "ioexception");
+      writer.write("action IOExceptio=
n");
+      actionURL.setParameter("op", "runtimeexception");
+      writer.write("action RuntimeExc=
eption");
+      actionURL.setParameter("op", "error");
+      writer.write("action Error<=
/div>");
+      writer.write("");
+      writer.write("");
+   }
+
+   private void throwException(PortletRequest req) throws PortletException=
, IOException
+   {
+      String op =3D req.getParameter("op");
+
+      // Throw any required exception
+      if ("portletexception".equals(op))
+      {
+         throw new PortletException();
+      }
+      if ("portletsecurityexception".equals(op))
+      {
+         throw new PortletSecurityException("");
+      }
+      if ("ioexception".equals(op))
+      {
+         throw new IOException();
+      }
+      if ("runtimeexception".equals(op))
+      {
+         throw new RuntimeException();
+      }
+      if ("error".equals(op))
+      {
+         throw new Error();
+      }
+   }
+}

Modified: modules/portlet/trunk/test/src/test/resources/portal/samples/basi=
c-war/WEB-INF/portlet.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/portal/samples/basic-war/=
WEB-INF/portlet.xml	2008-02-09 16:39:07 UTC (rev 9905)
+++ modules/portlet/trunk/test/src/test/resources/portal/samples/basic-war/=
WEB-INF/portlet.xml	2008-02-09 16:58:19 UTC (rev 9906)
@@ -28,8 +28,8 @@
              version=3D"1.0">
 =

    
-      ErrorPortlet
-      org.jboss.portal.portlet.portal.samples.basic.ErrorPo=
rtlet
+      ExceptionPortlet
+      org.jboss.portal.portlet.portal.samples.basic.Excepti=
onPortlet
       
         text/html
       

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/W=
EB-INF/jsp/error.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF=
/jsp/error.jsp	2008-02-09 16:39:07 UTC (rev 9905)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF=
/jsp/error.jsp	2008-02-09 16:58:19 UTC (rev 9906)
@@ -15,7 +15,7 @@
       Portlet name: <%=3D request.getAttribute("org.jboss.portal.po=
rtlet.portal.error.portlet_name")%>

       Portlet application
          name: <%=3D request.getAttribute("org.jboss.portal.portlet.po=
rtal.error.application_name")%>

-      Exception: <%=3D request.getAttribute("org.jboss.portal.portl=
et.portal.error.exception")%>

+      Exception: <%=3D request.getAttribute("org.jboss.portal.portl=
et.portal.error.cause")%>

       Window id: <%=3D request.getAttribute("org.jboss.portal.portl=
et.portal.error.window_id")%>

    
 

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/d=
emo/demo.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/de=
mo.jsp	2008-02-09 16:39:07 UTC (rev 9905)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/de=
mo.jsp	2008-02-09 16:58:19 UTC (rev 9906)
@@ -12,7 +12,7 @@
             
                
                
-               
+               
                
             
             

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/d=
emo/demo2.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/de=
mo2.jsp	2008-02-09 16:39:07 UTC (rev 9905)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/de=
mo2.jsp	2008-02-09 16:58:19 UTC (rev 9906)
@@ -15,6 +15,7 @@
             
             
 =

+               
                
                =

             

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/d=
emo/demo3.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/de=
mo3.jsp	2008-02-09 16:39:07 UTC (rev 9905)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/de=
mo3.jsp	2008-02-09 16:58:19 UTC (rev 9906)
@@ -16,7 +16,7 @@
 =

             
             
-               
+               
             
    
 


--===============6601856647574129984==--

From portal-commits at lists.jboss.org Sat Feb  9 12:00:33 2008
Content-Type: multipart/mixed; boundary="===============4195852224132351367=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9907 -
 modules/portlet/trunk/test/src/test/resources/portal/samples/basic-war/WEB-INF.
Date: Sat, 09 Feb 2008 12:00:33 -0500
Message-ID: 

--===============4195852224132351367==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-09 12:00:33 -0500 (Sat, 09 Feb 2008)
New Revision: 9907

Modified:
   modules/portlet/trunk/test/src/test/resources/portal/samples/basic-war/W=
EB-INF/portlet.xml
Log:
set title on exception portlet

Modified: modules/portlet/trunk/test/src/test/resources/portal/samples/basi=
c-war/WEB-INF/portlet.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/portal/samples/basic-war/=
WEB-INF/portlet.xml	2008-02-09 16:58:19 UTC (rev 9906)
+++ modules/portlet/trunk/test/src/test/resources/portal/samples/basic-war/=
WEB-INF/portlet.xml	2008-02-09 17:00:33 UTC (rev 9907)
@@ -34,7 +34,7 @@
         text/html
       
       
-         
+         ExceptionPortlet

Description	Price
").append(item.getDescription()).append= ("	$").append("" + price) + .append("
").append("$= " + total).append("

Description	Price
").append(item.getDescription()).append("<= /td>	$").append("" + item.getPrice()) + .append("	Add to cart


 =



--===============4195852224132351367==--

From portal-commits at lists.jboss.org Sat Feb  9 12:12:18 2008
Content-Type: multipart/mixed; boundary="===============2039740122160154965=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9908 - in
 modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet: test/jsp
 and 1 other directory.
Date: Sat, 09 Feb 2008 12:12:18 -0500
Message-ID: 

--===============2039740122160154965==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-09 12:12:18 -0500 (Sat, 09 Feb 2008)
New Revision: 9908

Removed:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/portal=
/samples/basic/ErrorPortlet.java
Modified:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/ControllerFilter.java
Log:
handle error in actions

Deleted: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/=
portal/samples/basic/ErrorPortlet.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/porta=
l/samples/basic/ErrorPortlet.java	2008-02-09 17:00:33 UTC (rev 9907)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/porta=
l/samples/basic/ErrorPortlet.java	2008-02-09 17:12:18 UTC (rev 9908)
@@ -1,41 +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.portal.samples.basic;
-
-import javax.portlet.GenericPortlet;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-import javax.portlet.PortletException;
-import java.io.IOException;
-
-/**
- * @author Julien Viet
- * @version $Revision: 630 $
- */
-public class ErrorPortlet extends GenericPortlet
-{
-   protected void doView(RenderRequest renderRequest, RenderResponse rende=
rResponse) throws PortletException, IOException
-   {
-      throw new PortletException("Some exception");
-   }
-}

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/ControllerFilter.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/ControllerFilter.java	2008-02-09 17:00:33 UTC (rev 9907)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/ControllerFilter.java	2008-02-09 17:12:18 UTC (rev 9908)
@@ -27,12 +27,14 @@
 import org.jboss.portal.portlet.PortletInvokerException;
 import org.jboss.portal.portlet.invocation.response.PortletInvocationRespo=
nse;
 import org.jboss.portal.portlet.invocation.response.FragmentResponse;
+import org.jboss.portal.portlet.invocation.response.ErrorResponse;
 import org.jboss.portal.portlet.controller.PortletController;
 import org.jboss.portal.portlet.controller.request.PortletActionRequest;
 import org.jboss.portal.portlet.controller.impl.state.StateControllerConte=
xtImpl;
 import org.jboss.portal.portlet.controller.response.ControllerResponse;
 import org.jboss.portal.portlet.controller.response.PageUpdateResponse;
 import org.jboss.portal.portlet.controller.response.ResourceResponse;
+import org.jboss.portal.portlet.controller.response.PortletResponse;
 import org.jboss.portal.portlet.controller.state.PageNavigationalState;
 import org.jboss.portal.common.io.IOTools;
 =

@@ -197,6 +199,31 @@
             //
             return;
          }
+         else if (controllerResponse instanceof PortletResponse)
+         {
+            PortletResponse portletResponse =3D (PortletResponse)controlle=
rResponse;
+            PortletInvocationResponse pir =3D portletResponse.response;
+
+            //
+            if (pir instanceof ErrorResponse)
+            {
+               ErrorResponse errorResponse =3D (ErrorResponse)pir;
+
+               //
+               if (errorResponse.getCause() !=3D null)
+               {
+                  throw new ServletException(errorResponse.getMessage(), e=
rrorResponse.getCause());
+               }
+               else
+               {
+                  throw new ServletException(errorResponse.getMessage());
+               }
+            }
+            else
+            {
+               // todo
+            }
+         }
          else
          {
             // todo


--===============2039740122160154965==--

From portal-commits at lists.jboss.org Sat Feb  9 12:34:08 2008
Content-Type: multipart/mixed; boundary="===============2251092466930164456=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9909 - in modules/portlet/trunk:
 test/src/test/resources/google-map-portlet-war/WEB-INF and 1 other
 directories.
Date: Sat, 09 Feb 2008 12:34:08 -0500
Message-ID: 

--===============2251092466930164456==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-09 12:34:08 -0500 (Sat, 09 Feb 2008)
New Revision: 9909

Modified:
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/asp=
ects/portlet/ConsumerCacheInterceptor.java
   modules/portlet/trunk/test/src/test/resources/google-map-portlet-war/WEB=
-INF/portlet.xml
   modules/portlet/trunk/test/src/test/resources/google-weather-portlet-war=
/WEB-INF/portlet.xml
Log:
- use caching in google portlets
- implements public nav state caching in consumer cache interceptor

Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/port=
let/aspects/portlet/ConsumerCacheInterceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/as=
pects/portlet/ConsumerCacheInterceptor.java	2008-02-09 17:12:18 UTC (rev 99=
08)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/as=
pects/portlet/ConsumerCacheInterceptor.java	2008-02-09 17:34:08 UTC (rev 99=
09)
@@ -35,6 +35,7 @@
 import org.jboss.portal.portlet.cache.CacheControl;
 import org.jboss.portal.common.invocation.InvocationException;
 import org.jboss.portal.common.invocation.AttributeResolver;
+import org.jboss.portal.common.util.ParameterMap;
 import org.jboss.portal.WindowState;
 import org.jboss.portal.Mode;
 =

@@ -64,7 +65,8 @@
          RenderInvocation renderInvocation =3D (RenderInvocation)invocatio=
n;
 =

          //
-         StateString navState =3D renderInvocation.getNavigationalState();
+         StateString navigationalState =3D renderInvocation.getNavigationa=
lState();
+         ParameterMap publicNavigationalState =3D renderInvocation.getPubl=
icNavigationalState();
          WindowState windowState =3D renderInvocation.getWindowState();
          Mode mode =3D renderInvocation.getMode();
 =

@@ -76,33 +78,58 @@
          {
             // Check time validity for fragment
             boolean useEntry =3D false;
-            StateString entryNavState =3D cachedEntry.navigationalState;
+            StateString entryNavigationalState =3D cachedEntry.navigationa=
lState;
+            ParameterMap entryPublicNavigationalState =3D cachedEntry.publ=
icNavigationalState;
 =

             // Then check nav state equality
-            if (navState =3D=3D null)
+            if (navigationalState =3D=3D null)
             {
-               if (entryNavState =3D=3D null)
+               if (entryNavigationalState =3D=3D null)
                {
                   useEntry =3D true;
                }
-               else if (entryNavState instanceof ParametersStateString)
+               else if (entryNavigationalState instanceof ParametersStateS=
tring)
                {
                   // We consider a parameters state string empty equivalen=
t to a null value
-                  useEntry =3D ((ParametersStateString)entryNavState).getS=
ize() =3D=3D 0;
+                  useEntry =3D ((ParametersStateString)entryNavigationalSt=
ate).getSize() =3D=3D 0;
                }
             }
-            else if (entryNavState =3D=3D null)
+            else if (entryNavigationalState =3D=3D null)
             {
-               if (navState instanceof ParametersStateString)
+               if (navigationalState instanceof ParametersStateString)
                {
-                  useEntry =3D ((ParametersStateString)navState).getSize()=
 =3D=3D 0;
+                  useEntry =3D ((ParametersStateString)navigationalState).=
getSize() =3D=3D 0;
                }
             }
             else
             {
-               useEntry =3D navState.equals(entryNavState);
+               useEntry =3D navigationalState.equals(entryNavigationalStat=
e);
             }
 =

+            // Check public nav state equality
+            if (useEntry)
+            {
+               if (publicNavigationalState =3D=3D null)
+               {
+                  if (entryPublicNavigationalState =3D=3D null)
+                  {
+                     //
+                  }
+                  else
+                  {
+                     useEntry =3D entryPublicNavigationalState.size() =3D=
=3D 0;
+                  }
+               }
+               else if (entryPublicNavigationalState =3D=3D null)
+               {
+                  useEntry =3D publicNavigationalState.size() =3D=3D 0;
+               }
+               else
+               {
+                  useEntry =3D publicNavigationalState.equals(entryPublicN=
avigationalState);
+               }
+            }
+
             // Then check window state equality
             useEntry &=3D windowState.equals(cachedEntry.windowState);
 =

@@ -173,7 +200,8 @@
             if (expirationTimeMillis > 0)
             {
                CacheEntry cacheEntry =3D new CacheEntry(
-                  navState,
+                  navigationalState,
+                  publicNavigationalState,
                   windowState,
                   mode,
                   fragment,
@@ -216,6 +244,9 @@
       /** . */
       private final Mode mode;
 =

+      /** . */
+      private final ParameterMap publicNavigationalState;
+
       /** The timed content. */
       private final ContentRef contentRef;
 =

@@ -227,6 +258,7 @@
 =

       public CacheEntry(
          StateString navigationalState,
+         ParameterMap publicNavigationalState,
          WindowState windowState,
          Mode mode,
          FragmentResponse content,
@@ -240,6 +272,7 @@
          this.navigationalState =3D navigationalState;
          this.windowState =3D windowState;
          this.mode =3D mode;
+         this.publicNavigationalState =3D publicNavigationalState;
          this.contentRef =3D new StrongContentRef(content);
          this.expirationTimeMillis =3D expirationTimeMillis;
          this.validationToken =3D validationToken;

Modified: modules/portlet/trunk/test/src/test/resources/google-map-portlet-=
war/WEB-INF/portlet.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/google-map-portlet-war/WE=
B-INF/portlet.xml	2008-02-09 17:12:18 UTC (rev 9908)
+++ modules/portlet/trunk/test/src/test/resources/google-map-portlet-war/WE=
B-INF/portlet.xml	2008-02-09 17:34:08 UTC (rev 9909)
@@ -30,6 +30,7 @@
       GoogleMap
       Google Map Portlet
       org.jboss.portal.simple.samples.GoogleClippingPortlet=

+      120
       
          text/html
          VIEW

Modified: modules/portlet/trunk/test/src/test/resources/google-weather-port=
let-war/WEB-INF/portlet.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/google-weather-portlet-wa=
r/WEB-INF/portlet.xml	2008-02-09 17:12:18 UTC (rev 9908)
+++ modules/portlet/trunk/test/src/test/resources/google-weather-portlet-wa=
r/WEB-INF/portlet.xml	2008-02-09 17:34:08 UTC (rev 9909)
@@ -30,6 +30,7 @@
       GoogleWeather
       Google Weather Portlet
       org.jboss.portal.simple.samples.GoogleWeatherClipping=
Portlet
+      120
       
          text/html
          VIEW


--===============2251092466930164456==--

From portal-commits at lists.jboss.org Sat Feb  9 15:41:38 2008
Content-Type: multipart/mixed; boundary="===============3433396793628768603=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9910 -
 modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api.
Date: Sat, 09 Feb 2008 15:41:37 -0500
Message-ID: 

--===============3433396793628768603==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: chris.laprun(a)jboss.com
Date: 2008-02-09 15:41:37 -0500 (Sat, 09 Feb 2008)
New Revision: 9910

Modified:
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/imp=
l/jsr168/api/StateAwareResponseImpl.java
Log:
- Removed output to sysout.

Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/port=
let/impl/jsr168/api/StateAwareResponseImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/jsr168/api/StateAwareResponseImpl.java	2008-02-09 17:34:08 UTC (rev 9909)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/jsr168/api/StateAwareResponseImpl.java	2008-02-09 20:41:37 UTC (rev 9910)
@@ -45,7 +45,6 @@
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.namespace.QName;
 import java.io.Serializable;
-import java.lang.annotation.Annotation;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.net.URI;
@@ -283,10 +282,6 @@
          // Check jaxb annotation
          if (requiresJAXBAnnotation(valueType))
          {
-            for (Annotation a : valueType.getAnnotations())
-            {
-               System.out.println("a =3D " + a);
-            }
             boolean b =3D valueType.isAnnotationPresent(XmlRootElement.cla=
ss);
             if (!b)
             {


--===============3433396793628768603==--

From portal-commits at lists.jboss.org Sat Feb  9 15:42:01 2008
Content-Type: multipart/mixed; boundary="===============7389164892190813142=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9911 -
 modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/samples/event.
Date: Sat, 09 Feb 2008 15:42:01 -0500
Message-ID: 

--===============7389164892190813142==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: chris.laprun(a)jboss.com
Date: 2008-02-09 15:42:01 -0500 (Sat, 09 Feb 2008)
New Revision: 9911

Modified:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/samples=
/event/CartPortlet.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/samples=
/event/CatalogPortlet.java
Log:
- Minor cosmetic changes.

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/=
samples/event/CartPortlet.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/sample=
s/event/CartPortlet.java	2008-02-09 20:41:37 UTC (rev 9910)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/sample=
s/event/CartPortlet.java	2008-02-09 20:42:01 UTC (rev 9911)
@@ -52,7 +52,7 @@
 =

       if (!items.isEmpty())
       {
-         writer.append("");
+         writer.append("Description Price
Description<=
tbody>");
          int total =3D 0;
          for (CatalogItem item : items)
          {
@@ -61,7 +61,8 @@
             writer.append("");
          }
-         writer.append("Price
").append(item.getDescription()).append=
(" $").append("" + price)
                .append("
").append("$=
" + total).append("");
+         writer.append("Total:")
+            .append("$" + total).append("");
       }
       else
       {

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/=
samples/event/CatalogPortlet.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/sample=
s/event/CatalogPortlet.java	2008-02-09 20:41:37 UTC (rev 9910)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/sample=
s/event/CatalogPortlet.java	2008-02-09 20:42:01 UTC (rev 9911)
@@ -46,7 +46,7 @@
       renderResponse.setContentType("text/html");
       Writer writer =3D renderResponse.getWriter();
 =

-      writer.append("<=
th>Actions");
+      writer.append("Description Price
");
 =

       PortletURL addURL =3D renderResponse.createActionURL();
       addURL.setParameter("op", "add");


--===============7389164892190813142==--

From portal-commits at lists.jboss.org Sat Feb  9 20:17:57 2008
Content-Type: multipart/mixed; boundary="===============5249803438541760500=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9912 - in
 modules/portlet/trunk/test/src:
 main/java/org/jboss/portal/portlet/portal/samples/event and 13 other
 directories.
Date: Sat, 09 Feb 2008 20:17:56 -0500
Message-ID: 

--===============5249803438541760500==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-09 20:17:56 -0500 (Sat, 09 Feb 2008)
New Revision: 9912

Added:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/portal=
/samples/GoogleClippingPortlet.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/portal=
/samples/GoogleWeatherClippingPortlet.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/portal=
/samples/RemoteControlResourcePortlet.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/portal=
/samples/event/
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/portal=
/samples/event/CartEvent.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/portal=
/samples/event/CartPortlet.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/portal=
/samples/event/Catalog.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/portal=
/samples/event/CatalogItem.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/portal=
/samples/event/CatalogPortlet.java
   modules/portlet/trunk/test/src/test/resources/portal/samples/cart-event-=
portlet-war/
   modules/portlet/trunk/test/src/test/resources/portal/samples/cart-event-=
portlet-war/WEB-INF/
   modules/portlet/trunk/test/src/test/resources/portal/samples/google-map-=
portlet-war/
   modules/portlet/trunk/test/src/test/resources/portal/samples/google-map-=
portlet-war/WEB-INF/
   modules/portlet/trunk/test/src/test/resources/portal/samples/google-weat=
her-portlet-war/
   modules/portlet/trunk/test/src/test/resources/portal/samples/google-weat=
her-portlet-war/WEB-INF/
   modules/portlet/trunk/test/src/test/resources/portal/samples/remotecontr=
ol-portlet-war/
   modules/portlet/trunk/test/src/test/resources/portal/samples/remotecontr=
ol-portlet-war/WEB-INF/
Removed:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/portal=
/samples/event/CartEvent.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/portal=
/samples/event/CartPortlet.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/portal=
/samples/event/Catalog.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/portal=
/samples/event/CatalogItem.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/portal=
/samples/event/CatalogPortlet.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/samples=
/GoogleClippingPortlet.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/samples=
/GoogleWeatherClippingPortlet.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/samples=
/RemoteControlResourcePortlet.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/samples=
/event/
   modules/portlet/trunk/test/src/test/resources/cart-event-portlet-war/
   modules/portlet/trunk/test/src/test/resources/google-map-portlet-war/
   modules/portlet/trunk/test/src/test/resources/google-weather-portlet-war/
   modules/portlet/trunk/test/src/test/resources/portal/samples/cart-event-=
portlet-war/WEB-INF/
   modules/portlet/trunk/test/src/test/resources/portal/samples/google-map-=
portlet-war/WEB-INF/
   modules/portlet/trunk/test/src/test/resources/portal/samples/google-weat=
her-portlet-war/WEB-INF/
   modules/portlet/trunk/test/src/test/resources/portal/samples/remotecontr=
ol-portlet-war/WEB-INF/
   modules/portlet/trunk/test/src/test/resources/remotecontrol-portlet-war/
Modified:
   modules/portlet/trunk/test/src/test/build.xml
   modules/portlet/trunk/test/src/test/resources/portal/samples/cart-event-=
portlet-war/WEB-INF/portlet.xml
   modules/portlet/trunk/test/src/test/resources/portal/samples/google-map-=
portlet-war/WEB-INF/portlet.xml
   modules/portlet/trunk/test/src/test/resources/portal/samples/google-weat=
her-portlet-war/WEB-INF/portlet.xml
   modules/portlet/trunk/test/src/test/resources/portal/samples/remotecontr=
ol-portlet-war/WEB-INF/portlet.xml
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/dem=
o.jsp
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/dem=
o1.jsp
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/dem=
o2.jsp
Log:
- moved stuff for more consistency but had to merge with changes so it may =
be f. up, will clean up just after

Copied: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/p=
ortal/samples/GoogleClippingPortlet.java (from rev 9905, modules/portlet/tr=
unk/test/src/main/java/org/jboss/portal/simple/samples/GoogleClippingPortle=
t.java)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/porta=
l/samples/GoogleClippingPortlet.java	                        (rev 0)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/porta=
l/samples/GoogleClippingPortlet.java	2008-02-10 01:17:56 UTC (rev 9912)
@@ -0,0 +1,178 @@
+/*************************************************************************=
*****
+ * 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.portal.samples;
+
+import javax.portlet.ActionRequest;
+import javax.portlet.ActionResponse;
+import javax.portlet.GenericPortlet;
+import javax.portlet.PortletException;
+import javax.portlet.PortletMode;
+import javax.portlet.PortletPreferences;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+import java.io.BufferedInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.PrintWriter;
+import java.net.URL;
+import java.net.URLConnection;
+
+/**
+ * A simple portlet using Google's search services to extract interesting =
information (weather, map, ...) from first
+ * result.
+ *
+ * @author Chris Laprun
+ * @version $Revision$
+ */
+public class GoogleClippingPortlet extends GenericPortlet
+{
+   protected static final String A =3D "";
+      String end =3D "Description Price Actions
";
+      int begIndex =3D html.indexOf(beg);
+      if (begIndex !=3D -1)
+      {
+         // extract table containing specific first result
+         int endIndex =3D html.indexOf(end, begIndex);
+         html =3D html.substring(begIndex + beg.length(), endIndex + end.l=
ength());
+
+         html =3D postProcessHTML(html);
+
+         renderResponse.setContentType("text/html");
+         PrintWriter printWriter =3D renderResponse.getWriter();
+         printWriter.print(html);
+      }
+   }
+
+   protected String getZipCode(RenderRequest renderRequest)
+   {
+      String zip =3D renderRequest.getParameter(ZIP);
+      if (zip =3D=3D null)
+      {
+         zip =3D renderRequest.getPreferences().getValue(ZIP, SAN_FRAN);
+      }
+      return zip;
+   }
+
+   @Override
+   protected void doEdit(RenderRequest renderRequest, RenderResponse rende=
rResponse) throws PortletException, IOException
+   {
+      renderResponse.setContentType("text/html");
+      renderResponse.getWriter().print(
+         "\n" +
+            "   
\n" +
+            "   Change Location:\n" +
+            "\n" +
+            "   Zip Code:
\n" +
+            "      \n" +
+            "      
\n" +
+            "      \n" +
+            "   \n" +
+            "");
+   }
+
+   @Override
+   public void processAction(ActionRequest actionRequest, ActionResponse a=
ctionResponse) throws PortletException, IOException
+   {
+      String zip =3D actionRequest.getParameter(ZIP);
+
+      if (null !=3D zip)
+      {
+         PortletPreferences prefs =3D actionRequest.getPreferences();
+         prefs.setValue(ZIP, zip);
+         prefs.store();
+      }
+
+      // set zip as render parameter
+      actionResponse.setRenderParameter(ZIP, zip);
+
+      // request view
+      actionResponse.setPortletMode(PortletMode.VIEW);
+   }
+
+   protected String postProcessHTML(String html)
+   {
+      // links should open in new windows
+      html =3D html.replaceAll(A, A_TARGET_BLANK);
+
+      // src attributes should be absolute
+      html =3D html.replaceAll("src=3D/", "src=3Dhttp://google.com/");
+      html =3D html.replaceAll("src=3D\"/", "src=3D\"http://google.com/");
+
+      // forms should open in new windows and have an absolute action URL
+      html =3D html.replaceAll("action=3D\"/", "target=3D'_blank' action=
=3D\"http://google.com/");
+
+      return html;
+   }
+
+   protected String getQueryString(String zip)
+   {
+      return GOOGLE + zip;
+   }
+
+   private byte[] getBytes(InputStream in, int bufferSize) throws IOExcept=
ion, IllegalArgumentException
+   {
+      ByteArrayOutputStream out =3D new ByteArrayOutputStream();
+
+      byte[] buffer =3D new byte[bufferSize];
+      while (true)
+      {
+         int i =3D in.read(buffer);
+         if (i =3D=3D 0)
+         {
+            continue;
+         }
+         if (i =3D=3D -1)
+         {
+            break;
+         }
+         out.write(buffer, 0, i);
+      }
+      return out.toByteArray();
+   }
+
+}


Property changes on: modules/portlet/trunk/test/src/main/java/org/jboss/por=
tal/portlet/portal/samples/GoogleClippingPortlet.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/p=
ortal/samples/GoogleWeatherClippingPortlet.java (from rev 9905, modules/por=
tlet/trunk/test/src/main/java/org/jboss/portal/simple/samples/GoogleWeather=
ClippingPortlet.java)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/porta=
l/samples/GoogleWeatherClippingPortlet.java	                        (rev 0)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/porta=
l/samples/GoogleWeatherClippingPortlet.java	2008-02-10 01:17:56 UTC (rev 99=
12)
@@ -0,0 +1,55 @@
+/*************************************************************************=
*****
+ * 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.portal.samples;
+
+/**
+ * @author Chris Laprun
+ * @version $Revision$
+ */
+public class GoogleWeatherClippingPortlet extends GoogleClippingPortlet
+{
+   private final static String WEATHER_URL =3D "http://www.google.com/sear=
ch?q=3Dweather+";
+   private static final String A_END =3D "";
+
+   protected String getQueryString(String zip)
+   {
+      return WEATHER_URL + zip;
+   }
+
+   protected String postProcessHTML(String html)
+   {
+      int begIndex;
+      int endIndex;
+
+      // remove add to iGoogle link
+      begIndex =3D html.indexOf(A);
+      if (begIndex !=3D -1)
+      {
+         endIndex =3D html.indexOf(A_END, begIndex);
+         html =3D html.substring(0, begIndex) + html.substring(endIndex + =
A_END.length());
+      }
+
+      return super.postProcessHTML(html);
+   }
+}


Property changes on: modules/portlet/trunk/test/src/main/java/org/jboss/por=
tal/portlet/portal/samples/GoogleWeatherClippingPortlet.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/p=
ortal/samples/RemoteControlResourcePortlet.java (from rev 9905, modules/por=
tlet/trunk/test/src/main/java/org/jboss/portal/simple/samples/RemoteControl=
ResourcePortlet.java)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/porta=
l/samples/RemoteControlResourcePortlet.java	                        (rev 0)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/porta=
l/samples/RemoteControlResourcePortlet.java	2008-02-10 01:17:56 UTC (rev 99=
12)
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2008, Your Corporation. All Rights Reserved.
+ */
+
+package org.jboss.portal.portlet.portal.samples;
+
+import javax.portlet.GenericPortlet;
+import javax.portlet.PortletException;
+import javax.portlet.PortletURL;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+import javax.portlet.ResourceRequest;
+import javax.portlet.ResourceResponse;
+import javax.portlet.ResourceURL;
+import javax.portlet.WindowState;
+import java.io.IOException;
+import java.io.PrintWriter;
+
+/**
+ * @author Chris Laprun
+ * @version $Revision$
+ */
+public class RemoteControlResourcePortlet extends GenericPortlet
+{
+   private static final String ZIPCODE =3D "zipcode";
+
+   @Override
+   protected void doView(RenderRequest renderRequest, RenderResponse rende=
rResponse) throws PortletException, IOException
+   {
+      renderResponse.setContentType("text/html");
+      PrintWriter printWriter =3D renderResponse.getWriter();
+      printWriter.print("");
+      printWriter.print("Open remote control!");
+   }
+
+   @Override
+   public void serveResource(ResourceRequest resourceRequest, ResourceResp=
onse resourceResponse) throws PortletException, IOException
+   {
+      resourceResponse.setContentType("text/html");
+      PrintWriter writer =3D resourceResponse.getWriter();
+      writer.print("");
+      PortletURL url =3D resourceResponse.createRenderURL();
+      url.setWindowState(WindowState.MINIMIZED);
+      writer.print("minimize parent portlet");
+      url.setWindowState(WindowState.MAXIMIZED);
+      writer.print("maximize parent portlet");
+      url.setWindowState(WindowState.NORMAL);
+      writer.print("make parent portlet normal");
+      writer.print("'zipcode' public render parameter value: " +=
 resourceRequest.getParameter(ZIPCODE) + "
");
+      writer.print("Set value of 'zipcode' public render parameter =
to:");
+      url.setParameter(ZIPCODE, "80201");
+      writer.print("Denver");
+      url.setParameter(ZIPCODE, "94102");
+      writer.print("
San Francisco");
+      url.setParameter(ZIPCODE, "20001");
+      writer.print("
Washington, DC");
+      writer.print("");
+   }
+
+   private String createParentURL(PortletURL url)
+   {
+      return "openLinkInParent('" + url + "')";
+   }
+}


Property changes on: modules/portlet/trunk/test/src/main/java/org/jboss/por=
tal/portlet/portal/samples/RemoteControlResourcePortlet.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Copied: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/p=
ortal/samples/event (from rev 9905, modules/portlet/trunk/test/src/main/jav=
a/org/jboss/portal/simple/samples/event)

Deleted: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/=
portal/samples/event/CartEvent.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/sample=
s/event/CartEvent.java	2008-02-09 16:39:07 UTC (rev 9905)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/porta=
l/samples/event/CartEvent.java	2008-02-10 01:17:56 UTC (rev 9912)
@@ -1,50 +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.simple.samples.event;
-
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.namespace.QName;
-import java.io.Serializable;
-
-/**
- * @author Chris Laprun
- * @version $Revision$
- */
-(a)XmlRootElement
-public class CartEvent implements Serializable
-{
-   private String id;
-
-   public static final QName QNAME =3D new QName("urn:jboss:portal:samples=
:event", "CartEvent");
-
-   public CartEvent(String id)
-   {
-      this.id =3D id;
-   }
-
-   public String getId()
-   {
-      return id;
-   }
-}

Copied: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/p=
ortal/samples/event/CartEvent.java (from rev 9911, modules/portlet/trunk/te=
st/src/main/java/org/jboss/portal/simple/samples/event/CartEvent.java)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/porta=
l/samples/event/CartEvent.java	                        (rev 0)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/porta=
l/samples/event/CartEvent.java	2008-02-10 01:17:56 UTC (rev 9912)
@@ -0,0 +1,50 @@
+/*************************************************************************=
*****
+ * 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.portal.samples.event;
+
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.namespace.QName;
+import java.io.Serializable;
+
+/**
+ * @author Chris Laprun
+ * @version $Revision$
+ */
+(a)XmlRootElement
+public class CartEvent implements Serializable
+{
+   private String id;
+
+   public static final QName QNAME =3D new QName("urn:jboss:portal:samples=
:event", "CartEvent");
+
+   public CartEvent(String id)
+   {
+      this.id =3D id;
+   }
+
+   public String getId()
+   {
+      return id;
+   }
+}

Deleted: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/=
portal/samples/event/CartPortlet.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/sample=
s/event/CartPortlet.java	2008-02-09 16:39:07 UTC (rev 9905)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/porta=
l/samples/event/CartPortlet.java	2008-02-10 01:17:56 UTC (rev 9912)
@@ -1,82 +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.simple.samples.event;
-
-import javax.portlet.Event;
-import javax.portlet.EventRequest;
-import javax.portlet.EventResponse;
-import javax.portlet.GenericPortlet;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-import java.io.IOException;
-import java.io.Writer;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author Chris Laprun
- * @version $Revision$
- */
-public class CartPortlet extends GenericPortlet
-{
-   List items =3D new ArrayList(7);
-
-   @Override
-   protected void doView(RenderRequest renderRequest, RenderResponse rende=
rResponse) throws PortletException, IOException
-   {
-      renderResponse.setContentType("text/html");
-      Writer writer =3D renderResponse.getWriter();
-
-
-      if (!items.isEmpty())
-      {
-         writer.append("");
-         int total =3D 0;
-         for (CatalogItem item : items)
-         {
-            int price =3D item.getPrice();
-            total +=3D price;
-            writer.append("");
-         }
-         writer.append("Description Price
").append(item.getDescription()).append=
(" $").append("" + price)
-               .append("
").append("$=
" + total).append("");
-      }
-      else
-      {
-         writer.append("Cart is empty.");
-      }
-   }
-
-   @Override
-   public void processEvent(EventRequest eventRequest, EventResponse event=
Response) throws PortletException, IOException
-   {
-      Event event =3D eventRequest.getEvent();
-      if (event.getName().equals("CartEvent"))
-      {
-         CartEvent cartEvent =3D (CartEvent)event.getValue();
-         items.add(Catalog.get(cartEvent.getId()));
-      }
-   }
-}

Copied: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/p=
ortal/samples/event/CartPortlet.java (from rev 9911, modules/portlet/trunk/=
test/src/main/java/org/jboss/portal/simple/samples/event/CartPortlet.java)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/porta=
l/samples/event/CartPortlet.java	                        (rev 0)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/porta=
l/samples/event/CartPortlet.java	2008-02-10 01:17:56 UTC (rev 9912)
@@ -0,0 +1,83 @@
+/*************************************************************************=
*****
+ * 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.portal.samples.event;
+
+import javax.portlet.Event;
+import javax.portlet.EventRequest;
+import javax.portlet.EventResponse;
+import javax.portlet.GenericPortlet;
+import javax.portlet.PortletException;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+import java.io.IOException;
+import java.io.Writer;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author Chris Laprun
+ * @version $Revision$
+ */
+public class CartPortlet extends GenericPortlet
+{
+   List items =3D new ArrayList(7);
+
+   @Override
+   protected void doView(RenderRequest renderRequest, RenderResponse rende=
rResponse) throws PortletException, IOException
+   {
+      renderResponse.setContentType("text/html");
+      Writer writer =3D renderResponse.getWriter();
+
+
+      if (!items.isEmpty())
+      {
+         writer.append("Description<=
tbody>");
+         int total =3D 0;
+         for (CatalogItem item : items)
+         {
+            int price =3D item.getPrice();
+            total +=3D price;
+            writer.append("");
+         }
+         writer.append("Price
").append(item.getDescription()).append=
(" $").append("" + price)
+               .append("
Total: ")
+            .append("$" + total).append("");
+      }
+      else
+      {
+         writer.append("Cart is empty.");
+      }
+   }
+
+   @Override
+   public void processEvent(EventRequest eventRequest, EventResponse event=
Response) throws PortletException, IOException
+   {
+      Event event =3D eventRequest.getEvent();
+      if (event.getName().equals("CartEvent"))
+      {
+         CartEvent cartEvent =3D (CartEvent)event.getValue();
+         items.add(Catalog.get(cartEvent.getId()));
+      }
+   }
+}

Deleted: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/=
portal/samples/event/Catalog.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/sample=
s/event/Catalog.java	2008-02-09 16:39:07 UTC (rev 9905)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/porta=
l/samples/event/Catalog.java	2008-02-10 01:17:56 UTC (rev 9912)
@@ -1,63 +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.simple.samples.event;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @author Chris Laprun
- * @version $Revision$
- */
-public class Catalog
-{
-   private static Map items;
-
-   static
-   {
-      items =3D new HashMap(7);
-      items.put("1", new CatalogItem("1", 800, "Bike"));
-      items.put("2", new CatalogItem("2", 450, "Snowboard"));
-      items.put("3", new CatalogItem("3", 225, "Tent"));
-      items.put("4", new CatalogItem("4", 75, "Backpack"));
-      items.put("5", new CatalogItem("5", 119, "Skateboard"));
-      items.put("6", new CatalogItem("6", 333, "Surfboard"));
-      items.put("7", new CatalogItem("7", 90, "Sneakers"));
-   }
-
-   private Catalog()
-   {
-   }
-
-   public static CatalogItem get(String id)
-   {
-      return items.get(id);
-   }
-
-   public static Collection getAll()
-   {
-      return items.values();
-   }
-}

Copied: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/p=
ortal/samples/event/Catalog.java (from rev 9911, modules/portlet/trunk/test=
/src/main/java/org/jboss/portal/simple/samples/event/Catalog.java)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/porta=
l/samples/event/Catalog.java	                        (rev 0)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/porta=
l/samples/event/Catalog.java	2008-02-10 01:17:56 UTC (rev 9912)
@@ -0,0 +1,63 @@
+/*************************************************************************=
*****
+ * 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.portal.samples.event;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author Chris Laprun
+ * @version $Revision$
+ */
+public class Catalog
+{
+   private static Map items;
+
+   static
+   {
+      items =3D new HashMap(7);
+      items.put("1", new CatalogItem("1", 800, "Bike"));
+      items.put("2", new CatalogItem("2", 450, "Snowboard"));
+      items.put("3", new CatalogItem("3", 225, "Tent"));
+      items.put("4", new CatalogItem("4", 75, "Backpack"));
+      items.put("5", new CatalogItem("5", 119, "Skateboard"));
+      items.put("6", new CatalogItem("6", 333, "Surfboard"));
+      items.put("7", new CatalogItem("7", 90, "Sneakers"));
+   }
+
+   private Catalog()
+   {
+   }
+
+   public static CatalogItem get(String id)
+   {
+      return items.get(id);
+   }
+
+   public static Collection getAll()
+   {
+      return items.values();
+   }
+}

Deleted: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/=
portal/samples/event/CatalogItem.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/sample=
s/event/CatalogItem.java	2008-02-09 16:39:07 UTC (rev 9905)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/porta=
l/samples/event/CatalogItem.java	2008-02-10 01:17:56 UTC (rev 9912)
@@ -1,57 +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.simple.samples.event;
-
-/**
- * @author Chris Laprun
- * @version $Revision$
- */
-public class CatalogItem
-{
-   private String id;
-   private int price;
-   private String description;
-
-   public CatalogItem(String id, int price, String description)
-   {
-      this.id =3D id;
-      this.price =3D price;
-      this.description =3D description;
-   }
-
-   public String getId()
-   {
-      return id;
-   }
-
-   public int getPrice()
-   {
-      return price;
-   }
-
-   public String getDescription()
-   {
-      return description;
-   }
-}

Copied: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/p=
ortal/samples/event/CatalogItem.java (from rev 9911, modules/portlet/trunk/=
test/src/main/java/org/jboss/portal/simple/samples/event/CatalogItem.java)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/porta=
l/samples/event/CatalogItem.java	                        (rev 0)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/porta=
l/samples/event/CatalogItem.java	2008-02-10 01:17:56 UTC (rev 9912)
@@ -0,0 +1,57 @@
+/*************************************************************************=
*****
+ * 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.portal.samples.event;
+
+/**
+ * @author Chris Laprun
+ * @version $Revision$
+ */
+public class CatalogItem
+{
+   private String id;
+   private int price;
+   private String description;
+
+   public CatalogItem(String id, int price, String description)
+   {
+      this.id =3D id;
+      this.price =3D price;
+      this.description =3D description;
+   }
+
+   public String getId()
+   {
+      return id;
+   }
+
+   public int getPrice()
+   {
+      return price;
+   }
+
+   public String getDescription()
+   {
+      return description;
+   }
+}

Deleted: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/=
portal/samples/event/CatalogPortlet.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/sample=
s/event/CatalogPortlet.java	2008-02-09 16:39:07 UTC (rev 9905)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/porta=
l/samples/event/CatalogPortlet.java	2008-02-10 01:17:56 UTC (rev 9912)
@@ -1,71 +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.simple.samples.event;
-
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.GenericPortlet;
-import javax.portlet.PortletException;
-import javax.portlet.PortletURL;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-import java.io.IOException;
-import java.io.Writer;
-import java.util.Collection;
-
-/**
- * @author Chris Laprun
- * @version $Revision$
- */
-public class CatalogPortlet extends GenericPortlet
-{
-   @Override
-   protected void doView(RenderRequest renderRequest, RenderResponse rende=
rResponse) throws PortletException, IOException
-   {
-      renderResponse.setContentType("text/html");
-      Writer writer =3D renderResponse.getWriter();
-
-      writer.append("<=
th>Actions");
-
-      PortletURL addURL =3D renderResponse.createActionURL();
-      addURL.setParameter("op", "add");
-
-      Collection items =3D Catalog.getAll();
-      for (CatalogItem item : items)
-      {
-         addURL.setParameter("id", item.getId());
-         writer.append("");
-      }
-
-      writer.append("Description Price
").append(item.getDescription()).append("<=
/td> $").append("" + item.getPrice())
-            .append(" Add to cart");
-   }
-
-   @Override
-   public void processAction(ActionRequest actionRequest, ActionResponse a=
ctionResponse) throws PortletException, IOException
-   {
-      String value =3D actionRequest.getParameter("id");
-      actionResponse.setEvent(CartEvent.QNAME, new CartEvent(value));
-   }
-}

Copied: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/p=
ortal/samples/event/CatalogPortlet.java (from rev 9911, modules/portlet/tru=
nk/test/src/main/java/org/jboss/portal/simple/samples/event/CatalogPortlet.=
java)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/porta=
l/samples/event/CatalogPortlet.java	                        (rev 0)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/porta=
l/samples/event/CatalogPortlet.java	2008-02-10 01:17:56 UTC (rev 9912)
@@ -0,0 +1,71 @@
+/*************************************************************************=
*****
+ * 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.portal.samples.event;
+
+import javax.portlet.ActionRequest;
+import javax.portlet.ActionResponse;
+import javax.portlet.GenericPortlet;
+import javax.portlet.PortletException;
+import javax.portlet.PortletURL;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+import java.io.IOException;
+import java.io.Writer;
+import java.util.Collection;
+
+/**
+ * @author Chris Laprun
+ * @version $Revision$
+ */
+public class CatalogPortlet extends GenericPortlet
+{
+   @Override
+   protected void doView(RenderRequest renderRequest, RenderResponse rende=
rResponse) throws PortletException, IOException
+   {
+      renderResponse.setContentType("text/html");
+      Writer writer =3D renderResponse.getWriter();
+
+      writer.append("");
+
+      PortletURL addURL =3D renderResponse.createActionURL();
+      addURL.setParameter("op", "add");
+
+      Collection items =3D Catalog.getAll();
+      for (CatalogItem item : items)
+      {
+         addURL.setParameter("id", item.getId());
+         writer.append("");
+      }
+
+      writer.append("Description Price Actions
").append(item.getDescription()).append("<=
/td> $").append("" + item.getPrice())
+            .append(" Add to cart");
+   }
+
+   @Override
+   public void processAction(ActionRequest actionRequest, ActionResponse a=
ctionResponse) throws PortletException, IOException
+   {
+      String value =3D actionRequest.getParameter("id");
+      actionResponse.setEvent(CartEvent.QNAME, new CartEvent(value));
+   }
+}

Deleted: modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/s=
amples/GoogleClippingPortlet.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/sample=
s/GoogleClippingPortlet.java	2008-02-09 20:42:01 UTC (rev 9911)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/sample=
s/GoogleClippingPortlet.java	2008-02-10 01:17:56 UTC (rev 9912)
@@ -1,178 +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.simple.samples;
-
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.GenericPortlet;
-import javax.portlet.PortletException;
-import javax.portlet.PortletMode;
-import javax.portlet.PortletPreferences;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-import java.io.BufferedInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.PrintWriter;
-import java.net.URL;
-import java.net.URLConnection;
-
-/**
- * A simple portlet using Google's search services to extract interesting =
information (weather, map, ...) from first
- * result.
- *
- * @author Chris Laprun
- * @version $Revision$
- */
-public class GoogleClippingPortlet extends GenericPortlet
-{
-   protected static final String A =3D "";
-      String end =3D "";
-      int begIndex =3D html.indexOf(beg);
-      if (begIndex !=3D -1)
-      {
-         // extract table containing specific first result
-         int endIndex =3D html.indexOf(end, begIndex);
-         html =3D html.substring(begIndex + beg.length(), endIndex + end.l=
ength());
-
-         html =3D postProcessHTML(html);
-
-         renderResponse.setContentType("text/html");
-         PrintWriter printWriter =3D renderResponse.getWriter();
-         printWriter.print(html);
-      }
-   }
-
-   protected String getZipCode(RenderRequest renderRequest)
-   {
-      String zip =3D renderRequest.getParameter(ZIP);
-      if (zip =3D=3D null)
-      {
-         zip =3D renderRequest.getPreferences().getValue(ZIP, SAN_FRAN);
-      }
-      return zip;
-   }
-
-   @Override
-   protected void doEdit(RenderRequest renderRequest, RenderResponse rende=
rResponse) throws PortletException, IOException
-   {
-      renderResponse.setContentType("text/html");
-      renderResponse.getWriter().print(
-         "\n" +
-            "   
\n" +
-            "   Change Location:\n" +
-            "\n" +
-            "   Zip Code:
\n" +
-            "      \n" +
-            "      
\n" +
-            "      \n" +
-            "   \n" +
-            "");
-   }
-
-   @Override
-   public void processAction(ActionRequest actionRequest, ActionResponse a=
ctionResponse) throws PortletException, IOException
-   {
-      String zip =3D actionRequest.getParameter(ZIP);
-
-      if (null !=3D zip)
-      {
-         PortletPreferences prefs =3D actionRequest.getPreferences();
-         prefs.setValue(ZIP, zip);
-         prefs.store();
-      }
-
-      // set zip as render parameter
-      actionResponse.setRenderParameter(ZIP, zip);
-
-      // request view
-      actionResponse.setPortletMode(PortletMode.VIEW);
-   }
-
-   protected String postProcessHTML(String html)
-   {
-      // links should open in new windows
-      html =3D html.replaceAll(A, A_TARGET_BLANK);
-
-      // src attributes should be absolute
-      html =3D html.replaceAll("src=3D/", "src=3Dhttp://google.com/");
-      html =3D html.replaceAll("src=3D\"/", "src=3D\"http://google.com/");
-
-      // forms should open in new windows and have an absolute action URL
-      html =3D html.replaceAll("action=3D\"/", "target=3D'_blank' action=
=3D\"http://google.com/");
-
-      return html;
-   }
-
-   protected String getQueryString(String zip)
-   {
-      return GOOGLE + zip;
-   }
-
-   private byte[] getBytes(InputStream in, int bufferSize) throws IOExcept=
ion, IllegalArgumentException
-   {
-      ByteArrayOutputStream out =3D new ByteArrayOutputStream();
-
-      byte[] buffer =3D new byte[bufferSize];
-      while (true)
-      {
-         int i =3D in.read(buffer);
-         if (i =3D=3D 0)
-         {
-            continue;
-         }
-         if (i =3D=3D -1)
-         {
-            break;
-         }
-         out.write(buffer, 0, i);
-      }
-      return out.toByteArray();
-   }
-
-}

Deleted: modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/s=
amples/GoogleWeatherClippingPortlet.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/sample=
s/GoogleWeatherClippingPortlet.java	2008-02-09 20:42:01 UTC (rev 9911)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/sample=
s/GoogleWeatherClippingPortlet.java	2008-02-10 01:17:56 UTC (rev 9912)
@@ -1,55 +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.simple.samples;
-
-/**
- * @author Chris Laprun
- * @version $Revision$
- */
-public class GoogleWeatherClippingPortlet extends GoogleClippingPortlet
-{
-   private final static String WEATHER_URL =3D "http://www.google.com/sear=
ch?q=3Dweather+";
-   private static final String A_END =3D "";
-
-   protected String getQueryString(String zip)
-   {
-      return WEATHER_URL + zip;
-   }
-
-   protected String postProcessHTML(String html)
-   {
-      int begIndex;
-      int endIndex;
-
-      // remove add to iGoogle link
-      begIndex =3D html.indexOf(A);
-      if (begIndex !=3D -1)
-      {
-         endIndex =3D html.indexOf(A_END, begIndex);
-         html =3D html.substring(0, begIndex) + html.substring(endIndex + =
A_END.length());
-      }
-
-      return super.postProcessHTML(html);
-   }
-}

Deleted: modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/s=
amples/RemoteControlResourcePortlet.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/sample=
s/RemoteControlResourcePortlet.java	2008-02-09 20:42:01 UTC (rev 9911)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/sample=
s/RemoteControlResourcePortlet.java	2008-02-10 01:17:56 UTC (rev 9912)
@@ -1,68 +0,0 @@
-/*
- * Copyright (c) 2008, Your Corporation. All Rights Reserved.
- */
-
-package org.jboss.portal.simple.samples;
-
-import javax.portlet.GenericPortlet;
-import javax.portlet.PortletException;
-import javax.portlet.PortletURL;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-import javax.portlet.ResourceRequest;
-import javax.portlet.ResourceResponse;
-import javax.portlet.ResourceURL;
-import javax.portlet.WindowState;
-import java.io.IOException;
-import java.io.PrintWriter;
-
-/**
- * @author Chris Laprun
- * @version $Revision$
- */
-public class RemoteControlResourcePortlet extends GenericPortlet
-{
-   private static final String ZIPCODE =3D "zipcode";
-
-   @Override
-   protected void doView(RenderRequest renderRequest, RenderResponse rende=
rResponse) throws PortletException, IOException
-   {
-      renderResponse.setContentType("text/html");
-      PrintWriter printWriter =3D renderResponse.getWriter();
-      printWriter.print("");
-      printWriter.print("Open remote control!");
-   }
-
-   @Override
-   public void serveResource(ResourceRequest resourceRequest, ResourceResp=
onse resourceResponse) throws PortletException, IOException
-   {
-      resourceResponse.setContentType("text/html");
-      PrintWriter writer =3D resourceResponse.getWriter();
-      writer.print("");
-      PortletURL url =3D resourceResponse.createRenderURL();
-      url.setWindowState(WindowState.MINIMIZED);
-      writer.print("minimize parent portlet");
-      url.setWindowState(WindowState.MAXIMIZED);
-      writer.print("maximize parent portlet");
-      url.setWindowState(WindowState.NORMAL);
-      writer.print("make parent portlet normal");
-      writer.print("'zipcode' public render parameter value: " +=
 resourceRequest.getParameter(ZIPCODE) + "
");
-      writer.print("Set value of 'zipcode' public render parameter =
to:");
-      url.setParameter(ZIPCODE, "80201");
-      writer.print("Denver");
-      url.setParameter(ZIPCODE, "94102");
-      writer.print("
San Francisco");
-      url.setParameter(ZIPCODE, "20001");
-      writer.print("
Washington, DC");
-      writer.print("");
-   }
-
-   private String createParentURL(PortletURL url)
-   {
-      return "openLinkInParent('" + url + "')";
-   }
-}

Modified: modules/portlet/trunk/test/src/test/build.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/build.xml	2008-02-09 20:42:01 UTC (=
rev 9911)
+++ modules/portlet/trunk/test/src/test/build.xml	2008-02-10 01:17:56 UTC (=
rev 9912)
@@ -755,46 +755,48 @@
    
 =

    
-      
-         
-         
+
+      
+      
+      
+
+      
+         
+         
       
-      
-         
+      
+         
       
 =

-      
-         
-         
+      
+         
+         
       
-      
-         
+      
+         
       
 =

-      
-         
+      
+         
          
+                  includes=3D"org/jboss/portal/portlet/portal/samples/Remo=
teControlResourcePortlet.class"/>
       
-      
-         
+      
+         
       
 =

-      
-         
-         
+      
+         
+         
       
-      
-         
+      
+         
       
 =

-      
-      
       
          
          
       
-      
       
          
       

Copied: modules/portlet/trunk/test/src/test/resources/portal/samples/cart-e=
vent-portlet-war (from rev 9905, modules/portlet/trunk/test/src/test/resour=
ces/cart-event-portlet-war)

Copied: modules/portlet/trunk/test/src/test/resources/portal/samples/cart-e=
vent-portlet-war/WEB-INF (from rev 9911, modules/portlet/trunk/test/src/tes=
t/resources/cart-event-portlet-war/WEB-INF)

Modified: modules/portlet/trunk/test/src/test/resources/portal/samples/cart=
-event-portlet-war/WEB-INF/portlet.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/cart-event-portlet-war/WE=
B-INF/portlet.xml	2008-02-09 20:42:01 UTC (rev 9911)
+++ modules/portlet/trunk/test/src/test/resources/portal/samples/cart-event=
-portlet-war/WEB-INF/portlet.xml	2008-02-10 01:17:56 UTC (rev 9912)
@@ -30,7 +30,7 @@
       Catalog Portlet
       Catalog
       Catalog Portlet
-      org.jboss.portal.simple.samples.event.CatalogPortlet<=
/portlet-class>
+      org.jboss.portal.portlet.portal.samples.event.Catalog=
Portlet
       
          text/html
          VIEW
@@ -48,7 +48,7 @@
       Cart Portlet
       Cart
       Cart Portlet
-      org.jboss.portal.simple.samples.event.CartPortlet
+      org.jboss.portal.portlet.portal.samples.event.CartPor=
tlet
       
          text/html
          VIEW
@@ -64,7 +64,7 @@
 =

    
       jbp:CartEvent
-      org.jboss.portal.simple.samples.event.CartEvent
+      org.jboss.portal.portlet.portal.samples.event.CartEvent<=
/value-type>
    
 
 =


Copied: modules/portlet/trunk/test/src/test/resources/portal/samples/google=
-map-portlet-war (from rev 9905, modules/portlet/trunk/test/src/test/resour=
ces/google-map-portlet-war)

Copied: modules/portlet/trunk/test/src/test/resources/portal/samples/google=
-map-portlet-war/WEB-INF (from rev 9911, modules/portlet/trunk/test/src/tes=
t/resources/google-map-portlet-war/WEB-INF)

Modified: modules/portlet/trunk/test/src/test/resources/portal/samples/goog=
le-map-portlet-war/WEB-INF/portlet.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/google-map-portlet-war/WE=
B-INF/portlet.xml	2008-02-09 20:42:01 UTC (rev 9911)
+++ modules/portlet/trunk/test/src/test/resources/portal/samples/google-map=
-portlet-war/WEB-INF/portlet.xml	2008-02-10 01:17:56 UTC (rev 9912)
@@ -29,7 +29,7 @@
       Portlet displaying a location on Google Maps
       GoogleMap
       Google Map Portlet
-      org.jboss.portal.simple.samples.GoogleClippingPortlet=

+      org.jboss.portal.portlet.portal.samples.GoogleClippin=
gPortlet
       120
       
          text/html

Copied: modules/portlet/trunk/test/src/test/resources/portal/samples/google=
-weather-portlet-war (from rev 9905, modules/portlet/trunk/test/src/test/re=
sources/google-weather-portlet-war)

Copied: modules/portlet/trunk/test/src/test/resources/portal/samples/google=
-weather-portlet-war/WEB-INF (from rev 9911, modules/portlet/trunk/test/src=
/test/resources/google-weather-portlet-war/WEB-INF)

Modified: modules/portlet/trunk/test/src/test/resources/portal/samples/goog=
le-weather-portlet-war/WEB-INF/portlet.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/google-weather-portlet-wa=
r/WEB-INF/portlet.xml	2008-02-09 20:42:01 UTC (rev 9911)
+++ modules/portlet/trunk/test/src/test/resources/portal/samples/google-wea=
ther-portlet-war/WEB-INF/portlet.xml	2008-02-10 01:17:56 UTC (rev 9912)
@@ -29,7 +29,7 @@
       Portlet displaying the weather forecast for the specifi=
ed location
       GoogleWeather
       Google Weather Portlet
-      org.jboss.portal.simple.samples.GoogleWeatherClipping=
Portlet
+      org.jboss.portal.portlet.portal.samples.GoogleWeather=
ClippingPortlet
       120
       
          text/html

Copied: modules/portlet/trunk/test/src/test/resources/portal/samples/remote=
control-portlet-war (from rev 9905, modules/portlet/trunk/test/src/test/res=
ources/remotecontrol-portlet-war)

Copied: modules/portlet/trunk/test/src/test/resources/portal/samples/remote=
control-portlet-war/WEB-INF (from rev 9911, modules/portlet/trunk/test/src/=
test/resources/remotecontrol-portlet-war/WEB-INF)

Modified: modules/portlet/trunk/test/src/test/resources/portal/samples/remo=
tecontrol-portlet-war/WEB-INF/portlet.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/remotecontrol-portlet-war=
/WEB-INF/portlet.xml	2008-02-09 20:42:01 UTC (rev 9911)
+++ modules/portlet/trunk/test/src/test/resources/portal/samples/remotecont=
rol-portlet-war/WEB-INF/portlet.xml	2008-02-10 01:17:56 UTC (rev 9912)
@@ -29,7 +29,7 @@
       Portlet controlling display of other portlets
       RemoteControl
       Remote Control Resource Portlet
-      org.jboss.portal.simple.samples.RemoteControlResource=
Portlet
+      org.jboss.portal.portlet.portal.samples.RemoteControl=
ResourcePortlet
       
          text/html
          VIEW

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/d=
emo/demo.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/de=
mo.jsp	2008-02-09 20:42:01 UTC (rev 9911)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/de=
mo.jsp	2008-02-10 01:17:56 UTC (rev 9912)
@@ -10,15 +10,15 @@
    
    
             
-               
+               
                
                
-               
+               
             
             
-               
-               
-               
+               
+               
+               
             
    
 

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/d=
emo/demo1.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/de=
mo1.jsp	2008-02-09 20:42:01 UTC (rev 9911)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/de=
mo1.jsp	2008-02-10 01:17:56 UTC (rev 9912)
@@ -10,10 +10,10 @@
    
    
             
-               
+               
             
             
-               
+               
             
    
 

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/d=
emo/demo2.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/de=
mo2.jsp	2008-02-09 20:42:01 UTC (rev 9911)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/de=
mo2.jsp	2008-02-10 01:17:56 UTC (rev 9912)
@@ -10,13 +10,13 @@
    
    
             
-               
+               
 =

             
             
 =

-               
-               
+               
+               
                =

             
    


--===============5249803438541760500==--

From portal-commits at lists.jboss.org Sat Feb  9 20:34:16 2008
Content-Type: multipart/mixed; boundary="===============5957546977310685925=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9913 -
 modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp/taglib.
Date: Sat, 09 Feb 2008 20:34:14 -0500
Message-ID: 

--===============5957546977310685925==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-09 20:34:14 -0500 (Sat, 09 Feb 2008)
New Revision: 9913

Modified:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/PageTag.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/PortalBodyTagSupport.java
Log:
fixed maximized not work

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/taglib/PageTag.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PageTag.java	2008-02-10 01:17:56 UTC (rev 9912)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PageTag.java	2008-02-10 01:34:14 UTC (rev 9913)
@@ -24,6 +24,7 @@
 =

 import org.jboss.portal.portlet.test.jsp.PortalRenderResponse;
 import org.jboss.portal.portlet.test.jsp.PortalResponse;
+import org.jboss.portal.portlet.test.jsp.PortalActionResponse;
 =

 import javax.servlet.jsp.JspException;
 import javax.xml.namespace.QName;
@@ -87,12 +88,12 @@
       return EVAL_PAGE;
    }
 =

-   public int doStartTag(PortalResponse portalResponse) throws JspException
+   public int doStartActionTag(PortalActionResponse portalResponse) throws=
 JspException
    {
       return EVAL_BODY_INCLUDE;
    }
 =

-   public int doEndTag(PortalResponse portalResponse) throws JspException
+   public int doEndActionTag(PortalActionResponse portalResponse) throws J=
spException
    {
       return EVAL_PAGE;
    }

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/taglib/PortalBodyTagSupport.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortalBodyTagSupport.java	2008-02-10 01:17:56 UTC (rev 9912)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortalBodyTagSupport.java	2008-02-10 01:34:14 UTC (rev 9913)
@@ -123,11 +123,11 @@
 =

    public int doStartRenderTag(PortalRenderResponse renderResponse) throws=
 JspException
    {
-      return super.doStartTag();
+      throw new NotYetImplemented();
    }
 =

    public int doEndRenderTag(PortalRenderResponse renderResponse) throws J=
spException
    {
-      return super.doEndTag();
+      throw new NotYetImplemented();
    }
 }


--===============5957546977310685925==--

From portal-commits at lists.jboss.org Sat Feb  9 20:38:00 2008
Content-Type: multipart/mixed; boundary="===============2219220630205000836=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9914 -
 modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple.
Date: Sat, 09 Feb 2008 20:38:00 -0500
Message-ID: 

--===============2219220630205000836==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-09 20:37:59 -0500 (Sat, 09 Feb 2008)
New Revision: 9914

Removed:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/samples/
Log:
remove empty dir


--===============2219220630205000836==--

From portal-commits at lists.jboss.org Sat Feb  9 21:16:33 2008
Content-Type: multipart/mixed; boundary="===============0588548740953442939=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9915 - in
 modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp:
 taglib and 1 other directory.
Date: Sat, 09 Feb 2008 21:16:32 -0500
Message-ID: 

--===============0588548740953442939==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-09 21:16:32 -0500 (Sat, 09 Feb 2008)
New Revision: 9915

Added:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/PortalPrepareResponse.java
Removed:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/PortalActionResponse.java
Modified:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/ControllerFilter.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/PageEventControllerContext.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/PagePortletControllerContext.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/PageParamTag.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/PageTag.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/ParamTag.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/PortalBodyTagSupport.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/PortalSimpleTagSupport.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/PortletMarkupTag.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/PortletTag.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/PortletTitleTag.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/PortletURLTag.java
Log:
rename action -> prepare phase

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/ControllerFilter.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/ControllerFilter.java	2008-02-10 01:37:59 UTC (rev 9914)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/ControllerFilter.java	2008-02-10 02:16:32 UTC (rev 9915)
@@ -88,13 +88,13 @@
       PortletInvoker invoker =3D (PortletInvoker)getServletContext().getAt=
tribute("ConsumerPortletInvoker");
 =

       //
-      PortalActionResponse actionResponse =3D new PortalActionResponse(res=
p, invoker);
+      PortalPrepareResponse prepareResponse =3D new PortalPrepareResponse(=
resp, invoker);
 =

       // Discover existing portlets on the page (introspection phase)
-      chain.doFilter(req, actionResponse);
+      chain.doFilter(req, prepareResponse);
 =

       // Now we can create a populated context
-      PagePortletControllerContext context =3D new PagePortletControllerCo=
ntext(req, resp, getServletContext(), actionResponse);
+      PagePortletControllerContext context =3D new PagePortletControllerCo=
ntext(req, resp, getServletContext(), prepareResponse);
 =

       //
       PageNavigationalState pageState =3D null;

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/PageEventControllerContext.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/PageEventControllerContext.java	2008-02-10 01:37:59 UTC (rev 9914)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/PageEventControllerContext.java	2008-02-10 02:16:32 UTC (rev 9915)
@@ -41,11 +41,11 @@
 {
 =

    /** . */
-   private final PortalActionResponse actionResponse;
+   private final PortalPrepareResponse prepareResponse;
 =

-   public PageEventControllerContext(PortalActionResponse actionResponse)
+   public PageEventControllerContext(PortalPrepareResponse prepareResponse)
    {
-      this.actionResponse =3D actionResponse;
+      this.prepareResponse =3D prepareResponse;
    }
 =

    public List getConsumedEvents(Event producedEvent)
@@ -53,9 +53,9 @@
       ArrayList consumedEvents =3D new ArrayList();
 =

       //
-      for (String windowId : actionResponse.getWindowIds())
+      for (String windowId : prepareResponse.getWindowIds())
       {
-         Portlet portlet =3D actionResponse.getPortlet(windowId);
+         Portlet portlet =3D prepareResponse.getPortlet(windowId);
 =

          //
          PortletInfo portletInfo =3D portlet.getInfo();

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/PagePortletControllerContext.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/PagePortletControllerContext.java	2008-02-10 01:37:59 UTC (rev 9914)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/PagePortletControllerContext.java	2008-02-10 02:16:32 UTC (rev 9915)
@@ -47,30 +47,30 @@
    private final EventControllerContext eventControllerContext;
 =

    /** . */
-   private final PortalActionResponse actionResponse;
+   private final PortalPrepareResponse prepareResponse;
 =

    public PagePortletControllerContext(
       HttpServletRequest req,
       HttpServletResponse resp,
       ServletContext servletContext,
-      PortalActionResponse actionResponse)
+      PortalPrepareResponse prepareResponse)
       throws IllegalRequestException, IOException, ServletException, Portl=
etInvokerException
    {
       super(req, resp, servletContext);
 =

       //
-      this.actionResponse =3D actionResponse;
-      this.eventControllerContext =3D new PageEventControllerContext(actio=
nResponse);
+      this.prepareResponse =3D prepareResponse;
+      this.eventControllerContext =3D new PageEventControllerContext(prepa=
reResponse);
    }
 =

    protected Portlet getPortlet(String windowId) throws PortletInvokerExce=
ption
    {
-      return actionResponse.getPortlet(windowId);
+      return prepareResponse.getPortlet(windowId);
    }
 =

    public PortletInvocationResponse invoke(PortletInvocation invocation) t=
hrows PortletInvokerException
    {
-      return actionResponse.getInvoker().invoke(invocation);
+      return prepareResponse.getInvoker().invoke(invocation);
    }
 =

    public EventControllerContext getEventControllerContext()

Deleted: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/=
test/jsp/PortalActionResponse.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/PortalActionResponse.java	2008-02-10 01:37:59 UTC (rev 9914)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/PortalActionResponse.java	2008-02-10 02:16:32 UTC (rev 9915)
@@ -1,242 +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.Portlet;
-import org.jboss.portal.portlet.PortletInvoker;
-import org.jboss.portal.portlet.PortletInvokerException;
-
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.Cookie;
-import javax.servlet.ServletOutputStream;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.Writer;
-import java.util.Locale;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.Set;
-
-/**
- * @author Julien Viet
- * @version $Revision: 630 $
- */
-public class PortalActionResponse extends PortalResponse
-{
-
-   /** . */
-   private String contentType;
-
-   /** . */
-   private Locale locale;
-
-   /** . */
-   private String characterEncoding;
-
-   /** . */
-   private int bufferSize;
-
-   /** . */
-   private ServletOutputStream outputStream;
-
-   /** . */
-   private PrintWriter writer;
-
-   /** . */
-   private Map windows;
-
-   public PortalActionResponse(HttpServletResponse response, PortletInvoke=
r invoker) throws PortletInvokerException
-   {
-      super(response, invoker);
-
-      //
-      this.windows =3D new HashMap();
-   }
-
-   public void addWindow(String windowId, Portlet portlet)
-   {
-      windows.put(windowId, portlet);
-   }
-
-   public Set getWindowIds()
-   {
-      return windows.keySet();
-   }
-
-   public Portlet getPortlet(String windowId)
-   {
-      return windows.get(windowId);
-   }
-
-   public ServletOutputStream getOutputStream() throws IOException
-   {
-      if (writer !=3D null)
-      {
-         throw new IllegalStateException();
-      }
-      if (outputStream =3D=3D null)
-      {
-         outputStream =3D new ServletOutputStream()
-         {
-            public void write(int b) throws IOException
-            {
-            }
-         };
-      }
-      return outputStream;
-   }
-
-   public PrintWriter getWriter() throws IOException
-   {
-      if (outputStream !=3D null)
-      {
-         throw new IllegalStateException();
-      }
-      if (writer =3D=3D null)
-      {
-         Writer tmp =3D new Writer()
-         {
-            public void write(char cbuf[], int off, int len) throws IOExce=
ption
-            {
-            }
-            public void flush() throws IOException
-            {
-            }
-            public void close() throws IOException
-            {
-            }
-         };
-         writer =3D new PrintWriter(tmp);
-      }
-      return writer;
-   }
-
-   public void flushBuffer() throws IOException
-   {
-   }
-
-   public boolean isCommitted()
-   {
-      return false;
-   }
-
-   public void reset()
-   {
-   }
-
-   public void resetBuffer()
-   {
-   }
-
-   public void sendError(int i, String s) throws IOException
-   {
-   }
-
-   public void sendError(int i) throws IOException
-   {
-   }
-
-   public void sendRedirect(String s) throws IOException
-   {
-   }
-
-   public void addCookie(Cookie cookie)
-   {
-   }
-
-   public void setDateHeader(String s, long l)
-   {
-   }
-
-   public void addDateHeader(String s, long l)
-   {
-   }
-
-   public void setHeader(String s, String s1)
-   {
-   }
-
-   public void addHeader(String s, String s1)
-   {
-   }
-
-   public void setContentType(String contentType)
-   {
-      this.contentType =3D contentType;
-   }
-
-   public void setContentLength(int i)
-   {
-   }
-
-   public void setCharacterEncoding(String characterEncoding)
-   {
-      this.characterEncoding =3D characterEncoding;
-   }
-
-   public void setIntHeader(String s, int i)
-   {
-   }
-
-   public void addIntHeader(String s, int i)
-   {
-   }
-
-   public void setStatus(int i)
-   {
-   }
-
-   public void setStatus(int i, String s)
-   {
-   }
-
-   public void setLocale(Locale locale)
-   {
-      this.locale =3D locale;
-   }
-
-   public String getContentType()
-   {
-      return contentType;
-   }
-
-   public Locale getLocale()
-   {
-      return locale;
-   }
-
-   public String getCharacterEncoding()
-   {
-      return characterEncoding;
-   }
-
-   public void setBufferSize(int bufferSize)
-   {
-      this.bufferSize =3D bufferSize;
-   }
-
-   public int getBufferSize()
-   {
-      return bufferSize;
-   }
-}

Copied: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/t=
est/jsp/PortalPrepareResponse.java (from rev 9913, modules/portlet/trunk/te=
st/src/main/java/org/jboss/portal/portlet/test/jsp/PortalActionResponse.jav=
a)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/PortalPrepareResponse.java	                        (rev 0)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/PortalPrepareResponse.java	2008-02-10 02:16:32 UTC (rev 9915)
@@ -0,0 +1,242 @@
+/*************************************************************************=
*****
+ * 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.Portlet;
+import org.jboss.portal.portlet.PortletInvoker;
+import org.jboss.portal.portlet.PortletInvokerException;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.Cookie;
+import javax.servlet.ServletOutputStream;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.Writer;
+import java.util.Locale;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Set;
+
+/**
+ * @author Julien Viet
+ * @version $Revision: 630 $
+ */
+public class PortalPrepareResponse extends PortalResponse
+{
+
+   /** . */
+   private String contentType;
+
+   /** . */
+   private Locale locale;
+
+   /** . */
+   private String characterEncoding;
+
+   /** . */
+   private int bufferSize;
+
+   /** . */
+   private ServletOutputStream outputStream;
+
+   /** . */
+   private PrintWriter writer;
+
+   /** . */
+   private Map windows;
+
+   public PortalPrepareResponse(HttpServletResponse response, PortletInvok=
er invoker) throws PortletInvokerException
+   {
+      super(response, invoker);
+
+      //
+      this.windows =3D new HashMap();
+   }
+
+   public void addWindow(String windowId, Portlet portlet)
+   {
+      windows.put(windowId, portlet);
+   }
+
+   public Set getWindowIds()
+   {
+      return windows.keySet();
+   }
+
+   public Portlet getPortlet(String windowId)
+   {
+      return windows.get(windowId);
+   }
+
+   public ServletOutputStream getOutputStream() throws IOException
+   {
+      if (writer !=3D null)
+      {
+         throw new IllegalStateException();
+      }
+      if (outputStream =3D=3D null)
+      {
+         outputStream =3D new ServletOutputStream()
+         {
+            public void write(int b) throws IOException
+            {
+            }
+         };
+      }
+      return outputStream;
+   }
+
+   public PrintWriter getWriter() throws IOException
+   {
+      if (outputStream !=3D null)
+      {
+         throw new IllegalStateException();
+      }
+      if (writer =3D=3D null)
+      {
+         Writer tmp =3D new Writer()
+         {
+            public void write(char cbuf[], int off, int len) throws IOExce=
ption
+            {
+            }
+            public void flush() throws IOException
+            {
+            }
+            public void close() throws IOException
+            {
+            }
+         };
+         writer =3D new PrintWriter(tmp);
+      }
+      return writer;
+   }
+
+   public void flushBuffer() throws IOException
+   {
+   }
+
+   public boolean isCommitted()
+   {
+      return false;
+   }
+
+   public void reset()
+   {
+   }
+
+   public void resetBuffer()
+   {
+   }
+
+   public void sendError(int i, String s) throws IOException
+   {
+   }
+
+   public void sendError(int i) throws IOException
+   {
+   }
+
+   public void sendRedirect(String s) throws IOException
+   {
+   }
+
+   public void addCookie(Cookie cookie)
+   {
+   }
+
+   public void setDateHeader(String s, long l)
+   {
+   }
+
+   public void addDateHeader(String s, long l)
+   {
+   }
+
+   public void setHeader(String s, String s1)
+   {
+   }
+
+   public void addHeader(String s, String s1)
+   {
+   }
+
+   public void setContentType(String contentType)
+   {
+      this.contentType =3D contentType;
+   }
+
+   public void setContentLength(int i)
+   {
+   }
+
+   public void setCharacterEncoding(String characterEncoding)
+   {
+      this.characterEncoding =3D characterEncoding;
+   }
+
+   public void setIntHeader(String s, int i)
+   {
+   }
+
+   public void addIntHeader(String s, int i)
+   {
+   }
+
+   public void setStatus(int i)
+   {
+   }
+
+   public void setStatus(int i, String s)
+   {
+   }
+
+   public void setLocale(Locale locale)
+   {
+      this.locale =3D locale;
+   }
+
+   public String getContentType()
+   {
+      return contentType;
+   }
+
+   public Locale getLocale()
+   {
+      return locale;
+   }
+
+   public String getCharacterEncoding()
+   {
+      return characterEncoding;
+   }
+
+   public void setBufferSize(int bufferSize)
+   {
+      this.bufferSize =3D bufferSize;
+   }
+
+   public int getBufferSize()
+   {
+      return bufferSize;
+   }
+}

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/taglib/PageParamTag.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PageParamTag.java	2008-02-10 01:37:59 UTC (rev 9914)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PageParamTag.java	2008-02-10 02:16:32 UTC (rev 9915)
@@ -23,6 +23,7 @@
 package org.jboss.portal.portlet.test.jsp.taglib;
 =

 import org.jboss.portal.portlet.test.jsp.PortalRenderResponse;
+import org.jboss.portal.portlet.test.jsp.PortalPrepareResponse;
 =

 import javax.servlet.jsp.JspException;
 import javax.xml.namespace.QName;
@@ -87,7 +88,7 @@
       this.frozen =3D frozen;
    }
 =

-   public void doRenderTag(PortalRenderResponse renderResponse) throws Jsp=
Exception, IOException
+   public void doTag(PortalRenderResponse renderResponse) throws JspExcept=
ion, IOException
    {
       if (renderResponse.isPageStateModifiable())
       {
@@ -105,7 +106,7 @@
       }
    }
 =

-   public void doActionTag() throws JspException, IOException
+   public void doTag(PortalPrepareResponse prepareResponse) throws JspExce=
ption, IOException
    {
    }
 }

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/taglib/PageTag.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PageTag.java	2008-02-10 01:37:59 UTC (rev 9914)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PageTag.java	2008-02-10 02:16:32 UTC (rev 9915)
@@ -23,8 +23,7 @@
 package org.jboss.portal.portlet.test.jsp.taglib;
 =

 import org.jboss.portal.portlet.test.jsp.PortalRenderResponse;
-import org.jboss.portal.portlet.test.jsp.PortalResponse;
-import org.jboss.portal.portlet.test.jsp.PortalActionResponse;
+import org.jboss.portal.portlet.test.jsp.PortalPrepareResponse;
 =

 import javax.servlet.jsp.JspException;
 import javax.xml.namespace.QName;
@@ -55,7 +54,7 @@
    /** . */
    Status status =3D Status.ACTIVE;
 =

-   public int doStartRenderTag(PortalRenderResponse renderResponse) throws=
 JspException
+   public int doStartTag(PortalRenderResponse renderResponse) throws JspEx=
ception
    {
       maximizedId =3D renderResponse.getMaximizedWindowId();
 =

@@ -70,7 +69,7 @@
       }
    }
 =

-   public int doEndRenderTag(PortalRenderResponse renderResponse) throws J=
spException
+   public int doEndTag(PortalRenderResponse renderResponse) throws JspExce=
ption
    {
       if (maximizedId !=3D null)
       {
@@ -88,12 +87,12 @@
       return EVAL_PAGE;
    }
 =

-   public int doStartActionTag(PortalActionResponse portalResponse) throws=
 JspException
+   public int doStartTag(PortalPrepareResponse portalResponse) throws JspE=
xception
    {
       return EVAL_BODY_INCLUDE;
    }
 =

-   public int doEndActionTag(PortalActionResponse portalResponse) throws J=
spException
+   public int doEndTag(PortalPrepareResponse portalResponse) throws JspExc=
eption
    {
       return EVAL_PAGE;
    }

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/taglib/ParamTag.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/ParamTag.java	2008-02-10 01:37:59 UTC (rev 9914)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/ParamTag.java	2008-02-10 02:16:32 UTC (rev 9915)
@@ -61,7 +61,7 @@
       this.value =3D value;
    }
 =

-   public void doRenderTag(PortalRenderResponse renderResponse) throws Jsp=
Exception, IOException
+   public void doTag(PortalRenderResponse renderResponse) throws JspExcept=
ion, IOException
    {
       AbstractURLTag urlTag =3D (AbstractURLTag)SimpleTagSupport.findAnces=
torWithClass(this, AbstractURLTag.class);
       urlTag.setParam(name, value);

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/taglib/PortalBodyTagSupport.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortalBodyTagSupport.java	2008-02-10 01:37:59 UTC (rev 9914)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortalBodyTagSupport.java	2008-02-10 02:16:32 UTC (rev 9915)
@@ -23,7 +23,7 @@
 package org.jboss.portal.portlet.test.jsp.taglib;
 =

 import org.jboss.portal.portlet.test.jsp.PortalRenderResponse;
-import org.jboss.portal.portlet.test.jsp.PortalActionResponse;
+import org.jboss.portal.portlet.test.jsp.PortalPrepareResponse;
 import org.jboss.portal.portlet.test.jsp.PortalResponse;
 import org.jboss.portal.common.NotYetImplemented;
 =

@@ -72,13 +72,13 @@
       }
       else
       {
-         if (portalResponse instanceof PortalActionResponse)
+         if (portalResponse instanceof PortalPrepareResponse)
          {
-            return doStartActionTag((PortalActionResponse)portalResponse);
+            return doStartTag((PortalPrepareResponse)portalResponse);
          }
          else
          {
-            return doStartRenderTag((PortalRenderResponse)portalResponse);
+            return doStartTag((PortalRenderResponse)portalResponse);
          }
       }
    }
@@ -96,13 +96,13 @@
       //
       if (pageTag !=3D null && pageTag.status =3D=3D PageTag.Status.ACTIVE)
       {
-         if (portalResponse instanceof PortalActionResponse)
+         if (portalResponse instanceof PortalPrepareResponse)
          {
-            return doEndActionTag((PortalActionResponse)portalResponse);
+            return doEndTag((PortalPrepareResponse)portalResponse);
          }
          else
          {
-            return doEndRenderTag((PortalRenderResponse)portalResponse);
+            return doEndTag((PortalRenderResponse)portalResponse);
          }
       }
       else
@@ -111,22 +111,22 @@
       }
    }
 =

-   public int doStartActionTag(PortalActionResponse actionResponse) throws=
 JspException
+   public int doStartTag(PortalPrepareResponse prepareResponse) throws Jsp=
Exception
    {
       throw new NotYetImplemented();
    }
 =

-   public int doEndActionTag(PortalActionResponse actionResponse) throws J=
spException
+   public int doEndTag(PortalPrepareResponse prepareResponse) throws JspEx=
ception
    {
       throw new NotYetImplemented();
    }
 =

-   public int doStartRenderTag(PortalRenderResponse renderResponse) throws=
 JspException
+   public int doStartTag(PortalRenderResponse renderResponse) throws JspEx=
ception
    {
       throw new NotYetImplemented();
    }
 =

-   public int doEndRenderTag(PortalRenderResponse renderResponse) throws J=
spException
+   public int doEndTag(PortalRenderResponse renderResponse) throws JspExce=
ption
    {
       throw new NotYetImplemented();
    }

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/taglib/PortalSimpleTagSupport.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortalSimpleTagSupport.java	2008-02-10 01:37:59 UTC (rev 9914)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortalSimpleTagSupport.java	2008-02-10 02:16:32 UTC (rev 9915)
@@ -24,7 +24,7 @@
 =

 import org.jboss.portal.portlet.test.jsp.PortalRenderResponse;
 import org.jboss.portal.portlet.test.jsp.PortalResponse;
-import org.jboss.portal.portlet.test.jsp.PortalActionResponse;
+import org.jboss.portal.portlet.test.jsp.PortalPrepareResponse;
 import org.jboss.portal.common.NotYetImplemented;
 =

 import javax.servlet.jsp.tagext.SimpleTagSupport;
@@ -51,24 +51,27 @@
       //
       if (pageTag !=3D null && pageTag.status =3D=3D PageTag.Status.ACTIVE)
       {
-         if (getPortalResponse() instanceof PortalActionResponse)
+         PortalResponse portalResponse =3D getPortalResponse();
+
+         //
+         if (portalResponse instanceof PortalPrepareResponse)
          {
-            doActionTag();
+            doTag((PortalPrepareResponse)portalResponse);
          }
          else
          {
-            doRenderTag((PortalRenderResponse)getPortalResponse());
+            doTag((PortalRenderResponse)portalResponse);
          }
       }
    }
 =

-   public void doActionTag() throws JspException, IOException
+   public void doTag(PortalPrepareResponse prepareResponse) throws JspExce=
ption, IOException
    {
       throw new NotYetImplemented();
    }
 =

-   public void doRenderTag(PortalRenderResponse renderResponse) throws Jsp=
Exception, IOException
+   public void doTag(PortalRenderResponse renderResponse) throws JspExcept=
ion, IOException
    {
-      super.doTag();
+      throw new NotYetImplemented();
    }
 }

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/taglib/PortletMarkupTag.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortletMarkupTag.java	2008-02-10 01:37:59 UTC (rev 9914)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortletMarkupTag.java	2008-02-10 02:16:32 UTC (rev 9915)
@@ -39,7 +39,7 @@
  */
 public class PortletMarkupTag extends PortalSimpleTagSupport
 {
-   public void doRenderTag(PortalRenderResponse renderResponse) throws Jsp=
Exception, IOException
+   public void doTag(PortalRenderResponse renderResponse) throws JspExcept=
ion, IOException
    {
       PortletTag portletTag =3D (PortletTag)SimpleTagSupport.findAncestorW=
ithClass(this, PortletTag.class);
 =


Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/taglib/PortletTag.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortletTag.java	2008-02-10 01:37:59 UTC (rev 9914)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortletTag.java	2008-02-10 02:16:32 UTC (rev 9915)
@@ -23,7 +23,7 @@
 package org.jboss.portal.portlet.test.jsp.taglib;
 =

 import org.jboss.portal.portlet.test.jsp.PortalRenderResponse;
-import org.jboss.portal.portlet.test.jsp.PortalActionResponse;
+import org.jboss.portal.portlet.test.jsp.PortalPrepareResponse;
 import org.jboss.portal.portlet.test.jsp.PortalResponse;
 import org.jboss.portal.portlet.invocation.response.PortletInvocationRespo=
nse;
 import org.jboss.portal.portlet.invocation.response.FragmentResponse;
@@ -209,21 +209,21 @@
       this.windowId =3D null;
    }
 =

-   public int doStartActionTag(PortalActionResponse actionResponse) throws=
 JspException
+   public int doStartTag(PortalPrepareResponse prepareResponse) throws Jsp=
Exception
    {
-      initState(actionResponse);
+      initState(prepareResponse);
 =

       //
       if (portlet !=3D null)
       {
-         actionResponse.addWindow(windowId, portlet);
+         prepareResponse.addWindow(windowId, portlet);
       }
 =

       //
       return SKIP_BODY;
    }
 =

-   public int doEndActionTag(PortalActionResponse actionResponse) throws J=
spException
+   public int doEndTag(PortalPrepareResponse prepareResponse) throws JspEx=
ception
    {
       destroyState();
 =

@@ -231,7 +231,7 @@
       return EVAL_PAGE;
    }
 =

-   public int doStartRenderTag(PortalRenderResponse renderResponse) throws=
 JspException
+   public int doStartTag(PortalRenderResponse renderResponse) throws JspEx=
ception
    {
       initState(renderResponse);
 =

@@ -263,7 +263,7 @@
       }
    }
 =

-   public int doEndRenderTag(PortalRenderResponse renderResponse) throws J=
spException
+   public int doEndTag(PortalRenderResponse renderResponse) throws JspExce=
ption
    {
       if (bodyContent !=3D null)
       {

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/taglib/PortletTitleTag.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortletTitleTag.java	2008-02-10 01:37:59 UTC (rev 9914)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortletTitleTag.java	2008-02-10 02:16:32 UTC (rev 9915)
@@ -38,7 +38,7 @@
 public class PortletTitleTag extends PortalSimpleTagSupport
 {
 =

-   public void doRenderTag(PortalRenderResponse renderResponse) throws Jsp=
Exception, IOException
+   public void doTag(PortalRenderResponse renderResponse) throws JspExcept=
ion, IOException
    {
 =

       PortletTag portletTag =3D (PortletTag)SimpleTagSupport.findAncestorW=
ithClass(this, PortletTag.class);

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/taglib/PortletURLTag.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortletURLTag.java	2008-02-10 01:37:59 UTC (rev 9914)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortletURLTag.java	2008-02-10 02:16:32 UTC (rev 9915)
@@ -70,12 +70,12 @@
       this.windowStateValue =3D windowState;
    }
 =

-   public int doStartRenderTag(PortalRenderResponse renderResponse) throws=
 JspException
+   public int doStartTag(PortalRenderResponse renderResponse) throws JspEx=
ception
    {
       return EVAL_BODY_BUFFERED;
    }
 =

-   public int doEndRenderTag(PortalRenderResponse renderResponse) throws J=
spException
+   public int doEndTag(PortalRenderResponse renderResponse) throws JspExce=
ption
    {
       PagePortletControllerContext context =3D renderResponse.getPortletCo=
ntrollerContext();
       PortletTag portletTag =3D (PortletTag)SimpleTagSupport.findAncestorW=
ithClass(this, PortletTag.class);


--===============0588548740953442939==--

From portal-commits at lists.jboss.org Sat Feb  9 22:39:44 2008
Content-Type: multipart/mixed; boundary="===============3274569447271347716=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9916 - in
 modules/portlet/trunk/test/src/test/resources/simple-portal-war: css and 1
 other directory.
Date: Sat, 09 Feb 2008 22:38:04 -0500
Message-ID: 

--===============3274569447271347716==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: wesleyhales
Date: 2008-02-09 22:38:03 -0500 (Sat, 09 Feb 2008)
New Revision: 9916

Modified:
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/=
jsp/error.jsp
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/css/mast=
er.css
Log:
error formatting and other css

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/W=
EB-INF/jsp/error.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF=
/jsp/error.jsp	2008-02-10 02:16:32 UTC (rev 9915)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF=
/jsp/error.jsp	2008-02-10 03:38:03 UTC (rev 9916)
@@ -1,21 +1,34 @@
-<%@ page language=3D"java" %>
-
+<%@ page language=3D"java"  %>
 
    
       
          
             
-               <%=3D request.getAttribute("org.jboss.portal.portlet.po=
rtal.error.portlet_name")%>
+               

+                  ${requestScope['org.jboss.portal.portlet.portal.error.po=
rtlet_name']}  ${requestScope['org.jboss.portal.portlet.portal.error.status=
'] =3D=3D 'not_found' ? ' not found' : ''}
                
             
          
       
-      Portlet was not rendered
-      Error status: <%=3D request.getAttribute("org.jboss.portal.po=
rtlet.portal.error.status")%>

-      Portlet name: <%=3D request.getAttribute("org.jboss.portal.po=
rtlet.portal.error.portlet_name")%>

-      Portlet application
-         name: <%=3D request.getAttribute("org.jboss.portal.portlet.po=
rtal.error.application_name")%>

-      Exception: <%=3D request.getAttribute("org.jboss.portal.portl=
et.portal.error.cause")%>

-      Window id: <%=3D request.getAttribute("org.jboss.portal.portl=
et.portal.error.window_id")%>

+      Portlet was not rendered
+      
+      
+         
+            Error status: ${requestScope['org.jboss.portal.po=
rtlet.portal.error.status']}
+         
+         
+            Portlet name: ${requestScope['org.jboss.portal.po=
rtlet.portal.error.portlet_name']}
+         
+         
+            Portlet application name: ${requestScope['org.jbo=
ss.portal.portlet.portal.error.application_name']}
+         
+         
+            Exception: ${!empty requestScope['org.jboss.porta=
l.portlet.portal.error.cause'] ? requestScope['org.jboss.portal.portlet.por=
tal.error.cause'] : 'Error cause unavailable'}
+         
+         
+            Window id: ${requestScope['org.jboss.portal.portl=
et.portal.error.window_id']}
+         
+      
+        =

    
 

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/c=
ss/master.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/css/mas=
ter.css	2008-02-10 02:16:32 UTC (rev 9915)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/css/mas=
ter.css	2008-02-10 03:38:03 UTC (rev 9916)
@@ -118,7 +118,7 @@
 }
 =

 a {
-   color: #e1d77e;
+   color: #666666;
 }
 =

 p {
@@ -179,7 +179,7 @@
    background-repeat: repeat-x;
    background-position: top left;
    text-decoration:none;
-   font: bold 11px Lucida Sans, Trebuchet, tahoma, sans-serif;
+   font: bold 11px;
 }
 =

 div#container div.nav ul li a{
@@ -215,7 +215,6 @@
 div#container div#content div.portlet-frame{
    background-color: #fff;
    border: 1px solid #fff;
-      /*height: 500px;*/
 }
 =

 div#container div#content div.portlet div.header {
@@ -246,4 +245,40 @@
 div#container div#content div.portlet div.header div.header-layer div.cont=
rols span.mode-button{
    text-align: right;
    padding: 0 5px 0 0;
-}
\ No newline at end of file
+}
+
+div#container div#content div.portlet div.header div.header-layer div.cont=
rols span.mode-button a {
+   color: #e1d77e;
+   font: normal 11px;
+   text-decoration:none;
+}
+
+/*----------------------------------Error portlet*/
+
+div.error-container {
+   padding: 5px;
+   background-color: #fff;
+}
+
+h3.error-header {
+   background-color: #cc1100;
+   color: #fff;
+   padding: 3px;
+}
+
+div.error-container ul {
+   list-style: none;
+   list-style-position: inside;
+}
+
+div.error-container ul li {
+   padding: 3px 0 3px 0;
+   border-bottom: 1px solid #777777;
+}
+
+div.error-container ul li span {
+   font-weight: bold;
+   color: #cc1100
+}
+
+


--===============3274569447271347716==--

From portal-commits at lists.jboss.org Sat Feb  9 23:31:21 2008
Content-Type: multipart/mixed; boundary="===============0985329618478659102=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9917 - in
 modules/portlet/trunk/test/src: test/resources/simple-portal-war/WEB-INF/jsp
 and 1 other directories.
Date: Sat, 09 Feb 2008 23:31:21 -0500
Message-ID: 

--===============0985329618478659102==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: wesleyhales
Date: 2008-02-09 23:31:21 -0500 (Sat, 09 Feb 2008)
New Revision: 9917

Modified:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/portal=
/samples/RemoteControlResourcePortlet.java
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/=
jsp/error.jsp
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/css/mast=
er.css
Log:
remote control cleanup

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/portal/samples/RemoteControlResourcePortlet.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/porta=
l/samples/RemoteControlResourcePortlet.java	2008-02-10 03:38:03 UTC (rev 99=
16)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/porta=
l/samples/RemoteControlResourcePortlet.java	2008-02-10 04:31:21 UTC (rev 99=
17)
@@ -42,23 +42,27 @@
    {
       resourceResponse.setContentType("text/html");
       PrintWriter writer =3D resourceResponse.getWriter();
-      writer.print("");
+      writer.print("" +
+         "");
       PortletURL url =3D resourceResponse.createRenderURL();
       url.setWindowState(WindowState.MINIMIZED);
-      writer.print("minimize parent portlet");
+      writer.print(" minimize parent portlet");
       url.setWindowState(WindowState.MAXIMIZED);
-      writer.print("maximize parent portlet");
+      writer.print(" maximize parent portlet");
       url.setWindowState(WindowState.NORMAL);
-      writer.print("make parent portlet normal");
-      writer.print("'zipcode' public render parameter value: " +=
 resourceRequest.getParameter(ZIPCODE) + "
");
-      writer.print("Set value of 'zipcode' public render parameter =
to:");
+      writer.print(" make parent portlet normal");
+      writer.print("
'zipcode' public render parameter =
value: " + resourceRequest.getParameter(ZIPCODE) + "
");
+      writer.print("Set value of 'zipcode' public render parameter =
to:");
       url.setParameter(ZIPCODE, "80201");
-      writer.print("Denver");
+      writer.print("
Denver");
       url.setParameter(ZIPCODE, "94102");
       writer.print("
San Francisco");
       url.setParameter(ZIPCODE, "20001");
       writer.print("
Washington, DC");
-      writer.print("");
+      writer.print("

Price
").append(item.getDescription()).append= ("	$").append("" + price) .append("
").append("$= " + total).append("

Description	Price
").append(item.getDescription()).append= ("	$").append("" + price) - .append("
").append("$= " + total).append("

Price
").append(item.getDescription()).append= ("	$").append("" + price) + .append("
Total:	") + .append("$" + total).append("

Description	Price
").append(item.getDescription()).append("<= /td>	$").append("" + item.getPrice()) - .append("	Add to cart

Description	Price	Actions
").append(item.getDescription()).append("<= /td>	$").append("" + item.getPrice()) + .append("	Add to cart

");
    }
 =

    private String createParentURL(PortletURL url)

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/W=
EB-INF/jsp/error.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF=
/jsp/error.jsp	2008-02-10 03:38:03 UTC (rev 9916)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF=
/jsp/error.jsp	2008-02-10 04:31:21 UTC (rev 9917)
@@ -1,4 +1,5 @@
 <%@ page language=3D"java"  %>
+
 
    
       

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/c=
ss/master.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/css/mas=
ter.css	2008-02-10 03:38:03 UTC (rev 9916)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/css/mas=
ter.css	2008-02-10 04:31:21 UTC (rev 9917)
@@ -281,4 +281,24 @@
    color: #cc1100
 }
 =

+/*-------------------------------------Remote Window*/
 =

+div.remote-container {
+   padding: 8px 0 0 0;
+}
+
+div.remote-container ul {
+   list-style: none;
+   list-style-position: inside;
+   width: 90%;
+   margin: 0 auto 0 auto;
+}
+
+div.remote-container ul li {
+   padding: 3px 0 3px 0;
+   border-bottom: 1px solid #777777;
+}
+
+div.remote-container ul li a {
+   color: #332299 =

+}


--===============0985329618478659102==--

From portal-commits at lists.jboss.org Sun Feb 10 08:47:07 2008
Content-Type: multipart/mixed; boundary="===============1288735348785809688=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9918 - in modules/portlet/trunk:
 test/src/main/java/org/jboss/portal/portlet/test/jsp and 1 other directories.
Date: Sun, 10 Feb 2008 08:47:05 -0500
Message-ID: 

--===============1288735348785809688==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-10 08:47:05 -0500 (Sun, 10 Feb 2008)
New Revision: 9918

Added:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/PageParameterDef.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/PortletResult.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/WindowDef.java
Modified:
   modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/=
controller/impl/state/PageNavigationalStateImpl.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/ControllerFilter.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/PageEventControllerContext.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/PagePortletControllerContext.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/PortalPrepareResponse.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/PortalRenderResponse.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/PortalResponse.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/PageParamTag.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/PortletMarkupTag.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/PortletTag.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/PortletURLTag.java
Log:
make portlet rendering ahead of JSP rendering (between prepare and render p=
hases of portal)

Modified: modules/portlet/trunk/controller/src/main/java/org/jboss/portal/p=
ortlet/controller/impl/state/PageNavigationalStateImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet=
/controller/impl/state/PageNavigationalStateImpl.java	2008-02-10 04:31:21 U=
TC (rev 9917)
+++ modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet=
/controller/impl/state/PageNavigationalStateImpl.java	2008-02-10 13:47:05 U=
TC (rev 9918)
@@ -123,7 +123,8 @@
 =

    public String[] getPublicNavigationalState(QName name)
    {
-      return page.get(name).clone();
+      String[] values =3D page.get(name);
+      return values !=3D null ? values.clone() : null;
    }
 =

    public void setWindowNavigationalState(String windowId, WindowNavigatio=
nalState windowState)

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/ControllerFilter.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/ControllerFilter.java	2008-02-10 04:31:21 UTC (rev 9917)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/ControllerFilter.java	2008-02-10 13:47:05 UTC (rev 9918)
@@ -88,13 +88,13 @@
       PortletInvoker invoker =3D (PortletInvoker)getServletContext().getAt=
tribute("ConsumerPortletInvoker");
 =

       //
-      PortalPrepareResponse prepareResponse =3D new PortalPrepareResponse(=
resp, invoker);
+      PortalPrepareResponse prepareResponse =3D new PortalPrepareResponse(=
resp);
 =

       // Discover existing portlets on the page (introspection phase)
       chain.doFilter(req, prepareResponse);
 =

       // Now we can create a populated context
-      PagePortletControllerContext context =3D new PagePortletControllerCo=
ntext(req, resp, getServletContext(), prepareResponse);
+      PagePortletControllerContext context =3D new PagePortletControllerCo=
ntext(req, resp, invoker, getServletContext(), prepareResponse);
 =

       //
       PageNavigationalState pageState =3D null;
@@ -235,7 +235,7 @@
       }
 =

       //
-      PortalRenderResponse renderResponse =3D new PortalRenderResponse(res=
p, invoker, context, pageState);
+      PortalRenderResponse renderResponse =3D new PortalRenderResponse(res=
p, context, pageState, prepareResponse);
 =

       //
       chain.doFilter(req, renderResponse);

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/PageEventControllerContext.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/PageEventControllerContext.java	2008-02-10 04:31:21 UTC (rev 9917)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/PageEventControllerContext.java	2008-02-10 13:47:05 UTC (rev 9918)
@@ -25,6 +25,7 @@
 import org.jboss.portal.portlet.controller.event.EventControllerContext;
 import org.jboss.portal.portlet.controller.event.Event;
 import org.jboss.portal.portlet.Portlet;
+import org.jboss.portal.portlet.PortletInvokerException;
 import org.jboss.portal.portlet.info.PortletInfo;
 =

 import java.util.List;
@@ -43,8 +44,14 @@
    /** . */
    private final PortalPrepareResponse prepareResponse;
 =

-   public PageEventControllerContext(PortalPrepareResponse prepareResponse)
+   /** . */
+   private final PagePortletControllerContext context;
+
+   public PageEventControllerContext(
+      PagePortletControllerContext context,
+      PortalPrepareResponse prepareResponse)
    {
+      this.context =3D context;
       this.prepareResponse =3D prepareResponse;
    }
 =

@@ -55,16 +62,26 @@
       //
       for (String windowId : prepareResponse.getWindowIds())
       {
-         Portlet portlet =3D prepareResponse.getPortlet(windowId);
+         try
+         {
+            Portlet portlet =3D context.getPortlet(windowId);
 =

-         //
-         PortletInfo portletInfo =3D portlet.getInfo();
+            //
+            if (portlet !=3D null)
+            {
+               PortletInfo portletInfo =3D portlet.getInfo();
 =

-         //
-         if (portletInfo.getEventing().getConsumedEvents().containsKey(pro=
ducedEvent.getName()))
+               //
+               if (portletInfo.getEventing().getConsumedEvents().containsK=
ey(producedEvent.getName()))
+               {
+                  Event consumedEvent =3D new Event(producedEvent.getName(=
), producedEvent.getPayload(), windowId);
+                  consumedEvents.add(consumedEvent);
+               }
+            }
+         }
+         catch (PortletInvokerException e)
          {
-            Event consumedEvent =3D new Event(producedEvent.getName(), pro=
ducedEvent.getPayload(), windowId);
-            consumedEvents.add(consumedEvent);
+            e.printStackTrace();
          }
       }
 =


Added: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/te=
st/jsp/PageParameterDef.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/PageParameterDef.java	                        (rev 0)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/PageParameterDef.java	2008-02-10 13:47:05 UTC (rev 9918)
@@ -0,0 +1,64 @@
+/*************************************************************************=
*****
+ * 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 javax.xml.namespace.QName;
+
+/**
+ * @author Julien Viet
+ * @version $Revision: 630 $
+ */
+public class PageParameterDef
+{
+
+   /** . */
+   private QName name;
+
+   /** . */
+   private String value;
+
+   /** . */
+   private boolean frozen;
+
+   public PageParameterDef(QName name, String value, boolean frozen)
+   {
+      this.name =3D name;
+      this.value =3D value;
+      this.frozen =3D frozen;
+   }
+
+   public QName getName()
+   {
+      return name;
+   }
+
+   public String getValue()
+   {
+      return value;
+   }
+
+   public boolean isFrozen()
+   {
+      return frozen;
+   }
+}

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/PagePortletControllerContext.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/PagePortletControllerContext.java	2008-02-10 04:31:21 UTC (rev 9917)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/PagePortletControllerContext.java	2008-02-10 13:47:05 UTC (rev 9918)
@@ -24,6 +24,8 @@
 =

 import org.jboss.portal.portlet.Portlet;
 import org.jboss.portal.portlet.PortletInvokerException;
+import org.jboss.portal.portlet.PortletInvoker;
+import org.jboss.portal.portlet.info.PortletInfo;
 import org.jboss.portal.portlet.controller.event.EventControllerContext;
 import org.jboss.portal.portlet.invocation.PortletInvocation;
 import org.jboss.portal.portlet.invocation.response.PortletInvocationRespo=
nse;
@@ -35,6 +37,8 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.util.Map;
+import java.util.HashMap;
 =

 /**
  * @author Julien Viet
@@ -49,9 +53,16 @@
    /** . */
    private final PortalPrepareResponse prepareResponse;
 =

+   /** . */
+   private final Map portlets;
+
+   /** . */
+   private final PortletInvoker invoker;
+
    public PagePortletControllerContext(
       HttpServletRequest req,
       HttpServletResponse resp,
+      PortletInvoker invoker,
       ServletContext servletContext,
       PortalPrepareResponse prepareResponse)
       throws IllegalRequestException, IOException, ServletException, Portl=
etInvokerException
@@ -59,22 +70,78 @@
       super(req, resp, servletContext);
 =

       //
+      Map portlets =3D new HashMap();
+      for (Portlet portlet : invoker.getPortlets())
+      {
+         PortletInfo portletInfo =3D portlet.getInfo();
+         String portletName =3D portletInfo.getName();
+         String applicationName =3D portletInfo.getApplicationName();
+         Key key =3D new Key(applicationName, portletName);
+         portlets.put(key, portlet);
+      }
+
+      //
+      this.invoker =3D invoker;
+      this.portlets =3D portlets;
       this.prepareResponse =3D prepareResponse;
-      this.eventControllerContext =3D new PageEventControllerContext(prepa=
reResponse);
+      this.eventControllerContext =3D new PageEventControllerContext(this,=
 prepareResponse);
    }
 =

+   public Portlet findPortlet(String applicationName, String portletName)
+   {
+      return portlets.get(new Key(applicationName, portletName));
+   }
+
    protected Portlet getPortlet(String windowId) throws PortletInvokerExce=
ption
    {
-      return prepareResponse.getPortlet(windowId);
+      WindowDef windowDef =3D prepareResponse.getWindowDef(windowId);
+
+      //
+      return findPortlet(windowDef.getApplicationName(), windowDef.getPort=
letName());
    }
 =

    public PortletInvocationResponse invoke(PortletInvocation invocation) t=
hrows PortletInvokerException
    {
-      return prepareResponse.getInvoker().invoke(invocation);
+      return invoker.invoke(invocation);
    }
 =

    public EventControllerContext getEventControllerContext()
    {
       return eventControllerContext;
    }
+
+   private static class Key
+   {
+
+      /** . */
+      private final String applicationName;
+
+      /** . */
+      private final String portletName;
+
+      private Key(String applicationName, String portletName)
+      {
+         this.applicationName =3D applicationName;
+         this.portletName =3D portletName;
+      }
+
+      public boolean equals(Object obj)
+      {
+         if (obj =3D=3D this)
+         {
+            return true;
+         }
+         if (obj instanceof Key)
+         {
+            Key that =3D (Key)obj;
+            return applicationName.equals(that.applicationName) && portlet=
Name.equals(that.portletName);
+         }
+         return false;
+      }
+
+      public int hashCode()
+      {
+         return applicationName.hashCode() + portletName.hashCode();
+      }
+   }
 }

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/PortalPrepareResponse.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/PortalPrepareResponse.java	2008-02-10 04:31:21 UTC (rev 9917)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/PortalPrepareResponse.java	2008-02-10 13:47:05 UTC (rev 9918)
@@ -22,13 +22,12 @@
  *************************************************************************=
*****/
 package org.jboss.portal.portlet.test.jsp;
 =

-import org.jboss.portal.portlet.Portlet;
-import org.jboss.portal.portlet.PortletInvoker;
 import org.jboss.portal.portlet.PortletInvokerException;
 =

 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.Cookie;
 import javax.servlet.ServletOutputStream;
+import javax.xml.namespace.QName;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.Writer;
@@ -63,31 +62,50 @@
    private PrintWriter writer;
 =

    /** . */
-   private Map windows;
+   private Map windowDefs;
 =

-   public PortalPrepareResponse(HttpServletResponse response, PortletInvok=
er invoker) throws PortletInvokerException
+   /** . */
+   private Map paramDefs;
+
+   public PortalPrepareResponse(HttpServletResponse response) throws Portl=
etInvokerException
    {
-      super(response, invoker);
+      super(response);
 =

       //
-      this.windows =3D new HashMap();
+      this.windowDefs =3D new HashMap();
+      this.paramDefs =3D new HashMap();
    }
 =

-   public void addWindow(String windowId, Portlet portlet)
+   public Set getWindowIds()
    {
-      windows.put(windowId, portlet);
+      return windowDefs.keySet();
    }
 =

-   public Set getWindowIds()
+   public WindowDef getWindowDef(String windowId)
    {
-      return windows.keySet();
+      return windowDefs.get(windowId);
    }
 =

-   public Portlet getPortlet(String windowId)
+   public void addWindowDef(String windowId, WindowDef portlet)
    {
-      return windows.get(windowId);
+      windowDefs.put(windowId, portlet);
    }
 =

+   public Set getPageParameterNames()
+   {
+      return paramDefs.keySet();
+   }
+
+   public PageParameterDef getPageParameterDef(QName name)
+   {
+      return paramDefs.get(name);
+   }
+
+   public void setPageParameterDef(PageParameterDef parameterDef)
+   {
+      paramDefs.put(parameterDef.getName(), parameterDef);
+   }
+
    public ServletOutputStream getOutputStream() throws IOException
    {
       if (writer !=3D null)

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/PortalRenderResponse.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/PortalRenderResponse.java	2008-02-10 04:31:21 UTC (rev 9917)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/PortalRenderResponse.java	2008-02-10 13:47:05 UTC (rev 9918)
@@ -24,6 +24,7 @@
 =

 import org.jboss.portal.portlet.test.controller.TestInstanceContext;
 import org.jboss.portal.portlet.test.controller.TestPortalContext;
+import org.jboss.portal.portlet.test.jsp.PortletResult;
 import org.jboss.portal.portlet.controller.state.PageNavigationalState;
 import org.jboss.portal.portlet.controller.state.WindowNavigationalState;
 import org.jboss.portal.portlet.invocation.response.PortletInvocationRespo=
nse;
@@ -31,7 +32,6 @@
 import org.jboss.portal.portlet.PortletInvokerException;
 import org.jboss.portal.portlet.Portlet;
 import org.jboss.portal.portlet.StateString;
-import org.jboss.portal.portlet.PortletInvoker;
 import org.jboss.portal.portlet.impl.spi.AbstractClientContext;
 import org.jboss.portal.portlet.impl.spi.AbstractServerContext;
 import org.jboss.portal.portlet.impl.spi.AbstractUserContext;
@@ -44,6 +44,9 @@
 =

 import javax.servlet.http.HttpServletResponse;
 import javax.xml.namespace.QName;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Set;
 =

 /**
  * @author Julien Viet
@@ -55,24 +58,46 @@
    /** . */
    private PageNavigationalState pageState;
 =

-   /** Wether or not the page state can be modified. */
-   private boolean pageStateModifiable;
-
    /** . */
    private PagePortletControllerContext portletControllerContext;
 =

+   /** . */
+   private Map windowResults;
+
    public PortalRenderResponse(
       HttpServletResponse response,
-      PortletInvoker invoker,
       PagePortletControllerContext portletControllerContext,
-      PageNavigationalState pageState) throws PortletInvokerException
+      PageNavigationalState pageState,
+      PortalPrepareResponse prepareResponse) throws PortletInvokerException
    {
-      super(response, invoker);
+      super(response);
 =

       //
+      Set pageParameterNames =3D prepareResponse.getPageParameterNa=
mes();
+      if (pageParameterNames.size() > 0)
+      {
+         if (pageState =3D=3D null)
+         {
+            pageState =3D portletControllerContext.getStateControllerConte=
xt().createPageState(true);
+         }
+         for (QName parameterName : pageParameterNames)
+         {
+            PageParameterDef parameterDef =3D prepareResponse.getPageParam=
eterDef(parameterName);
+            boolean update =3D parameterDef.isFrozen() ? true : pageState.=
getPublicNavigationalState(parameterName) =3D=3D null;
+            if (update)
+            {
+               pageState.setPublicNavigationalState(parameterName, new Str=
ing[]{parameterDef.getValue()});
+            }
+         }
+      }
+
+      //
+      this.portletControllerContext =3D portletControllerContext;
+      this.windowResults =3D new HashMap();
       this.pageState =3D pageState;
-      this.pageStateModifiable =3D true;
-      this.portletControllerContext =3D portletControllerContext;
+
+      //
+      render(prepareResponse);
    }
 =

    /**
@@ -85,12 +110,17 @@
       return pageState;
    }
 =

+   public PortletResult getWindowResult(String windowId)
+   {
+      return windowResults.get(windowId);
+   }
+
    public PagePortletControllerContext getPortletControllerContext()
    {
       return portletControllerContext;
    }
 =

-   public PortletInvocationResponse render(Portlet portlet, String windowI=
d) throws PortletInvokerException
+   private PortletInvocationResponse render(Portlet portlet, String window=
Id) throws PortletInvokerException
    {
       WindowNavigationalState windowNS =3D null;
       if (pageState !=3D null)
@@ -144,36 +174,41 @@
       render.setPublicNavigationalState(publicNS);
 =

       //
-      pageStateModifiable =3D false;
-
-      //
       return portletControllerContext.invoke(render);
    }
 =

-   public boolean isPageStateModifiable()
+   private void render(PortalPrepareResponse prepareResponse)
    {
-      return pageStateModifiable;
-   }
+      for (String windowId : prepareResponse.getWindowIds())
+      {
+         WindowDef windowDef =3D prepareResponse.getWindowDef(windowId);
 =

-   public String getPageParameter(QName name)
-   {
-      return pageState !=3D null ? pageState.getPublicNavigationalState(na=
me)[0] : null;
-   }
+         //
+         try
+         {
+            Portlet portlet =3D portletControllerContext.getPortlet(window=
Id);
 =

-   public void setPageParameter(QName name, String value)
-   {
-      if (pageStateModifiable)
-      {
-         if (pageState =3D=3D null)
+            //
+            if (portlet !=3D null)
+            {
+               PortletInvocationResponse portletResponse =3D render(portle=
t, windowId);
+
+               //
+               PortletResult result =3D new PortletResult(windowDef, portl=
etResponse);
+
+               //
+               windowResults.put(windowId, result);
+            }
+            else
+            {
+               // log
+            }
+         }
+         catch (PortletInvokerException e)
          {
-            pageState =3D portletControllerContext.getStateControllerConte=
xt().createPageState(true);
+            e.printStackTrace();
          }
-         pageState.setPublicNavigationalState(name, new String[]{value});
       }
-      else
-      {
-         throw new IllegalStateException("Page state cannot be modified");
-      }
    }
 =

    public String getMaximizedWindowId()

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/PortalResponse.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/PortalResponse.java	2008-02-10 04:31:21 UTC (rev 9917)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/PortalResponse.java	2008-02-10 13:47:05 UTC (rev 9918)
@@ -22,15 +22,10 @@
  *************************************************************************=
*****/
 package org.jboss.portal.portlet.test.jsp;
 =

-import org.jboss.portal.portlet.Portlet;
-import org.jboss.portal.portlet.PortletInvoker;
 import org.jboss.portal.portlet.PortletInvokerException;
-import org.jboss.portal.portlet.info.PortletInfo;
 =

 import javax.servlet.http.HttpServletResponseWrapper;
 import javax.servlet.http.HttpServletResponse;
-import java.util.Map;
-import java.util.HashMap;
 =

 /**
  * Expose stuff common to action and render response.
@@ -42,46 +37,13 @@
 {
 =

    /** . */
-   private final PortletInvoker invoker;
-
-   /** . */
-   private final Map portlets;
-
-   /** . */
    private int count =3D 0;
 =

-   public PortalResponse(
-      HttpServletResponse response,
-      PortletInvoker invoker) throws PortletInvokerException
+   public PortalResponse(HttpServletResponse response) throws PortletInvok=
erException
    {
       super(response);
-
-      //
-      Map portlets =3D new HashMap();
-      for (Portlet portlet : invoker.getPortlets())
-      {
-         PortletInfo portletInfo =3D portlet.getInfo();
-         String portletName =3D portletInfo.getName();
-         String applicationName =3D portletInfo.getApplicationName();
-         Key key =3D new Key(applicationName, portletName);
-         portlets.put(key, portlet);
-      }
-
-      //
-      this.portlets =3D portlets;
-      this.invoker =3D invoker;
    }
 =

-   public PortletInvoker getInvoker()
-   {
-      return invoker;
-   }
-
-   public Portlet findPortlet(String applicationName, String portletName)
-   {
-      return portlets.get(new Key(applicationName, portletName));
-   }
-
    /**
     * todo : add on JSP portlet tag a notion of 'id', because this id gene=
ration relies on the portlet
     * rendering order on the page which could not be the same between 2 re=
quests.
@@ -90,39 +52,4 @@
    {
       return "" + count++;
    }
-
-   private static class Key
-   {
-
-      /** . */
-      private final String applicationName;
-
-      /** . */
-      private final String portletName;
-
-      private Key(String applicationName, String portletName)
-      {
-         this.applicationName =3D applicationName;
-         this.portletName =3D portletName;
-      }
-
-      public boolean equals(Object obj)
-      {
-         if (obj =3D=3D this)
-         {
-            return true;
-         }
-         if (obj instanceof Key)
-         {
-            Key that =3D (Key)obj;
-            return applicationName.equals(that.applicationName) && portlet=
Name.equals(that.portletName);
-         }
-         return false;
-      }
-
-      public int hashCode()
-      {
-         return applicationName.hashCode() + portletName.hashCode();
-      }
-   }
 }

Copied: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/t=
est/jsp/PortletResult.java (from rev 9913, modules/portlet/trunk/test/src/m=
ain/java/org/jboss/portal/portlet/test/jsp/taglib/PortletResult.java)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/PortletResult.java	                        (rev 0)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/PortletResult.java	2008-02-10 13:47:05 UTC (rev 9918)
@@ -0,0 +1,59 @@
+/*************************************************************************=
*****
+ * 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.PortletInvocationRespo=
nse;
+import org.jboss.portal.portlet.test.jsp.WindowDef;
+
+/**
+ * Combines the invocation of a portlet and the info on the portlet JSP ta=
g. It does
+ * not need to be exposed out of this package.
+ *
+ * @author Julien Viet
+ * @version $Revision: 630 $
+ */
+public class PortletResult
+{
+
+   /** . */
+   private final WindowDef windowDef;
+
+   /** . */
+   private final PortletInvocationResponse response;
+
+   public PortletResult(WindowDef windowDef, PortletInvocationResponse res=
ponse)
+   {
+      this.windowDef =3D windowDef;
+      this.response =3D response;
+   }
+
+   public WindowDef getWindowDef()
+   {
+      return windowDef;
+   }
+
+   public PortletInvocationResponse getResponse()
+   {
+      return response;
+   }
+}

Added: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/te=
st/jsp/WindowDef.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/WindowDef.java	                        (rev 0)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/WindowDef.java	2008-02-10 13:47:05 UTC (rev 9918)
@@ -0,0 +1,103 @@
+/*************************************************************************=
*****
+ * 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.Mode;
+import org.jboss.portal.WindowState;
+
+import java.util.Set;
+
+/**
+ * Combines the invocation of a portlet and the info on the portlet JSP ta=
g. It does
+ * not need to be exposed out of this package.
+ *
+ * @author Julien Viet
+ * @version $Revision: 630 $
+ */
+public class WindowDef
+{
+
+   /** . */
+   private final String portletName;
+
+   /** . */
+   private final String applicationName;
+
+   /** . */
+   private final String windowId;
+
+   /** . */
+   private final Mode initialMode;
+
+   /** . */
+   private final Set supportedModes;
+
+   /** . */
+   private final Set supportedWindowStates;
+
+   public WindowDef(
+      String portletName,
+      String applicationName,
+      String windowId,
+      Mode initialMode,
+      Set supportedModes,
+      Set supportedWindowStates)
+   {
+      this.portletName =3D portletName;
+      this.applicationName =3D applicationName;
+      this.windowId =3D windowId;
+      this.initialMode =3D initialMode;
+      this.supportedModes =3D supportedModes;
+      this.supportedWindowStates =3D supportedWindowStates;
+   }
+
+   public String getPortletName()
+   {
+      return portletName;
+   }
+
+   public String getApplicationName()
+   {
+      return applicationName;
+   }
+
+   public String getWindowId()
+   {
+      return windowId;
+   }
+
+   public Mode getInitialMode()
+   {
+      return initialMode;
+   }
+
+   public Set getSupportedModes()
+   {
+      return supportedModes;
+   }
+
+   public Set getSupportedWindowStates()
+   {
+      return supportedWindowStates;
+   }
+}
\ No newline at end of file

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/taglib/PageParamTag.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PageParamTag.java	2008-02-10 04:31:21 UTC (rev 9917)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PageParamTag.java	2008-02-10 13:47:05 UTC (rev 9918)
@@ -24,6 +24,7 @@
 =

 import org.jboss.portal.portlet.test.jsp.PortalRenderResponse;
 import org.jboss.portal.portlet.test.jsp.PortalPrepareResponse;
+import org.jboss.portal.portlet.test.jsp.PageParameterDef;
 =

 import javax.servlet.jsp.JspException;
 import javax.xml.namespace.QName;
@@ -37,76 +38,66 @@
 {
 =

    /** . */
-   private String namespaceURI;
+   private String namespaceURIAttr;
 =

    /** . */
-   private String localName;
+   private String localNameAttr;
 =

    /** . */
-   private String value;
+   private String valueAttr;
 =

    /** . */
-   private String frozen;
+   private String frozenAttr;
 =

    public String getNamespaceURI()
    {
-      return namespaceURI;
+      return namespaceURIAttr;
    }
 =

    public void setNamespaceURI(String namespaceURI)
    {
-      this.namespaceURI =3D namespaceURI;
+      this.namespaceURIAttr =3D namespaceURI;
    }
 =

    public String getLocalName()
    {
-      return localName;
+      return localNameAttr;
    }
 =

    public void setLocalName(String localName)
    {
-      this.localName =3D localName;
+      this.localNameAttr =3D localName;
    }
 =

    public String getValue()
    {
-      return value;
+      return valueAttr;
    }
 =

    public void setValue(String value)
    {
-      this.value =3D value;
+      this.valueAttr =3D value;
    }
 =

    public String getFrozen()
    {
-      return frozen;
+      return frozenAttr;
    }
 =

    public void setFrozen(String frozen)
    {
-      this.frozen =3D frozen;
+      this.frozenAttr =3D frozen;
    }
 =

    public void doTag(PortalRenderResponse renderResponse) throws JspExcept=
ion, IOException
    {
-      if (renderResponse.isPageStateModifiable())
-      {
-         QName name =3D new QName(namespaceURI, localName);
-
-         //
-         if ("true".equals(frozen))
-         {
-            //
-         }
-         else if (renderResponse.getPageParameter(name) =3D=3D null)
-         {
-            renderResponse.setPageParameter(name, value);
-         }
-      }
    }
 =

    public void doTag(PortalPrepareResponse prepareResponse) throws JspExce=
ption, IOException
    {
+      QName name =3D new QName(namespaceURIAttr, localNameAttr);
+      boolean frozen =3D "true".equals(frozenAttr);
+      PageParameterDef parameterDef =3D new PageParameterDef(name, valueAt=
tr, frozen);
+      prepareResponse.setPageParameterDef(parameterDef);
    }
 }

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/taglib/PortletMarkupTag.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortletMarkupTag.java	2008-02-10 04:31:21 UTC (rev 9917)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortletMarkupTag.java	2008-02-10 13:47:05 UTC (rev 9918)
@@ -55,7 +55,7 @@
             WindowNavigationalState windowNS =3D null;
             if (renderResponse.getPageState() !=3D null)
             {
-               windowNS =3D renderResponse.getPageState().getWindowNavigat=
ionalState(portletTag.result.getWindowId());
+               windowNS =3D renderResponse.getPageState().getWindowNavigat=
ionalState(portletTag.result.getWindowDef().getWindowId());
             }
             if (windowNS =3D=3D null || !windowNS.getWindowState().equals(=
WindowState.MINIMIZED))
             {
@@ -77,13 +77,13 @@
          }
          else
          {
-            out.write(portletResp.getClass().getSimpleName() + "[" + portl=
etTag.result.getPortletName() + "," + portletTag.result.getApplicationName(=
) + "]");
+            out.write(portletResp.getClass().getSimpleName() + "[" + portl=
etTag.result.getWindowDef().getPortletName() + "," + portletTag.result.getW=
indowDef().getApplicationName() + "]");
             out.flush();
          }
       }
       else
       {
-         out.write("Empty[" + portletTag.result.getPortletName() + "," + p=
ortletTag.result.getApplicationName() + "]");
+         out.write("Empty[" + portletTag.result.getWindowDef().getPortletN=
ame() + "," + portletTag.result.getWindowDef().getApplicationName() + "]");
          out.flush();
       }
    }

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/taglib/PortletTag.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortletTag.java	2008-02-10 04:31:21 UTC (rev 9917)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortletTag.java	2008-02-10 13:47:05 UTC (rev 9918)
@@ -25,12 +25,12 @@
 import org.jboss.portal.portlet.test.jsp.PortalRenderResponse;
 import org.jboss.portal.portlet.test.jsp.PortalPrepareResponse;
 import org.jboss.portal.portlet.test.jsp.PortalResponse;
+import org.jboss.portal.portlet.test.jsp.WindowDef;
+import org.jboss.portal.portlet.test.jsp.PortletResult;
 import org.jboss.portal.portlet.invocation.response.PortletInvocationRespo=
nse;
 import org.jboss.portal.portlet.invocation.response.FragmentResponse;
 import org.jboss.portal.portlet.invocation.response.ErrorResponse;
 import org.jboss.portal.portlet.invocation.response.UnavailableResponse;
-import org.jboss.portal.portlet.PortletInvokerException;
-import org.jboss.portal.portlet.Portlet;
 import org.jboss.portal.Mode;
 import org.jboss.portal.WindowState;
 import org.jboss.portal.common.util.Tools;
@@ -79,10 +79,8 @@
    private Set supportedModes;
    private Mode initialMode;
    private PageTag pageTag;
-   private Portlet portlet;
    private String windowId;
 =

-   /** . */
    PortletResult result;
 =

    public String getName()
@@ -185,9 +183,6 @@
       }
 =

       //
-      Portlet portlet =3D portalResponse.findPortlet(applicationNameAttr, =
nameAttr);
-
-      //
       String windowId =3D portalResponse.nextId();
 =

       //
@@ -195,7 +190,6 @@
       this.supportedModes =3D supportedModes;
       this.supportedWindowStates =3D supportedWindowStates;
       this.pageTag =3D (PageTag)findAncestorWithClass(this, PageTag.class);
-      this.portlet =3D portlet;
       this.windowId =3D windowId;
    }
 =

@@ -205,7 +199,6 @@
       this.supportedModes =3D null;
       this.supportedWindowStates =3D null;
       this.pageTag =3D null;
-      this.portlet =3D null;
       this.windowId =3D null;
    }
 =

@@ -214,12 +207,12 @@
       initState(prepareResponse);
 =

       //
-      if (portlet !=3D null)
-      {
-         prepareResponse.addWindow(windowId, portlet);
-      }
+      WindowDef windowDef =3D new WindowDef(nameAttr, applicationNameAttr,=
 windowId, initialMode, supportedModes, supportedWindowStates);
 =

       //
+      prepareResponse.addWindowDef(windowId, windowDef);
+
+      //
       return SKIP_BODY;
    }
 =

@@ -236,7 +229,10 @@
       initState(renderResponse);
 =

       //
-      if (portlet =3D=3D null)
+      PortletResult result =3D renderResponse.getWindowResult(windowId);
+
+      //
+      if (result =3D=3D null || result.getResponse() =3D=3D null)
       {
          handleError(renderResponse, Constants.NOT_FOUND, null, null);
 =

@@ -249,7 +245,7 @@
          {
             if (windowId.equals(pageTag.maximizedId))
             {
-               return render(renderResponse, EVAL_BODY_BUFFERED);
+               return render(renderResponse, result, EVAL_BODY_BUFFERED);
             }
             else
             {
@@ -258,7 +254,7 @@
          }
          else
          {
-            return render(renderResponse, EVAL_BODY_INCLUDE);
+            return render(renderResponse, result, EVAL_BODY_INCLUDE);
          }
       }
    }
@@ -277,55 +273,37 @@
       return EVAL_PAGE;
    }
 =

-   public int render(PortalRenderResponse renderResponse, int rt)
+   public int render(PortalRenderResponse renderResponse, PortletResult re=
sult, int rt)
    {
-      try
+      PortletInvocationResponse portletResponse =3D result.getResponse();
+
+      //
+      if (portletResponse instanceof FragmentResponse)
       {
-         PortletInvocationResponse portletResponse =3D renderResponse.rend=
er(portlet, windowId);
+         this.result =3D result;
+         //
+         return rt;
+      }
+      else if (portletResponse instanceof ErrorResponse)
+      {
+         ErrorResponse error =3D (ErrorResponse)portletResponse;
 =

          //
-         if (portletResponse instanceof FragmentResponse)
-         {
-            result =3D new PortletResult(
-               nameAttr,
-               applicationNameAttr,
-               windowId,
-               portletResponse,
-               initialMode,
-               supportedModes,
-               supportedWindowStates);
+         handleError(renderResponse, Constants.PORTLET_ERROR, error.getCau=
se(), error.getMessage());
 =

-            //
-            return rt;
-         }
-         else if (portletResponse instanceof ErrorResponse)
-         {
-            ErrorResponse error =3D (ErrorResponse)portletResponse;
+         //
+         return SKIP_BODY;
+      }
+      else if (portletResponse instanceof UnavailableResponse)
+      {
+         handleError(renderResponse, Constants.UNAVAILABLE, null, null);
 =

-            //
-            handleError(renderResponse, Constants.PORTLET_ERROR, error.get=
Cause(), error.getMessage());
-
-            //
-            return SKIP_BODY;
-         }
-         else if (portletResponse instanceof UnavailableResponse)
-         {
-            handleError(renderResponse, Constants.UNAVAILABLE, null, null);
-
-            //
-            return SKIP_BODY;
-         }
-         else
-         {
-            handleError(renderResponse, Constants.INTERNAL_ERROR, null, nu=
ll);
-
-            //
-            return SKIP_BODY;
-         }
+         //
+         return SKIP_BODY;
       }
-      catch (PortletInvokerException e)
+      else
       {
-         handleError(renderResponse, Constants.INTERNAL_ERROR, e, e.getMes=
sage());
+         handleError(renderResponse, Constants.INTERNAL_ERROR, null, null);
 =

          //
          return SKIP_BODY;

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/taglib/PortletURLTag.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortletURLTag.java	2008-02-10 04:31:21 UTC (rev 9917)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortletURLTag.java	2008-02-10 13:47:05 UTC (rev 9918)
@@ -130,7 +130,7 @@
       try
       {
          JspWriter out =3D pageContext.getOut();
-         String renderedURL =3D renderer.renderURL(portletTag.result.getWi=
ndowId(), url, null, null, true);
+         String renderedURL =3D renderer.renderURL(portletTag.result.getWi=
ndowDef().getWindowId(), url, null, null, true);
          out.write(renderedURL);
       }
       catch (IOException e)


--===============1288735348785809688==--

From portal-commits at lists.jboss.org Sun Feb 10 08:49:29 2008
Content-Type: multipart/mixed; boundary="===============1244519276842085386=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9919 - in
 modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp:
 taglib and 1 other directory.
Date: Sun, 10 Feb 2008 08:49:29 -0500
Message-ID: 

--===============1244519276842085386==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-10 08:49:29 -0500 (Sun, 10 Feb 2008)
New Revision: 9919

Added:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/WindowResult.java
Removed:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/PortletResult.java
Modified:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/PortalRenderResponse.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/PortletTag.java
Log:
rename

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/PortalRenderResponse.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/PortalRenderResponse.java	2008-02-10 13:47:05 UTC (rev 9918)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/PortalRenderResponse.java	2008-02-10 13:49:29 UTC (rev 9919)
@@ -24,7 +24,7 @@
 =

 import org.jboss.portal.portlet.test.controller.TestInstanceContext;
 import org.jboss.portal.portlet.test.controller.TestPortalContext;
-import org.jboss.portal.portlet.test.jsp.PortletResult;
+import org.jboss.portal.portlet.test.jsp.WindowResult;
 import org.jboss.portal.portlet.controller.state.PageNavigationalState;
 import org.jboss.portal.portlet.controller.state.WindowNavigationalState;
 import org.jboss.portal.portlet.invocation.response.PortletInvocationRespo=
nse;
@@ -62,7 +62,7 @@
    private PagePortletControllerContext portletControllerContext;
 =

    /** . */
-   private Map windowResults;
+   private Map windowResults;
 =

    public PortalRenderResponse(
       HttpServletResponse response,
@@ -93,7 +93,7 @@
 =

       //
       this.portletControllerContext =3D portletControllerContext;
-      this.windowResults =3D new HashMap();
+      this.windowResults =3D new HashMap();
       this.pageState =3D pageState;
 =

       //
@@ -110,7 +110,7 @@
       return pageState;
    }
 =

-   public PortletResult getWindowResult(String windowId)
+   public WindowResult getWindowResult(String windowId)
    {
       return windowResults.get(windowId);
    }
@@ -194,7 +194,7 @@
                PortletInvocationResponse portletResponse =3D render(portle=
t, windowId);
 =

                //
-               PortletResult result =3D new PortletResult(windowDef, portl=
etResponse);
+               WindowResult result =3D new WindowResult(windowDef, portlet=
Response);
 =

                //
                windowResults.put(windowId, result);

Copied: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/t=
est/jsp/WindowResult.java (from rev 9918, modules/portlet/trunk/test/src/ma=
in/java/org/jboss/portal/portlet/test/jsp/PortletResult.java)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/WindowResult.java	                        (rev 0)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/WindowResult.java	2008-02-10 13:49:29 UTC (rev 9919)
@@ -0,0 +1,59 @@
+/*************************************************************************=
*****
+ * 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.PortletInvocationRespo=
nse;
+import org.jboss.portal.portlet.test.jsp.WindowDef;
+
+/**
+ * Combines the invocation of a portlet and the info on the portlet JSP ta=
g. It does
+ * not need to be exposed out of this package.
+ *
+ * @author Julien Viet
+ * @version $Revision: 630 $
+ */
+public class WindowResult
+{
+
+   /** . */
+   private final WindowDef windowDef;
+
+   /** . */
+   private final PortletInvocationResponse response;
+
+   public WindowResult(WindowDef windowDef, PortletInvocationResponse resp=
onse)
+   {
+      this.windowDef =3D windowDef;
+      this.response =3D response;
+   }
+
+   public WindowDef getWindowDef()
+   {
+      return windowDef;
+   }
+
+   public PortletInvocationResponse getResponse()
+   {
+      return response;
+   }
+}

Deleted: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/=
test/jsp/taglib/PortletResult.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortletResult.java	2008-02-10 13:47:05 UTC (rev 9918)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortletResult.java	2008-02-10 13:49:29 UTC (rev 9919)
@@ -1,114 +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.taglib;
-
-import org.jboss.portal.Mode;
-import org.jboss.portal.WindowState;
-import org.jboss.portal.portlet.invocation.response.PortletInvocationRespo=
nse;
-
-import java.util.Set;
-
-/**
- * Combines the invocation of a portlet and the info on the portlet JSP ta=
g. It does
- * not need to be exposed out of this package.
- *
- * @author Julien Viet
- * @version $Revision: 630 $
- */
-class PortletResult
-{
-
-   /** . */
-   private final String portletName;
-
-   /** . */
-   private final String applicationName;
-
-   /** . */
-   private final String windowId;
-
-   /** . */
-   private final PortletInvocationResponse response;
-
-   /** . */
-   private final Mode initialMode;
-
-   /** . */
-   private final Set supportedModes;
-
-   /** . */
-   private final Set supportedWindowStates;
-
-   public PortletResult(
-      String portletName,
-      String applicationName,
-      String windowId,
-      PortletInvocationResponse response,
-      Mode initialMode,
-      Set supportedModes,
-      Set supportedWindowStates)
-   {
-      this.portletName =3D portletName;
-      this.applicationName =3D applicationName;
-      this.windowId =3D windowId;
-      this.response =3D response;
-      this.initialMode =3D initialMode;
-      this.supportedModes =3D supportedModes;
-      this.supportedWindowStates =3D supportedWindowStates;
-   }
-
-   public String getPortletName()
-   {
-      return portletName;
-   }
-
-   public String getApplicationName()
-   {
-      return applicationName;
-   }
-
-   public String getWindowId()
-   {
-      return windowId;
-   }
-
-   public PortletInvocationResponse getResponse()
-   {
-      return response;
-   }
-
-   public Mode getInitialMode()
-   {
-      return initialMode;
-   }
-
-   public Set getSupportedModes()
-   {
-      return supportedModes;
-   }
-
-   public Set getSupportedWindowStates()
-   {
-      return supportedWindowStates;
-   }
-}

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/taglib/PortletTag.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortletTag.java	2008-02-10 13:47:05 UTC (rev 9918)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortletTag.java	2008-02-10 13:49:29 UTC (rev 9919)
@@ -26,7 +26,7 @@
 import org.jboss.portal.portlet.test.jsp.PortalPrepareResponse;
 import org.jboss.portal.portlet.test.jsp.PortalResponse;
 import org.jboss.portal.portlet.test.jsp.WindowDef;
-import org.jboss.portal.portlet.test.jsp.PortletResult;
+import org.jboss.portal.portlet.test.jsp.WindowResult;
 import org.jboss.portal.portlet.invocation.response.PortletInvocationRespo=
nse;
 import org.jboss.portal.portlet.invocation.response.FragmentResponse;
 import org.jboss.portal.portlet.invocation.response.ErrorResponse;
@@ -81,7 +81,7 @@
    private PageTag pageTag;
    private String windowId;
 =

-   PortletResult result;
+   WindowResult result;
 =

    public String getName()
    {
@@ -229,7 +229,7 @@
       initState(renderResponse);
 =

       //
-      PortletResult result =3D renderResponse.getWindowResult(windowId);
+      WindowResult result =3D renderResponse.getWindowResult(windowId);
 =

       //
       if (result =3D=3D null || result.getResponse() =3D=3D null)
@@ -273,7 +273,7 @@
       return EVAL_PAGE;
    }
 =

-   public int render(PortalRenderResponse renderResponse, PortletResult re=
sult, int rt)
+   public int render(PortalRenderResponse renderResponse, WindowResult res=
ult, int rt)
    {
       PortletInvocationResponse portletResponse =3D result.getResponse();
 =



--===============1244519276842085386==--

From portal-commits at lists.jboss.org Sun Feb 10 09:56:55 2008
Content-Type: multipart/mixed; boundary="===============0454578247960016139=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9920 - in
 modules/portlet/trunk/test/src: main/java/org/jboss/portal/portlet/test/jsp
 and 5 other directories.
Date: Sun, 10 Feb 2008 09:56:49 -0500
Message-ID: 

--===============0454578247960016139==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-10 09:56:47 -0500 (Sun, 10 Feb 2008)
New Revision: 9920

Added:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/portal=
/samples/basic/HeaderPortlet.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/HeadersTag.java
Modified:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/PortalRenderResponse.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/PortalSimpleTagSupport.java
   modules/portlet/trunk/test/src/test/resources/portal/samples/basic-war/W=
EB-INF/portlet.xml
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/=
portal.tld
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/dem=
o3.jsp
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/=
header.jsp
Log:
start to add support for headers, need to work on resource with a content t=
ype different from text/html

Added: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/po=
rtal/samples/basic/HeaderPortlet.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/porta=
l/samples/basic/HeaderPortlet.java	                        (rev 0)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/porta=
l/samples/basic/HeaderPortlet.java	2008-02-10 14:56:47 UTC (rev 9920)
@@ -0,0 +1,63 @@
+/*************************************************************************=
*****
+ * 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.portal.samples.basic;
+
+import org.w3c.dom.Element;
+
+import javax.portlet.GenericPortlet;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+import javax.portlet.PortletException;
+import javax.portlet.ResourceRequest;
+import javax.portlet.ResourceResponse;
+import javax.portlet.ResourceURL;
+import java.io.IOException;
+import java.io.PrintWriter;
+
+/**
+ * @author Julien Viet
+ * @version $Revision: 630 $
+ */
+public class HeaderPortlet extends GenericPortlet
+{
+   public void render(RenderRequest req, RenderResponse resp) throws Portl=
etException, IOException
+   {
+      ResourceURL resourceURL =3D resp.createResourceURL();
+
+      //
+      Element elt =3D resp.createElement("script");
+      elt.setAttribute("type", "text/javascript");
+      elt.setAttribute("src", resourceURL.toString());
+      elt.appendChild(elt.getOwnerDocument().createTextNode(""));
+      resp.addProperty("script", elt);
+   }
+
+   public void serveResource(ResourceRequest req, ResourceResponse resp) t=
hrows PortletException, IOException
+   {
+//      String namespace =3Dresp.getNamespace();
+      resp.setContentType("text/javascript");
+      PrintWriter writer =3D resp.getWriter();
+      writer.print("alert('shouldwork');");
+      writer.close();
+   }
+}

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/PortalRenderResponse.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/PortalRenderResponse.java	2008-02-10 13:49:29 UTC (rev 9919)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/PortalRenderResponse.java	2008-02-10 14:56:47 UTC (rev 9920)
@@ -110,6 +110,11 @@
       return pageState;
    }
 =

+   public Set getWindowIds()
+   {
+      return windowResults.keySet();
+   }
+
    public WindowResult getWindowResult(String windowId)
    {
       return windowResults.get(windowId);
@@ -211,6 +216,15 @@
       }
    }
 =

+   public boolean isMaximizedWindow(String windowId)
+   {
+      if (windowId =3D=3D null)
+      {
+         throw new IllegalArgumentException();
+      }
+      return windowId.equals(getMaximizedWindowId());
+   }
+
    public String getMaximizedWindowId()
    {
       if (pageState !=3D null)

Added: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/te=
st/jsp/taglib/HeadersTag.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/HeadersTag.java	                        (rev 0)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/HeadersTag.java	2008-02-10 14:56:47 UTC (rev 9920)
@@ -0,0 +1,105 @@
+/*************************************************************************=
*****
+ * 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.taglib;
+
+import org.jboss.portal.portlet.test.jsp.PortalRenderResponse;
+import org.jboss.portal.portlet.test.jsp.WindowResult;
+import org.jboss.portal.portlet.test.jsp.PortalPrepareResponse;
+import org.jboss.portal.portlet.invocation.response.PortletInvocationRespo=
nse;
+import org.jboss.portal.portlet.invocation.response.FragmentResponse;
+import org.jboss.portal.portlet.invocation.response.ResponseProperties;
+import org.jboss.portal.common.util.MultiValuedPropertyMap;
+import org.jboss.portal.common.xml.XMLTools;
+import org.w3c.dom.Element;
+
+import javax.servlet.jsp.JspException;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * @author Julien Viet
+ * @version $Revision: 630 $
+ */
+public class HeadersTag extends PortalSimpleTagSupport
+{
+
+   public HeadersTag()
+   {
+      super(false);
+   }
+
+   public void doTag(PortalPrepareResponse prepareResponse) throws JspExce=
ption, IOException
+   {
+   }
+
+   public void doTag(PortalRenderResponse renderResponse) throws JspExcept=
ion, IOException
+   {
+      String maxmizedWindowId =3D renderResponse.getMaximizedWindowId();
+
+      //
+      for (String windowId : renderResponse.getWindowIds())
+      {
+         if (maxmizedWindowId =3D=3D null || maxmizedWindowId.equals(windo=
wId))
+         {
+            WindowResult result =3D renderResponse.getWindowResult(windowI=
d);
+
+            //
+            if (result !=3D null)
+            {
+               PortletInvocationResponse response =3D result.getResponse();
+
+               //
+               if (response instanceof FragmentResponse)
+               {
+                  FragmentResponse fragmentResponse =3D (FragmentResponse)=
response;
+
+                  //
+                  ResponseProperties properties =3D fragmentResponse.getPr=
operties();
+
+                  //
+                  if (properties !=3D null)
+                  {
+                     MultiValuedPropertyMap markupHeaders =3D pro=
perties.getMarkupHeaders();
+                     for (String key : markupHeaders.keySet())
+                     {
+                        List headElement =3D markupHeaders.getVal=
ues(key);
+                        for (Element headerValue : headElement)
+                        {
+                           try
+                           {
+                              String serializedElement =3D XMLTools.toStri=
ng(headerValue);
+                              getJspContext().getOut().print(serializedEle=
ment);
+                           }
+                           catch (Exception e)
+                           {
+                              e.printStackTrace();
+                           }
+                        }
+                     }
+                  }
+               }
+            }
+         }
+      }
+   }
+}

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/taglib/PortalSimpleTagSupport.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortalSimpleTagSupport.java	2008-02-10 13:49:29 UTC (rev 9919)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortalSimpleTagSupport.java	2008-02-10 14:56:47 UTC (rev 9920)
@@ -38,19 +38,49 @@
  */
 public class PortalSimpleTagSupport extends SimpleTagSupport
 {
+
+   private final boolean pageScoped;
+
+   public PortalSimpleTagSupport()
+   {
+      this(true);
+   }
+
+   public PortalSimpleTagSupport(boolean pageScoped)
+   {
+      this.pageScoped =3D pageScoped;
+   }
+
+   public boolean isPageScoped()
+   {
+      return pageScoped;
+   }
+
    private PortalResponse getPortalResponse()
    {
       PageContext pageContext =3D (PageContext)getJspContext();
       return (PortalResponse)pageContext.getResponse();
    }
 =

-   public final void doTag() throws JspException, IOException
+   protected final boolean isActive()
    {
-      PageTag pageTag =3D (PageTag)findAncestorWithClass(this, PageTag.cla=
ss);
+      if (pageScoped)
+      {
+         PageTag pageTag =3D (PageTag)findAncestorWithClass(this, PageTag.=
class);
 =

-      //
-      if (pageTag !=3D null && pageTag.status =3D=3D PageTag.Status.ACTIVE)
+         //
+         return pageTag !=3D null && pageTag.status =3D=3D PageTag.Status.=
ACTIVE;
+      }
+      else
       {
+         return false;
+      }
+   }
+
+   public final void doTag() throws JspException, IOException
+   {
+      if (isActive())
+      {
          PortalResponse portalResponse =3D getPortalResponse();
 =

          //

Modified: modules/portlet/trunk/test/src/test/resources/portal/samples/basi=
c-war/WEB-INF/portlet.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/portal/samples/basic-war/=
WEB-INF/portlet.xml	2008-02-10 13:49:29 UTC (rev 9919)
+++ modules/portlet/trunk/test/src/test/resources/portal/samples/basic-war/=
WEB-INF/portlet.xml	2008-02-10 14:56:47 UTC (rev 9920)
@@ -38,4 +38,16 @@
       
    
 =

+   
+      HeaderPortlet
+      org.jboss.portal.portlet.portal.samples.basic.HeaderP=
ortlet
+      
+        text/html
+        text/javascript
+      
+      
+         HeaderPortlet
+      
+   
+
 

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/W=
EB-INF/portal.tld
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF=
/portal.tld	2008-02-10 13:49:29 UTC (rev 9919)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF=
/portal.tld	2008-02-10 14:56:47 UTC (rev 9920)
@@ -127,4 +127,10 @@
       
    
 =

+   
+      headers
+      org.jboss.portal.portlet.test.jsp.taglib.HeadersTag
+      empty
+   
+
 

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/d=
emo/demo3.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/de=
mo3.jsp	2008-02-10 13:49:29 UTC (rev 9919)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/de=
mo3.jsp	2008-02-10 14:56:47 UTC (rev 9920)
@@ -17,6 +17,7 @@
             
             
                
+               
             
    
 

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/l=
ayouts/header.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts=
/header.jsp	2008-02-10 13:49:29 UTC (rev 9919)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts=
/header.jsp	2008-02-10 14:56:47 UTC (rev 9920)
@@ -1,3 +1,4 @@
+<%@ taglib uri=3D"/WEB-INF/portal.tld" prefix=3D"portal" %>
 
 
 Portlet Container 2.0
 
+
 
 
 =



--===============0454578247960016139==--

From portal-commits at lists.jboss.org Sun Feb 10 10:10:18 2008
Content-Type: multipart/mixed; boundary="===============7556551689944450955=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9921 - in
 modules/portlet/trunk/test/src:
 test/resources/portal/samples/basic-war/WEB-INF and 1 other directory.
Date: Sun, 10 Feb 2008 10:10:15 -0500
Message-ID: 

--===============7556551689944450955==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

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/j=
sp/PortletResult.java
Modified:
   modules/portlet/trunk/test/src/test/resources/portal/samples/basic-war/W=
EB-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
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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.PortletInvocationRespo=
nse;
-import org.jboss.portal.portlet.test.jsp.WindowDef;
-
-/**
- * Combines the invocation of a portlet and the info on the portlet JSP ta=
g. It does
- * not need to be exposed out of this package.
- *
- * @author Julien Viet
- * @version $Revision: 630 $
- */
-public class PortletResult
-{
-
-   /** . */
-   private final WindowDef windowDef;
-
-   /** . */
-   private final PortletInvocationResponse response;
-
-   public PortletResult(WindowDef windowDef, PortletInvocationResponse res=
ponse)
-   {
-      this.windowDef =3D windowDef;
-      this.response =3D response;
-   }
-
-   public WindowDef getWindowDef()
-   {
-      return windowDef;
-   }
-
-   public PortletInvocationResponse getResponse()
-   {
-      return response;
-   }
-}

Modified: modules/portlet/trunk/test/src/test/resources/portal/samples/basi=
c-war/WEB-INF/portlet.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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.              =
    ~
   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~=
~~~-->
 =

-
+             xsi:schemaLocation=3D"http://java.sun.com/xml/ns/portlet/port=
let-app_2_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd"
+             version=3D"2.0">
 =

    
       ExceptionPortlet
@@ -43,8 +43,10 @@
       org.jboss.portal.portlet.portal.samples.basic.HeaderP=
ortlet
       
         text/html
-        text/javascript
       
+      
+         text/javascript
+      
       
          HeaderPortlet
       


--===============7556551689944450955==--

From portal-commits at lists.jboss.org Sun Feb 10 12:54:36 2008
Content-Type: multipart/mixed; boundary="===============1306568004285210663=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9922 - in modules/portlet/trunk:
 portlet/src/main/java/org/jboss/portal/portlet/spi and 4 other directories.
Date: Sun, 10 Feb 2008 12:51:38 -0500
Message-ID: 

--===============1306568004285210663==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-10 12:51:37 -0500 (Sun, 10 Feb 2008)
New Revision: 9922

Modified:
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/imp=
l/jsr168/api/MimeResponseImpl.java
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/spi=
/PortletInvocationContext.java
   modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portle=
t/jsr168/api/portletcontext/ServerInfoTestCase.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/portal=
/samples/basic/HeaderPortlet.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/c=
ontroller/AbstractPortletControllerContext.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/taglib/PortalSimpleTagSupport.java
Log:
- make javascript serveable from a resource
- fix a bug in the portal side that was not sending the correct window id d=
uring the different life cycle phase and so the getNamespace() value was no=
t correct in render/resource

Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/port=
let/impl/jsr168/api/MimeResponseImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/jsr168/api/MimeResponseImpl.java	2008-02-10 15:10:14 UTC (rev 9921)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/jsr168/api/MimeResponseImpl.java	2008-02-10 17:51:37 UTC (rev 9922)
@@ -28,9 +28,12 @@
 import org.jboss.portal.portlet.invocation.response.RevalidateMarkupRespon=
se;
 import org.jboss.portal.portlet.info.PortletInfo;
 import org.jboss.portal.portlet.info.CacheInfo;
+import org.jboss.portal.portlet.info.CapabilitiesInfo;
+import org.jboss.portal.portlet.info.ModeInfo;
 import org.jboss.portal.portlet.cache.CacheScope;
 import org.jboss.portal.common.util.MediaType;
 import org.jboss.portal.common.util.ContentInfo;
+import org.jboss.portal.Mode;
 =

 import javax.portlet.MimeResponse;
 import javax.portlet.PortletURL;
@@ -41,6 +44,7 @@
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.Locale;
+import java.util.Set;
 =

 /**
  * @author Julien Viet
@@ -119,17 +123,36 @@
          MediaType requestedMediaType =3D MediaType.parseMimeType(contentT=
ype);
 =

          // Get the response media type
-         ContentInfo info =3D invocation.getContext().getMarkupInfo();
-         MediaType responseMediaType =3D info.getContentType();
+//         ContentInfo info =3D invocation.getContext().getMarkupInfo();
+//         MediaType responseMediaType =3D info.getContentType();
 =

          // Check if the requested media type is allowed as a subtype of t=
he main response
-         if (!responseMediaType.isAllowedSubType(requestedMediaType))
+//         if (!responseMediaType.isAllowedSubType(requestedMediaType))
+//         {
+//            throw new IllegalArgumentException("Content type not accepte=
d");
+//         }
+
+         //
+         Mode currentMode =3D preq.invocation.getMode();
+
+         PortletInfo info =3D preq.container.getInfo();
+         CapabilitiesInfo capabilities =3D info.getCapabilities();
+         Set compatibleModes =3D capabilities.getModes(contentTy=
pe);
+         for (ModeInfo modeInfo : compatibleModes)
          {
-            throw new IllegalArgumentException("Content type not accepted"=
);
+            if (currentMode.equals(modeInfo.getMode()))
+            {
+               // Set the content type
+               fragment.setContentType(contentType);
+
+               //
+               return;
+            }
          }
 =

-         // Set the content type
-         fragment.setContentType(contentType);
+         //
+         throw new IllegalArgumentException("Mime type " + contentType + "=
 not accepted as content type");
+
       }
       catch (MimeTypeParseException e)
       {

Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/port=
let/spi/PortletInvocationContext.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/sp=
i/PortletInvocationContext.java	2008-02-10 15:10:14 UTC (rev 9921)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/sp=
i/PortletInvocationContext.java	2008-02-10 17:51:37 UTC (rev 9922)
@@ -40,6 +40,8 @@
 {
 =

    /**
+    * todo : move me to client content // see if it is still needed with C=
C/PP
+    *
     * Return information about the underlying http wire this invocation is=
 performed.
     *
     * @return the stream info

Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test=
/portlet/jsr168/api/portletcontext/ServerInfoTestCase.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portl=
et/jsr168/api/portletcontext/ServerInfoTestCase.java	2008-02-10 15:10:14 UT=
C (rev 9921)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portl=
et/jsr168/api/portletcontext/ServerInfoTestCase.java	2008-02-10 17:51:37 UT=
C (rev 9922)
@@ -46,7 +46,7 @@
 {
 =

    /** . */
-   private static final String VERSION_REGEX =3D "JBossPortal/[0-9]+\\.[0-=
9]+";
+   private static final String VERSION_REGEX =3D "JBossPortletContainer/[0=
-9]+\\.[0-9]+";
 =

    /** . */
    private static final Pattern VERSION_PATTERN =3D Pattern.compile(VERSIO=
N_REGEX, Pattern.CASE_INSENSITIVE);

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/portal/samples/basic/HeaderPortlet.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/porta=
l/samples/basic/HeaderPortlet.java	2008-02-10 15:10:14 UTC (rev 9921)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/porta=
l/samples/basic/HeaderPortlet.java	2008-02-10 17:51:37 UTC (rev 9922)
@@ -50,14 +50,19 @@
       elt.setAttribute("src", resourceURL.toString());
       elt.appendChild(elt.getOwnerDocument().createTextNode(""));
       resp.addProperty("script", elt);
+
+      //
+      resp.setContentType("text/html");
+      PrintWriter writer =3D resp.getWriter();
+      writer.print("Click me to trigger script");
    }
 =

    public void serveResource(ResourceRequest req, ResourceResponse resp) t=
hrows PortletException, IOException
    {
-//      String namespace =3Dresp.getNamespace();
+      String namespace =3Dresp.getNamespace();
       resp.setContentType("text/javascript");
       PrintWriter writer =3D resp.getWriter();
-      writer.print("alert('shouldwork');");
+      writer.print("function " + namespace  + "_handle() { alert('Some ale=
rt'); }");
       writer.close();
    }
 }

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/controller/AbstractPortletControllerContext.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
controller/AbstractPortletControllerContext.java	2008-02-10 15:10:14 UTC (r=
ev 9921)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
controller/AbstractPortletControllerContext.java	2008-02-10 17:51:37 UTC (r=
ev 9922)
@@ -318,7 +318,7 @@
       actionInvocation.setServerContext(new AbstractServerContext(req, res=
p));
       actionInvocation.setInstanceContext(instanceContext);
       actionInvocation.setUserContext(new AbstractUserContext(req));
-      actionInvocation.setWindowContext(new AbstractWindowContext(portlet.=
getContext().getId()));
+      actionInvocation.setWindowContext(new AbstractWindowContext(windowId=
));
       actionInvocation.setPortalContext(new TestPortalContext());
       actionInvocation.setSecurityContext(new AbstractSecurityContext(req)=
);
       actionInvocation.setRequestContext(new AbstractRequestContext(req));
@@ -355,7 +355,7 @@
       resourceInvocation.setServerContext(new AbstractServerContext(req, r=
esp));
       resourceInvocation.setInstanceContext(instanceContext);
       resourceInvocation.setUserContext(new AbstractUserContext(req));
-      resourceInvocation.setWindowContext(new AbstractWindowContext(portle=
t.getContext().getId()));
+      resourceInvocation.setWindowContext(new AbstractWindowContext(window=
Id));
       resourceInvocation.setPortalContext(new TestPortalContext());
       resourceInvocation.setSecurityContext(new AbstractSecurityContext(re=
q));
       resourceInvocation.setRequestContext(new AbstractRequestContext(req)=
);

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/taglib/PortalSimpleTagSupport.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortalSimpleTagSupport.java	2008-02-10 15:10:14 UTC (rev 9921)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/taglib/PortalSimpleTagSupport.java	2008-02-10 17:51:37 UTC (rev 9922)
@@ -73,7 +73,7 @@
       }
       else
       {
-         return false;
+         return true;
       }
    }
 =



--===============1306568004285210663==--

From portal-commits at lists.jboss.org Sun Feb 10 15:44:22 2008
Content-Type: multipart/mixed; boundary="===============2419788438530767426=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9923 -
 modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo.
Date: Sun, 10 Feb 2008 15:44:22 -0500
Message-ID: 

--===============2419788438530767426==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-10 15:44:21 -0500 (Sun, 10 Feb 2008)
New Revision: 9923

Modified:
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/hom=
e.jsp
Log:
home page did not have the right portlet ref

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/d=
emo/home.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/ho=
me.jsp	2008-02-10 17:51:37 UTC (rev 9922)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/ho=
me.jsp	2008-02-10 20:44:21 UTC (rev 9923)
@@ -9,7 +9,7 @@
       
           
             
-               
+               
             
              Demo Page Title
              Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed=
 do eiusmod tempor incididunt ut labore et


--===============2419788438530767426==--

From portal-commits at lists.jboss.org Sun Feb 10 17:20:29 2008
Content-Type: multipart/mixed; boundary="===============3066782397418488712=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9924 -
 modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/jsp.
Date: Sun, 10 Feb 2008 17:20:27 -0500
Message-ID: 

--===============3066782397418488712==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-10 17:20:27 -0500 (Sun, 10 Feb 2008)
New Revision: 9924

Modified:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/ControllerFilter.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/PortalPrepareResponse.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/PortalRenderResponse.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/j=
sp/PortalResponse.java
Log:
create better window ids in portal demo (request URI + sequence number)

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/ControllerFilter.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/ControllerFilter.java	2008-02-10 20:44:21 UTC (rev 9923)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/ControllerFilter.java	2008-02-10 22:20:27 UTC (rev 9924)
@@ -88,7 +88,7 @@
       PortletInvoker invoker =3D (PortletInvoker)getServletContext().getAt=
tribute("ConsumerPortletInvoker");
 =

       //
-      PortalPrepareResponse prepareResponse =3D new PortalPrepareResponse(=
resp);
+      PortalPrepareResponse prepareResponse =3D new PortalPrepareResponse(=
req, resp);
 =

       // Discover existing portlets on the page (introspection phase)
       chain.doFilter(req, prepareResponse);
@@ -235,7 +235,7 @@
       }
 =

       //
-      PortalRenderResponse renderResponse =3D new PortalRenderResponse(res=
p, context, pageState, prepareResponse);
+      PortalRenderResponse renderResponse =3D new PortalRenderResponse(req=
, resp, context, pageState, prepareResponse);
 =

       //
       chain.doFilter(req, renderResponse);

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/PortalPrepareResponse.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/PortalPrepareResponse.java	2008-02-10 20:44:21 UTC (rev 9923)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/PortalPrepareResponse.java	2008-02-10 22:20:27 UTC (rev 9924)
@@ -26,6 +26,7 @@
 =

 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.ServletOutputStream;
 import javax.xml.namespace.QName;
 import java.io.IOException;
@@ -67,9 +68,9 @@
    /** . */
    private Map paramDefs;
 =

-   public PortalPrepareResponse(HttpServletResponse response) throws Portl=
etInvokerException
+   public PortalPrepareResponse(HttpServletRequest request, HttpServletRes=
ponse response) throws PortletInvokerException
    {
-      super(response);
+      super(request, response);
 =

       //
       this.windowDefs =3D new HashMap();

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/PortalRenderResponse.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/PortalRenderResponse.java	2008-02-10 20:44:21 UTC (rev 9923)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/PortalRenderResponse.java	2008-02-10 22:20:27 UTC (rev 9924)
@@ -43,6 +43,7 @@
 import org.jboss.portal.common.util.ParameterMap;
 =

 import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletRequest;
 import javax.xml.namespace.QName;
 import java.util.Map;
 import java.util.HashMap;
@@ -65,12 +66,13 @@
    private Map windowResults;
 =

    public PortalRenderResponse(
+      HttpServletRequest request,
       HttpServletResponse response,
       PagePortletControllerContext portletControllerContext,
       PageNavigationalState pageState,
       PortalPrepareResponse prepareResponse) throws PortletInvokerException
    {
-      super(response);
+      super(request, response);
 =

       //
       Set pageParameterNames =3D prepareResponse.getPageParameterNa=
mes();

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/jsp/PortalResponse.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/PortalResponse.java	2008-02-10 20:44:21 UTC (rev 9923)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
jsp/PortalResponse.java	2008-02-10 22:20:27 UTC (rev 9924)
@@ -26,6 +26,7 @@
 =

 import javax.servlet.http.HttpServletResponseWrapper;
 import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletRequest;
 =

 /**
  * Expose stuff common to action and render response.
@@ -39,9 +40,19 @@
    /** . */
    private int count =3D 0;
 =

-   public PortalResponse(HttpServletResponse response) throws PortletInvok=
erException
+   /** . */
+   private final String pageId;
+
+   public PortalResponse(HttpServletRequest request, HttpServletResponse r=
esponse) throws PortletInvokerException
    {
       super(response);
+
+      // We don't keep a ref to the request since this will be used mainly=
 during in a dispatch to a JSP
+      // and the info returned by a request after a dispatch are not the s=
ame than before (like the path info).
+      String pageId =3D request.getRequestURI();
+
+      //
+      this.pageId =3D pageId;
    }
 =

    /**
@@ -50,6 +61,6 @@
     */
    public String nextId()
    {
-      return "" + count++;
+      return pageId + "/" + count++;
    }
 }


--===============3066782397418488712==--

From portal-commits at lists.jboss.org Sun Feb 10 17:38:02 2008
Content-Type: multipart/mixed; boundary="===============8492981546570372873=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9925 -
 docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
Date: Sun, 10 Feb 2008 17:38:01 -0500
Message-ID: 

--===============8492981546570372873==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mmcallis
Date: 2008-02-10 17:38:01 -0500 (Sun, 10 Feb 2008)
New Revision: 9925

Modified:
   docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorial=
s.xml
Log:
5.2.1.4. Application Descriptors
changing itemizedlist to variabelist


Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/t=
utorials.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutoria=
ls.xml	2008-02-10 22:20:27 UTC (rev 9924)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutoria=
ls.xml	2008-02-10 22:38:01 UTC (rev 9925)
@@ -393,49 +393,57 @@
 default.default page, and specify where it should appea=
r on that page.
 
 
-
-                        
-                           
-                              
-                                 defa=
ult.default]]>
-                                 Tells the portal where this portlet shoul=
d appear. In this case,
-                                 default.default specif=
ies that this portlet should appear in the
-                                 portal instance named default and the page named
-                                 default.
-                              
-                           
-                           
-                              
-                                 overw=
rite]]>
-                                 Instructs the portal to overwrite or keep=
 this object if it already exists.
-                                 Possible values are overwrite or keep.
-                                 overwrite will destroy=
 the existing object and create a new one
-                                 based on the content of the deployment. <=
literal>keep will maintain the
-                                 existing object deployment or create a ne=
w one if it does not yet exist.
-                              
-                           
-                           
-                              
-                                 Hel=
loWorldPortletWindow]]>
-                                 Can be named anything.
-                              
-                           
-                           
-                              
-                                 He=
lloWorldPortletInstance]]>
-                                 The value of instance-ref must match the value of one of the
+	
+		default.default]]>
+
+
+	
+		Tells the portal where this portlet should appear. In this case, default.default specifies that this portlet shoul=
d appear in the portal instance named default and the pa=
ge named
+		default.
+	
+
+
+overwrite]]>
+
+
+	
+		Instructs the portal to overwrite or keep this object if it already exis=
ts. Possible values are overwrite or keep. overwrite will destroy the existing object and cre=
ate a new one based on the content of the deployment. keep will maintain the existing object deployment or create a new one if it d=
oes not yet exist.
+	
+
+
+HelloWorldPortletWindow]]>
+
+
+	
+              Can be named anything.
+      
+
+
+HelloWorldPortletInstance]]>
+
+
+	
+		The value of instance-ref must match the value of one=
 of the
                                  instance-id found in <=
literal>portlet-instances.xml.
-                              
-                           
-                           
-                              
-                                 center
-1]]>
-                                 Specify the layout region and order this =
window will be found on the portal page.
-                              
-                           
-                        
-                     
+	
+
+
+center
+1]]>
+
+
+	
+		Specify the layout region and order this window will be found on the por=
tal page.
+	
+
+
+
+
 =

             
                To illustrate the relationship between the descriptors, we =
have provided this simple diagram


--===============8492981546570372873==--

From portal-commits at lists.jboss.org Sun Feb 10 17:38:05 2008
Content-Type: multipart/mixed; boundary="===============2520208405075492044=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9926 -
 modules/portlet/trunk/test/src/test/resources/portal/samples/remotecontrol-portlet-war/WEB-INF.
Date: Sun, 10 Feb 2008 17:38:04 -0500
Message-ID: 

--===============2520208405075492044==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: chris.laprun(a)jboss.com
Date: 2008-02-10 17:38:04 -0500 (Sun, 10 Feb 2008)
New Revision: 9926

Modified:
   modules/portlet/trunk/test/src/test/resources/portal/samples/remotecontr=
ol-portlet-war/WEB-INF/portlet.xml
Log:
- Shortened title so that it doesn't mess the layout up :)

Modified: modules/portlet/trunk/test/src/test/resources/portal/samples/remo=
tecontrol-portlet-war/WEB-INF/portlet.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/portal/samples/remotecont=
rol-portlet-war/WEB-INF/portlet.xml	2008-02-10 22:38:01 UTC (rev 9925)
+++ modules/portlet/trunk/test/src/test/resources/portal/samples/remotecont=
rol-portlet-war/WEB-INF/portlet.xml	2008-02-10 22:38:04 UTC (rev 9926)
@@ -28,14 +28,14 @@
    
       Portlet controlling display of other portlets
       RemoteControl
-      Remote Control Resource Portlet
+      Remote Control Portlet
       org.jboss.portal.portlet.portal.samples.RemoteControl=
ResourcePortlet
       
          text/html
          VIEW
       
       
-         Remote Control Resource Portlet
+         Remote Control Portlet
          sample,resource,remotecontrol
       
       zipcode


--===============2520208405075492044==--

From portal-commits at lists.jboss.org Sun Feb 10 18:16:05 2008
Content-Type: multipart/mixed; boundary="===============5768551095363921232=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9927 - in
 modules/portlet/trunk/test/src:
 test/resources/portal/samples/remotecontrol-portlet-war/WEB-INF and 1 other
 directory.
Date: Sun, 10 Feb 2008 18:14:25 -0500
Message-ID: 

--===============5768551095363921232==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: chris.laprun(a)jboss.com
Date: 2008-02-10 18:14:25 -0500 (Sun, 10 Feb 2008)
New Revision: 9927

Modified:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/portal=
/samples/RemoteControlResourcePortlet.java
   modules/portlet/trunk/test/src/test/resources/portal/samples/remotecontr=
ol-portlet-war/WEB-INF/portlet.xml
Log:
- Added interaction with preferences but doesn't work yet (preference value=
 is not written)...

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/portal/samples/RemoteControlResourcePortlet.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/porta=
l/samples/RemoteControlResourcePortlet.java	2008-02-10 22:38:04 UTC (rev 99=
26)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/porta=
l/samples/RemoteControlResourcePortlet.java	2008-02-10 23:14:25 UTC (rev 99=
27)
@@ -23,6 +23,8 @@
 public class RemoteControlResourcePortlet extends GenericPortlet
 {
    private static final String ZIPCODE =3D "zipcode";
+   private static int COLOR_INDEX =3D 0;
+   private static final String[] COLORS =3D {"000", "f00", "0f0", "00f", "=
ff0", "0ff", "f0f", "fff"};
 =

    @Override
    protected void doView(RenderRequest renderRequest, RenderResponse rende=
rResponse) throws PortletException, IOException
@@ -30,11 +32,14 @@
       renderResponse.setContentType("text/html");
       PrintWriter printWriter =3D renderResponse.getWriter();
       printWriter.print("");
+         "window.open(url, 'jbp_remote', 'width=3D400,height=3D300,scrolla=
ble=3Dyes')}");
       printWriter.print("Open remote control!");
+      String color =3D renderRequest.getPreferences().getValue("color", "0=
00");
+      printWriter.print("Preferred color:  ");
    }
 =

    @Override
@@ -42,6 +47,7 @@
    {
       resourceResponse.setContentType("text/html");
       PrintWriter writer =3D resourceResponse.getWriter();
+      resourceRequest.getPreferences().setValue("color", COLORS[COLOR_INDE=
X++ % 8]);
       writer.print("" +
          "");
       PortletURL url =3D resourceResponse.createRenderURL();

Modified: modules/portlet/trunk/test/src/test/resources/portal/samples/remo=
tecontrol-portlet-war/WEB-INF/portlet.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/portal/samples/remotecont=
rol-portlet-war/WEB-INF/portlet.xml	2008-02-10 22:38:04 UTC (rev 9926)
+++ modules/portlet/trunk/test/src/test/resources/portal/samples/remotecont=
rol-portlet-war/WEB-INF/portlet.xml	2008-02-10 23:14:25 UTC (rev 9927)
@@ -38,6 +38,13 @@
          Remote Control Portlet
          sample,resource,remotecontrol
       
+      
+         
+            color
+            ffe
+            false
+         
+      
       zipcode
    
 =



--===============5768551095363921232==--

From portal-commits at lists.jboss.org Sun Feb 10 18:26:51 2008
Content-Type: multipart/mixed; boundary="===============1479437558858109190=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9928 -
 docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
Date: Sun, 10 Feb 2008 18:26:50 -0500
Message-ID: 

--===============1479437558858109190==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mmcallis
Date: 2008-02-10 18:26:50 -0500 (Sun, 10 Feb 2008)
New Revision: 9928

Modified:
   docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorial=
s.xml
Log:
5.2.1.4. Application Descriptors
adding an itemizedlist to describe what the
example object.xml file does


Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/t=
utorials.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutoria=
ls.xml	2008-02-10 23:14:25 UTC (rev 9927)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutoria=
ls.xml	2008-02-10 23:26:50 UTC (rev 9928)
@@ -321,7 +321,7 @@
 		<mime-type> element, which is required for ever=
y portlet. The declared MIME types must match the capability of the portlet.
 	
 	
-		As well, it allows you to pair which modes and window states are support=
ed for each markup type. All portlets must support the VIEW portlet mode, s=
o this does not have to be decared. Define which markup type your porlet su=
pports, which in this examepl is text/html. This section=
 tells the portal that it will only output text and HTML, and that it only =
supports the VIEW mode.
+		As well, it allows you to pair which modes and window states are support=
ed for each markup type. All portlets must support the VIEW portlet mode, s=
o this does not have to be declared. Use <mime-type> to define which markup type your portlet supports, which in this example=
, is text/html. This section tells the portal that it wi=
ll only output text and HTML, and that it only supports the VIEW mode.
 	
 
 
@@ -357,16 +357,45 @@
 
 
 
-	This is a JBoss Portal specific descriptor that allows you to create inst=
ances of portlets. The
+	This is a JBoss Portal specific descriptor, that allows you to create ins=
tances of portlets. The
 	<portlet-ref> value must match the <=
portlet-name> value
 	given in the HelloWorldPortlet/WEB-INF/portlet.xml f=
ile. The <instance-id>
 	value can be named anything, but it must match the instance-ref<=
/literal> values given
-	in *-object.xml files as we shall below.
+	in the *-object.xml files, which in this example, woul=
d be HelloWorldPortlet/WEB-INF/helloworld-object.xml, =
as shown below.
 
 
-	The following is an example helloworld-object.xml fi=
le:
+	The *-object.xml files are JBoss Portal specific descr=
iptors that allow users to
+	define the structure of their portal instances, as well as create and con=
figure their windows and
+	pages. In this example:
 
 
+	
+		
+			
+				a portlet window is created.
+			
+		
+		
+			
+				it is specified that it will display the markup generated by the HelloWorldPortletInstance portlet instance.
+			
+		
+		
+			
+				the window is assinged to the default.default page.
+			
+		
+		
+			
+				specify where the window will appear on the page, by the <region> element.
+			
+		
+	
+
+
+	The following is an example HelloWorldPortlet/WEB-INF file:
+
+
 
 ]]>
 
 
+
 
-*-object.xml files are JBoss Portal specific descriptor=
s and allow users to
-define the structure of their portal instances as well as create/configure=
 their windows and
-pages. In our example, we create a portlet window, specify that it will di=
splay the markup
-generated by the HelloWorldPortletInstance portlet inst=
ance, assign it to the
-default.default page, and specify where it should appea=
r on that page.
-
-
 	
 		default.default]]>


--===============1479437558858109190==--

From portal-commits at lists.jboss.org Sun Feb 10 18:55:18 2008
Content-Type: multipart/mixed; boundary="===============6196933519102914061=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9929 -
 docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
Date: Sun, 10 Feb 2008 18:55:18 -0500
Message-ID: 

--===============6196933519102914061==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mmcallis
Date: 2008-02-10 18:55:18 -0500 (Sun, 10 Feb 2008)
New Revision: 9929

Modified:
   docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorial=
s.xml
Log:
5.2.1.4. Application Descriptors
move paragraph, minor spelling corrections


Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/t=
utorials.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutoria=
ls.xml	2008-02-10 23:26:50 UTC (rev 9928)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutoria=
ls.xml	2008-02-10 23:55:18 UTC (rev 9929)
@@ -338,7 +338,13 @@
 
 
 
-	The following is an example of the HelloWorldPortlet/WEB-INF/po=
rtlet-instances.xml file:
+	
+		The HelloWorldPortlet/WEB-INF/portlet-instances.xml=
 file is a JBoss Portal specific descriptor, that allows you to create inst=
ances of portlets. The
+		<portlet-ref> value must match the <=
;portlet-name> value
+		given in the HelloWorldPortlet/WEB-INF/portlet.xml =
file. The <instance-id>
+		value can be named anything, but it must match the <instance=
-ref> values given
+		in the *-object.xml files, which in this example, wou=
ld be HelloWorldPortlet/WEB-INF/helloworld-object.xml.
+The following is an example of the HelloWorldPortlet/WEB-=
INF/portlet-instances.xml file:
 
 
 
 
 
-	This is a JBoss Portal specific descriptor, that allows you to create ins=
tances of portlets. The
-	<portlet-ref> value must match the <=
portlet-name> value
-	given in the HelloWorldPortlet/WEB-INF/portlet.xml f=
ile. The <instance-id>
-	value can be named anything, but it must match the instance-ref<=
/literal> values given
-	in the *-object.xml files, which in this example, woul=
d be HelloWorldPortlet/WEB-INF/helloworld-object.xml, =
as shown below.
-
-
 	The *-object.xml files are JBoss Portal specific descr=
iptors that allow users to
 	define the structure of their portal instances, as well as create and con=
figure their windows and
-	pages. In this example:
+	pages. In the following example:
 
 
 	
@@ -377,23 +376,23 @@
 		
 		
 			
-				it is specified that it will display the markup generated by the HelloWorldPortletInstance portlet instance.
+				specifies that it will display the markup generated by the He=
lloWorldPortletInstance portlet instance.
 			
 		
 		
 			
-				the window is assinged to the default.default page.
+				the window is assigned to the default.default page.
 			
 		
 		
 			
-				specify where the window will appear on the page, by the <region> element.
+				specifies where the window will appear on the page, by the <region> element.
 			
 		
 	
 
 
-	The following is an example HelloWorldPortlet/WEB-INF file:
+	The following is an example HelloWorldPortlet/WEB-INF/helloworl=
d-object.xml file:
 
 
 


--===============6196933519102914061==--

From portal-commits at lists.jboss.org Sun Feb 10 21:47:58 2008
Content-Type: multipart/mixed; boundary="===============8885246203895835885=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9930 - in
 modules/portlet/trunk/test/src/test/resources/simple-portal-war: WEB-INF/jsp
 and 5 other directories.
Date: Sun, 10 Feb 2008 21:47:56 -0500
Message-ID: 

--===============8885246203895835885==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: wesleyhales
Date: 2008-02-10 21:47:55 -0500 (Sun, 10 Feb 2008)
New Revision: 9930

Added:
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/css/shad=
owbox-light.css
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/css/shad=
owbox.css
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/images/l=
oading-light.gif
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/images/l=
oading.gif
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/images/o=
verlay-85.png
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/js/
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/js/proto=
type.js
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/js/scrip=
taculous/
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/js/scrip=
taculous/builder.js
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/js/scrip=
taculous/controls.js
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/js/scrip=
taculous/dragdrop.js
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/js/scrip=
taculous/effects.js
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/js/scrip=
taculous/scriptaculous.js
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/js/scrip=
taculous/slider.js
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/js/scrip=
taculous/sound.js
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/js/scrip=
taculous/unittest.js
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/js/shado=
wbox-prototype.js
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/js/shado=
wbox.js
Modified:
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/=
jsp/error.jsp
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/css/mast=
er.css
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/=
header.jsp
Log:
added prototype, scriptaculous, and error modal

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/W=
EB-INF/jsp/error.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF=
/jsp/error.jsp	2008-02-10 23:55:18 UTC (rev 9929)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF=
/jsp/error.jsp	2008-02-11 02:47:55 UTC (rev 9930)
@@ -1,3 +1,5 @@
+<%@ page import=3D"org.jboss.portal.common.util.Exceptions" %>
+<%@ page import=3D"java.io.PrintWriter" %>
 <%@ page language=3D"java"  %>
 =

 
@@ -25,6 +27,14 @@
          
          
             Exception: ${!empty requestScope['org.jboss.porta=
l.portlet.portal.error.cause'] ? requestScope['org.jboss.portal.portlet.por=
tal.error.cause'] : 'Error cause unavailable'}
+            <%if (request.getAttribute("org.jboss.portal.portlet.portal.er=
ror.cause") !=3D null){%>
+               ${!empty requestScope['org.jboss.portal=
.portlet.portal.error.cause'] ? 'View Stack Trace' : ''}
+               
+                  
+                  <%=3DExceptions.toHTML((Throwable)request.getAttribute("=
org.jboss.portal.portlet.portal.error.cause"))%>
+                  
+               
+            <%}%>
          
          
             Window id: ${requestScope['org.jboss.portal.portl=
et.portal.error.window_id']}

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/c=
ss/master.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/css/mas=
ter.css	2008-02-10 23:55:18 UTC (rev 9929)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/css/mas=
ter.css	2008-02-11 02:47:55 UTC (rev 9930)
@@ -94,6 +94,10 @@
 =

 }
 =

+.hidden {
+   display: none;
+}
+
 /*--------------------------------Decoration*/
 =

 h2 {
@@ -281,6 +285,10 @@
    color: #cc1100
 }
 =

+div.exception code{
+   color: #33ff00;
+}
+
 /*-------------------------------------Remote Window*/
 =

 div.remote-container {

Added: modules/portlet/trunk/test/src/test/resources/simple-portal-war/css/=
shadowbox-light.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/css/sha=
dowbox-light.css	                        (rev 0)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/css/sha=
dowbox-light.css	2008-02-11 02:47:55 UTC (rev 9930)
@@ -0,0 +1,211 @@
+/**
+ * The CSS for Shadowbox.
+ *
+ * This file is part of Shadowbox.
+ *
+ * Shadowbox is free software: you can redistribute it and/or modify it un=
der
+ * the terms of the GNU Lesser General Public License as published by the =
Free
+ * Software Foundation, either version 3 of the License, or (at your optio=
n)
+ * any later version.
+ *
+ * Shadowbox is distributed in the hope that it will be useful, but WITHOU=
T ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNE=
SS
+ * 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 Shadowbox.  If not, see .
+ *
+ * @author      Michael J. I. Jackson 
+ * @copyright   2007 Michael J. I. Jackson
+ * @license     http://www.gnu.org/licenses/lgpl-3.0.txt GNU LGPL 3.0
+ * @version     SVN: $Id: shadowbox.js 150 2007-12-04 18:42:03Z michael $
+ */
+
+/*_________________________________________________________________  Overl=
ay  */
+#shadowbox_overlay {
+  visibility: hidden;
+  position: absolute;
+  display: block;
+  margin: 0;
+  padding: 0;
+  top: 0;
+  left: 0;
+  z-index: 998;
+}
+
+/*_______________________________________________________________  Contain=
er  */
+#shadowbox_container {
+  position: fixed;
+  height: 0px;
+  width: 100%;
+  margin: 0;
+  padding: 0;
+  top: 0;
+  left: 0;
+  z-index: 999;
+  text-align: center; /* centers in quirks and IE */
+}
+
+/*_______________________________________________________________  Shadowb=
ox  */
+#shadowbox {
+  visibility: hidden;
+  margin: 0 auto;
+  position: relative;
+  font-family: 'Lucida Grande', Tahoma, sans-serif;
+  text-align: left; /* reset left alignment */
+  color: #888;
+}
+
+/*___________________________________________________________________  Tit=
le  */
+/*
+HTML snapshot:
+
+  Title Here
+
+*/
+#shadowbox_title {
+  height: 30px;
+  padding: 0;
+  overflow: hidden;
+}
+#shadowbox_title_inner {
+  height: 16px;
+  font-size: 16px;
+  line-height: 16px;
+  white-space: nowrap;
+  padding: 10px 0 4px 10px;
+  background-color: #fff;
+}
+
+/*____________________________________________________________________  Bo=
dy  */
+/*
+HTML snapsnot:
+
+  
+    
+  
+  
+    
+    Cancel
+  
+
+*/
+#shadowbox_body {
+  position: relative;
+  overflow: hidden;
+  margin: 0;
+  padding: 0;
+  border: 10px solid #fff;
+  background-color: #eee;
+}
+#shadowbox_body_inner {
+  position: relative;
+  overflow: hidden;
+}
+#shadowbox_loading {
+  position: absolute;
+  top: 0;
+  left: 0;
+  height: 10000px; /* overflow:hidden will clip this */
+  width: 100%;
+  background-color: #ccc;
+}
+#shadowbox_loading img {
+  float: left;
+  margin: 10px 10px 0 10px;
+}
+#shadowbox_loading span {
+  float: left;
+  margin-top: 16px;
+  font-size: 10px;
+}
+#shadowbox_loading span a,
+#shadowbox_loading span a:link,
+#shadowbox_loading span a:visited {
+  color: #fff;
+}
+#shadowbox_content.html { /* make html content scrollable */
+  height: 100%;
+  width: 100%;
+  overflow: auto;
+}
+
+/*_________________________________________________________________  Toolb=
ar  */
+/*
+HTML snapshot:
+
+  
+    
+      C=
lose
+    
+    
+      N<=
/span>ext
+    
+    
+      Previous
+    
+    
+      1
+      2
+      3
+    
+  
+
+*/
+#shadowbox_toolbar {
+  margin: 0;
+  padding: 0;
+  height: 26px;
+  overflow: hidden;
+}
+#shadowbox_toolbar_inner {
+  height: 26px;
+  background-color: #fff;
+}
+#shadowbox_toolbar_inner div {
+  padding-top: 6px;
+  font-size: 10px;
+  height: 10px;
+  line-height: 10px;
+}
+#shadowbox_toolbar_inner div span.shortcut {
+  text-decoration: underline;
+  font-weight: bold;
+}
+#shadowbox_toolbar_inner div a {
+  text-decoration: none;
+  color: #888;
+}
+#shadowbox_nav_close,
+#shadowbox_nav_previous,
+#shadowbox_nav_next {
+  float: right;
+  padding-right: 10px;
+}
+#shadowbox_counter {
+  float: left;
+  padding-left: 10px;
+}
+#shadowbox_counter a {
+  padding: 0 4px 0 0;
+}
+#shadowbox_counter a.shadowbox_counter_current {
+  text-decoration: underline;
+  font-weight: bold;
+}
+
+/*________________________________________________________________  Messag=
es  */
+div.shadowbox_message {
+  text-align: center;
+  padding: 10px;
+}
+div.shadowbox_message a:link,
+div.shadowbox_message a:visited {
+  text-decoration: none;
+  color: #bed333;
+}
+div.shadowbox_message a:hover,
+div.shadowbox_message a:focus {
+  text-decoration: underline;
+}

Added: modules/portlet/trunk/test/src/test/resources/simple-portal-war/css/=
shadowbox.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/css/sha=
dowbox.css	                        (rev 0)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/css/sha=
dowbox.css	2008-02-11 02:47:55 UTC (rev 9930)
@@ -0,0 +1,212 @@
+/**
+ * The CSS for Shadowbox.
+ *
+ * This file is part of Shadowbox.
+ *
+ * Shadowbox is free software: you can redistribute it and/or modify it un=
der
+ * the terms of the GNU Lesser General Public License as published by the =
Free
+ * Software Foundation, either version 3 of the License, or (at your optio=
n)
+ * any later version.
+ *
+ * Shadowbox is distributed in the hope that it will be useful, but WITHOU=
T ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNE=
SS
+ * 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 Shadowbox.  If not, see .
+ *
+ * @author      Michael J. I. Jackson 
+ * @copyright   2007 Michael J. I. Jackson
+ * @license     http://www.gnu.org/licenses/lgpl-3.0.txt GNU LGPL 3.0
+ * @version     SVN: $Id: shadowbox.js 150 2007-12-04 18:42:03Z michael $
+ */
+
+/*_________________________________________________________________  Overl=
ay  */
+#shadowbox_overlay {
+  visibility: hidden;
+  position: absolute;
+  display: block;
+  margin: 0;
+  padding: 0;
+  top: 0;
+  left: 0;
+  z-index: 998;
+}
+
+/*_______________________________________________________________  Contain=
er  */
+#shadowbox_container {
+  position: fixed;
+  height: 0px;
+  width: 100%;
+  margin: 0;
+  padding: 0;
+  top: 0;
+  left: 0;
+  z-index: 999;
+  text-align: center; /* centers in quirks and IE */
+}
+
+/*_______________________________________________________________  Shadowb=
ox  */
+#shadowbox {
+  visibility: hidden;
+  margin: 0 auto;
+  position: relative;
+  font-family: 'Lucida Grande', Tahoma, sans-serif;
+  text-align: left; /* reset left alignment */
+}
+
+/*___________________________________________________________________  Tit=
le  */
+/*
+HTML snapshot:
+
+  Title Here
+
+*/
+#shadowbox_title {
+  height: 25px;
+  padding: 0;
+  overflow: hidden;
+}
+#shadowbox_title_inner {
+  height: 16px;
+  font-size: 16px;
+  line-height: 16px;
+  white-space: nowrap;
+  padding: 5px 0 4px 8px;
+  color: #fff;
+}
+
+/*____________________________________________________________________  Bo=
dy  */
+/*
+HTML snapsnot:
+
+  
+    
+  
+  
+    
+    Cancel
+  
+
+*/
+#shadowbox_body {
+  position: relative;
+  overflow: hidden;
+  margin: 0;
+  padding: 0;
+  border: 2px solid #fff;
+  background-color: #000;
+}
+#shadowbox_body_inner {
+  position: relative;
+  overflow: hidden;
+}
+#shadowbox_loading {
+  position: absolute;
+  top: 0;
+  left: 0;
+  height: 10000px; /* overflow:hidden will clip this */
+  width: 100%;
+  background-color: #222;
+}
+#shadowbox_loading img {
+  float: left;
+  margin: 10px 10px 0 10px;
+}
+#shadowbox_loading span {
+  float: left;
+  margin-top: 16px;
+  font-size: 10px;
+}
+#shadowbox_loading span a,
+#shadowbox_loading span a:link,
+#shadowbox_loading span a:visited {
+  color: #fff;
+}
+
+#shadowbox_content.html { /* make html content scrollable */
+  height: 100%;
+  width: 100%;
+  overflow: auto;
+}
+
+/*_________________________________________________________________  Toolb=
ar  */
+/*
+HTML snapshot:
+
+  
+    
+      C=
lose
+    
+    
+      N<=
/span>ext
+    
+    
+      Previous
+    
+    
+      1
+      2
+      3
+    
+  
+
+*/
+#shadowbox_toolbar {
+  margin: 0;
+  padding: 0;
+  height: 20px;
+  overflow: hidden;
+}
+#shadowbox_toolbar_inner {
+  height: 20px;
+  color: #fff;
+}
+#shadowbox_toolbar_inner div {
+  padding-top: 4px;
+  padding-bottom: 2px;
+  font-size: 10px;
+  height: 10px;
+  line-height: 10px;
+}
+#shadowbox_toolbar_inner div span.shortcut {
+  text-decoration: underline;
+  font-weight: bold;
+}
+#shadowbox_toolbar_inner div a {
+  text-decoration: none;
+  color: #fff;
+}
+#shadowbox_nav_close,
+#shadowbox_nav_previous,
+#shadowbox_nav_next {
+  float: right;
+  padding-right: 10px;
+}
+#shadowbox_counter {
+  float: left;
+  padding-left: 10px;
+}
+#shadowbox_counter a {
+  padding: 0 4px 0 0;
+}
+#shadowbox_counter a.shadowbox_counter_current {
+  text-decoration: underline;
+  font-weight: bold;
+}
+
+/*________________________________________________________________  Messag=
es  */
+div.shadowbox_message {
+  text-align: center;
+  padding: 10px;
+}
+div.shadowbox_message a:link,
+div.shadowbox_message a:visited {
+  text-decoration: none;
+  color: #bed333;
+}
+div.shadowbox_message a:hover,
+div.shadowbox_message a:focus {
+  text-decoration: underline;
+}


Property changes on: modules/portlet/trunk/test/src/test/resources/simple-p=
ortal-war/css/shadowbox.css
___________________________________________________________________
Name: svn:executable
   + *

Added: modules/portlet/trunk/test/src/test/resources/simple-portal-war/imag=
es/loading-light.gif
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: modules/portlet/trunk/test/src/test/resources/simple-p=
ortal-war/images/loading-light.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: modules/portlet/trunk/test/src/test/resources/simple-portal-war/imag=
es/loading.gif
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: modules/portlet/trunk/test/src/test/resources/simple-p=
ortal-war/images/loading.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: modules/portlet/trunk/test/src/test/resources/simple-portal-war/imag=
es/overlay-85.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: modules/portlet/trunk/test/src/test/resources/simple-p=
ortal-war/images/overlay-85.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: modules/portlet/trunk/test/src/test/resources/simple-portal-war/js/p=
rototype.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/js/prot=
otype.js	                        (rev 0)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/js/prot=
otype.js	2008-02-11 02:47:55 UTC (rev 9930)
@@ -0,0 +1,4221 @@
+/*  Prototype JavaScript framework, version 1.6.0.2
+ *  (c) 2005-2008 Sam Stephenson
+ *
+ *  Prototype is freely distributable under the terms of an MIT-style lice=
nse.
+ *  For details, see the Prototype web site: http://www.prototypejs.org/
+ *
+ *------------------------------------------------------------------------=
--*/
+
+var Prototype =3D {
+  Version: '1.6.0.2',
+
+  Browser: {
+    IE:     !!(window.attachEvent && !window.opera),
+    Opera:  !!window.opera,
+    WebKit: navigator.userAgent.indexOf('AppleWebKit/') > -1,
+    Gecko:  navigator.userAgent.indexOf('Gecko') > -1 && navigator.userAge=
nt.indexOf('KHTML') =3D=3D -1,
+    MobileSafari: !!navigator.userAgent.match(/Apple.*Mobile.*Safari/)
+  },
+
+  BrowserFeatures: {
+    XPath: !!document.evaluate,
+    ElementExtensions: !!window.HTMLElement,
+    SpecificElementExtensions:
+      document.createElement('div').__proto__ &&
+      document.createElement('div').__proto__ !=3D=3D
+        document.createElement('form').__proto__
+  },
+
+  ScriptFragment: ']*>([\\S\\s]*?)<\/script>',
+  JSONFilter: /^\/\*-secure-([\s\S]*)\*\/\s*$/,
+
+  emptyFunction: function() { },
+  K: function(x) { return x }
+};
+
+if (Prototype.Browser.MobileSafari)
+  Prototype.BrowserFeatures.SpecificElementExtensions =3D false;
+
+
+/* Based on Alex Arnell's inheritance implementation. */
+var Class =3D {
+  create: function() {
+    var parent =3D null, properties =3D $A(arguments);
+    if (Object.isFunction(properties[0]))
+      parent =3D properties.shift();
+
+    function klass() {
+      this.initialize.apply(this, arguments);
+    }
+
+    Object.extend(klass, Class.Methods);
+    klass.superclass =3D parent;
+    klass.subclasses =3D [];
+
+    if (parent) {
+      var subclass =3D function() { };
+      subclass.prototype =3D parent.prototype;
+      klass.prototype =3D new subclass;
+      parent.subclasses.push(klass);
+    }
+
+    for (var i =3D 0; i < properties.length; i++)
+      klass.addMethods(properties[i]);
+
+    if (!klass.prototype.initialize)
+      klass.prototype.initialize =3D Prototype.emptyFunction;
+
+    klass.prototype.constructor =3D klass;
+
+    return klass;
+  }
+};
+
+Class.Methods =3D {
+  addMethods: function(source) {
+    var ancestor   =3D this.superclass && this.superclass.prototype;
+    var properties =3D Object.keys(source);
+
+    if (!Object.keys({ toString: true }).length)
+      properties.push("toString", "valueOf");
+
+    for (var i =3D 0, length =3D properties.length; i < length; i++) {
+      var property =3D properties[i], value =3D source[property];
+      if (ancestor && Object.isFunction(value) &&
+          value.argumentNames().first() =3D=3D "$super") {
+        var method =3D value, value =3D Object.extend((function(m) {
+          return function() { return ancestor[m].apply(this, arguments) };
+        })(property).wrap(method), {
+          valueOf:  function() { return method },
+          toString: function() { return method.toString() }
+        });
+      }
+      this.prototype[property] =3D value;
+    }
+
+    return this;
+  }
+};
+
+var Abstract =3D { };
+
+Object.extend =3D function(destination, source) {
+  for (var property in source)
+    destination[property] =3D source[property];
+  return destination;
+};
+
+Object.extend(Object, {
+  inspect: function(object) {
+    try {
+      if (Object.isUndefined(object)) return 'undefined';
+      if (object =3D=3D=3D null) return 'null';
+      return object.inspect ? object.inspect() : String(object);
+    } catch (e) {
+      if (e instanceof RangeError) return '...';
+      throw e;
+    }
+  },
+
+  toJSON: function(object) {
+    var type =3D typeof object;
+    switch (type) {
+      case 'undefined':
+      case 'function':
+      case 'unknown': return;
+      case 'boolean': return object.toString();
+    }
+
+    if (object =3D=3D=3D null) return 'null';
+    if (object.toJSON) return object.toJSON();
+    if (Object.isElement(object)) return;
+
+    var results =3D [];
+    for (var property in object) {
+      var value =3D Object.toJSON(object[property]);
+      if (!Object.isUndefined(value))
+        results.push(property.toJSON() + ': ' + value);
+    }
+
+    return '{' + results.join(', ') + '}';
+  },
+
+  toQueryString: function(object) {
+    return $H(object).toQueryString();
+  },
+
+  toHTML: function(object) {
+    return object && object.toHTML ? object.toHTML() : String.interpret(ob=
ject);
+  },
+
+  keys: function(object) {
+    var keys =3D [];
+    for (var property in object)
+      keys.push(property);
+    return keys;
+  },
+
+  values: function(object) {
+    var values =3D [];
+    for (var property in object)
+      values.push(object[property]);
+    return values;
+  },
+
+  clone: function(object) {
+    return Object.extend({ }, object);
+  },
+
+  isElement: function(object) {
+    return object && object.nodeType =3D=3D 1;
+  },
+
+  isArray: function(object) {
+    return object !=3D null && typeof object =3D=3D "object" &&
+      'splice' in object && 'join' in object;
+  },
+
+  isHash: function(object) {
+    return object instanceof Hash;
+  },
+
+  isFunction: function(object) {
+    return typeof object =3D=3D "function";
+  },
+
+  isString: function(object) {
+    return typeof object =3D=3D "string";
+  },
+
+  isNumber: function(object) {
+    return typeof object =3D=3D "number";
+  },
+
+  isUndefined: function(object) {
+    return typeof object =3D=3D "undefined";
+  }
+});
+
+Object.extend(Function.prototype, {
+  argumentNames: function() {
+    var names =3D this.toString().match(/^[\s\(]*function[^(]*\((.*?)\)/)[=
1].split(",").invoke("strip");
+    return names.length =3D=3D 1 && !names[0] ? [] : names;
+  },
+
+  bind: function() {
+    if (arguments.length < 2 && Object.isUndefined(arguments[0])) return t=
his;
+    var __method =3D this, args =3D $A(arguments), object =3D args.shift();
+    return function() {
+      return __method.apply(object, args.concat($A(arguments)));
+    }
+  },
+
+  bindAsEventListener: function() {
+    var __method =3D this, args =3D $A(arguments), object =3D args.shift();
+    return function(event) {
+      return __method.apply(object, [event || window.event].concat(args));
+    }
+  },
+
+  curry: function() {
+    if (!arguments.length) return this;
+    var __method =3D this, args =3D $A(arguments);
+    return function() {
+      return __method.apply(this, args.concat($A(arguments)));
+    }
+  },
+
+  delay: function() {
+    var __method =3D this, args =3D $A(arguments), timeout =3D args.shift(=
) * 1000;
+    return window.setTimeout(function() {
+      return __method.apply(__method, args);
+    }, timeout);
+  },
+
+  wrap: function(wrapper) {
+    var __method =3D this;
+    return function() {
+      return wrapper.apply(this, [__method.bind(this)].concat($A(arguments=
)));
+    }
+  },
+
+  methodize: function() {
+    if (this._methodized) return this._methodized;
+    var __method =3D this;
+    return this._methodized =3D function() {
+      return __method.apply(null, [this].concat($A(arguments)));
+    };
+  }
+});
+
+Function.prototype.defer =3D Function.prototype.delay.curry(0.01);
+
+Date.prototype.toJSON =3D function() {
+  return '"' + this.getUTCFullYear() + '-' +
+    (this.getUTCMonth() + 1).toPaddedString(2) + '-' +
+    this.getUTCDate().toPaddedString(2) + 'T' +
+    this.getUTCHours().toPaddedString(2) + ':' +
+    this.getUTCMinutes().toPaddedString(2) + ':' +
+    this.getUTCSeconds().toPaddedString(2) + 'Z"';
+};
+
+var Try =3D {
+  these: function() {
+    var returnValue;
+
+    for (var i =3D 0, length =3D arguments.length; i < length; i++) {
+      var lambda =3D arguments[i];
+      try {
+        returnValue =3D lambda();
+        break;
+      } catch (e) { }
+    }
+
+    return returnValue;
+  }
+};
+
+RegExp.prototype.match =3D RegExp.prototype.test;
+
+RegExp.escape =3D function(str) {
+  return String(str).replace(/([.*+?^=3D!:${}()|[\]\/\\])/g, '\\$1');
+};
+
+/*------------------------------------------------------------------------=
--*/
+
+var PeriodicalExecuter =3D Class.create({
+  initialize: function(callback, frequency) {
+    this.callback =3D callback;
+    this.frequency =3D frequency;
+    this.currentlyExecuting =3D false;
+
+    this.registerCallback();
+  },
+
+  registerCallback: function() {
+    this.timer =3D setInterval(this.onTimerEvent.bind(this), this.frequenc=
y * 1000);
+  },
+
+  execute: function() {
+    this.callback(this);
+  },
+
+  stop: function() {
+    if (!this.timer) return;
+    clearInterval(this.timer);
+    this.timer =3D null;
+  },
+
+  onTimerEvent: function() {
+    if (!this.currentlyExecuting) {
+      try {
+        this.currentlyExecuting =3D true;
+        this.execute();
+      } finally {
+        this.currentlyExecuting =3D false;
+      }
+    }
+  }
+});
+Object.extend(String, {
+  interpret: function(value) {
+    return value =3D=3D null ? '' : String(value);
+  },
+  specialChar: {
+    '\b': '\\b',
+    '\t': '\\t',
+    '\n': '\\n',
+    '\f': '\\f',
+    '\r': '\\r',
+    '\\': '\\\\'
+  }
+});
+
+Object.extend(String.prototype, {
+  gsub: function(pattern, replacement) {
+    var result =3D '', source =3D this, match;
+    replacement =3D arguments.callee.prepareReplacement(replacement);
+
+    while (source.length > 0) {
+      if (match =3D source.match(pattern)) {
+        result +=3D source.slice(0, match.index);
+        result +=3D String.interpret(replacement(match));
+        source  =3D source.slice(match.index + match[0].length);
+      } else {
+        result +=3D source, source =3D '';
+      }
+    }
+    return result;
+  },
+
+  sub: function(pattern, replacement, count) {
+    replacement =3D this.gsub.prepareReplacement(replacement);
+    count =3D Object.isUndefined(count) ? 1 : count;
+
+    return this.gsub(pattern, function(match) {
+      if (--count < 0) return match[0];
+      return replacement(match);
+    });
+  },
+
+  scan: function(pattern, iterator) {
+    this.gsub(pattern, iterator);
+    return String(this);
+  },
+
+  truncate: function(length, truncation) {
+    length =3D length || 30;
+    truncation =3D Object.isUndefined(truncation) ? '...' : truncation;
+    return this.length > length ?
+      this.slice(0, length - truncation.length) + truncation : String(this=
);
+  },
+
+  strip: function() {
+    return this.replace(/^\s+/, '').replace(/\s+$/, '');
+  },
+
+  stripTags: function() {
+    return this.replace(/<\/?[^>]+>/gi, '');
+  },
+
+  stripScripts: function() {
+    return this.replace(new RegExp(Prototype.ScriptFragment, 'img'), '');
+  },
+
+  extractScripts: function() {
+    var matchAll =3D new RegExp(Prototype.ScriptFragment, 'img');
+    var matchOne =3D new RegExp(Prototype.ScriptFragment, 'im');
+    return (this.match(matchAll) || []).map(function(scriptTag) {
+      return (scriptTag.match(matchOne) || ['', ''])[1];
+    });
+  },
+
+  evalScripts: function() {
+    return this.extractScripts().map(function(script) { return eval(script=
) });
+  },
+
+  escapeHTML: function() {
+    var self =3D arguments.callee;
+    self.text.data =3D this;
+    return self.div.innerHTML;
+  },
+
+  unescapeHTML: function() {
+    var div =3D new Element('div');
+    div.innerHTML =3D this.stripTags();
+    return div.childNodes[0] ? (div.childNodes.length > 1 ?
+      $A(div.childNodes).inject('', function(memo, node) { return memo+nod=
e.nodeValue }) :
+      div.childNodes[0].nodeValue) : '';
+  },
+
+  toQueryParams: function(separator) {
+    var match =3D this.strip().match(/([^?#]*)(#.*)?$/);
+    if (!match) return { };
+
+    return match[1].split(separator || '&').inject({ }, function(hash, pai=
r) {
+      if ((pair =3D pair.split('=3D'))[0]) {
+        var key =3D decodeURIComponent(pair.shift());
+        var value =3D pair.length > 1 ? pair.join('=3D') : pair[0];
+        if (value !=3D undefined) value =3D decodeURIComponent(value);
+
+        if (key in hash) {
+          if (!Object.isArray(hash[key])) hash[key] =3D [hash[key]];
+          hash[key].push(value);
+        }
+        else hash[key] =3D value;
+      }
+      return hash;
+    });
+  },
+
+  toArray: function() {
+    return this.split('');
+  },
+
+  succ: function() {
+    return this.slice(0, this.length - 1) +
+      String.fromCharCode(this.charCodeAt(this.length - 1) + 1);
+  },
+
+  times: function(count) {
+    return count < 1 ? '' : new Array(count + 1).join(this);
+  },
+
+  camelize: function() {
+    var parts =3D this.split('-'), len =3D parts.length;
+    if (len =3D=3D 1) return parts[0];
+
+    var camelized =3D this.charAt(0) =3D=3D '-'
+      ? parts[0].charAt(0).toUpperCase() + parts[0].substring(1)
+      : parts[0];
+
+    for (var i =3D 1; i < len; i++)
+      camelized +=3D parts[i].charAt(0).toUpperCase() + parts[i].substring=
(1);
+
+    return camelized;
+  },
+
+  capitalize: function() {
+    return this.charAt(0).toUpperCase() + this.substring(1).toLowerCase();
+  },
+
+  underscore: function() {
+    return this.gsub(/::/, '/').gsub(/([A-Z]+)([A-Z][a-z])/,'#{1}_#{2}').g=
sub(/([a-z\d])([A-Z])/,'#{1}_#{2}').gsub(/-/,'_').toLowerCase();
+  },
+
+  dasherize: function() {
+    return this.gsub(/_/,'-');
+  },
+
+  inspect: function(useDoubleQuotes) {
+    var escapedString =3D this.gsub(/[\x00-\x1f\\]/, function(match) {
+      var character =3D String.specialChar[match[0]];
+      return character ? character : '\\u00' + match[0].charCodeAt().toPad=
dedString(2, 16);
+    });
+    if (useDoubleQuotes) return '"' + escapedString.replace(/"/g, '\\"') +=
 '"';
+    return "'" + escapedString.replace(/'/g, '\\\'') + "'";
+  },
+
+  toJSON: function() {
+    return this.inspect(true);
+  },
+
+  unfilterJSON: function(filter) {
+    return this.sub(filter || Prototype.JSONFilter, '#{1}');
+  },
+
+  isJSON: function() {
+    var str =3D this;
+    if (str.blank()) return false;
+    str =3D this.replace(/\\./g, '@').replace(/"[^"\\\n\r]*"/g, '');
+    return (/^[,:{}\[\]0-9.\-+Eaeflnr-u \n\r\t]*$/).test(str);
+  },
+
+  evalJSON: function(sanitize) {
+    var json =3D this.unfilterJSON();
+    try {
+      if (!sanitize || json.isJSON()) return eval('(' + json + ')');
+    } catch (e) { }
+    throw new SyntaxError('Badly formed JSON string: ' + this.inspect());
+  },
+
+  include: function(pattern) {
+    return this.indexOf(pattern) > -1;
+  },
+
+  startsWith: function(pattern) {
+    return this.indexOf(pattern) =3D=3D=3D 0;
+  },
+
+  endsWith: function(pattern) {
+    var d =3D this.length - pattern.length;
+    return d >=3D 0 && this.lastIndexOf(pattern) =3D=3D=3D d;
+  },
+
+  empty: function() {
+    return this =3D=3D '';
+  },
+
+  blank: function() {
+    return /^\s*$/.test(this);
+  },
+
+  interpolate: function(object, pattern) {
+    return new Template(this, pattern).evaluate(object);
+  }
+});
+
+if (Prototype.Browser.WebKit || Prototype.Browser.IE) Object.extend(String=
.prototype, {
+  escapeHTML: function() {
+    return this.replace(/&/g,'&').replace(//g,'&=
gt;');
+  },
+  unescapeHTML: function() {
+    return this.replace(/&/g,'&').replace(/</g,'<').replace(/>/g=
,'>');
+  }
+});
+
+String.prototype.gsub.prepareReplacement =3D function(replacement) {
+  if (Object.isFunction(replacement)) return replacement;
+  var template =3D new Template(replacement);
+  return function(match) { return template.evaluate(match) };
+};
+
+String.prototype.parseQuery =3D String.prototype.toQueryParams;
+
+Object.extend(String.prototype.escapeHTML, {
+  div:  document.createElement('div'),
+  text: document.createTextNode('')
+});
+
+with (String.prototype.escapeHTML) div.appendChild(text);
+
+var Template =3D Class.create({
+  initialize: function(template, pattern) {
+    this.template =3D template.toString();
+    this.pattern =3D pattern || Template.Pattern;
+  },
+
+  evaluate: function(object) {
+    if (Object.isFunction(object.toTemplateReplacements))
+      object =3D object.toTemplateReplacements();
+
+    return this.template.gsub(this.pattern, function(match) {
+      if (object =3D=3D null) return '';
+
+      var before =3D match[1] || '';
+      if (before =3D=3D '\\') return match[2];
+
+      var ctx =3D object, expr =3D match[3];
+      var pattern =3D /^([^.[]+|\[((?:.*?[^\\])?)\])(\.|\[|$)/;
+      match =3D pattern.exec(expr);
+      if (match =3D=3D null) return before;
+
+      while (match !=3D null) {
+        var comp =3D match[1].startsWith('[') ? match[2].gsub('\\\\]', ']'=
) : match[1];
+        ctx =3D ctx[comp];
+        if (null =3D=3D ctx || '' =3D=3D match[3]) break;
+        expr =3D expr.substring('[' =3D=3D match[3] ? match[1].length : ma=
tch[0].length);
+        match =3D pattern.exec(expr);
+      }
+
+      return before + String.interpret(ctx);
+    });
+  }
+});
+Template.Pattern =3D /(^|.|\r|\n)(#\{(.*?)\})/;
+
+var $break =3D { };
+
+var Enumerable =3D {
+  each: function(iterator, context) {
+    var index =3D 0;
+    iterator =3D iterator.bind(context);
+    try {
+      this._each(function(value) {
+        iterator(value, index++);
+      });
+    } catch (e) {
+      if (e !=3D $break) throw e;
+    }
+    return this;
+  },
+
+  eachSlice: function(number, iterator, context) {
+    iterator =3D iterator ? iterator.bind(context) : Prototype.K;
+    var index =3D -number, slices =3D [], array =3D this.toArray();
+    while ((index +=3D number) < array.length)
+      slices.push(array.slice(index, index+number));
+    return slices.collect(iterator, context);
+  },
+
+  all: function(iterator, context) {
+    iterator =3D iterator ? iterator.bind(context) : Prototype.K;
+    var result =3D true;
+    this.each(function(value, index) {
+      result =3D result && !!iterator(value, index);
+      if (!result) throw $break;
+    });
+    return result;
+  },
+
+  any: function(iterator, context) {
+    iterator =3D iterator ? iterator.bind(context) : Prototype.K;
+    var result =3D false;
+    this.each(function(value, index) {
+      if (result =3D !!iterator(value, index))
+        throw $break;
+    });
+    return result;
+  },
+
+  collect: function(iterator, context) {
+    iterator =3D iterator ? iterator.bind(context) : Prototype.K;
+    var results =3D [];
+    this.each(function(value, index) {
+      results.push(iterator(value, index));
+    });
+    return results;
+  },
+
+  detect: function(iterator, context) {
+    iterator =3D iterator.bind(context);
+    var result;
+    this.each(function(value, index) {
+      if (iterator(value, index)) {
+        result =3D value;
+        throw $break;
+      }
+    });
+    return result;
+  },
+
+  findAll: function(iterator, context) {
+    iterator =3D iterator.bind(context);
+    var results =3D [];
+    this.each(function(value, index) {
+      if (iterator(value, index))
+        results.push(value);
+    });
+    return results;
+  },
+
+  grep: function(filter, iterator, context) {
+    iterator =3D iterator ? iterator.bind(context) : Prototype.K;
+    var results =3D [];
+
+    if (Object.isString(filter))
+      filter =3D new RegExp(filter);
+
+    this.each(function(value, index) {
+      if (filter.match(value))
+        results.push(iterator(value, index));
+    });
+    return results;
+  },
+
+  include: function(object) {
+    if (Object.isFunction(this.indexOf))
+      if (this.indexOf(object) !=3D -1) return true;
+
+    var found =3D false;
+    this.each(function(value) {
+      if (value =3D=3D object) {
+        found =3D true;
+        throw $break;
+      }
+    });
+    return found;
+  },
+
+  inGroupsOf: function(number, fillWith) {
+    fillWith =3D Object.isUndefined(fillWith) ? null : fillWith;
+    return this.eachSlice(number, function(slice) {
+      while(slice.length < number) slice.push(fillWith);
+      return slice;
+    });
+  },
+
+  inject: function(memo, iterator, context) {
+    iterator =3D iterator.bind(context);
+    this.each(function(value, index) {
+      memo =3D iterator(memo, value, index);
+    });
+    return memo;
+  },
+
+  invoke: function(method) {
+    var args =3D $A(arguments).slice(1);
+    return this.map(function(value) {
+      return value[method].apply(value, args);
+    });
+  },
+
+  max: function(iterator, context) {
+    iterator =3D iterator ? iterator.bind(context) : Prototype.K;
+    var result;
+    this.each(function(value, index) {
+      value =3D iterator(value, index);
+      if (result =3D=3D null || value >=3D result)
+        result =3D value;
+    });
+    return result;
+  },
+
+  min: function(iterator, context) {
+    iterator =3D iterator ? iterator.bind(context) : Prototype.K;
+    var result;
+    this.each(function(value, index) {
+      value =3D iterator(value, index);
+      if (result =3D=3D null || value < result)
+        result =3D value;
+    });
+    return result;
+  },
+
+  partition: function(iterator, context) {
+    iterator =3D iterator ? iterator.bind(context) : Prototype.K;
+    var trues =3D [], falses =3D [];
+    this.each(function(value, index) {
+      (iterator(value, index) ?
+        trues : falses).push(value);
+    });
+    return [trues, falses];
+  },
+
+  pluck: function(property) {
+    var results =3D [];
+    this.each(function(value) {
+      results.push(value[property]);
+    });
+    return results;
+  },
+
+  reject: function(iterator, context) {
+    iterator =3D iterator.bind(context);
+    var results =3D [];
+    this.each(function(value, index) {
+      if (!iterator(value, index))
+        results.push(value);
+    });
+    return results;
+  },
+
+  sortBy: function(iterator, context) {
+    iterator =3D iterator.bind(context);
+    return this.map(function(value, index) {
+      return {value: value, criteria: iterator(value, index)};
+    }).sort(function(left, right) {
+      var a =3D left.criteria, b =3D right.criteria;
+      return a < b ? -1 : a > b ? 1 : 0;
+    }).pluck('value');
+  },
+
+  toArray: function() {
+    return this.map();
+  },
+
+  zip: function() {
+    var iterator =3D Prototype.K, args =3D $A(arguments);
+    if (Object.isFunction(args.last()))
+      iterator =3D args.pop();
+
+    var collections =3D [this].concat(args).map($A);
+    return this.map(function(value, index) {
+      return iterator(collections.pluck(index));
+    });
+  },
+
+  size: function() {
+    return this.toArray().length;
+  },
+
+  inspect: function() {
+    return '#';
+  }
+};
+
+Object.extend(Enumerable, {
+  map:     Enumerable.collect,
+  find:    Enumerable.detect,
+  select:  Enumerable.findAll,
+  filter:  Enumerable.findAll,
+  member:  Enumerable.include,
+  entries: Enumerable.toArray,
+  every:   Enumerable.all,
+  some:    Enumerable.any
+});
+function $A(iterable) {
+  if (!iterable) return [];
+  if (iterable.toArray) return iterable.toArray();
+  var length =3D iterable.length || 0, results =3D new Array(length);
+  while (length--) results[length] =3D iterable[length];
+  return results;
+}
+
+if (Prototype.Browser.WebKit) {
+  $A =3D function(iterable) {
+    if (!iterable) return [];
+    if (!(Object.isFunction(iterable) && iterable =3D=3D '[object NodeList=
]') &&
+        iterable.toArray) return iterable.toArray();
+    var length =3D iterable.length || 0, results =3D new Array(length);
+    while (length--) results[length] =3D iterable[length];
+    return results;
+  };
+}
+
+Array.from =3D $A;
+
+Object.extend(Array.prototype, Enumerable);
+
+if (!Array.prototype._reverse) Array.prototype._reverse =3D Array.prototyp=
e.reverse;
+
+Object.extend(Array.prototype, {
+  _each: function(iterator) {
+    for (var i =3D 0, length =3D this.length; i < length; i++)
+      iterator(this[i]);
+  },
+
+  clear: function() {
+    this.length =3D 0;
+    return this;
+  },
+
+  first: function() {
+    return this[0];
+  },
+
+  last: function() {
+    return this[this.length - 1];
+  },
+
+  compact: function() {
+    return this.select(function(value) {
+      return value !=3D null;
+    });
+  },
+
+  flatten: function() {
+    return this.inject([], function(array, value) {
+      return array.concat(Object.isArray(value) ?
+        value.flatten() : [value]);
+    });
+  },
+
+  without: function() {
+    var values =3D $A(arguments);
+    return this.select(function(value) {
+      return !values.include(value);
+    });
+  },
+
+  reverse: function(inline) {
+    return (inline !=3D=3D false ? this : this.toArray())._reverse();
+  },
+
+  reduce: function() {
+    return this.length > 1 ? this : this[0];
+  },
+
+  uniq: function(sorted) {
+    return this.inject([], function(array, value, index) {
+      if (0 =3D=3D index || (sorted ? array.last() !=3D value : !array.inc=
lude(value)))
+        array.push(value);
+      return array;
+    });
+  },
+
+  intersect: function(array) {
+    return this.uniq().findAll(function(item) {
+      return array.detect(function(value) { return item =3D=3D=3D value });
+    });
+  },
+
+  clone: function() {
+    return [].concat(this);
+  },
+
+  size: function() {
+    return this.length;
+  },
+
+  inspect: function() {
+    return '[' + this.map(Object.inspect).join(', ') + ']';
+  },
+
+  toJSON: function() {
+    var results =3D [];
+    this.each(function(object) {
+      var value =3D Object.toJSON(object);
+      if (!Object.isUndefined(value)) results.push(value);
+    });
+    return '[' + results.join(', ') + ']';
+  }
+});
+
+// use native browser JS 1.6 implementation if available
+if (Object.isFunction(Array.prototype.forEach))
+  Array.prototype._each =3D Array.prototype.forEach;
+
+if (!Array.prototype.indexOf) Array.prototype.indexOf =3D function(item, i=
) {
+  i || (i =3D 0);
+  var length =3D this.length;
+  if (i < 0) i =3D length + i;
+  for (; i < length; i++)
+    if (this[i] =3D=3D=3D item) return i;
+  return -1;
+};
+
+if (!Array.prototype.lastIndexOf) Array.prototype.lastIndexOf =3D function=
(item, i) {
+  i =3D isNaN(i) ? this.length : (i < 0 ? this.length + i : i) + 1;
+  var n =3D this.slice(0, i).reverse().indexOf(item);
+  return (n < 0) ? n : i - n - 1;
+};
+
+Array.prototype.toArray =3D Array.prototype.clone;
+
+function $w(string) {
+  if (!Object.isString(string)) return [];
+  string =3D string.strip();
+  return string ? string.split(/\s+/) : [];
+}
+
+if (Prototype.Browser.Opera){
+  Array.prototype.concat =3D function() {
+    var array =3D [];
+    for (var i =3D 0, length =3D this.length; i < length; i++) array.push(=
this[i]);
+    for (var i =3D 0, length =3D arguments.length; i < length; i++) {
+      if (Object.isArray(arguments[i])) {
+        for (var j =3D 0, arrayLength =3D arguments[i].length; j < arrayLe=
ngth; j++)
+          array.push(arguments[i][j]);
+      } else {
+        array.push(arguments[i]);
+      }
+    }
+    return array;
+  };
+}
+Object.extend(Number.prototype, {
+  toColorPart: function() {
+    return this.toPaddedString(2, 16);
+  },
+
+  succ: function() {
+    return this + 1;
+  },
+
+  times: function(iterator) {
+    $R(0, this, true).each(iterator);
+    return this;
+  },
+
+  toPaddedString: function(length, radix) {
+    var string =3D this.toString(radix || 10);
+    return '0'.times(length - string.length) + string;
+  },
+
+  toJSON: function() {
+    return isFinite(this) ? this.toString() : 'null';
+  }
+});
+
+$w('abs round ceil floor').each(function(method){
+  Number.prototype[method] =3D Math[method].methodize();
+});
+function $H(object) {
+  return new Hash(object);
+};
+
+var Hash =3D Class.create(Enumerable, (function() {
+
+  function toQueryPair(key, value) {
+    if (Object.isUndefined(value)) return key;
+    return key + '=3D' + encodeURIComponent(String.interpret(value));
+  }
+
+  return {
+    initialize: function(object) {
+      this._object =3D Object.isHash(object) ? object.toObject() : Object.=
clone(object);
+    },
+
+    _each: function(iterator) {
+      for (var key in this._object) {
+        var value =3D this._object[key], pair =3D [key, value];
+        pair.key =3D key;
+        pair.value =3D value;
+        iterator(pair);
+      }
+    },
+
+    set: function(key, value) {
+      return this._object[key] =3D value;
+    },
+
+    get: function(key) {
+      return this._object[key];
+    },
+
+    unset: function(key) {
+      var value =3D this._object[key];
+      delete this._object[key];
+      return value;
+    },
+
+    toObject: function() {
+      return Object.clone(this._object);
+    },
+
+    keys: function() {
+      return this.pluck('key');
+    },
+
+    values: function() {
+      return this.pluck('value');
+    },
+
+    index: function(value) {
+      var match =3D this.detect(function(pair) {
+        return pair.value =3D=3D=3D value;
+      });
+      return match && match.key;
+    },
+
+    merge: function(object) {
+      return this.clone().update(object);
+    },
+
+    update: function(object) {
+      return new Hash(object).inject(this, function(result, pair) {
+        result.set(pair.key, pair.value);
+        return result;
+      });
+    },
+
+    toQueryString: function() {
+      return this.map(function(pair) {
+        var key =3D encodeURIComponent(pair.key), values =3D pair.value;
+
+        if (values && typeof values =3D=3D 'object') {
+          if (Object.isArray(values))
+            return values.map(toQueryPair.curry(key)).join('&');
+        }
+        return toQueryPair(key, values);
+      }).join('&');
+    },
+
+    inspect: function() {
+      return '#';
+    },
+
+    toJSON: function() {
+      return Object.toJSON(this.toObject());
+    },
+
+    clone: function() {
+      return new Hash(this);
+    }
+  }
+})());
+
+Hash.prototype.toTemplateReplacements =3D Hash.prototype.toObject;
+Hash.from =3D $H;
+var ObjectRange =3D Class.create(Enumerable, {
+  initialize: function(start, end, exclusive) {
+    this.start =3D start;
+    this.end =3D end;
+    this.exclusive =3D exclusive;
+  },
+
+  _each: function(iterator) {
+    var value =3D this.start;
+    while (this.include(value)) {
+      iterator(value);
+      value =3D value.succ();
+    }
+  },
+
+  include: function(value) {
+    if (value < this.start)
+      return false;
+    if (this.exclusive)
+      return value < this.end;
+    return value <=3D this.end;
+  }
+});
+
+var $R =3D function(start, end, exclusive) {
+  return new ObjectRange(start, end, exclusive);
+};
+
+var Ajax =3D {
+  getTransport: function() {
+    return Try.these(
+      function() {return new XMLHttpRequest()},
+      function() {return new ActiveXObject('Msxml2.XMLHTTP')},
+      function() {return new ActiveXObject('Microsoft.XMLHTTP')}
+    ) || false;
+  },
+
+  activeRequestCount: 0
+};
+
+Ajax.Responders =3D {
+  responders: [],
+
+  _each: function(iterator) {
+    this.responders._each(iterator);
+  },
+
+  register: function(responder) {
+    if (!this.include(responder))
+      this.responders.push(responder);
+  },
+
+  unregister: function(responder) {
+    this.responders =3D this.responders.without(responder);
+  },
+
+  dispatch: function(callback, request, transport, json) {
+    this.each(function(responder) {
+      if (Object.isFunction(responder[callback])) {
+        try {
+          responder[callback].apply(responder, [request, transport, json]);
+        } catch (e) { }
+      }
+    });
+  }
+};
+
+Object.extend(Ajax.Responders, Enumerable);
+
+Ajax.Responders.register({
+  onCreate:   function() { Ajax.activeRequestCount++ },
+  onComplete: function() { Ajax.activeRequestCount-- }
+});
+
+Ajax.Base =3D Class.create({
+  initialize: function(options) {
+    this.options =3D {
+      method:       'post',
+      asynchronous: true,
+      contentType:  'application/x-www-form-urlencoded',
+      encoding:     'UTF-8',
+      parameters:   '',
+      evalJSON:     true,
+      evalJS:       true
+    };
+    Object.extend(this.options, options || { });
+
+    this.options.method =3D this.options.method.toLowerCase();
+
+    if (Object.isString(this.options.parameters))
+      this.options.parameters =3D this.options.parameters.toQueryParams();
+    else if (Object.isHash(this.options.parameters))
+      this.options.parameters =3D this.options.parameters.toObject();
+  }
+});
+
+Ajax.Request =3D Class.create(Ajax.Base, {
+  _complete: false,
+
+  initialize: function($super, url, options) {
+    $super(options);
+    this.transport =3D Ajax.getTransport();
+    this.request(url);
+  },
+
+  request: function(url) {
+    this.url =3D url;
+    this.method =3D this.options.method;
+    var params =3D Object.clone(this.options.parameters);
+
+    if (!['get', 'post'].include(this.method)) {
+      // simulate other verbs over post
+      params['_method'] =3D this.method;
+      this.method =3D 'post';
+    }
+
+    this.parameters =3D params;
+
+    if (params =3D Object.toQueryString(params)) {
+      // when GET, append parameters to URL
+      if (this.method =3D=3D 'get')
+        this.url +=3D (this.url.include('?') ? '&' : '?') + params;
+      else if (/Konqueror|Safari|KHTML/.test(navigator.userAgent))
+        params +=3D '&_=3D';
+    }
+
+    try {
+      var response =3D new Ajax.Response(this);
+      if (this.options.onCreate) this.options.onCreate(response);
+      Ajax.Responders.dispatch('onCreate', this, response);
+
+      this.transport.open(this.method.toUpperCase(), this.url,
+        this.options.asynchronous);
+
+      if (this.options.asynchronous) this.respondToReadyState.bind(this).d=
efer(1);
+
+      this.transport.onreadystatechange =3D this.onStateChange.bind(this);
+      this.setRequestHeaders();
+
+      this.body =3D this.method =3D=3D 'post' ? (this.options.postBody || =
params) : null;
+      this.transport.send(this.body);
+
+      /* Force Firefox to handle ready state 4 for synchronous requests */
+      if (!this.options.asynchronous && this.transport.overrideMimeType)
+        this.onStateChange();
+
+    }
+    catch (e) {
+      this.dispatchException(e);
+    }
+  },
+
+  onStateChange: function() {
+    var readyState =3D this.transport.readyState;
+    if (readyState > 1 && !((readyState =3D=3D 4) && this._complete))
+      this.respondToReadyState(this.transport.readyState);
+  },
+
+  setRequestHeaders: function() {
+    var headers =3D {
+      'X-Requested-With': 'XMLHttpRequest',
+      'X-Prototype-Version': Prototype.Version,
+      'Accept': 'text/javascript, text/html, application/xml, text/xml, */=
*'
+    };
+
+    if (this.method =3D=3D 'post') {
+      headers['Content-type'] =3D this.options.contentType +
+        (this.options.encoding ? '; charset=3D' + this.options.encoding : =
'');
+
+      /* Force "Connection: close" for older Mozilla browsers to work
+       * around a bug where XMLHttpRequest sends an incorrect
+       * Content-length header. See Mozilla Bugzilla #246651.
+       */
+      if (this.transport.overrideMimeType &&
+          (navigator.userAgent.match(/Gecko\/(\d{4})/) || [0,2005])[1] < 2=
005)
+            headers['Connection'] =3D 'close';
+    }
+
+    // user-defined headers
+    if (typeof this.options.requestHeaders =3D=3D 'object') {
+      var extras =3D this.options.requestHeaders;
+
+      if (Object.isFunction(extras.push))
+        for (var i =3D 0, length =3D extras.length; i < length; i +=3D 2)
+          headers[extras[i]] =3D extras[i+1];
+      else
+        $H(extras).each(function(pair) { headers[pair.key] =3D pair.value =
});
+    }
+
+    for (var name in headers)
+      this.transport.setRequestHeader(name, headers[name]);
+  },
+
+  success: function() {
+    var status =3D this.getStatus();
+    return !status || (status >=3D 200 && status < 300);
+  },
+
+  getStatus: function() {
+    try {
+      return this.transport.status || 0;
+    } catch (e) { return 0 }
+  },
+
+  respondToReadyState: function(readyState) {
+    var state =3D Ajax.Request.Events[readyState], response =3D new Ajax.R=
esponse(this);
+
+    if (state =3D=3D 'Complete') {
+      try {
+        this._complete =3D true;
+        (this.options['on' + response.status]
+         || this.options['on' + (this.success() ? 'Success' : 'Failure')]
+         || Prototype.emptyFunction)(response, response.headerJSON);
+      } catch (e) {
+        this.dispatchException(e);
+      }
+
+      var contentType =3D response.getHeader('Content-type');
+      if (this.options.evalJS =3D=3D 'force'
+          || (this.options.evalJS && this.isSameOrigin() && contentType
+          && contentType.match(/^\s*(text|application)\/(x-)?(java|ecma)sc=
ript(;.*)?\s*$/i)))
+        this.evalResponse();
+    }
+
+    try {
+      (this.options['on' + state] || Prototype.emptyFunction)(response, re=
sponse.headerJSON);
+      Ajax.Responders.dispatch('on' + state, this, response, response.head=
erJSON);
+    } catch (e) {
+      this.dispatchException(e);
+    }
+
+    if (state =3D=3D 'Complete') {
+      // avoid memory leak in MSIE: clean up
+      this.transport.onreadystatechange =3D Prototype.emptyFunction;
+    }
+  },
+
+  isSameOrigin: function() {
+    var m =3D this.url.match(/^\s*https?:\/\/[^\/]*/);
+    return !m || (m[0] =3D=3D '#{protocol}//#{domain}#{port}'.interpolate({
+      protocol: location.protocol,
+      domain: document.domain,
+      port: location.port ? ':' + location.port : ''
+    }));
+  },
+
+  getHeader: function(name) {
+    try {
+      return this.transport.getResponseHeader(name) || null;
+    } catch (e) { return null }
+  },
+
+  evalResponse: function() {
+    try {
+      return eval((this.transport.responseText || '').unfilterJSON());
+    } catch (e) {
+      this.dispatchException(e);
+    }
+  },
+
+  dispatchException: function(exception) {
+    (this.options.onException || Prototype.emptyFunction)(this, exception);
+    Ajax.Responders.dispatch('onException', this, exception);
+  }
+});
+
+Ajax.Request.Events =3D
+  ['Uninitialized', 'Loading', 'Loaded', 'Interactive', 'Complete'];
+
+Ajax.Response =3D Class.create({
+  initialize: function(request){
+    this.request =3D request;
+    var transport  =3D this.transport  =3D request.transport,
+        readyState =3D this.readyState =3D transport.readyState;
+
+    if((readyState > 2 && !Prototype.Browser.IE) || readyState =3D=3D 4) {
+      this.status       =3D this.getStatus();
+      this.statusText   =3D this.getStatusText();
+      this.responseText =3D String.interpret(transport.responseText);
+      this.headerJSON   =3D this._getHeaderJSON();
+    }
+
+    if(readyState =3D=3D 4) {
+      var xml =3D transport.responseXML;
+      this.responseXML  =3D Object.isUndefined(xml) ? null : xml;
+      this.responseJSON =3D this._getResponseJSON();
+    }
+  },
+
+  status:      0,
+  statusText: '',
+
+  getStatus: Ajax.Request.prototype.getStatus,
+
+  getStatusText: function() {
+    try {
+      return this.transport.statusText || '';
+    } catch (e) { return '' }
+  },
+
+  getHeader: Ajax.Request.prototype.getHeader,
+
+  getAllHeaders: function() {
+    try {
+      return this.getAllResponseHeaders();
+    } catch (e) { return null }
+  },
+
+  getResponseHeader: function(name) {
+    return this.transport.getResponseHeader(name);
+  },
+
+  getAllResponseHeaders: function() {
+    return this.transport.getAllResponseHeaders();
+  },
+
+  _getHeaderJSON: function() {
+    var json =3D this.getHeader('X-JSON');
+    if (!json) return null;
+    json =3D decodeURIComponent(escape(json));
+    try {
+      return json.evalJSON(this.request.options.sanitizeJSON ||
+        !this.request.isSameOrigin());
+    } catch (e) {
+      this.request.dispatchException(e);
+    }
+  },
+
+  _getResponseJSON: function() {
+    var options =3D this.request.options;
+    if (!options.evalJSON || (options.evalJSON !=3D 'force' &&
+      !(this.getHeader('Content-type') || '').include('application/json'))=
 ||
+        this.responseText.blank())
+          return null;
+    try {
+      return this.responseText.evalJSON(options.sanitizeJSON ||
+        !this.request.isSameOrigin());
+    } catch (e) {
+      this.request.dispatchException(e);
+    }
+  }
+});
+
+Ajax.Updater =3D Class.create(Ajax.Request, {
+  initialize: function($super, container, url, options) {
+    this.container =3D {
+      success: (container.success || container),
+      failure: (container.failure || (container.success ? null : container=
))
+    };
+
+    options =3D Object.clone(options);
+    var onComplete =3D options.onComplete;
+    options.onComplete =3D (function(response, json) {
+      this.updateContent(response.responseText);
+      if (Object.isFunction(onComplete)) onComplete(response, json);
+    }).bind(this);
+
+    $super(url, options);
+  },
+
+  updateContent: function(responseText) {
+    var receiver =3D this.container[this.success() ? 'success' : 'failure'=
],
+        options =3D this.options;
+
+    if (!options.evalScripts) responseText =3D responseText.stripScripts();
+
+    if (receiver =3D $(receiver)) {
+      if (options.insertion) {
+        if (Object.isString(options.insertion)) {
+          var insertion =3D { }; insertion[options.insertion] =3D response=
Text;
+          receiver.insert(insertion);
+        }
+        else options.insertion(receiver, responseText);
+      }
+      else receiver.update(responseText);
+    }
+  }
+});
+
+Ajax.PeriodicalUpdater =3D Class.create(Ajax.Base, {
+  initialize: function($super, container, url, options) {
+    $super(options);
+    this.onComplete =3D this.options.onComplete;
+
+    this.frequency =3D (this.options.frequency || 2);
+    this.decay =3D (this.options.decay || 1);
+
+    this.updater =3D { };
+    this.container =3D container;
+    this.url =3D url;
+
+    this.start();
+  },
+
+  start: function() {
+    this.options.onComplete =3D this.updateComplete.bind(this);
+    this.onTimerEvent();
+  },
+
+  stop: function() {
+    this.updater.options.onComplete =3D undefined;
+    clearTimeout(this.timer);
+    (this.onComplete || Prototype.emptyFunction).apply(this, arguments);
+  },
+
+  updateComplete: function(response) {
+    if (this.options.decay) {
+      this.decay =3D (response.responseText =3D=3D this.lastText ?
+        this.decay * this.options.decay : 1);
+
+      this.lastText =3D response.responseText;
+    }
+    this.timer =3D this.onTimerEvent.bind(this).delay(this.decay * this.fr=
equency);
+  },
+
+  onTimerEvent: function() {
+    this.updater =3D new Ajax.Updater(this.container, this.url, this.optio=
ns);
+  }
+});
+function $(element) {
+  if (arguments.length > 1) {
+    for (var i =3D 0, elements =3D [], length =3D arguments.length; i < le=
ngth; i++)
+      elements.push($(arguments[i]));
+    return elements;
+  }
+  if (Object.isString(element))
+    element =3D document.getElementById(element);
+  return Element.extend(element);
+}
+
+if (Prototype.BrowserFeatures.XPath) {
+  document._getElementsByXPath =3D function(expression, parentElement) {
+    var results =3D [];
+    var query =3D document.evaluate(expression, $(parentElement) || docume=
nt,
+      null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null);
+    for (var i =3D 0, length =3D query.snapshotLength; i < length; i++)
+      results.push(Element.extend(query.snapshotItem(i)));
+    return results;
+  };
+}
+
+/*------------------------------------------------------------------------=
--*/
+
+if (!window.Node) var Node =3D { };
+
+if (!Node.ELEMENT_NODE) {
+  // DOM level 2 ECMAScript Language Binding
+  Object.extend(Node, {
+    ELEMENT_NODE: 1,
+    ATTRIBUTE_NODE: 2,
+    TEXT_NODE: 3,
+    CDATA_SECTION_NODE: 4,
+    ENTITY_REFERENCE_NODE: 5,
+    ENTITY_NODE: 6,
+    PROCESSING_INSTRUCTION_NODE: 7,
+    COMMENT_NODE: 8,
+    DOCUMENT_NODE: 9,
+    DOCUMENT_TYPE_NODE: 10,
+    DOCUMENT_FRAGMENT_NODE: 11,
+    NOTATION_NODE: 12
+  });
+}
+
+(function() {
+  var element =3D this.Element;
+  this.Element =3D function(tagName, attributes) {
+    attributes =3D attributes || { };
+    tagName =3D tagName.toLowerCase();
+    var cache =3D Element.cache;
+    if (Prototype.Browser.IE && attributes.name) {
+      tagName =3D '<' + tagName + ' name=3D"' + attributes.name + '">';
+      delete attributes.name;
+      return Element.writeAttribute(document.createElement(tagName), attri=
butes);
+    }
+    if (!cache[tagName]) cache[tagName] =3D Element.extend(document.create=
Element(tagName));
+    return Element.writeAttribute(cache[tagName].cloneNode(false), attribu=
tes);
+  };
+  Object.extend(this.Element, element || { });
+}).call(window);
+
+Element.cache =3D { };
+
+Element.Methods =3D {
+  visible: function(element) {
+    return $(element).style.display !=3D 'none';
+  },
+
+  toggle: function(element) {
+    element =3D $(element);
+    Element[Element.visible(element) ? 'hide' : 'show'](element);
+    return element;
+  },
+
+  hide: function(element) {
+    $(element).style.display =3D 'none';
+    return element;
+  },
+
+  show: function(element) {
+    $(element).style.display =3D '';
+    return element;
+  },
+
+  remove: function(element) {
+    element =3D $(element);
+    element.parentNode.removeChild(element);
+    return element;
+  },
+
+  update: function(element, content) {
+    element =3D $(element);
+    if (content && content.toElement) content =3D content.toElement();
+    if (Object.isElement(content)) return element.update().insert(content);
+    content =3D Object.toHTML(content);
+    element.innerHTML =3D content.stripScripts();
+    content.evalScripts.bind(content).defer();
+    return element;
+  },
+
+  replace: function(element, content) {
+    element =3D $(element);
+    if (content && content.toElement) content =3D content.toElement();
+    else if (!Object.isElement(content)) {
+      content =3D Object.toHTML(content);
+      var range =3D element.ownerDocument.createRange();
+      range.selectNode(element);
+      content.evalScripts.bind(content).defer();
+      content =3D range.createContextualFragment(content.stripScripts());
+    }
+    element.parentNode.replaceChild(content, element);
+    return element;
+  },
+
+  insert: function(element, insertions) {
+    element =3D $(element);
+
+    if (Object.isString(insertions) || Object.isNumber(insertions) ||
+        Object.isElement(insertions) || (insertions && (insertions.toEleme=
nt || insertions.toHTML)))
+          insertions =3D {bottom:insertions};
+
+    var content, insert, tagName, childNodes;
+
+    for (var position in insertions) {
+      content  =3D insertions[position];
+      position =3D position.toLowerCase();
+      insert =3D Element._insertionTranslations[position];
+
+      if (content && content.toElement) content =3D content.toElement();
+      if (Object.isElement(content)) {
+        insert(element, content);
+        continue;
+      }
+
+      content =3D Object.toHTML(content);
+
+      tagName =3D ((position =3D=3D 'before' || position =3D=3D 'after')
+        ? element.parentNode : element).tagName.toUpperCase();
+
+      childNodes =3D Element._getContentFromAnonymousElement(tagName, cont=
ent.stripScripts());
+
+      if (position =3D=3D 'top' || position =3D=3D 'after') childNodes.rev=
erse();
+      childNodes.each(insert.curry(element));
+
+      content.evalScripts.bind(content).defer();
+    }
+
+    return element;
+  },
+
+  wrap: function(element, wrapper, attributes) {
+    element =3D $(element);
+    if (Object.isElement(wrapper))
+      $(wrapper).writeAttribute(attributes || { });
+    else if (Object.isString(wrapper)) wrapper =3D new Element(wrapper, at=
tributes);
+    else wrapper =3D new Element('div', wrapper);
+    if (element.parentNode)
+      element.parentNode.replaceChild(wrapper, element);
+    wrapper.appendChild(element);
+    return wrapper;
+  },
+
+  inspect: function(element) {
+    element =3D $(element);
+    var result =3D '<' + element.tagName.toLowerCase();
+    $H({'id': 'id', 'className': 'class'}).each(function(pair) {
+      var property =3D pair.first(), attribute =3D pair.last();
+      var value =3D (element[property] || '').toString();
+      if (value) result +=3D ' ' + attribute + '=3D' + value.inspect(true);
+    });
+    return result + '>';
+  },
+
+  recursivelyCollect: function(element, property) {
+    element =3D $(element);
+    var elements =3D [];
+    while (element =3D element[property])
+      if (element.nodeType =3D=3D 1)
+        elements.push(Element.extend(element));
+    return elements;
+  },
+
+  ancestors: function(element) {
+    return $(element).recursivelyCollect('parentNode');
+  },
+
+  descendants: function(element) {
+    return $(element).select("*");
+  },
+
+  firstDescendant: function(element) {
+    element =3D $(element).firstChild;
+    while (element && element.nodeType !=3D 1) element =3D element.nextSib=
ling;
+    return $(element);
+  },
+
+  immediateDescendants: function(element) {
+    if (!(element =3D $(element).firstChild)) return [];
+    while (element && element.nodeType !=3D 1) element =3D element.nextSib=
ling;
+    if (element) return [element].concat($(element).nextSiblings());
+    return [];
+  },
+
+  previousSiblings: function(element) {
+    return $(element).recursivelyCollect('previousSibling');
+  },
+
+  nextSiblings: function(element) {
+    return $(element).recursivelyCollect('nextSibling');
+  },
+
+  siblings: function(element) {
+    element =3D $(element);
+    return element.previousSiblings().reverse().concat(element.nextSibling=
s());
+  },
+
+  match: function(element, selector) {
+    if (Object.isString(selector))
+      selector =3D new Selector(selector);
+    return selector.match($(element));
+  },
+
+  up: function(element, expression, index) {
+    element =3D $(element);
+    if (arguments.length =3D=3D 1) return $(element.parentNode);
+    var ancestors =3D element.ancestors();
+    return Object.isNumber(expression) ? ancestors[expression] :
+      Selector.findElement(ancestors, expression, index);
+  },
+
+  down: function(element, expression, index) {
+    element =3D $(element);
+    if (arguments.length =3D=3D 1) return element.firstDescendant();
+    return Object.isNumber(expression) ? element.descendants()[expression]=
 :
+      element.select(expression)[index || 0];
+  },
+
+  previous: function(element, expression, index) {
+    element =3D $(element);
+    if (arguments.length =3D=3D 1) return $(Selector.handlers.previousElem=
entSibling(element));
+    var previousSiblings =3D element.previousSiblings();
+    return Object.isNumber(expression) ? previousSiblings[expression] :
+      Selector.findElement(previousSiblings, expression, index);
+  },
+
+  next: function(element, expression, index) {
+    element =3D $(element);
+    if (arguments.length =3D=3D 1) return $(Selector.handlers.nextElementS=
ibling(element));
+    var nextSiblings =3D element.nextSiblings();
+    return Object.isNumber(expression) ? nextSiblings[expression] :
+      Selector.findElement(nextSiblings, expression, index);
+  },
+
+  select: function() {
+    var args =3D $A(arguments), element =3D $(args.shift());
+    return Selector.findChildElements(element, args);
+  },
+
+  adjacent: function() {
+    var args =3D $A(arguments), element =3D $(args.shift());
+    return Selector.findChildElements(element.parentNode, args).without(el=
ement);
+  },
+
+  identify: function(element) {
+    element =3D $(element);
+    var id =3D element.readAttribute('id'), self =3D arguments.callee;
+    if (id) return id;
+    do { id =3D 'anonymous_element_' + self.counter++ } while ($(id));
+    element.writeAttribute('id', id);
+    return id;
+  },
+
+  readAttribute: function(element, name) {
+    element =3D $(element);
+    if (Prototype.Browser.IE) {
+      var t =3D Element._attributeTranslations.read;
+      if (t.values[name]) return t.values[name](element, name);
+      if (t.names[name]) name =3D t.names[name];
+      if (name.include(':')) {
+        return (!element.attributes || !element.attributes[name]) ? null :
+         element.attributes[name].value;
+      }
+    }
+    return element.getAttribute(name);
+  },
+
+  writeAttribute: function(element, name, value) {
+    element =3D $(element);
+    var attributes =3D { }, t =3D Element._attributeTranslations.write;
+
+    if (typeof name =3D=3D 'object') attributes =3D name;
+    else attributes[name] =3D Object.isUndefined(value) ? true : value;
+
+    for (var attr in attributes) {
+      name =3D t.names[attr] || attr;
+      value =3D attributes[attr];
+      if (t.values[attr]) name =3D t.values[attr](element, value);
+      if (value =3D=3D=3D false || value =3D=3D=3D null)
+        element.removeAttribute(name);
+      else if (value =3D=3D=3D true)
+        element.setAttribute(name, name);
+      else element.setAttribute(name, value);
+    }
+    return element;
+  },
+
+  getHeight: function(element) {
+    return $(element).getDimensions().height;
+  },
+
+  getWidth: function(element) {
+    return $(element).getDimensions().width;
+  },
+
+  classNames: function(element) {
+    return new Element.ClassNames(element);
+  },
+
+  hasClassName: function(element, className) {
+    if (!(element =3D $(element))) return;
+    var elementClassName =3D element.className;
+    return (elementClassName.length > 0 && (elementClassName =3D=3D classN=
ame ||
+      new RegExp("(^|\\s)" + className + "(\\s|$)").test(elementClassName)=
));
+  },
+
+  addClassName: function(element, className) {
+    if (!(element =3D $(element))) return;
+    if (!element.hasClassName(className))
+      element.className +=3D (element.className ? ' ' : '') + className;
+    return element;
+  },
+
+  removeClassName: function(element, className) {
+    if (!(element =3D $(element))) return;
+    element.className =3D element.className.replace(
+      new RegExp("(^|\\s+)" + className + "(\\s+|$)"), ' ').strip();
+    return element;
+  },
+
+  toggleClassName: function(element, className) {
+    if (!(element =3D $(element))) return;
+    return element[element.hasClassName(className) ?
+      'removeClassName' : 'addClassName'](className);
+  },
+
+  // removes whitespace-only text node children
+  cleanWhitespace: function(element) {
+    element =3D $(element);
+    var node =3D element.firstChild;
+    while (node) {
+      var nextNode =3D node.nextSibling;
+      if (node.nodeType =3D=3D 3 && !/\S/.test(node.nodeValue))
+        element.removeChild(node);
+      node =3D nextNode;
+    }
+    return element;
+  },
+
+  empty: function(element) {
+    return $(element).innerHTML.blank();
+  },
+
+  descendantOf: function(element, ancestor) {
+    element =3D $(element), ancestor =3D $(ancestor);
+    var originalAncestor =3D ancestor;
+
+    if (element.compareDocumentPosition)
+      return (element.compareDocumentPosition(ancestor) & 8) =3D=3D=3D 8;
+
+    if (element.sourceIndex && !Prototype.Browser.Opera) {
+      var e =3D element.sourceIndex, a =3D ancestor.sourceIndex,
+       nextAncestor =3D ancestor.nextSibling;
+      if (!nextAncestor) {
+        do { ancestor =3D ancestor.parentNode; }
+        while (!(nextAncestor =3D ancestor.nextSibling) && ancestor.parent=
Node);
+      }
+      if (nextAncestor && nextAncestor.sourceIndex)
+       return (e > a && e < nextAncestor.sourceIndex);
+    }
+
+    while (element =3D element.parentNode)
+      if (element =3D=3D originalAncestor) return true;
+    return false;
+  },
+
+  scrollTo: function(element) {
+    element =3D $(element);
+    var pos =3D element.cumulativeOffset();
+    window.scrollTo(pos[0], pos[1]);
+    return element;
+  },
+
+  getStyle: function(element, style) {
+    element =3D $(element);
+    style =3D style =3D=3D 'float' ? 'cssFloat' : style.camelize();
+    var value =3D element.style[style];
+    if (!value) {
+      var css =3D document.defaultView.getComputedStyle(element, null);
+      value =3D css ? css[style] : null;
+    }
+    if (style =3D=3D 'opacity') return value ? parseFloat(value) : 1.0;
+    return value =3D=3D 'auto' ? null : value;
+  },
+
+  getOpacity: function(element) {
+    return $(element).getStyle('opacity');
+  },
+
+  setStyle: function(element, styles) {
+    element =3D $(element);
+    var elementStyle =3D element.style, match;
+    if (Object.isString(styles)) {
+      element.style.cssText +=3D ';' + styles;
+      return styles.include('opacity') ?
+        element.setOpacity(styles.match(/opacity:\s*(\d?\.?\d*)/)[1]) : el=
ement;
+    }
+    for (var property in styles)
+      if (property =3D=3D 'opacity') element.setOpacity(styles[property]);
+      else
+        elementStyle[(property =3D=3D 'float' || property =3D=3D 'cssFloat=
') ?
+          (Object.isUndefined(elementStyle.styleFloat) ? 'cssFloat' : 'sty=
leFloat') :
+            property] =3D styles[property];
+
+    return element;
+  },
+
+  setOpacity: function(element, value) {
+    element =3D $(element);
+    element.style.opacity =3D (value =3D=3D 1 || value =3D=3D=3D '') ? '' :
+      (value < 0.00001) ? 0 : value;
+    return element;
+  },
+
+  getDimensions: function(element) {
+    element =3D $(element);
+    var display =3D $(element).getStyle('display');
+    if (display !=3D 'none' && display !=3D null) // Safari bug
+      return {width: element.offsetWidth, height: element.offsetHeight};
+
+    // All *Width and *Height properties give 0 on elements with display n=
one,
+    // so enable the element temporarily
+    var els =3D element.style;
+    var originalVisibility =3D els.visibility;
+    var originalPosition =3D els.position;
+    var originalDisplay =3D els.display;
+    els.visibility =3D 'hidden';
+    els.position =3D 'absolute';
+    els.display =3D 'block';
+    var originalWidth =3D element.clientWidth;
+    var originalHeight =3D element.clientHeight;
+    els.display =3D originalDisplay;
+    els.position =3D originalPosition;
+    els.visibility =3D originalVisibility;
+    return {width: originalWidth, height: originalHeight};
+  },
+
+  makePositioned: function(element) {
+    element =3D $(element);
+    var pos =3D Element.getStyle(element, 'position');
+    if (pos =3D=3D 'static' || !pos) {
+      element._madePositioned =3D true;
+      element.style.position =3D 'relative';
+      // Opera returns the offset relative to the positioning context, whe=
n an
+      // element is position relative but top and left have not been defin=
ed
+      if (window.opera) {
+        element.style.top =3D 0;
+        element.style.left =3D 0;
+      }
+    }
+    return element;
+  },
+
+  undoPositioned: function(element) {
+    element =3D $(element);
+    if (element._madePositioned) {
+      element._madePositioned =3D undefined;
+      element.style.position =3D
+        element.style.top =3D
+        element.style.left =3D
+        element.style.bottom =3D
+        element.style.right =3D '';
+    }
+    return element;
+  },
+
+  makeClipping: function(element) {
+    element =3D $(element);
+    if (element._overflow) return element;
+    element._overflow =3D Element.getStyle(element, 'overflow') || 'auto';
+    if (element._overflow !=3D=3D 'hidden')
+      element.style.overflow =3D 'hidden';
+    return element;
+  },
+
+  undoClipping: function(element) {
+    element =3D $(element);
+    if (!element._overflow) return element;
+    element.style.overflow =3D element._overflow =3D=3D 'auto' ? '' : elem=
ent._overflow;
+    element._overflow =3D null;
+    return element;
+  },
+
+  cumulativeOffset: function(element) {
+    var valueT =3D 0, valueL =3D 0;
+    do {
+      valueT +=3D element.offsetTop  || 0;
+      valueL +=3D element.offsetLeft || 0;
+      element =3D element.offsetParent;
+    } while (element);
+    return Element._returnOffset(valueL, valueT);
+  },
+
+  positionedOffset: function(element) {
+    var valueT =3D 0, valueL =3D 0;
+    do {
+      valueT +=3D element.offsetTop  || 0;
+      valueL +=3D element.offsetLeft || 0;
+      element =3D element.offsetParent;
+      if (element) {
+        if (element.tagName =3D=3D 'BODY') break;
+        var p =3D Element.getStyle(element, 'position');
+        if (p !=3D=3D 'static') break;
+      }
+    } while (element);
+    return Element._returnOffset(valueL, valueT);
+  },
+
+  absolutize: function(element) {
+    element =3D $(element);
+    if (element.getStyle('position') =3D=3D 'absolute') return;
+    // Position.prepare(); // To be done manually by Scripty when it needs=
 it.
+
+    var offsets =3D element.positionedOffset();
+    var top     =3D offsets[1];
+    var left    =3D offsets[0];
+    var width   =3D element.clientWidth;
+    var height  =3D element.clientHeight;
+
+    element._originalLeft   =3D left - parseFloat(element.style.left  || 0=
);
+    element._originalTop    =3D top  - parseFloat(element.style.top || 0);
+    element._originalWidth  =3D element.style.width;
+    element._originalHeight =3D element.style.height;
+
+    element.style.position =3D 'absolute';
+    element.style.top    =3D top + 'px';
+    element.style.left   =3D left + 'px';
+    element.style.width  =3D width + 'px';
+    element.style.height =3D height + 'px';
+    return element;
+  },
+
+  relativize: function(element) {
+    element =3D $(element);
+    if (element.getStyle('position') =3D=3D 'relative') return;
+    // Position.prepare(); // To be done manually by Scripty when it needs=
 it.
+
+    element.style.position =3D 'relative';
+    var top  =3D parseFloat(element.style.top  || 0) - (element._originalT=
op || 0);
+    var left =3D parseFloat(element.style.left || 0) - (element._originalL=
eft || 0);
+
+    element.style.top    =3D top + 'px';
+    element.style.left   =3D left + 'px';
+    element.style.height =3D element._originalHeight;
+    element.style.width  =3D element._originalWidth;
+    return element;
+  },
+
+  cumulativeScrollOffset: function(element) {
+    var valueT =3D 0, valueL =3D 0;
+    do {
+      valueT +=3D element.scrollTop  || 0;
+      valueL +=3D element.scrollLeft || 0;
+      element =3D element.parentNode;
+    } while (element);
+    return Element._returnOffset(valueL, valueT);
+  },
+
+  getOffsetParent: function(element) {
+    if (element.offsetParent) return $(element.offsetParent);
+    if (element =3D=3D document.body) return $(element);
+
+    while ((element =3D element.parentNode) && element !=3D document.body)
+      if (Element.getStyle(element, 'position') !=3D 'static')
+        return $(element);
+
+    return $(document.body);
+  },
+
+  viewportOffset: function(forElement) {
+    var valueT =3D 0, valueL =3D 0;
+
+    var element =3D forElement;
+    do {
+      valueT +=3D element.offsetTop  || 0;
+      valueL +=3D element.offsetLeft || 0;
+
+      // Safari fix
+      if (element.offsetParent =3D=3D document.body &&
+        Element.getStyle(element, 'position') =3D=3D 'absolute') break;
+
+    } while (element =3D element.offsetParent);
+
+    element =3D forElement;
+    do {
+      if (!Prototype.Browser.Opera || element.tagName =3D=3D 'BODY') {
+        valueT -=3D element.scrollTop  || 0;
+        valueL -=3D element.scrollLeft || 0;
+      }
+    } while (element =3D element.parentNode);
+
+    return Element._returnOffset(valueL, valueT);
+  },
+
+  clonePosition: function(element, source) {
+    var options =3D Object.extend({
+      setLeft:    true,
+      setTop:     true,
+      setWidth:   true,
+      setHeight:  true,
+      offsetTop:  0,
+      offsetLeft: 0
+    }, arguments[2] || { });
+
+    // find page position of source
+    source =3D $(source);
+    var p =3D source.viewportOffset();
+
+    // find coordinate system to use
+    element =3D $(element);
+    var delta =3D [0, 0];
+    var parent =3D null;
+    // delta [0,0] will do fine with position: fixed elements,
+    // position:absolute needs offsetParent deltas
+    if (Element.getStyle(element, 'position') =3D=3D 'absolute') {
+      parent =3D element.getOffsetParent();
+      delta =3D parent.viewportOffset();
+    }
+
+    // correct by body offsets (fixes Safari)
+    if (parent =3D=3D document.body) {
+      delta[0] -=3D document.body.offsetLeft;
+      delta[1] -=3D document.body.offsetTop;
+    }
+
+    // set position
+    if (options.setLeft)   element.style.left  =3D (p[0] - delta[0] + opti=
ons.offsetLeft) + 'px';
+    if (options.setTop)    element.style.top   =3D (p[1] - delta[1] + opti=
ons.offsetTop) + 'px';
+    if (options.setWidth)  element.style.width =3D source.offsetWidth + 'p=
x';
+    if (options.setHeight) element.style.height =3D source.offsetHeight + =
'px';
+    return element;
+  }
+};
+
+Element.Methods.identify.counter =3D 1;
+
+Object.extend(Element.Methods, {
+  getElementsBySelector: Element.Methods.select,
+  childElements: Element.Methods.immediateDescendants
+});
+
+Element._attributeTranslations =3D {
+  write: {
+    names: {
+      className: 'class',
+      htmlFor:   'for'
+    },
+    values: { }
+  }
+};
+
+if (Prototype.Browser.Opera) {
+  Element.Methods.getStyle =3D Element.Methods.getStyle.wrap(
+    function(proceed, element, style) {
+      switch (style) {
+        case 'left': case 'top': case 'right': case 'bottom':
+          if (proceed(element, 'position') =3D=3D=3D 'static') return null;
+        case 'height': case 'width':
+          // returns '0px' for hidden elements; we want it to return null
+          if (!Element.visible(element)) return null;
+
+          // returns the border-box dimensions rather than the content-box
+          // dimensions, so we subtract padding and borders from the value
+          var dim =3D parseInt(proceed(element, style), 10);
+
+          if (dim !=3D=3D element['offset' + style.capitalize()])
+            return dim + 'px';
+
+          var properties;
+          if (style =3D=3D=3D 'height') {
+            properties =3D ['border-top-width', 'padding-top',
+             'padding-bottom', 'border-bottom-width'];
+          }
+          else {
+            properties =3D ['border-left-width', 'padding-left',
+             'padding-right', 'border-right-width'];
+          }
+          return properties.inject(dim, function(memo, property) {
+            var val =3D proceed(element, property);
+            return val =3D=3D=3D null ? memo : memo - parseInt(val, 10);
+          }) + 'px';
+        default: return proceed(element, style);
+      }
+    }
+  );
+
+  Element.Methods.readAttribute =3D Element.Methods.readAttribute.wrap(
+    function(proceed, element, attribute) {
+      if (attribute =3D=3D=3D 'title') return element.title;
+      return proceed(element, attribute);
+    }
+  );
+}
+
+else if (Prototype.Browser.IE) {
+  // IE doesn't report offsets correctly for static elements, so we change=
 them
+  // to "relative" to get the values, then change them back.
+  Element.Methods.getOffsetParent =3D Element.Methods.getOffsetParent.wrap(
+    function(proceed, element) {
+      element =3D $(element);
+      var position =3D element.getStyle('position');
+      if (position !=3D=3D 'static') return proceed(element);
+      element.setStyle({ position: 'relative' });
+      var value =3D proceed(element);
+      element.setStyle({ position: position });
+      return value;
+    }
+  );
+
+  $w('positionedOffset viewportOffset').each(function(method) {
+    Element.Methods[method] =3D Element.Methods[method].wrap(
+      function(proceed, element) {
+        element =3D $(element);
+        var position =3D element.getStyle('position');
+        if (position !=3D=3D 'static') return proceed(element);
+        // Trigger hasLayout on the offset parent so that IE6 reports
+        // accurate offsetTop and offsetLeft values for position: fixed.
+        var offsetParent =3D element.getOffsetParent();
+        if (offsetParent && offsetParent.getStyle('position') =3D=3D=3D 'f=
ixed')
+          offsetParent.setStyle({ zoom: 1 });
+        element.setStyle({ position: 'relative' });
+        var value =3D proceed(element);
+        element.setStyle({ position: position });
+        return value;
+      }
+    );
+  });
+
+  Element.Methods.getStyle =3D function(element, style) {
+    element =3D $(element);
+    style =3D (style =3D=3D 'float' || style =3D=3D 'cssFloat') ? 'styleFl=
oat' : style.camelize();
+    var value =3D element.style[style];
+    if (!value && element.currentStyle) value =3D element.currentStyle[sty=
le];
+
+    if (style =3D=3D 'opacity') {
+      if (value =3D (element.getStyle('filter') || '').match(/alpha\(opaci=
ty=3D(.*)\)/))
+        if (value[1]) return parseFloat(value[1]) / 100;
+      return 1.0;
+    }
+
+    if (value =3D=3D 'auto') {
+      if ((style =3D=3D 'width' || style =3D=3D 'height') && (element.getS=
tyle('display') !=3D 'none'))
+        return element['offset' + style.capitalize()] + 'px';
+      return null;
+    }
+    return value;
+  };
+
+  Element.Methods.setOpacity =3D function(element, value) {
+    function stripAlpha(filter){
+      return filter.replace(/alpha\([^\)]*\)/gi,'');
+    }
+    element =3D $(element);
+    var currentStyle =3D element.currentStyle;
+    if ((currentStyle && !currentStyle.hasLayout) ||
+      (!currentStyle && element.style.zoom =3D=3D 'normal'))
+        element.style.zoom =3D 1;
+
+    var filter =3D element.getStyle('filter'), style =3D element.style;
+    if (value =3D=3D 1 || value =3D=3D=3D '') {
+      (filter =3D stripAlpha(filter)) ?
+        style.filter =3D filter : style.removeAttribute('filter');
+      return element;
+    } else if (value < 0.00001) value =3D 0;
+    style.filter =3D stripAlpha(filter) +
+      'alpha(opacity=3D' + (value * 100) + ')';
+    return element;
+  };
+
+  Element._attributeTranslations =3D {
+    read: {
+      names: {
+        'class': 'className',
+        'for':   'htmlFor'
+      },
+      values: {
+        _getAttr: function(element, attribute) {
+          return element.getAttribute(attribute, 2);
+        },
+        _getAttrNode: function(element, attribute) {
+          var node =3D element.getAttributeNode(attribute);
+          return node ? node.value : "";
+        },
+        _getEv: function(element, attribute) {
+          attribute =3D element.getAttribute(attribute);
+          return attribute ? attribute.toString().slice(23, -2) : null;
+        },
+        _flag: function(element, attribute) {
+          return $(element).hasAttribute(attribute) ? attribute : null;
+        },
+        style: function(element) {
+          return element.style.cssText.toLowerCase();
+        },
+        title: function(element) {
+          return element.title;
+        }
+      }
+    }
+  };
+
+  Element._attributeTranslations.write =3D {
+    names: Object.extend({
+      cellpadding: 'cellPadding',
+      cellspacing: 'cellSpacing'
+    }, Element._attributeTranslations.read.names),
+    values: {
+      checked: function(element, value) {
+        element.checked =3D !!value;
+      },
+
+      style: function(element, value) {
+        element.style.cssText =3D value ? value : '';
+      }
+    }
+  };
+
+  Element._attributeTranslations.has =3D {};
+
+  $w('colSpan rowSpan vAlign dateTime accessKey tabIndex ' +
+      'encType maxLength readOnly longDesc').each(function(attr) {
+    Element._attributeTranslations.write.names[attr.toLowerCase()] =3D att=
r;
+    Element._attributeTranslations.has[attr.toLowerCase()] =3D attr;
+  });
+
+  (function(v) {
+    Object.extend(v, {
+      href:        v._getAttr,
+      src:         v._getAttr,
+      type:        v._getAttr,
+      action:      v._getAttrNode,
+      disabled:    v._flag,
+      checked:     v._flag,
+      readonly:    v._flag,
+      multiple:    v._flag,
+      onload:      v._getEv,
+      onunload:    v._getEv,
+      onclick:     v._getEv,
+      ondblclick:  v._getEv,
+      onmousedown: v._getEv,
+      onmouseup:   v._getEv,
+      onmouseover: v._getEv,
+      onmousemove: v._getEv,
+      onmouseout:  v._getEv,
+      onfocus:     v._getEv,
+      onblur:      v._getEv,
+      onkeypress:  v._getEv,
+      onkeydown:   v._getEv,
+      onkeyup:     v._getEv,
+      onsubmit:    v._getEv,
+      onreset:     v._getEv,
+      onselect:    v._getEv,
+      onchange:    v._getEv
+    });
+  })(Element._attributeTranslations.read.values);
+}
+
+else if (Prototype.Browser.Gecko && /rv:1\.8\.0/.test(navigator.userAgent)=
) {
+  Element.Methods.setOpacity =3D function(element, value) {
+    element =3D $(element);
+    element.style.opacity =3D (value =3D=3D 1) ? 0.999999 :
+      (value =3D=3D=3D '') ? '' : (value < 0.00001) ? 0 : value;
+    return element;
+  };
+}
+
+else if (Prototype.Browser.WebKit) {
+  Element.Methods.setOpacity =3D function(element, value) {
+    element =3D $(element);
+    element.style.opacity =3D (value =3D=3D 1 || value =3D=3D=3D '') ? '' :
+      (value < 0.00001) ? 0 : value;
+
+    if (value =3D=3D 1)
+      if(element.tagName =3D=3D 'IMG' && element.width) {
+        element.width++; element.width--;
+      } else try {
+        var n =3D document.createTextNode(' ');
+        element.appendChild(n);
+        element.removeChild(n);
+      } catch (e) { }
+
+    return element;
+  };
+
+  // Safari returns margins on body which is incorrect if the child is abs=
olutely
+  // positioned.  For performance reasons, redefine Element#cumulativeOffs=
et for
+  // KHTML/WebKit only.
+  Element.Methods.cumulativeOffset =3D function(element) {
+    var valueT =3D 0, valueL =3D 0;
+    do {
+      valueT +=3D element.offsetTop  || 0;
+      valueL +=3D element.offsetLeft || 0;
+      if (element.offsetParent =3D=3D document.body)
+        if (Element.getStyle(element, 'position') =3D=3D 'absolute') break;
+
+      element =3D element.offsetParent;
+    } while (element);
+
+    return Element._returnOffset(valueL, valueT);
+  };
+}
+
+if (Prototype.Browser.IE || Prototype.Browser.Opera) {
+  // IE and Opera are missing .innerHTML support for TABLE-related and SEL=
ECT elements
+  Element.Methods.update =3D function(element, content) {
+    element =3D $(element);
+
+    if (content && content.toElement) content =3D content.toElement();
+    if (Object.isElement(content)) return element.update().insert(content);
+
+    content =3D Object.toHTML(content);
+    var tagName =3D element.tagName.toUpperCase();
+
+    if (tagName in Element._insertionTranslations.tags) {
+      $A(element.childNodes).each(function(node) { element.removeChild(nod=
e) });
+      Element._getContentFromAnonymousElement(tagName, content.stripScript=
s())
+        .each(function(node) { element.appendChild(node) });
+    }
+    else element.innerHTML =3D content.stripScripts();
+
+    content.evalScripts.bind(content).defer();
+    return element;
+  };
+}
+
+if ('outerHTML' in document.createElement('div')) {
+  Element.Methods.replace =3D function(element, content) {
+    element =3D $(element);
+
+    if (content && content.toElement) content =3D content.toElement();
+    if (Object.isElement(content)) {
+      element.parentNode.replaceChild(content, element);
+      return element;
+    }
+
+    content =3D Object.toHTML(content);
+    var parent =3D element.parentNode, tagName =3D parent.tagName.toUpperC=
ase();
+
+    if (Element._insertionTranslations.tags[tagName]) {
+      var nextSibling =3D element.next();
+      var fragments =3D Element._getContentFromAnonymousElement(tagName, c=
ontent.stripScripts());
+      parent.removeChild(element);
+      if (nextSibling)
+        fragments.each(function(node) { parent.insertBefore(node, nextSibl=
ing) });
+      else
+        fragments.each(function(node) { parent.appendChild(node) });
+    }
+    else element.outerHTML =3D content.stripScripts();
+
+    content.evalScripts.bind(content).defer();
+    return element;
+  };
+}
+
+Element._returnOffset =3D function(l, t) {
+  var result =3D [l, t];
+  result.left =3D l;
+  result.top =3D t;
+  return result;
+};
+
+Element._getContentFromAnonymousElement =3D function(tagName, html) {
+  var div =3D new Element('div'), t =3D Element._insertionTranslations.tag=
s[tagName];
+  if (t) {
+    div.innerHTML =3D t[0] + html + t[1];
+    t[2].times(function() { div =3D div.firstChild });
+  } else div.innerHTML =3D html;
+  return $A(div.childNodes);
+};
+
+Element._insertionTranslations =3D {
+  before: function(element, node) {
+    element.parentNode.insertBefore(node, element);
+  },
+  top: function(element, node) {
+    element.insertBefore(node, element.firstChild);
+  },
+  bottom: function(element, node) {
+    element.appendChild(node);
+  },
+  after: function(element, node) {
+    element.parentNode.insertBefore(node, element.nextSibling);
+  },
+  tags: {
+    TABLE:  ['',                '',                   1],
+    TBODY:  ['',         '',           2],
+    TR:     ['',     '',      3],
+    TD:     ['', '', 4],
+    SELECT: ['',                  1]
+  }
+};
+
+(function() {
+  Object.extend(this.tags, {
+    THEAD: this.tags.TBODY,
+    TFOOT: this.tags.TBODY,
+    TH:    this.tags.TD
+  });
+}).call(Element._insertionTranslations);
+
+Element.Methods.Simulated =3D {
+  hasAttribute: function(element, attribute) {
+    attribute =3D Element._attributeTranslations.has[attribute] || attribu=
te;
+    var node =3D $(element).getAttributeNode(attribute);
+    return node && node.specified;
+  }
+};
+
+Element.Methods.ByTag =3D { };
+
+Object.extend(Element, Element.Methods);
+
+if (!Prototype.BrowserFeatures.ElementExtensions &&
+    document.createElement('div').__proto__) {
+  window.HTMLElement =3D { };
+  window.HTMLElement.prototype =3D document.createElement('div').__proto__;
+  Prototype.BrowserFeatures.ElementExtensions =3D true;
+}
+
+Element.extend =3D (function() {
+  if (Prototype.BrowserFeatures.SpecificElementExtensions)
+    return Prototype.K;
+
+  var Methods =3D { }, ByTag =3D Element.Methods.ByTag;
+
+  var extend =3D Object.extend(function(element) {
+    if (!element || element._extendedByPrototype ||
+        element.nodeType !=3D 1 || element =3D=3D window) return element;
+
+    var methods =3D Object.clone(Methods),
+      tagName =3D element.tagName, property, value;
+
+    // extend methods for specific tags
+    if (ByTag[tagName]) Object.extend(methods, ByTag[tagName]);
+
+    for (property in methods) {
+      value =3D methods[property];
+      if (Object.isFunction(value) && !(property in element))
+        element[property] =3D value.methodize();
+    }
+
+    element._extendedByPrototype =3D Prototype.emptyFunction;
+    return element;
+
+  }, {
+    refresh: function() {
+      // extend methods for all tags (Safari doesn't need this)
+      if (!Prototype.BrowserFeatures.ElementExtensions) {
+        Object.extend(Methods, Element.Methods);
+        Object.extend(Methods, Element.Methods.Simulated);
+      }
+    }
+  });
+
+  extend.refresh();
+  return extend;
+})();
+
+Element.hasAttribute =3D function(element, attribute) {
+  if (element.hasAttribute) return element.hasAttribute(attribute);
+  return Element.Methods.Simulated.hasAttribute(element, attribute);
+};
+
+Element.addMethods =3D function(methods) {
+  var F =3D Prototype.BrowserFeatures, T =3D Element.Methods.ByTag;
+
+  if (!methods) {
+    Object.extend(Form, Form.Methods);
+    Object.extend(Form.Element, Form.Element.Methods);
+    Object.extend(Element.Methods.ByTag, {
+      "FORM":     Object.clone(Form.Methods),
+      "INPUT":    Object.clone(Form.Element.Methods),
+      "SELECT":   Object.clone(Form.Element.Methods),
+      "TEXTAREA": Object.clone(Form.Element.Methods)
+    });
+  }
+
+  if (arguments.length =3D=3D 2) {
+    var tagName =3D methods;
+    methods =3D arguments[1];
+  }
+
+  if (!tagName) Object.extend(Element.Methods, methods || { });
+  else {
+    if (Object.isArray(tagName)) tagName.each(extend);
+    else extend(tagName);
+  }
+
+  function extend(tagName) {
+    tagName =3D tagName.toUpperCase();
+    if (!Element.Methods.ByTag[tagName])
+      Element.Methods.ByTag[tagName] =3D { };
+    Object.extend(Element.Methods.ByTag[tagName], methods);
+  }
+
+  function copy(methods, destination, onlyIfAbsent) {
+    onlyIfAbsent =3D onlyIfAbsent || false;
+    for (var property in methods) {
+      var value =3D methods[property];
+      if (!Object.isFunction(value)) continue;
+      if (!onlyIfAbsent || !(property in destination))
+        destination[property] =3D value.methodize();
+    }
+  }
+
+  function findDOMClass(tagName) {
+    var klass;
+    var trans =3D {
+      "OPTGROUP": "OptGroup", "TEXTAREA": "TextArea", "P": "Paragraph",
+      "FIELDSET": "FieldSet", "UL": "UList", "OL": "OList", "DL": "DList",
+      "DIR": "Directory", "H1": "Heading", "H2": "Heading", "H3": "Heading=
",
+      "H4": "Heading", "H5": "Heading", "H6": "Heading", "Q": "Quote",
+      "INS": "Mod", "DEL": "Mod", "A": "Anchor", "IMG": "Image", "CAPTION":
+      "TableCaption", "COL": "TableCol", "COLGROUP": "TableCol", "THEAD":
+      "TableSection", "TFOOT": "TableSection", "TBODY": "TableSection", "T=
R":
+      "TableRow", "TH": "TableCell", "TD": "TableCell", "FRAMESET":
+      "FrameSet", "IFRAME": "IFrame"
+    };
+    if (trans[tagName]) klass =3D 'HTML' + trans[tagName] + 'Element';
+    if (window[klass]) return window[klass];
+    klass =3D 'HTML' + tagName + 'Element';
+    if (window[klass]) return window[klass];
+    klass =3D 'HTML' + tagName.capitalize() + 'Element';
+    if (window[klass]) return window[klass];
+
+    window[klass] =3D { };
+    window[klass].prototype =3D document.createElement(tagName).__proto__;
+    return window[klass];
+  }
+
+  if (F.ElementExtensions) {
+    copy(Element.Methods, HTMLElement.prototype);
+    copy(Element.Methods.Simulated, HTMLElement.prototype, true);
+  }
+
+  if (F.SpecificElementExtensions) {
+    for (var tag in Element.Methods.ByTag) {
+      var klass =3D findDOMClass(tag);
+      if (Object.isUndefined(klass)) continue;
+      copy(T[tag], klass.prototype);
+    }
+  }
+
+  Object.extend(Element, Element.Methods);
+  delete Element.ByTag;
+
+  if (Element.extend.refresh) Element.extend.refresh();
+  Element.cache =3D { };
+};
+
+document.viewport =3D {
+  getDimensions: function() {
+    var dimensions =3D { };
+    var B =3D Prototype.Browser;
+    $w('width height').each(function(d) {
+      var D =3D d.capitalize();
+      dimensions[d] =3D (B.WebKit && !document.evaluate) ? self['inner' + =
D] :
+        (B.Opera) ? document.body['client' + D] : document.documentElement=
['client' + D];
+    });
+    return dimensions;
+  },
+
+  getWidth: function() {
+    return this.getDimensions().width;
+  },
+
+  getHeight: function() {
+    return this.getDimensions().height;
+  },
+
+  getScrollOffsets: function() {
+    return Element._returnOffset(
+      window.pageXOffset || document.documentElement.scrollLeft || documen=
t.body.scrollLeft,
+      window.pageYOffset || document.documentElement.scrollTop || document=
.body.scrollTop);
+  }
+};
+/* Portions of the Selector class are derived from Jack Slocum=EF=BF=BD=DB=
=AAs DomQuery,
+ * part of YUI-Ext version 0.40, distributed under the terms of an MIT-sty=
le
+ * license.  Please see http://www.yui-ext.com/ for more information. */
+
+var Selector =3D Class.create({
+  initialize: function(expression) {
+    this.expression =3D expression.strip();
+    this.compileMatcher();
+  },
+
+  shouldUseXPath: function() {
+    if (!Prototype.BrowserFeatures.XPath) return false;
+
+    var e =3D this.expression;
+
+    // Safari 3 chokes on :*-of-type and :empty
+    if (Prototype.Browser.WebKit &&
+     (e.include("-of-type") || e.include(":empty")))
+      return false;
+
+    // XPath can't do namespaced attributes, nor can it read
+    // the "checked" property from DOM nodes
+    if ((/(\[[\w-]*?:|:checked)/).test(this.expression))
+      return false;
+
+    return true;
+  },
+
+  compileMatcher: function() {
+    if (this.shouldUseXPath())
+      return this.compileXPathMatcher();
+
+    var e =3D this.expression, ps =3D Selector.patterns, h =3D Selector.ha=
ndlers,
+        c =3D Selector.criteria, le, p, m;
+
+    if (Selector._cache[e]) {
+      this.matcher =3D Selector._cache[e];
+      return;
+    }
+
+    this.matcher =3D ["this.matcher =3D function(root) {",
+                    "var r =3D root, h =3D Selector.handlers, c =3D false,=
 n;"];
+
+    while (e && le !=3D e && (/\S/).test(e)) {
+      le =3D e;
+      for (var i in ps) {
+        p =3D ps[i];
+        if (m =3D e.match(p)) {
+          this.matcher.push(Object.isFunction(c[i]) ? c[i](m) :
+    	      new Template(c[i]).evaluate(m));
+          e =3D e.replace(m[0], '');
+          break;
+        }
+      }
+    }
+
+    this.matcher.push("return h.unique(n);\n}");
+    eval(this.matcher.join('\n'));
+    Selector._cache[this.expression] =3D this.matcher;
+  },
+
+  compileXPathMatcher: function() {
+    var e =3D this.expression, ps =3D Selector.patterns,
+        x =3D Selector.xpath, le, m;
+
+    if (Selector._cache[e]) {
+      this.xpath =3D Selector._cache[e]; return;
+    }
+
+    this.matcher =3D ['.//*'];
+    while (e && le !=3D e && (/\S/).test(e)) {
+      le =3D e;
+      for (var i in ps) {
+        if (m =3D e.match(ps[i])) {
+          this.matcher.push(Object.isFunction(x[i]) ? x[i](m) :
+            new Template(x[i]).evaluate(m));
+          e =3D e.replace(m[0], '');
+          break;
+        }
+      }
+    }
+
+    this.xpath =3D this.matcher.join('');
+    Selector._cache[this.expression] =3D this.xpath;
+  },
+
+  findElements: function(root) {
+    root =3D root || document;
+    if (this.xpath) return document._getElementsByXPath(this.xpath, root);
+    return this.matcher(root);
+  },
+
+  match: function(element) {
+    this.tokens =3D [];
+
+    var e =3D this.expression, ps =3D Selector.patterns, as =3D Selector.a=
ssertions;
+    var le, p, m;
+
+    while (e && le !=3D=3D e && (/\S/).test(e)) {
+      le =3D e;
+      for (var i in ps) {
+        p =3D ps[i];
+        if (m =3D e.match(p)) {
+          // use the Selector.assertions methods unless the selector
+          // is too complex.
+          if (as[i]) {
+            this.tokens.push([i, Object.clone(m)]);
+            e =3D e.replace(m[0], '');
+          } else {
+            // reluctantly do a document-wide search
+            // and look for a match in the array
+            return this.findElements(document).include(element);
+          }
+        }
+      }
+    }
+
+    var match =3D true, name, matches;
+    for (var i =3D 0, token; token =3D this.tokens[i]; i++) {
+      name =3D token[0], matches =3D token[1];
+      if (!Selector.assertions[name](element, matches)) {
+        match =3D false; break;
+      }
+    }
+
+    return match;
+  },
+
+  toString: function() {
+    return this.expression;
+  },
+
+  inspect: function() {
+    return "#";
+  }
+});
+
+Object.extend(Selector, {
+  _cache: { },
+
+  xpath: {
+    descendant:   "//*",
+    child:        "/*",
+    adjacent:     "/following-sibling::*[1]",
+    laterSibling: '/following-sibling::*',
+    tagName:      function(m) {
+      if (m[1] =3D=3D '*') return '';
+      return "[local-name()=3D'" + m[1].toLowerCase() +
+             "' or local-name()=3D'" + m[1].toUpperCase() + "']";
+    },
+    className:    "[contains(concat(' ', @class, ' '), ' #{1} ')]",
+    id:           "[@id=3D'#{1}']",
+    attrPresence: function(m) {
+      m[1] =3D m[1].toLowerCase();
+      return new Template("[@#{1}]").evaluate(m);
+    },
+    attr: function(m) {
+      m[1] =3D m[1].toLowerCase();
+      m[3] =3D m[5] || m[6];
+      return new Template(Selector.xpath.operators[m[2]]).evaluate(m);
+    },
+    pseudo: function(m) {
+      var h =3D Selector.xpath.pseudos[m[1]];
+      if (!h) return '';
+      if (Object.isFunction(h)) return h(m);
+      return new Template(Selector.xpath.pseudos[m[1]]).evaluate(m);
+    },
+    operators: {
+      '=3D':  "[@#{1}=3D'#{3}']",
+      '!=3D': "[@#{1}!=3D'#{3}']",
+      '^=3D': "[starts-with(@#{1}, '#{3}')]",
+      '$=3D': "[substring(@#{1}, (string-length(@#{1}) - string-length('#{=
3}') + 1))=3D'#{3}']",
+      '*=3D': "[contains(@#{1}, '#{3}')]",
+      '~=3D': "[contains(concat(' ', @#{1}, ' '), ' #{3} ')]",
+      '|=3D': "[contains(concat('-', @#{1}, '-'), '-#{3}-')]"
+    },
+    pseudos: {
+      'first-child': '[not(preceding-sibling::*)]',
+      'last-child':  '[not(following-sibling::*)]',
+      'only-child':  '[not(preceding-sibling::* or following-sibling::*)]',
+      'empty':       "[count(*) =3D 0 and (count(text()) =3D 0 or translat=
e(text(), ' \t\r\n', '') =3D '')]",
+      'checked':     "[@checked]",
+      'disabled':    "[@disabled]",
+      'enabled':     "[not(@disabled)]",
+      'not': function(m) {
+        var e =3D m[6], p =3D Selector.patterns,
+            x =3D Selector.xpath, le, v;
+
+        var exclusion =3D [];
+        while (e && le !=3D e && (/\S/).test(e)) {
+          le =3D e;
+          for (var i in p) {
+            if (m =3D e.match(p[i])) {
+              v =3D Object.isFunction(x[i]) ? x[i](m) : new Template(x[i])=
.evaluate(m);
+              exclusion.push("(" + v.substring(1, v.length - 1) + ")");
+              e =3D e.replace(m[0], '');
+              break;
+            }
+          }
+        }
+        return "[not(" + exclusion.join(" and ") + ")]";
+      },
+      'nth-child':      function(m) {
+        return Selector.xpath.pseudos.nth("(count(./preceding-sibling::*) =
+ 1) ", m);
+      },
+      'nth-last-child': function(m) {
+        return Selector.xpath.pseudos.nth("(count(./following-sibling::*) =
+ 1) ", m);
+      },
+      'nth-of-type':    function(m) {
+        return Selector.xpath.pseudos.nth("position() ", m);
+      },
+      'nth-last-of-type': function(m) {
+        return Selector.xpath.pseudos.nth("(last() + 1 - position()) ", m);
+      },
+      'first-of-type':  function(m) {
+        m[6] =3D "1"; return Selector.xpath.pseudos['nth-of-type'](m);
+      },
+      'last-of-type':   function(m) {
+        m[6] =3D "1"; return Selector.xpath.pseudos['nth-last-of-type'](m);
+      },
+      'only-of-type':   function(m) {
+        var p =3D Selector.xpath.pseudos; return p['first-of-type'](m) + p=
['last-of-type'](m);
+      },
+      nth: function(fragment, m) {
+        var mm, formula =3D m[6], predicate;
+        if (formula =3D=3D 'even') formula =3D '2n+0';
+        if (formula =3D=3D 'odd')  formula =3D '2n+1';
+        if (mm =3D formula.match(/^(\d+)$/)) // digit only
+          return '[' + fragment + "=3D " + mm[1] + ']';
+        if (mm =3D formula.match(/^(-?\d*)?n(([+-])(\d+))?/)) { // an+b
+          if (mm[1] =3D=3D "-") mm[1] =3D -1;
+          var a =3D mm[1] ? Number(mm[1]) : 1;
+          var b =3D mm[2] ? Number(mm[2]) : 0;
+          predicate =3D "[((#{fragment} - #{b}) mod #{a} =3D 0) and " +
+          "((#{fragment} - #{b}) div #{a} >=3D 0)]";
+          return new Template(predicate).evaluate({
+            fragment: fragment, a: a, b: b });
+        }
+      }
+    }
+  },
+
+  criteria: {
+    tagName:      'n =3D h.tagName(n, r, "#{1}", c);      c =3D false;',
+    className:    'n =3D h.className(n, r, "#{1}", c);    c =3D false;',
+    id:           'n =3D h.id(n, r, "#{1}", c);           c =3D false;',
+    attrPresence: 'n =3D h.attrPresence(n, r, "#{1}", c); c =3D false;',
+    attr: function(m) {
+      m[3] =3D (m[5] || m[6]);
+      return new Template('n =3D h.attr(n, r, "#{1}", "#{3}", "#{2}", c); =
c =3D false;').evaluate(m);
+    },
+    pseudo: function(m) {
+      if (m[6]) m[6] =3D m[6].replace(/"/g, '\\"');
+      return new Template('n =3D h.pseudo(n, "#{1}", "#{6}", r, c); c =3D =
false;').evaluate(m);
+    },
+    descendant:   'c =3D "descendant";',
+    child:        'c =3D "child";',
+    adjacent:     'c =3D "adjacent";',
+    laterSibling: 'c =3D "laterSibling";'
+  },
+
+  patterns: {
+    // combinators must be listed first
+    // (and descendant needs to be last combinator)
+    laterSibling: /^\s*~\s*/,
+    child:        /^\s*>\s*/,
+    adjacent:     /^\s*\+\s*/,
+    descendant:   /^\s/,
+
+    // selectors follow
+    tagName:      /^\s*(\*|[\w\-]+)(\b|$)?/,
+    id:           /^#([\w\-\*]+)(\b|$)/,
+    className:    /^\.([\w\-\*]+)(\b|$)/,
+    pseudo:
+/^:((first|last|nth|nth-last|only)(-child|-of-type)|empty|checked|(en|dis)=
abled|not)(\((.*?)\))?(\b|$|(?=3D\s|[:+~>]))/,
+    attrPresence: /^\[([\w]+)\]/,
+    attr:         /\[((?:[\w-]*:)?[\w-]+)\s*(?:([!^$*~|]?=3D)\s*((['"])([^=
\4]*?)\4|([^'"][^\]]*?)))?\]/
+  },
+
+  // for Selector.match and Element#match
+  assertions: {
+    tagName: function(element, matches) {
+      return matches[1].toUpperCase() =3D=3D element.tagName.toUpperCase();
+    },
+
+    className: function(element, matches) {
+      return Element.hasClassName(element, matches[1]);
+    },
+
+    id: function(element, matches) {
+      return element.id =3D=3D=3D matches[1];
+    },
+
+    attrPresence: function(element, matches) {
+      return Element.hasAttribute(element, matches[1]);
+    },
+
+    attr: function(element, matches) {
+      var nodeValue =3D Element.readAttribute(element, matches[1]);
+      return nodeValue && Selector.operators[matches[2]](nodeValue, matche=
s[5] || matches[6]);
+    }
+  },
+
+  handlers: {
+    // UTILITY FUNCTIONS
+    // joins two collections
+    concat: function(a, b) {
+      for (var i =3D 0, node; node =3D b[i]; i++)
+        a.push(node);
+      return a;
+    },
+
+    // marks an array of nodes for counting
+    mark: function(nodes) {
+      var _true =3D Prototype.emptyFunction;
+      for (var i =3D 0, node; node =3D nodes[i]; i++)
+        node._countedByPrototype =3D _true;
+      return nodes;
+    },
+
+    unmark: function(nodes) {
+      for (var i =3D 0, node; node =3D nodes[i]; i++)
+        node._countedByPrototype =3D undefined;
+      return nodes;
+    },
+
+    // mark each child node with its position (for nth calls)
+    // "ofType" flag indicates whether we're indexing for nth-of-type
+    // rather than nth-child
+    index: function(parentNode, reverse, ofType) {
+      parentNode._countedByPrototype =3D Prototype.emptyFunction;
+      if (reverse) {
+        for (var nodes =3D parentNode.childNodes, i =3D nodes.length - 1, =
j =3D 1; i >=3D 0; i--) {
+          var node =3D nodes[i];
+          if (node.nodeType =3D=3D 1 && (!ofType || node._countedByPrototy=
pe)) node.nodeIndex =3D j++;
+        }
+      } else {
+        for (var i =3D 0, j =3D 1, nodes =3D parentNode.childNodes; node =
=3D nodes[i]; i++)
+          if (node.nodeType =3D=3D 1 && (!ofType || node._countedByPrototy=
pe)) node.nodeIndex =3D j++;
+      }
+    },
+
+    // filters out duplicates and extends all nodes
+    unique: function(nodes) {
+      if (nodes.length =3D=3D 0) return nodes;
+      var results =3D [], n;
+      for (var i =3D 0, l =3D nodes.length; i < l; i++)
+        if (!(n =3D nodes[i])._countedByPrototype) {
+          n._countedByPrototype =3D Prototype.emptyFunction;
+          results.push(Element.extend(n));
+        }
+      return Selector.handlers.unmark(results);
+    },
+
+    // COMBINATOR FUNCTIONS
+    descendant: function(nodes) {
+      var h =3D Selector.handlers;
+      for (var i =3D 0, results =3D [], node; node =3D nodes[i]; i++)
+        h.concat(results, node.getElementsByTagName('*'));
+      return results;
+    },
+
+    child: function(nodes) {
+      var h =3D Selector.handlers;
+      for (var i =3D 0, results =3D [], node; node =3D nodes[i]; i++) {
+        for (var j =3D 0, child; child =3D node.childNodes[j]; j++)
+          if (child.nodeType =3D=3D 1 && child.tagName !=3D '!') results.p=
ush(child);
+      }
+      return results;
+    },
+
+    adjacent: function(nodes) {
+      for (var i =3D 0, results =3D [], node; node =3D nodes[i]; i++) {
+        var next =3D this.nextElementSibling(node);
+        if (next) results.push(next);
+      }
+      return results;
+    },
+
+    laterSibling: function(nodes) {
+      var h =3D Selector.handlers;
+      for (var i =3D 0, results =3D [], node; node =3D nodes[i]; i++)
+        h.concat(results, Element.nextSiblings(node));
+      return results;
+    },
+
+    nextElementSibling: function(node) {
+      while (node =3D node.nextSibling)
+	      if (node.nodeType =3D=3D 1) return node;
+      return null;
+    },
+
+    previousElementSibling: function(node) {
+      while (node =3D node.previousSibling)
+        if (node.nodeType =3D=3D 1) return node;
+      return null;
+    },
+
+    // TOKEN FUNCTIONS
+    tagName: function(nodes, root, tagName, combinator) {
+      var uTagName =3D tagName.toUpperCase();
+      var results =3D [], h =3D Selector.handlers;
+      if (nodes) {
+        if (combinator) {
+          // fastlane for ordinary descendant combinators
+          if (combinator =3D=3D "descendant") {
+            for (var i =3D 0, node; node =3D nodes[i]; i++)
+              h.concat(results, node.getElementsByTagName(tagName));
+            return results;
+          } else nodes =3D this[combinator](nodes);
+          if (tagName =3D=3D "*") return nodes;
+        }
+        for (var i =3D 0, node; node =3D nodes[i]; i++)
+          if (node.tagName.toUpperCase() =3D=3D=3D uTagName) results.push(=
node);
+        return results;
+      } else return root.getElementsByTagName(tagName);
+    },
+
+    id: function(nodes, root, id, combinator) {
+      var targetNode =3D $(id), h =3D Selector.handlers;
+      if (!targetNode) return [];
+      if (!nodes && root =3D=3D document) return [targetNode];
+      if (nodes) {
+        if (combinator) {
+          if (combinator =3D=3D 'child') {
+            for (var i =3D 0, node; node =3D nodes[i]; i++)
+              if (targetNode.parentNode =3D=3D node) return [targetNode];
+          } else if (combinator =3D=3D 'descendant') {
+            for (var i =3D 0, node; node =3D nodes[i]; i++)
+              if (Element.descendantOf(targetNode, node)) return [targetNo=
de];
+          } else if (combinator =3D=3D 'adjacent') {
+            for (var i =3D 0, node; node =3D nodes[i]; i++)
+              if (Selector.handlers.previousElementSibling(targetNode) =3D=
=3D node)
+                return [targetNode];
+          } else nodes =3D h[combinator](nodes);
+        }
+        for (var i =3D 0, node; node =3D nodes[i]; i++)
+          if (node =3D=3D targetNode) return [targetNode];
+        return [];
+      }
+      return (targetNode && Element.descendantOf(targetNode, root)) ? [tar=
getNode] : [];
+    },
+
+    className: function(nodes, root, className, combinator) {
+      if (nodes && combinator) nodes =3D this[combinator](nodes);
+      return Selector.handlers.byClassName(nodes, root, className);
+    },
+
+    byClassName: function(nodes, root, className) {
+      if (!nodes) nodes =3D Selector.handlers.descendant([root]);
+      var needle =3D ' ' + className + ' ';
+      for (var i =3D 0, results =3D [], node, nodeClassName; node =3D node=
s[i]; i++) {
+        nodeClassName =3D node.className;
+        if (nodeClassName.length =3D=3D 0) continue;
+        if (nodeClassName =3D=3D className || (' ' + nodeClassName + ' ').=
include(needle))
+          results.push(node);
+      }
+      return results;
+    },
+
+    attrPresence: function(nodes, root, attr, combinator) {
+      if (!nodes) nodes =3D root.getElementsByTagName("*");
+      if (nodes && combinator) nodes =3D this[combinator](nodes);
+      var results =3D [];
+      for (var i =3D 0, node; node =3D nodes[i]; i++)
+        if (Element.hasAttribute(node, attr)) results.push(node);
+      return results;
+    },
+
+    attr: function(nodes, root, attr, value, operator, combinator) {
+      if (!nodes) nodes =3D root.getElementsByTagName("*");
+      if (nodes && combinator) nodes =3D this[combinator](nodes);
+      var handler =3D Selector.operators[operator], results =3D [];
+      for (var i =3D 0, node; node =3D nodes[i]; i++) {
+        var nodeValue =3D Element.readAttribute(node, attr);
+        if (nodeValue =3D=3D=3D null) continue;
+        if (handler(nodeValue, value)) results.push(node);
+      }
+      return results;
+    },
+
+    pseudo: function(nodes, name, value, root, combinator) {
+      if (nodes && combinator) nodes =3D this[combinator](nodes);
+      if (!nodes) nodes =3D root.getElementsByTagName("*");
+      return Selector.pseudos[name](nodes, value, root);
+    }
+  },
+
+  pseudos: {
+    'first-child': function(nodes, value, root) {
+      for (var i =3D 0, results =3D [], node; node =3D nodes[i]; i++) {
+        if (Selector.handlers.previousElementSibling(node)) continue;
+          results.push(node);
+      }
+      return results;
+    },
+    'last-child': function(nodes, value, root) {
+      for (var i =3D 0, results =3D [], node; node =3D nodes[i]; i++) {
+        if (Selector.handlers.nextElementSibling(node)) continue;
+          results.push(node);
+      }
+      return results;
+    },
+    'only-child': function(nodes, value, root) {
+      var h =3D Selector.handlers;
+      for (var i =3D 0, results =3D [], node; node =3D nodes[i]; i++)
+        if (!h.previousElementSibling(node) && !h.nextElementSibling(node))
+          results.push(node);
+      return results;
+    },
+    'nth-child':        function(nodes, formula, root) {
+      return Selector.pseudos.nth(nodes, formula, root);
+    },
+    'nth-last-child':   function(nodes, formula, root) {
+      return Selector.pseudos.nth(nodes, formula, root, true);
+    },
+    'nth-of-type':      function(nodes, formula, root) {
+      return Selector.pseudos.nth(nodes, formula, root, false, true);
+    },
+    'nth-last-of-type': function(nodes, formula, root) {
+      return Selector.pseudos.nth(nodes, formula, root, true, true);
+    },
+    'first-of-type':    function(nodes, formula, root) {
+      return Selector.pseudos.nth(nodes, "1", root, false, true);
+    },
+    'last-of-type':     function(nodes, formula, root) {
+      return Selector.pseudos.nth(nodes, "1", root, true, true);
+    },
+    'only-of-type':     function(nodes, formula, root) {
+      var p =3D Selector.pseudos;
+      return p['last-of-type'](p['first-of-type'](nodes, formula, root), f=
ormula, root);
+    },
+
+    // handles the an+b logic
+    getIndices: function(a, b, total) {
+      if (a =3D=3D 0) return b > 0 ? [b] : [];
+      return $R(1, total).inject([], function(memo, i) {
+        if (0 =3D=3D (i - b) % a && (i - b) / a >=3D 0) memo.push(i);
+        return memo;
+      });
+    },
+
+    // handles nth(-last)-child, nth(-last)-of-type, and (first|last)-of-t=
ype
+    nth: function(nodes, formula, root, reverse, ofType) {
+      if (nodes.length =3D=3D 0) return [];
+      if (formula =3D=3D 'even') formula =3D '2n+0';
+      if (formula =3D=3D 'odd')  formula =3D '2n+1';
+      var h =3D Selector.handlers, results =3D [], indexed =3D [], m;
+      h.mark(nodes);
+      for (var i =3D 0, node; node =3D nodes[i]; i++) {
+        if (!node.parentNode._countedByPrototype) {
+          h.index(node.parentNode, reverse, ofType);
+          indexed.push(node.parentNode);
+        }
+      }
+      if (formula.match(/^\d+$/)) { // just a number
+        formula =3D Number(formula);
+        for (var i =3D 0, node; node =3D nodes[i]; i++)
+          if (node.nodeIndex =3D=3D formula) results.push(node);
+      } else if (m =3D formula.match(/^(-?\d*)?n(([+-])(\d+))?/)) { // an+b
+        if (m[1] =3D=3D "-") m[1] =3D -1;
+        var a =3D m[1] ? Number(m[1]) : 1;
+        var b =3D m[2] ? Number(m[2]) : 0;
+        var indices =3D Selector.pseudos.getIndices(a, b, nodes.length);
+        for (var i =3D 0, node, l =3D indices.length; node =3D nodes[i]; i=
++) {
+          for (var j =3D 0; j < l; j++)
+            if (node.nodeIndex =3D=3D indices[j]) results.push(node);
+        }
+      }
+      h.unmark(nodes);
+      h.unmark(indexed);
+      return results;
+    },
+
+    'empty': function(nodes, value, root) {
+      for (var i =3D 0, results =3D [], node; node =3D nodes[i]; i++) {
+        // IE treats comments as element nodes
+        if (node.tagName =3D=3D '!' || (node.firstChild && !node.innerHTML=
.match(/^\s*$/))) continue;
+        results.push(node);
+      }
+      return results;
+    },
+
+    'not': function(nodes, selector, root) {
+      var h =3D Selector.handlers, selectorType, m;
+      var exclusions =3D new Selector(selector).findElements(root);
+      h.mark(exclusions);
+      for (var i =3D 0, results =3D [], node; node =3D nodes[i]; i++)
+        if (!node._countedByPrototype) results.push(node);
+      h.unmark(exclusions);
+      return results;
+    },
+
+    'enabled': function(nodes, value, root) {
+      for (var i =3D 0, results =3D [], node; node =3D nodes[i]; i++)
+        if (!node.disabled) results.push(node);
+      return results;
+    },
+
+    'disabled': function(nodes, value, root) {
+      for (var i =3D 0, results =3D [], node; node =3D nodes[i]; i++)
+        if (node.disabled) results.push(node);
+      return results;
+    },
+
+    'checked': function(nodes, value, root) {
+      for (var i =3D 0, results =3D [], node; node =3D nodes[i]; i++)
+        if (node.checked) results.push(node);
+      return results;
+    }
+  },
+
+  operators: {
+    '=3D':  function(nv, v) { return nv =3D=3D v; },
+    '!=3D': function(nv, v) { return nv !=3D v; },
+    '^=3D': function(nv, v) { return nv.startsWith(v); },
+    '$=3D': function(nv, v) { return nv.endsWith(v); },
+    '*=3D': function(nv, v) { return nv.include(v); },
+    '~=3D': function(nv, v) { return (' ' + nv + ' ').include(' ' + v + ' =
'); },
+    '|=3D': function(nv, v) { return ('-' + nv.toUpperCase() + '-').includ=
e('-' + v.toUpperCase() + '-'); }
+  },
+
+  split: function(expression) {
+    var expressions =3D [];
+    expression.scan(/(([\w#:.~>+()\s-]+|\*|\[.*?\])+)\s*(,|$)/, function(m=
) {
+      expressions.push(m[1].strip());
+    });
+    return expressions;
+  },
+
+  matchElements: function(elements, expression) {
+    var matches =3D $$(expression), h =3D Selector.handlers;
+    h.mark(matches);
+    for (var i =3D 0, results =3D [], element; element =3D elements[i]; i+=
+)
+      if (element._countedByPrototype) results.push(element);
+    h.unmark(matches);
+    return results;
+  },
+
+  findElement: function(elements, expression, index) {
+    if (Object.isNumber(expression)) {
+      index =3D expression; expression =3D false;
+    }
+    return Selector.matchElements(elements, expression || '*')[index || 0];
+  },
+
+  findChildElements: function(element, expressions) {
+    expressions =3D Selector.split(expressions.join(','));
+    var results =3D [], h =3D Selector.handlers;
+    for (var i =3D 0, l =3D expressions.length, selector; i < l; i++) {
+      selector =3D new Selector(expressions[i].strip());
+      h.concat(results, selector.findElements(element));
+    }
+    return (l > 1) ? h.unique(results) : results;
+  }
+});
+
+if (Prototype.Browser.IE) {
+  Object.extend(Selector.handlers, {
+    // IE returns comment nodes on getElementsByTagName("*").
+    // Filter them out.
+    concat: function(a, b) {
+      for (var i =3D 0, node; node =3D b[i]; i++)
+        if (node.tagName !=3D=3D "!") a.push(node);
+      return a;
+    },
+
+    // IE improperly serializes _countedByPrototype in (inner|outer)HTML.
+    unmark: function(nodes) {
+      for (var i =3D 0, node; node =3D nodes[i]; i++)
+        node.removeAttribute('_countedByPrototype');
+      return nodes;
+    }
+  });
+}
+
+function $$() {
+  return Selector.findChildElements(document, $A(arguments));
+}
+var Form =3D {
+  reset: function(form) {
+    $(form).reset();
+    return form;
+  },
+
+  serializeElements: function(elements, options) {
+    if (typeof options !=3D 'object') options =3D { hash: !!options };
+    else if (Object.isUndefined(options.hash)) options.hash =3D true;
+    var key, value, submitted =3D false, submit =3D options.submit;
+
+    var data =3D elements.inject({ }, function(result, element) {
+      if (!element.disabled && element.name) {
+        key =3D element.name; value =3D $(element).getValue();
+        if (value !=3D null && (element.type !=3D 'submit' || (!submitted =
&&
+            submit !=3D=3D false && (!submit || key =3D=3D submit) && (sub=
mitted =3D true)))) {
+          if (key in result) {
+            // a key is already present; construct an array of values
+            if (!Object.isArray(result[key])) result[key] =3D [result[key]=
];
+            result[key].push(value);
+          }
+          else result[key] =3D value;
+        }
+      }
+      return result;
+    });
+
+    return options.hash ? data : Object.toQueryString(data);
+  }
+};
+
+Form.Methods =3D {
+  serialize: function(form, options) {
+    return Form.serializeElements(Form.getElements(form), options);
+  },
+
+  getElements: function(form) {
+    return $A($(form).getElementsByTagName('*')).inject([],
+      function(elements, child) {
+        if (Form.Element.Serializers[child.tagName.toLowerCase()])
+          elements.push(Element.extend(child));
+        return elements;
+      }
+    );
+  },
+
+  getInputs: function(form, typeName, name) {
+    form =3D $(form);
+    var inputs =3D form.getElementsByTagName('input');
+
+    if (!typeName && !name) return $A(inputs).map(Element.extend);
+
+    for (var i =3D 0, matchingInputs =3D [], length =3D inputs.length; i <=
 length; i++) {
+      var input =3D inputs[i];
+      if ((typeName && input.type !=3D typeName) || (name && input.name !=
=3D name))
+        continue;
+      matchingInputs.push(Element.extend(input));
+    }
+
+    return matchingInputs;
+  },
+
+  disable: function(form) {
+    form =3D $(form);
+    Form.getElements(form).invoke('disable');
+    return form;
+  },
+
+  enable: function(form) {
+    form =3D $(form);
+    Form.getElements(form).invoke('enable');
+    return form;
+  },
+
+  findFirstElement: function(form) {
+    var elements =3D $(form).getElements().findAll(function(element) {
+      return 'hidden' !=3D element.type && !element.disabled;
+    });
+    var firstByIndex =3D elements.findAll(function(element) {
+      return element.hasAttribute('tabIndex') && element.tabIndex >=3D 0;
+    }).sortBy(function(element) { return element.tabIndex }).first();
+
+    return firstByIndex ? firstByIndex : elements.find(function(element) {
+      return ['input', 'select', 'textarea'].include(element.tagName.toLow=
erCase());
+    });
+  },
+
+  focusFirstElement: function(form) {
+    form =3D $(form);
+    form.findFirstElement().activate();
+    return form;
+  },
+
+  request: function(form, options) {
+    form =3D $(form), options =3D Object.clone(options || { });
+
+    var params =3D options.parameters, action =3D form.readAttribute('acti=
on') || '';
+    if (action.blank()) action =3D window.location.href;
+    options.parameters =3D form.serialize(true);
+
+    if (params) {
+      if (Object.isString(params)) params =3D params.toQueryParams();
+      Object.extend(options.parameters, params);
+    }
+
+    if (form.hasAttribute('method') && !options.method)
+      options.method =3D form.method;
+
+    return new Ajax.Request(action, options);
+  }
+};
+
+/*------------------------------------------------------------------------=
--*/
+
+Form.Element =3D {
+  focus: function(element) {
+    $(element).focus();
+    return element;
+  },
+
+  select: function(element) {
+    $(element).select();
+    return element;
+  }
+};
+
+Form.Element.Methods =3D {
+  serialize: function(element) {
+    element =3D $(element);
+    if (!element.disabled && element.name) {
+      var value =3D element.getValue();
+      if (value !=3D undefined) {
+        var pair =3D { };
+        pair[element.name] =3D value;
+        return Object.toQueryString(pair);
+      }
+    }
+    return '';
+  },
+
+  getValue: function(element) {
+    element =3D $(element);
+    var method =3D element.tagName.toLowerCase();
+    return Form.Element.Serializers[method](element);
+  },
+
+  setValue: function(element, value) {
+    element =3D $(element);
+    var method =3D element.tagName.toLowerCase();
+    Form.Element.Serializers[method](element, value);
+    return element;
+  },
+
+  clear: function(element) {
+    $(element).value =3D '';
+    return element;
+  },
+
+  present: function(element) {
+    return $(element).value !=3D '';
+  },
+
+  activate: function(element) {
+    element =3D $(element);
+    try {
+      element.focus();
+      if (element.select && (element.tagName.toLowerCase() !=3D 'input' ||
+          !['button', 'reset', 'submit'].include(element.type)))
+        element.select();
+    } catch (e) { }
+    return element;
+  },
+
+  disable: function(element) {
+    element =3D $(element);
+    element.blur();
+    element.disabled =3D true;
+    return element;
+  },
+
+  enable: function(element) {
+    element =3D $(element);
+    element.disabled =3D false;
+    return element;
+  }
+};
+
+/*------------------------------------------------------------------------=
--*/
+
+var Field =3D Form.Element;
+var $F =3D Form.Element.Methods.getValue;
+
+/*------------------------------------------------------------------------=
--*/
+
+Form.Element.Serializers =3D {
+  input: function(element, value) {
+    switch (element.type.toLowerCase()) {
+      case 'checkbox':
+      case 'radio':
+        return Form.Element.Serializers.inputSelector(element, value);
+      default:
+        return Form.Element.Serializers.textarea(element, value);
+    }
+  },
+
+  inputSelector: function(element, value) {
+    if (Object.isUndefined(value)) return element.checked ? element.value =
: null;
+    else element.checked =3D !!value;
+  },
+
+  textarea: function(element, value) {
+    if (Object.isUndefined(value)) return element.value;
+    else element.value =3D value;
+  },
+
+  select: function(element, index) {
+    if (Object.isUndefined(index))
+      return this[element.type =3D=3D 'select-one' ?
+        'selectOne' : 'selectMany'](element);
+    else {
+      var opt, value, single =3D !Object.isArray(index);
+      for (var i =3D 0, length =3D element.length; i < length; i++) {
+        opt =3D element.options[i];
+        value =3D this.optionValue(opt);
+        if (single) {
+          if (value =3D=3D index) {
+            opt.selected =3D true;
+            return;
+          }
+        }
+        else opt.selected =3D index.include(value);
+      }
+    }
+  },
+
+  selectOne: function(element) {
+    var index =3D element.selectedIndex;
+    return index >=3D 0 ? this.optionValue(element.options[index]) : null;
+  },
+
+  selectMany: function(element) {
+    var values, length =3D element.length;
+    if (!length) return null;
+
+    for (var i =3D 0, values =3D []; i < length; i++) {
+      var opt =3D element.options[i];
+      if (opt.selected) values.push(this.optionValue(opt));
+    }
+    return values;
+  },
+
+  optionValue: function(opt) {
+    // extend element because hasAttribute may not be native
+    return Element.extend(opt).hasAttribute('value') ? opt.value : opt.tex=
t;
+  }
+};
+
+/*------------------------------------------------------------------------=
--*/
+
+Abstract.TimedObserver =3D Class.create(PeriodicalExecuter, {
+  initialize: function($super, element, frequency, callback) {
+    $super(callback, frequency);
+    this.element   =3D $(element);
+    this.lastValue =3D this.getValue();
+  },
+
+  execute: function() {
+    var value =3D this.getValue();
+    if (Object.isString(this.lastValue) && Object.isString(value) ?
+        this.lastValue !=3D value : String(this.lastValue) !=3D String(val=
ue)) {
+      this.callback(this.element, value);
+      this.lastValue =3D value;
+    }
+  }
+});
+
+Form.Element.Observer =3D Class.create(Abstract.TimedObserver, {
+  getValue: function() {
+    return Form.Element.getValue(this.element);
+  }
+});
+
+Form.Observer =3D Class.create(Abstract.TimedObserver, {
+  getValue: function() {
+    return Form.serialize(this.element);
+  }
+});
+
+/*------------------------------------------------------------------------=
--*/
+
+Abstract.EventObserver =3D Class.create({
+  initialize: function(element, callback) {
+    this.element  =3D $(element);
+    this.callback =3D callback;
+
+    this.lastValue =3D this.getValue();
+    if (this.element.tagName.toLowerCase() =3D=3D 'form')
+      this.registerFormCallbacks();
+    else
+      this.registerCallback(this.element);
+  },
+
+  onElementEvent: function() {
+    var value =3D this.getValue();
+    if (this.lastValue !=3D value) {
+      this.callback(this.element, value);
+      this.lastValue =3D value;
+    }
+  },
+
+  registerFormCallbacks: function() {
+    Form.getElements(this.element).each(this.registerCallback, this);
+  },
+
+  registerCallback: function(element) {
+    if (element.type) {
+      switch (element.type.toLowerCase()) {
+        case 'checkbox':
+        case 'radio':
+          Event.observe(element, 'click', this.onElementEvent.bind(this));
+          break;
+        default:
+          Event.observe(element, 'change', this.onElementEvent.bind(this));
+          break;
+      }
+    }
+  }
+});
+
+Form.Element.EventObserver =3D Class.create(Abstract.EventObserver, {
+  getValue: function() {
+    return Form.Element.getValue(this.element);
+  }
+});
+
+Form.EventObserver =3D Class.create(Abstract.EventObserver, {
+  getValue: function() {
+    return Form.serialize(this.element);
+  }
+});
+if (!window.Event) var Event =3D { };
+
+Object.extend(Event, {
+  KEY_BACKSPACE: 8,
+  KEY_TAB:       9,
+  KEY_RETURN:   13,
+  KEY_ESC:      27,
+  KEY_LEFT:     37,
+  KEY_UP:       38,
+  KEY_RIGHT:    39,
+  KEY_DOWN:     40,
+  KEY_DELETE:   46,
+  KEY_HOME:     36,
+  KEY_END:      35,
+  KEY_PAGEUP:   33,
+  KEY_PAGEDOWN: 34,
+  KEY_INSERT:   45,
+
+  cache: { },
+
+  relatedTarget: function(event) {
+    var element;
+    switch(event.type) {
+      case 'mouseover': element =3D event.fromElement; break;
+      case 'mouseout':  element =3D event.toElement;   break;
+      default: return null;
+    }
+    return Element.extend(element);
+  }
+});
+
+Event.Methods =3D (function() {
+  var isButton;
+
+  if (Prototype.Browser.IE) {
+    var buttonMap =3D { 0: 1, 1: 4, 2: 2 };
+    isButton =3D function(event, code) {
+      return event.button =3D=3D buttonMap[code];
+    };
+
+  } else if (Prototype.Browser.WebKit) {
+    isButton =3D function(event, code) {
+      switch (code) {
+        case 0: return event.which =3D=3D 1 && !event.metaKey;
+        case 1: return event.which =3D=3D 1 && event.metaKey;
+        default: return false;
+      }
+    };
+
+  } else {
+    isButton =3D function(event, code) {
+      return event.which ? (event.which =3D=3D=3D code + 1) : (event.butto=
n =3D=3D=3D code);
+    };
+  }
+
+  return {
+    isLeftClick:   function(event) { return isButton(event, 0) },
+    isMiddleClick: function(event) { return isButton(event, 1) },
+    isRightClick:  function(event) { return isButton(event, 2) },
+
+    element: function(event) {
+      var node =3D Event.extend(event).target;
+      return Element.extend(node.nodeType =3D=3D Node.TEXT_NODE ? node.par=
entNode : node);
+    },
+
+    findElement: function(event, expression) {
+      var element =3D Event.element(event);
+      if (!expression) return element;
+      var elements =3D [element].concat(element.ancestors());
+      return Selector.findElement(elements, expression, 0);
+    },
+
+    pointer: function(event) {
+      return {
+        x: event.pageX || (event.clientX +
+          (document.documentElement.scrollLeft || document.body.scrollLeft=
)),
+        y: event.pageY || (event.clientY +
+          (document.documentElement.scrollTop || document.body.scrollTop))
+      };
+    },
+
+    pointerX: function(event) { return Event.pointer(event).x },
+    pointerY: function(event) { return Event.pointer(event).y },
+
+    stop: function(event) {
+      Event.extend(event);
+      event.preventDefault();
+      event.stopPropagation();
+      event.stopped =3D true;
+    }
+  };
+})();
+
+Event.extend =3D (function() {
+  var methods =3D Object.keys(Event.Methods).inject({ }, function(m, name)=
 {
+    m[name] =3D Event.Methods[name].methodize();
+    return m;
+  });
+
+  if (Prototype.Browser.IE) {
+    Object.extend(methods, {
+      stopPropagation: function() { this.cancelBubble =3D true },
+      preventDefault:  function() { this.returnValue =3D false },
+      inspect: function() { return "[object Event]" }
+    });
+
+    return function(event) {
+      if (!event) return false;
+      if (event._extendedByPrototype) return event;
+
+      event._extendedByPrototype =3D Prototype.emptyFunction;
+      var pointer =3D Event.pointer(event);
+      Object.extend(event, {
+        target: event.srcElement,
+        relatedTarget: Event.relatedTarget(event),
+        pageX:  pointer.x,
+        pageY:  pointer.y
+      });
+      return Object.extend(event, methods);
+    };
+
+  } else {
+    Event.prototype =3D Event.prototype || document.createEvent("HTMLEvent=
s").__proto__;
+    Object.extend(Event.prototype, methods);
+    return Prototype.K;
+  }
+})();
+
+Object.extend(Event, (function() {
+  var cache =3D Event.cache;
+
+  function getEventID(element) {
+    if (element._prototypeEventID) return element._prototypeEventID[0];
+    arguments.callee.id =3D arguments.callee.id || 1;
+    return element._prototypeEventID =3D [++arguments.callee.id];
+  }
+
+  function getDOMEventName(eventName) {
+    if (eventName && eventName.include(':')) return "dataavailable";
+    return eventName;
+  }
+
+  function getCacheForID(id) {
+    return cache[id] =3D cache[id] || { };
+  }
+
+  function getWrappersForEventName(id, eventName) {
+    var c =3D getCacheForID(id);
+    return c[eventName] =3D c[eventName] || [];
+  }
+
+  function createWrapper(element, eventName, handler) {
+    var id =3D getEventID(element);
+    var c =3D getWrappersForEventName(id, eventName);
+    if (c.pluck("handler").include(handler)) return false;
+
+    var wrapper =3D function(event) {
+      if (!Event || !Event.extend ||
+        (event.eventName && event.eventName !=3D eventName))
+          return false;
+
+      Event.extend(event);
+      handler.call(element, event);
+    };
+
+    wrapper.handler =3D handler;
+    c.push(wrapper);
+    return wrapper;
+  }
+
+  function findWrapper(id, eventName, handler) {
+    var c =3D getWrappersForEventName(id, eventName);
+    return c.find(function(wrapper) { return wrapper.handler =3D=3D handle=
r });
+  }
+
+  function destroyWrapper(id, eventName, handler) {
+    var c =3D getCacheForID(id);
+    if (!c[eventName]) return false;
+    c[eventName] =3D c[eventName].without(findWrapper(id, eventName, handl=
er));
+  }
+
+  function destroyCache() {
+    for (var id in cache)
+      for (var eventName in cache[id])
+        cache[id][eventName] =3D null;
+  }
+
+  if (window.attachEvent) {
+    window.attachEvent("onunload", destroyCache);
+  }
+
+  return {
+    observe: function(element, eventName, handler) {
+      element =3D $(element);
+      var name =3D getDOMEventName(eventName);
+
+      var wrapper =3D createWrapper(element, eventName, handler);
+      if (!wrapper) return element;
+
+      if (element.addEventListener) {
+        element.addEventListener(name, wrapper, false);
+      } else {
+        element.attachEvent("on" + name, wrapper);
+      }
+
+      return element;
+    },
+
+    stopObserving: function(element, eventName, handler) {
+      element =3D $(element);
+      var id =3D getEventID(element), name =3D getDOMEventName(eventName);
+
+      if (!handler && eventName) {
+        getWrappersForEventName(id, eventName).each(function(wrapper) {
+          element.stopObserving(eventName, wrapper.handler);
+        });
+        return element;
+
+      } else if (!eventName) {
+        Object.keys(getCacheForID(id)).each(function(eventName) {
+          element.stopObserving(eventName);
+        });
+        return element;
+      }
+
+      var wrapper =3D findWrapper(id, eventName, handler);
+      if (!wrapper) return element;
+
+      if (element.removeEventListener) {
+        element.removeEventListener(name, wrapper, false);
+      } else {
+        element.detachEvent("on" + name, wrapper);
+      }
+
+      destroyWrapper(id, eventName, handler);
+
+      return element;
+    },
+
+    fire: function(element, eventName, memo) {
+      element =3D $(element);
+      if (element =3D=3D document && document.createEvent && !element.disp=
atchEvent)
+        element =3D document.documentElement;
+
+      var event;
+      if (document.createEvent) {
+        event =3D document.createEvent("HTMLEvents");
+        event.initEvent("dataavailable", true, true);
+      } else {
+        event =3D document.createEventObject();
+        event.eventType =3D "ondataavailable";
+      }
+
+      event.eventName =3D eventName;
+      event.memo =3D memo || { };
+
+      if (document.createEvent) {
+        element.dispatchEvent(event);
+      } else {
+        element.fireEvent(event.eventType, event);
+      }
+
+      return Event.extend(event);
+    }
+  };
+})());
+
+Object.extend(Event, Event.Methods);
+
+Element.addMethods({
+  fire:          Event.fire,
+  observe:       Event.observe,
+  stopObserving: Event.stopObserving
+});
+
+Object.extend(document, {
+  fire:          Element.Methods.fire.methodize(),
+  observe:       Element.Methods.observe.methodize(),
+  stopObserving: Element.Methods.stopObserving.methodize(),
+  loaded:        false
+});
+
+(function() {
+  /* Support for the DOMContentLoaded event is based on work by Dan Webb,
+     Matthias Miller, Dean Edwards and John Resig. */
+
+  var timer;
+
+  function fireContentLoadedEvent() {
+    if (document.loaded) return;
+    if (timer) window.clearInterval(timer);
+    document.fire("dom:loaded");
+    document.loaded =3D true;
+  }
+
+  if (document.addEventListener) {
+    if (Prototype.Browser.WebKit) {
+      timer =3D window.setInterval(function() {
+        if (/loaded|complete/.test(document.readyState))
+          fireContentLoadedEvent();
+      }, 0);
+
+      Event.observe(window, "load", fireContentLoadedEvent);
+
+    } else {
+      document.addEventListener("DOMContentLoaded",
+        fireContentLoadedEvent, false);
+    }
+
+  } else {
+    document.write("
+
+
+
+   
 
 
 


--===============8885246203895835885==--

From portal-commits at lists.jboss.org Sun Feb 10 21:57:55 2008
Content-Type: multipart/mixed; boundary="===============5797208760909540506=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9931 -
 modules/portlet/trunk/test/src/test/resources/simple-portal-war/js.
Date: Sun, 10 Feb 2008 21:57:55 -0500
Message-ID: 

--===============5797208760909540506==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: wesleyhales
Date: 2008-02-10 21:57:55 -0500 (Sun, 10 Feb 2008)
New Revision: 9931

Modified:
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/js/shado=
wbox.js
Log:
small fix

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/j=
s/shadowbox.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/js/shad=
owbox.js	2008-02-11 02:47:55 UTC (rev 9930)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/js/shad=
owbox.js	2008-02-11 02:57:55 UTC (rev 9931)
@@ -69,7 +69,7 @@
          *
          * @var     {String}    loadingImage
          */
-        loadingImage:       'images/loading.gif',
+        loadingImage:       '../images/loading.gif',
 =

         /**
          * Enable animations.
@@ -118,7 +118,7 @@
          *
          * @var     {String}    overlayBgImage
          */
-        overlayBgImage:     'images/overlay-85.png',
+        overlayBgImage:     '../images/overlay-85.png',
 =

         /**
          * Automatically play movies.


--===============5797208760909540506==--

From portal-commits at lists.jboss.org Sun Feb 10 23:05:51 2008
Content-Type: multipart/mixed; boundary="===============2127310055338555483=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9932 - in
 modules/portlet/trunk/test/src:
 main/java/org/jboss/portal/portlet/portal/samples/event and 2 other
 directories.
Date: Sun, 10 Feb 2008 23:05:51 -0500
Message-ID: 

--===============2127310055338555483==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: wesleyhales
Date: 2008-02-10 23:05:50 -0500 (Sun, 10 Feb 2008)
New Revision: 9932

Modified:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/portal=
/samples/basic/HeaderPortlet.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/portal=
/samples/event/CartPortlet.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/portal=
/samples/event/CatalogPortlet.java
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/=
tags/portal/portlet.tag
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/dem=
o1.jsp
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/dem=
o3.jsp
Log:
some script enhancements

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/portal/samples/basic/HeaderPortlet.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/porta=
l/samples/basic/HeaderPortlet.java	2008-02-11 02:57:55 UTC (rev 9931)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/porta=
l/samples/basic/HeaderPortlet.java	2008-02-11 04:05:50 UTC (rev 9932)
@@ -54,7 +54,7 @@
       //
       resp.setContentType("text/html");
       PrintWriter writer =3D resp.getWriter();
-      writer.print("Click me to trigger script");
+      writer.print("Click me to trigger script");
    }
 =

    public void serveResource(ResourceRequest req, ResourceResponse resp) t=
hrows PortletException, IOException
@@ -62,7 +62,8 @@
       String namespace =3Dresp.getNamespace();
       resp.setContentType("text/javascript");
       PrintWriter writer =3D resp.getWriter();
-      writer.print("function " + namespace  + "_handle() { alert('Some ale=
rt'); }");
+      writer.print("function " + namespace  + "_handle() { " +
+         "new Effect.Grow(document.getElementById('header-portlet')) }");
       writer.close();
    }
 }

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/portal/samples/event/CartPortlet.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/porta=
l/samples/event/CartPortlet.java	2008-02-11 02:57:55 UTC (rev 9931)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/porta=
l/samples/event/CartPortlet.java	2008-02-11 04:05:50 UTC (rev 9932)
@@ -52,7 +52,7 @@
 =

       if (!items.isEmpty())
       {
-         writer.append("Description<=
tbody>");
+         writer.append("Price
");
          int total =3D 0;
          for (CatalogItem item : items)
          {

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/portal/samples/event/CatalogPortlet.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/porta=
l/samples/event/CatalogPortlet.java	2008-02-11 02:57:55 UTC (rev 9931)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/porta=
l/samples/event/CatalogPortlet.java	2008-02-11 04:05:50 UTC (rev 9932)
@@ -56,7 +56,7 @@
       {
          addURL.setParameter("id", item.getId());
          writer.append("");
+            .append("");
       }
 =

       writer.append("Description Pric=
e
").append(item.getDescription()).append("<=
/td> $").append("" + item.getPrice())
-            .append(" Add to cart
Add to cart");

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/W=
EB-INF/tags/portal/portlet.tag
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF=
/tags/portal/portlet.tag	2008-02-11 02:57:55 UTC (rev 9931)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF=
/tags/portal/portlet.tag	2008-02-11 04:05:50 UTC (rev 9932)
@@ -1,11 +1,13 @@
 <%@ tag body-content=3D"scriptless" %>
 <%@ attribute name=3D"name" rtexprvalue=3D"true" required=3D"true" %>
 <%@ attribute name=3D"applicationName" rtexprvalue=3D"true" required=3D"tr=
ue" %>
+<%@ attribute name=3D"id" rtexprvalue=3D"true" required=3D"false" %>
 <%@ attribute name=3D"content" fragment=3D"true" required=3D"false" %>
 <%@ taglib uri=3D"/WEB-INF/portal.tld" prefix=3D"portal" %>
+<%@ taglib prefix=3D"fn" uri=3D"http://java.sun.com/jsp/jstl/functions" %>
 =

 
-   
+   
       
          
             

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/d=
emo/demo1.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/de=
mo1.jsp	2008-02-11 02:57:55 UTC (rev 9931)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/de=
mo1.jsp	2008-02-11 04:05:50 UTC (rev 9932)
@@ -10,10 +10,10 @@
    
    
             
-               
+               
             
             
-               
+               
             
    
 

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/d=
emo/demo3.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/de=
mo3.jsp	2008-02-11 02:57:55 UTC (rev 9931)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/de=
mo3.jsp	2008-02-11 04:05:50 UTC (rev 9932)
@@ -10,14 +10,11 @@
    
    
             
-
                
-
-
             
             
                
-               
+               
             
    
 


--===============2127310055338555483==--

From portal-commits at lists.jboss.org Sun Feb 10 23:56:13 2008
Content-Type: multipart/mixed; boundary="===============9009366675599817940=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9933 -
 modules/portlet/trunk/test/src/test.
Date: Sun, 10 Feb 2008 23:56:13 -0500
Message-ID: 

--===============9009366675599817940==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: chris.laprun(a)jboss.com
Date: 2008-02-10 23:56:13 -0500 (Sun, 10 Feb 2008)
New Revision: 9933

Modified:
   modules/portlet/trunk/test/src/test/build.xml
Log:
- Started packaging effort. Only as42 version has been tested so far.

Modified: modules/portlet/trunk/test/src/test/build.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/build.xml	2008-02-11 04:05:50 UTC (=
rev 9932)
+++ modules/portlet/trunk/test/src/test/build.xml	2008-02-11 04:56:13 UTC (=
rev 9933)
@@ -404,7 +404,6 @@
          
 =

 =

-
          
          
          
@@ -688,10 +687,40 @@
 =

    
 =

+
+   
+      
+      
+         
+            
+               
+               
+               
+               
+               
+            
+         
+
+         
+            
+         
+      
+   
+
    
+      
+      
+      
+      
 =

-      
+      
 =

+      
+      
+      
+      
+
+
       
          
       
@@ -722,83 +751,77 @@
          
          
          
+      
 =

-         
+      
+      
+
+      
+      
+      
          
             
             
             
-            
          
-
       
 =

-      
+      
+      
 =

-      
-         
-      
-
-      
-         
-            
-            
-            
-            
-            
-         
-      
-
       
 =

-      
+      
    
 =

-   
+   
 =

-      
-      
-      
+      
+      
 =

-      
+      
+      
+
+      
          
-         
+         
       
-      
-         
+      
+         
       
 =

-      
+      
          
          
       
-      
-         
+      
+         
       
 =

-      
+      
          
          
       
-      
-         
+      
+         
       
 =

-      
+      
          
          
       
-      
-         
+      
+         
       
 =

-      
+      
          
          
       
-      
-         
+      
+         
       
 =

    


--===============9009366675599817940==--

From portal-commits at lists.jboss.org Mon Feb 11 02:52:14 2008
Content-Type: multipart/mixed; boundary="===============7515469155169777392=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9934 -
 docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
Date: Mon, 11 Feb 2008 02:52:14 -0500
Message-ID: 

--===============7515469155169777392==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mmcallis
Date: 2008-02-11 02:52:14 -0500 (Mon, 11 Feb 2008)
New Revision: 9934

Modified:
   docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorial=
s.xml
Log:
minor rivisions to 5.2.1.4. Application Descriptors


Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/t=
utorials.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutoria=
ls.xml	2008-02-11 04:56:13 UTC (rev 9933)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutoria=
ls.xml	2008-02-11 07:52:14 UTC (rev 9934)
@@ -297,7 +297,7 @@
 HelloWorldPortlet]]>
 
 	
-		Define the portlet name. It does not have to be the Class name.
+		Define the portlet name. It does not have to be the class name.
 	
 
 
@@ -318,11 +318,8 @@
 	
 		The <supports> element allows you to declare al=
l the markup types your
 		portlet supports in the render method. This is accomp=
lished via the
-		<mime-type> element, which is required for ever=
y portlet. The declared MIME types must match the capability of the portlet.
+		<mime-type> element, which is required for ever=
y portlet. The declared MIME types must match the capability of the portlet=
. As well, it allows you to pair which modes and window states are supporte=
d for each markup type. All portlets must support the VIEW portlet mode, so=
 this does not have to be declared. Use <mime-type> to define which markup type your portlet supports, which in this example,=
 is text/html. This section tells the portal that it wil=
l only output text and HTML, and that it only supports the VIEW mode.
 	
-	
-		As well, it allows you to pair which modes and window states are support=
ed for each markup type. All portlets must support the VIEW portlet mode, s=
o this does not have to be declared. Use <mime-type> to define which markup type your portlet supports, which in this example=
, is text/html. This section tells the portal that it wi=
ll only output text and HTML, and that it only supports the VIEW mode.
-	
 
 
 
 
 
-
 	
 		The HelloWorldPortlet/WEB-INF/portlet-instances.xml=
 file is a JBoss Portal specific descriptor, that allows you to create inst=
ances of portlets. The
 		<portlet-ref> value must match the <=
;portlet-name> value
 		given in the HelloWorldPortlet/WEB-INF/portlet.xml =
file. The <instance-id>
-		value can be named anything, but it must match the <instance=
-ref> values given
-		in the *-object.xml files, which in this example, wou=
ld be HelloWorldPortlet/WEB-INF/helloworld-object.xml.
-The following is an example of the HelloWorldPortlet/WEB-=
INF/portlet-instances.xml file:
+		value can be named anything, but it must match the <instance=
-ref> value given
+		in the *-object.xml files, which in this example, wou=
ld be the HelloWorldPortlet/WEB-INF/helloworld-object.xml file.
+	
+
+	The following is an example of the HelloWorldPortlet/WEB-INF/po=
rtlet-instances.xml file:
 
 
 
 		
 			
-				specifies that it will display the markup generated by the He=
lloWorldPortletInstance portlet instance.
+				specifies that the window will display the markup generated by the HelloWorldPortletInstance portlet instance.
 			
 		
 		
@@ -386,7 +384,7 @@
 		
 		
 			
-				specifies where the window will appear on the page, by the <region> element.
+				the <region> element specifies =
where the window will appear on the page.
 			
 		
 	
@@ -421,8 +419,7 @@
 
 
 	
-		Tells the portal where this portlet should appear. In this case, default.default specifies that this portlet shoul=
d appear in the portal instance named default and the pa=
ge named
-		default.
+		Tells the portal where this portlet should appear. In this case, default.default specifies that the portlet will a=
ppear in the portal instance named default, and on the p=
age named default.
 	
 
 
@@ -431,7 +428,7 @@
 
 
 	
-		Instructs the portal to overwrite or keep this object if it already exis=
ts. Possible values are overwrite or keep. overwrite will destroy the existing object and cre=
ate a new one based on the content of the deployment. keep will maintain the existing object deployment or create a new one if it d=
oes not yet exist.
+		Instructs the portal to overwrite or keep this object if it already exis=
ts. Possible values are overwrite or keep. The overwrite value will destroy the existing obje=
ct and create a new one based on the content of the deployment. The keep option will maintain the existing object deployment or cre=
ate a new one if it does not exist.
 	
 
 
@@ -449,8 +446,8 @@
 
 
 	
-		The value of instance-ref must match the value of one=
 of the
-                                 instance-id found in <=
literal>portlet-instances.xml.
+		The value of <instance-ref> must match the valu=
e of one of the
+		<instance-id> elements found in the  =
HelloWorldPortlet/WEB-INF/portlet-instances.xml file.
 	
 
 
@@ -460,22 +457,23 @@
 
 
 	
-		Specify the layout region and order this window will be found on the por=
tal page.
+		Specifies the layout region, and the order this window will be found on =
the portal page.
 	
 
 
 
 
-
-            
-               To illustrate the relationship between the descriptors, we =
have provided this simple diagram
+
+	The following diagram illustrates the relationship between the =
portlet.xml, portlet-instances.xml, and helloworld-object.xml descriptors:
+
+
                
                   
                      
                   
                
-            
+
 =

             
                Portal 2.6 introduces the notion of content type<=
/emphasis>, which is a generic mechanism to


--===============7515469155169777392==--

From portal-commits at lists.jboss.org Mon Feb 11 16:01:11 2008
Content-Type: multipart/mixed; boundary="===============3414310378971464815=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9935 -
 docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
Date: Mon, 11 Feb 2008 16:01:10 -0500
Message-ID: 

--===============3414310378971464815==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mmcallis
Date: 2008-02-11 16:01:10 -0500 (Mon, 11 Feb 2008)
New Revision: 9935

Modified:
   docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorial=
s.xml
Log:
revising last two paragraphs for
5.2.1.4. Application Descriptors


Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/t=
utorials.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutoria=
ls.xml	2008-02-11 07:52:14 UTC (rev 9934)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutoria=
ls.xml	2008-02-11 21:01:10 UTC (rev 9935)
@@ -476,11 +476,13 @@
 
 =

             
-               Portal 2.6 introduces the notion of content type<=
/emphasis>, which is a generic mechanism to
-               specify which content will be displayed by a given portlet =
window. The window section
-               of the previous example can be re-written to take advantage=
 of the new content framework, resulting in
-               the following deployment descriptor:
-               
+               JBoss Portal 2.6 introduces the notion of content=
 type, which is a generic mechanism to
+               specify what content will be displayed by a given portlet w=
indow. The window section
+	       of the previous example, HelloWorldPortlet/WEB-INF/hello=
world-object.xml, can be re-written to take advantage of the new=
 content framework. The following is an example deployment descriptor that =
uses the new content framework:
+            
+	    
+
 
@@ -498,17 +500,24 @@
          1
       
    
-]]>
-
-
+]]>
+
+	
+	
 =

-               This declaration is equivalent to the previous example. We =
specify that the content being displayed by
-               the HelloWorldPortletWindow is a portlet content. The content URI
-               identifies which content to be displayed, in this case, the=
 HelloWorldPortletInstance.
-               It is possible to declare windows with a cms content type and use directly the path to
-               the file in the CMS to make the window show the content of =
the associated file. That behavior is
-               pluggable and it is possible to plug virtually any kind of =
content.
-             =

+		This is equivalent to the previous HelloWorldPortlet/WEB-INF/h=
elloworld-object.xml example. The content to be display can be s=
pecified using <content-type>. In th=
is example, the content being displayed is a portlet. The &=
lt;content-uri> specifies which content to display, in =
this case, the HelloWorldPortletInstance:
+	
+	
+
+   portlet
+   HelloWorldPortletInstance
+]]>
+
+        
+	
+		To display certain content or a file, use the cms content-type, with the <content-uri> being the path to the file in the CMS. This behavior is pluggab=
le, and it is possible to plug almost any kind of content.
+          =

          
          
             Building your portlet


--===============3414310378971464815==--

From portal-commits at lists.jboss.org Mon Feb 11 16:47:48 2008
Content-Type: multipart/mixed; boundary="===============0700211780321578687=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9936 -
 docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
Date: Mon, 11 Feb 2008 16:47:48 -0500
Message-ID: 

--===============0700211780321578687==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mmcallis
Date: 2008-02-11 16:47:47 -0500 (Mon, 11 Feb 2008)
New Revision: 9936

Modified:
   docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorial=
s.xml
Log:
5.2.1.4. Application Descriptors rewriting
me rewrite, seemed to have missed the point...


Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/t=
utorials.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutoria=
ls.xml	2008-02-11 21:01:10 UTC (rev 9935)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutoria=
ls.xml	2008-02-11 21:47:47 UTC (rev 9936)
@@ -505,7 +505,7 @@
 	
 	
 =

-		This is equivalent to the previous HelloWorldPortlet/WEB-INF/h=
elloworld-object.xml example. The content to be display can be s=
pecified using <content-type>. In th=
is example, the content being displayed is a portlet. The &=
lt;content-uri> specifies which content to display, in =
this case, the HelloWorldPortletInstance:
+		This declaration is equivalent to the previous HelloWorldPortl=
et/WEB-INF/helloworld-object.xml example. Use &l=
t;content-type> to specify the content to display. In t=
his example, the content being displayed by HelloWorldPortl=
etWindow is a portlet. The <content-uri=
> element specifies which content to display, in this e=
xample, the HelloWorldPortletInstance:
 	
 	
 

--===============8952835185116777965==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mmcallis
Date: 2008-02-11 20:08:04 -0500 (Mon, 11 Feb 2008)
New Revision: 9937

Modified:
   docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorial=
s.xml
Log:
5.2.1.4. Application Descriptors final revision,
updating certain literal tags to computeroutput,
as per content in screen tags...


Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/t=
utorials.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutoria=
ls.xml	2008-02-11 21:47:47 UTC (rev 9936)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutoria=
ls.xml	2008-02-12 01:08:04 UTC (rev 9937)
@@ -316,9 +316,8 @@
 ]]>
 
 	
-		The <supports> element allows you to declare al=
l the markup types your
-		portlet supports in the render method. This is accomp=
lished via the
-		<mime-type> element, which is required for ever=
y portlet. The declared MIME types must match the capability of the portlet=
. As well, it allows you to pair which modes and window states are supporte=
d for each markup type. All portlets must support the VIEW portlet mode, so=
 this does not have to be declared. Use <mime-type> to define which markup type your portlet supports, which in this example,=
 is text/html. This section tells the portal that it wil=
l only output text and HTML, and that it only supports the VIEW mode.
+		The <supports> element allows you=
 to declare all the markup types your portlet supports in the rend=
er method. This is accomplished via the
+		<mime-type> element, which is req=
uired for every portlet. The declared MIME types must match the capability =
of the portlet. As well, it allows you to pair which modes and window state=
s are supported for each markup type. All portlets must support the VIEW po=
rtlet mode, so this does not have to be declared. Use <m=
ime-type> to define which markup type your portlet supp=
orts, which in this example, is text/html.=
 This section tells the portal that it will only output text and HTML, and =
that it only supports the VIEW mode.
 	
 
 
@@ -336,10 +335,10 @@
 
 	
 		The HelloWorldPortlet/WEB-INF/portlet-instances.xml=
 file is a JBoss Portal specific descriptor, that allows you to create inst=
ances of portlets. The
-		<portlet-ref> value must match the <=
;portlet-name> value
-		given in the HelloWorldPortlet/WEB-INF/portlet.xml =
file. The <instance-id>
-		value can be named anything, but it must match the <instance=
-ref> value given
-		in the *-object.xml files, which in this example, wou=
ld be the HelloWorldPortlet/WEB-INF/helloworld-object.xml file.
+		<portlet-ref> value must match th=
e <portlet-name> value
+		given in the HelloWorldPortlet/WEB-INF/portlet.xml =
file. The <instance-id>
+		value can be named anything, but it must match the <i=
nstance-ref> value given
+		in the *-object.xml files, which in this example, w=
ould be the HelloWorldPortlet/WEB-INF/helloworld-object.xml file.
 	
 
 	The following is an example of the HelloWorldPortlet/WEB-INF/po=
rtlet-instances.xml file:
@@ -361,8 +360,8 @@
 
 
 
-	The *-object.xml files are JBoss Portal specific descr=
iptors that allow users to
-	define the structure of their portal instances, as well as create and con=
figure their windows and
+	The *-object.xml files are JBoss Portal specific des=
criptors that allow users to
+	define the structure of their portal instances, and create and configure =
their windows and
 	pages. In the following example:
 
 
@@ -374,12 +373,12 @@
 		
 		
 			
-				specifies that the window will display the markup generated by the HelloWorldPortletInstance portlet instance.
+				specifies that the window will display the markup generated by the HelloWorldPortletInstance portlet instance.
 			
 		
 		
 			
-				the window is assigned to the default.default page.
+				the window is assigned to the default.default page.
 			
 		
 		
@@ -419,7 +418,7 @@
 
 
 	
-		Tells the portal where this portlet should appear. In this case, default.default specifies that the portlet will a=
ppear in the portal instance named default, and on the p=
age named default.
+		Tells the portal where this portlet should appear. In this case, default.default specifies that the portlet will a=
ppear in the portal instance named default=
, and on the page named default.
 	
 
 
@@ -437,7 +436,7 @@
 
 
 	
-              Can be named anything.
+              This can be named anything.
       
 
 
@@ -446,8 +445,8 @@
 
 
 	
-		The value of <instance-ref> must match the valu=
e of one of the
-		<instance-id> elements found in the  =
HelloWorldPortlet/WEB-INF/portlet-instances.xml file.
+		The value of <instance-ref> must =
match the value of one of the
+		<instance-id> elements found in t=
he  HelloWorldPortlet/WEB-INF/portlet-instances.xml fi=
le.
 	
 
 
@@ -457,7 +456,7 @@
 
 
 	
-		Specifies the layout region, and the order this window will be found on =
the portal page.
+		Specifies the layout region and the order this window will be found on t=
he portal page.
 	
 
 
@@ -505,7 +504,7 @@
 	
 	
 =

-		This declaration is equivalent to the previous HelloWorldPortl=
et/WEB-INF/helloworld-object.xml example. Use &l=
t;content-type> to specify the content to display. In t=
his example, the content being displayed by HelloWorldPortl=
etWindow is a portlet. The <content-uri=
> element specifies which content to display, in this e=
xample, the HelloWorldPortletInstance:
+		This declaration is equivalent to the previous HelloWorldPortl=
et/WEB-INF/helloworld-object.xml example. Use &l=
t;content-type> to specify the content to display. In t=
his example, the content being displayed by the HelloWorldP=
ortletWindow is a portlet=
. The <content-uri> element specifie=
s which content to display, which in this example, is the H=
elloWorldPortletInstance:
 	
 	
 
         
 	
-		To display certain content or a file, use the cms content-type, with the <content-uri> being the path to the file in the CMS. This behavior is pluggab=
le, and it is possible to plug almost any kind of content.
+		To display certain content or a file, use the cms content-type, with the <content-uri> element being the path to the file in the CMS. This behavior is=
 pluggable, and it is possible to plug in almost any kind of content.
           =

          
          


--===============8952835185116777965==--

From portal-commits at lists.jboss.org Mon Feb 11 22:35:38 2008
Content-Type: multipart/mixed; boundary="===============1331141599181595527=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9938 -
 docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
Date: Mon, 11 Feb 2008 22:35:38 -0500
Message-ID: 

--===============1331141599181595527==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mmcallis
Date: 2008-02-11 22:35:38 -0500 (Mon, 11 Feb 2008)
New Revision: 9938

Modified:
   docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorial=
s.xml
Log:
revising 5.2.1.5. Building your Portlet
adding orderedlist/procedure for building/exploding helloworldportlet
example


Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/t=
utorials.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutoria=
ls.xml	2008-02-12 01:08:04 UTC (rev 9937)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutoria=
ls.xml	2008-02-12 03:35:38 UTC (rev 9938)
@@ -519,41 +519,67 @@
           =

          
          
-            Building your portlet
-            If you have downloaded the sample, you can execute the b=
uild.xml with ant or inside your IDE.
-               Executing the deploy target will compile=
 all the source files and produce a
-               helloworldportlet.war file under
-               HelloWorldPortlet\helloworldportlet.war.
-            
+            Building your Portlet
             
-               
-                  
-                     
-                  
-               
-            
+		    A pre-compiled HelloWorldPortlet/helloworldportlet.war file is created after extracting the HelloWorldPorlet.zip file. To manually build the <=
filename>helloworldportlet.war file:
+	    
+	    
+		    
+			    
+				    
+					    Change into the HelloWorldPortlet/ directory=
, and remove the existing helloworldportlet.war file.
+				    
+			    
+			    
+				    
+					    Run the ant deploy command:
+				    
+				    
+               				
+						
+							
+						
+					
+				    
+			    
+		    
+	    
             
-               If you want to create an expanded WAR directory, after exec=
uting the above deploy target, you should
-               execute the explode target.
+		    Expanding the helloworldportlet.war allows you =
to deploy the portlet as an expanded directory, which makes development eas=
ier. This gives you access to the XML descriptors, resource files, JSF, and=
 JSP pages. To expand the helloworldportlet.war file:
+	    
+	    
+		    
+			    
+				    
+					    If you do not have the HelloWorldPortlet/helloworldport=
let.war file, change into the run the HelloWorldPortle=
t/ directory and run the ant deploy command t=
o create it.
+				    
+			    
+			    
+				    
+					    Change into the HelloWorldPortlet/ directory=
 and run the ant explode command:
+				    
+				    
+					    
+						    
+							    
+						    
+              				 
+				 
+			    
+		    
+	    
+	    
+		    The ant explode command creates a directory struc=
ture such as the following:
+	    
+	    
                
                   
-                     
-                  
-               
-            
-            
-               The above target will produce the following:
-               
-                  
                      
                   
                
-               This will deflate helloworldportlet.war,=
 and allow you to deploy it as an
-               expanded directory. It will work just the same but is easie=
r to work with during development as you can
-               easily modify the XML descriptors, resources files, JSF/JSP=
 pages. A simple touch
-               operation (or equivalent) on the web.xml=
 file will let any live JBoss Application
-               Server instance know that it needs to hot-redeploy your web=
 application.
+       	     
+	     
+		     The expanded directory and the XML descriptors are located in the <=
filename>HelloWorldPortlet/output/lib/exploded/helloworldportlet.war/ directory. Touching the web.xml file will let an=
y live JBoss AS instance know that it needs to hot re-deploy the web applic=
ation.
             
          
          


--===============1331141599181595527==--

From portal-commits at lists.jboss.org Tue Feb 12 08:41:35 2008
Content-Type: multipart/mixed; boundary="===============6824808690477708716=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9939 - in
 modules/portlet/trunk/test/src/test/resources/simple-portal-war: layouts/nav
 and 1 other directory.
Date: Tue, 12 Feb 2008 08:41:35 -0500
Message-ID: 

--===============6824808690477708716==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: wesleyhales
Date: 2008-02-12 08:41:35 -0500 (Tue, 12 Feb 2008)
New Revision: 9939

Added:
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/wik=
ipedia.jsp
Modified:
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/hom=
e.jsp
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/=
nav/main.jsp
Log:
wikipedia stuff and new home page

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/d=
emo/home.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/ho=
me.jsp	2008-02-12 03:35:38 UTC (rev 9938)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/ho=
me.jsp	2008-02-12 13:41:35 UTC (rev 9939)
@@ -7,79 +7,7 @@
    <%@ include file=3D"/layouts/header.jsp" %>
 =

       
-          
-            
-               
-            
-             Demo Page Title
-             Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed=
 do eiusmod tempor incididunt ut labore et
-             dolore magna aliqua. Ut enim ad minim veniam, quis nostrud ex=
ercitation ullamco laboris nisi ut aliquip
-             ex ea commodo consequat. Duis aute irure dolor in reprehender=
it in voluptate velit esse cillum dolore eu
-             fugiat nulla pariatur. Excepteur sint occaecat cupidatat non =
proident, sunt in culpa qui officia deserunt
-             mollit anim id est laborum.
-             

-             Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed=
 do eiusmod tempor incididunt ut labore et
-             dolore magna aliqua. Ut enim ad minim veniam, quis nostrud ex=
ercitation ullamco laboris nisi ut aliquip
-             ex ea commodo consequat. Duis aute irure dolor in reprehender=
it in voluptate velit esse cillum dolore eu
-             fugiat nulla pariatur. Excepteur sint occaecat cupidatat non =
proident, sunt in culpa qui officia deserunt
-             mollit anim id est laborum.
-             

-             Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed=
 do eiusmod tempor incididunt ut labore et
-             dolore magna aliqua. Ut enim ad minim veniam, quis nostrud ex=
ercitation ullamco laboris nisi ut aliquip
-             ex ea commodo consequat. Duis aute irure dolor in reprehender=
it in voluptate velit esse cillum dolore eu
-             fugiat nulla pariatur. Excepteur sint occaecat cupidatat non =
proident, sunt in culpa qui officia deserunt
-             mollit anim id est laborum.
-             

-             Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed=
 do eiusmod tempor incididunt ut labore et
-             dolore magna aliqua. Ut enim ad minim veniam, quis nostrud ex=
ercitation ullamco laboris nisi ut aliquip
-             ex ea commodo consequat. Duis aute irure dolor in reprehender=
it in voluptate velit esse cillum dolore eu
-             fugiat nulla pariatur. Excepteur sint occaecat cupidatat non =
proident, sunt in culpa qui officia deserunt
-             mollit anim id est laborum.
-             

-             Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed=
 do eiusmod tempor incididunt ut labore et
-             dolore magna aliqua. Ut enim ad minim veniam, quis nostrud ex=
ercitation ullamco laboris nisi ut aliquip
-             ex ea commodo consequat. Duis aute irure dolor in reprehender=
it in voluptate velit esse cillum dolore eu
-             fugiat nulla pariatur. Excepteur sint occaecat cupidatat non =
proident, sunt in culpa qui officia deserunt
-             mollit anim id est laborum.
-             

-             Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed=
 do eiusmod tempor incididunt ut labore et
-             dolore magna aliqua. Ut enim ad minim veniam, quis nostrud ex=
ercitation ullamco laboris nisi ut aliquip
-             ex ea commodo consequat. Duis aute irure dolor in reprehender=
it in voluptate velit esse cillum dolore eu
-             fugiat nulla pariatur. Excepteur sint occaecat cupidatat non =
proident, sunt in culpa qui officia deserunt
-             mollit anim id est laborum.
-             

-             Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed=
 do eiusmod tempor incididunt ut labore et
-             dolore magna aliqua. Ut enim ad minim veniam, quis nostrud ex=
ercitation ullamco laboris nisi ut aliquip
-             ex ea commodo consequat. Duis aute irure dolor in reprehender=
it in voluptate velit esse cillum dolore eu
-             fugiat nulla pariatur. Excepteur sint occaecat cupidatat non =
proident, sunt in culpa qui officia deserunt
-             mollit anim id est laborum.
-             

-             Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed=
 do eiusmod tempor incididunt ut labore et
-             dolore magna aliqua. Ut enim ad minim veniam, quis nostrud ex=
ercitation ullamco laboris nisi ut aliquip
-             ex ea commodo consequat. Duis aute irure dolor in reprehender=
it in voluptate velit esse cillum dolore eu
-             fugiat nulla pariatur. Excepteur sint occaecat cupidatat non =
proident, sunt in culpa qui officia deserunt
-             mollit anim id est laborum.
-             

-             Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed=
 do eiusmod tempor incididunt ut labore et
-             dolore magna aliqua. Ut enim ad minim veniam, quis nostrud ex=
ercitation ullamco laboris nisi ut aliquip
-             ex ea commodo consequat. Duis aute irure dolor in reprehender=
it in voluptate velit esse cillum dolore eu
-             fugiat nulla pariatur. Excepteur sint occaecat cupidatat non =
proident, sunt in culpa qui officia deserunt
-             mollit anim id est laborum.
-             

-             Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed=
 do eiusmod tempor incididunt ut labore et
-             dolore magna aliqua. Ut enim ad minim veniam, quis nostrud ex=
ercitation ullamco laboris nisi ut aliquip
-             ex ea commodo consequat. Duis aute irure dolor in reprehender=
it in voluptate velit esse cillum dolore eu
-             fugiat nulla pariatur. Excepteur sint occaecat cupidatat non =
proident, sunt in culpa qui officia deserunt
-             mollit anim id est laborum.
-             

-             Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed=
 do eiusmod tempor incididunt ut labore et
-             dolore magna aliqua. Ut enim ad minim veniam, quis nostrud ex=
ercitation ullamco laboris nisi ut aliquip
-             ex ea commodo consequat. Duis aute irure dolor in reprehender=
it in voluptate velit esse cillum dolore eu
-             fugiat nulla pariatur. Excepteur sint occaecat cupidatat non =
proident, sunt in culpa qui officia deserunt
-             mollit anim id est laborum.
-             

-          
-
+         =

       
 =

    <%@ include file=3D"/layouts/footer.jsp" %>
\ No newline at end of file

Copied: modules/portlet/trunk/test/src/test/resources/simple-portal-war/dem=
o/wikipedia.jsp (from rev 9936, modules/portlet/trunk/test/src/test/resourc=
es/simple-portal-war/demo/home.jsp)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/wi=
kipedia.jsp	                        (rev 0)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/wi=
kipedia.jsp	2008-02-12 13:41:35 UTC (rev 9939)
@@ -0,0 +1,37 @@
+<%@ page contentType=3D"text/html" %>
+<%@ page language=3D"java" %>
+<%@ taglib prefix=3D"jbp" tagdir=3D"/WEB-INF/tags/portal" %>
+<%@ taglib uri=3D"/WEB-INF/portal.tld" prefix=3D"portal" %>
+<%@ page isELIgnored=3D"false" %>
+
+   <%@ include file=3D"/layouts/header.jsp" %>
+
+      
+         
+          
+            
+               
+            
+             St. Augustine, Florida
+             St. Augustine is the county seat of St. Johns County [1], =
Florida, in the United States. It is the oldest continuously occupied Europ=
ean-established city, and the oldest port in the continental United States.=
[2] St. Augustine lies in a region of Florida known as The First Coast, whi=
ch extends from Amelia Island in the north, south to Jacksonville, St. Augu=
stine and Palm Coast. According to the 2000 census, the city population was=
 11,592; in 2004, the population estimated by the U.S. Census Bureau was 12=
,157 [1].
+             

+             St. Augustine was founded by the Spanish in 1565.[2] The f=
irst Christian worship service held in a permanent settlement in the contin=
ental United States was a Catholic Mass celebrated in St. Augustine. A few =
settlements were founded prior to St. Augustine but all failed, including t=
he original Pensacola colony in West Florida, founded by Trist=EF=BF=BDn de=
 Luna y Arellano in 1559, with the area abandoned in 1561 due to hurricanes=
, famine and warring tribes, and Fort Caroline in what is today Jacksonvill=
e, Florida, in 1564. The city was founded by the Spanish admiral Pedro Men=
=EF=BF=BDndez de Avil=EF=BF=BDs on September 8, 1565. Men=EF=BF=BDndez firs=
t sighted land on August 28, the feast day of Augustine of Hippo, and conse=
quently named the settlement San Agust=EF=BF=BDn. Mart=EF=BF=BDn de Arg=EF=
=BF=BDelles was born here one year later in 1566, the first child of Europe=
an ancestry to be born in what is now the continental United States. This c=
ame 21 years before the English settlement at Roanoke Island in Virginia!
  Colony, and 42 years before the successful settlements of Santa Fe, New M=
exico, and Jamestown, Virginia. In all the territory under the jurisdiction=
 of the United States, only (European) settlements in Puerto Rico are older=
 than St. Augustine, with the oldest being Caparra, founded in 1508, whose =
inhabitants relocated and founded San Juan, in 1521.
+             
 In 1586 St. Augustine was attacked and burned by Sir Fr=
ancis Drake. In 1668 it was plundered by pirates and most of the inhabitant=
s were killed. In 1702 and 1740 it was unsuccessfully attacked by British f=
orces from their new colonies in the Carolinas and Georgia. The most seriou=
s of these came in the latter year, when James Oglethorpe of Georgia allied=
 himself with Ahaya the Cowkeeper, chief of the Alachua band of the Seminol=
e tribe to lay siege to the city.
+             

+             In 1763, the Treaty of Paris ended the French and Indian War =
and gave Florida and St. Augustine to the British, an acquisition the Briti=
sh had been unable to take by force and keep due to the strong fort there. =
St. Augustine came under British rule and served as a Loyalist colony durin=
g the American Revolutionary War. The Treaty of Paris in 1783 gave the Amer=
ican colonies north of Florida their independence, and ceded Florida to Spa=
in in recognition of Spanish efforts on behalf of the American colonies dur=
ing the war.
+             

+             Florida was under Spanish control again from 1784 to 1821. Du=
ring this time, Spain was being invaded by Napoleon and was struggling to r=
etain its colonies. Florida no longer held its past importance to Spain. Th=
e expanding United States, however, regarded Florida as vital to its intere=
sts. In 1821, the Adams-On=EF=BF=BDs Treaty peaceably turned the Spanish co=
lonies in Florida and, with them, St. Augustine, over to the United States.
+             

+             Florida was a United States territory until 1845 when it beca=
me a U.S. state. In 1861, the American Civil War began and Florida seceded =
from the Union and joined the Confederacy. Days before Florida seceded, sta=
te troops took the fort at St. Augustine from a small Union garrison (Janua=
ry 7, 1861). However, federal troops loyal to the United States Government =
quickly reoccupied the city (March 11, 1862) and remained in control throug=
hout the four-year-long war. In 1865, Florida rejoined the United States.
+             

+             Spanish Colonial era buildings still existing in the city inc=
lude the fortress Castillo de San Marcos. The fortress successfully repelle=
d the British attacks of the 18th century, served as a prison for the Nativ=
e American leader Osceola in 1837, and was occupied by Union troops during =
the American Civil War. It was removed from the Army's active duty rolls in=
 1900 after 205 years of service under five different flags. It is now the =
Castillo de San Marcos National Monument.
+             

+             In the late 19th century the railroad came to town, and led b=
y northeastern industrialist Henry Flagler, St. Augustine became a winter r=
esort for the very wealthy. A number of mansions and palatial grand hotels =
of this era still exist, some converted to other use, such as housing parts=
 of Flagler College and museums. Flagler went on to develop much more of Fl=
orida's east coast, including his Florida East Coast Railway which eventual=
ly reached Key West in 1912.
+             

+             The city is a popular tourist attraction, for the rich Spanis=
h Colonial Revival Style architectural heritage as well as elite 19th centu=
ry architecture. In 1938 the theme park Marineland opened just south of St.=
 Augustine, becoming one of Florida's first themed parks and setting the st=
age for the development of this industry in the following decades. The city=
 is also one terminus of the Old Spanish Trail, which in the 1920's linked =
St. Augustine, Florida, to San Diego, California with 3000 miles of roadway=
s.
+           =

+          
+
+      
+
+   <%@ include file=3D"/layouts/footer.jsp" %>
\ No newline at end of file

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/l=
ayouts/nav/main.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts=
/nav/main.jsp	2008-02-12 03:35:38 UTC (rev 9938)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts=
/nav/main.jsp	2008-02-12 13:41:35 UTC (rev 9939)
@@ -15,6 +15,10 @@
 =

             Home
          
+          
+
+            Wikipedia
+         
          
             Demo Portlets
          


--===============6824808690477708716==--

From portal-commits at lists.jboss.org Tue Feb 12 13:47:38 2008
Content-Type: multipart/mixed; boundary="===============3289364875456279878=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9940 - in modules/portlet/trunk:
 test and 5 other directories.
Date: Tue, 12 Feb 2008 13:47:37 -0500
Message-ID: 

--===============3289364875456279878==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: chris.laprun(a)jboss.com
Date: 2008-02-12 13:47:37 -0500 (Tue, 12 Feb 2008)
New Revision: 9940

Removed:
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/=
jboss-web.xml
Modified:
   modules/portlet/trunk/build/pom.xml
   modules/portlet/trunk/test/pom.xml
   modules/portlet/trunk/test/src/test/build.xml
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/META-INF=
/context.xml
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/=
context.xml
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/=
web.xml
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/css/mast=
er.css
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/=
header.jsp
Log:
- More work on packaging. Tomcat is getting better but portlets are not tak=
en into account yet...
- Removed mapping to simple as it's not possible to do it with Tomcat. Mapp=
ing will now be simple-portal. Adapted files accordingly.
- Added JSTL dependencies for Tomcat.

Modified: modules/portlet/trunk/build/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/build/pom.xml	2008-02-12 13:41:35 UTC (rev 9939)
+++ modules/portlet/trunk/build/pom.xml	2008-02-12 18:47:37 UTC (rev 9940)
@@ -9,23 +9,24 @@
     the property
 -->
 
-  
-    org.jboss.portal
-    jboss-portal-parent
-    1-SNAPSHOT
-  
-  4.0.0
-  org.jboss.portal.portlet
-  module-parent
-  2.0-SNAPSHOT
-  pom
-  JBoss Portal Portlet Module
-  http://www.jboss.com/products/jbossmc
-  JBoss Portal Portlet Module
+         xsi:schemaLocation=3D"http://maven.apache.org/POM/4.0.0 http://ma=
ven.apache.org/maven-v4_0_0.xsd">
+   
+      org.jboss.portal
+      jboss-portal-parent
+      1-SNAPSHOT
+   
+   4.0.0
+   org.jboss.portal.portlet
+   module-parent
+   2.0-SNAPSHOT
+   pom
+   JBoss Portal Portlet Module
+   http://www.jboss.com/products/jbossmc
+   JBoss Portal Portlet Module
 =

    
       1.0.3
+      1.1.2
       1.0.2
       1.3.4
       2.5
@@ -79,7 +80,7 @@
    
 =

 =

-  
+   
       
          
             org.apache.maven.plugins
@@ -99,7 +100,7 @@
             
          
       
-  
+   
 =

    
       
@@ -131,16 +132,30 @@
             portals-bridges-common
             ${version.apache.portals.bridges}
          
+
+         
          
+            apache-taglibs
+            jstl
+            ${version.apache-taglibs}
+         
+         
+            apache-taglibs
+            standard
+            ${version.apache-taglibs}
+         
+
+
+         
             sun-jaxb
             jaxb-api
             ${version.sun-jaxb}
          
 =

          
-            
-            
-            
+         
+         
+         
          
          
             org.jboss.portal.common
@@ -178,9 +193,9 @@
             ${version.javax.servlet.jsp}
          
          
-            
-            
-            
+         
+         
+         
          
 =

          
@@ -344,39 +359,39 @@
             ${version.jboss.aop}
          
          
-            
-            
-            
+         
+         
+         
          
          
-            
-            
-            
+         
+         
+         
          
          
-            
-            
-            
+         
+         
+         
          
          
-            
-            
-            
+         
+         
+         
          
          
-            
-            
-            
+         
+         
+         
          
          
-            
-            
-            
+         
+         
+         
          
          
-            
-            
-            
+         
+         
+         
          
          
             commons-logging

Modified: modules/portlet/trunk/test/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/pom.xml	2008-02-12 13:41:35 UTC (rev 9939)
+++ modules/portlet/trunk/test/pom.xml	2008-02-12 18:47:37 UTC (rev 9940)
@@ -24,9 +24,6 @@
          portlet-controller
          ${project.version}
       
-
-
-
       
          org.jboss.portal.portlet
          portlet-portlet
@@ -196,6 +193,15 @@
          portlet-api
       
 =

+      
+      
+         apache-taglibs
+         jstl
+      
+      
+         apache-taglibs
+         standard
+      
    
 =

    
@@ -363,7 +369,7 @@
                                   value=3D"${maven.dependency.org.jboss.po=
rtal.portlet.portlet-portlet.jar.path}"/>
                         
-			               
                         
@@ -371,11 +377,17 @@
                         
 =

+                        
+                        
+                        
+
                         
                            
                            
                         
-						=

+
                      
                   
                   

Modified: modules/portlet/trunk/test/src/test/build.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/build.xml	2008-02-12 13:41:35 UTC (=
rev 9939)
+++ modules/portlet/trunk/test/src/test/build.xml	2008-02-12 18:47:37 UTC (=
rev 9940)
@@ -698,6 +698,7 @@
                
                
                
+               
             
          
 =

@@ -722,7 +723,7 @@
 =

 =

       
-         
+         
       
 =

       
@@ -738,10 +739,9 @@
 =

          
 =

-         
-
          
          
+         
          
          
          
@@ -753,21 +753,31 @@
          
       
 =

+      
+         
+      
+
       
       
 =

       
       
-      
+      
          
             
             
-            
+            
+            
+            
          
       
+      
+         
+      
+      
 =

       
-      
+      
 =

       
 =


Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/M=
ETA-INF/context.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/META-IN=
F/context.xml	2008-02-12 13:41:35 UTC (rev 9939)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/META-IN=
F/context.xml	2008-02-12 18:47:37 UTC (rev 9940)
@@ -1,2 +1,2 @@
 
-
\ No newline at end of file
+
\ No newline at end of file

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/W=
EB-INF/context.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF=
/context.xml	2008-02-12 13:41:35 UTC (rev 9939)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF=
/context.xml	2008-02-12 18:47:37 UTC (rev 9940)
@@ -1,2 +1,2 @@
 
-
\ No newline at end of file
+
\ No newline at end of file

Deleted: modules/portlet/trunk/test/src/test/resources/simple-portal-war/WE=
B-INF/jboss-web.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF=
/jboss-web.xml	2008-02-12 13:41:35 UTC (rev 9939)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF=
/jboss-web.xml	2008-02-12 18:47:37 UTC (rev 9940)
@@ -1,26 +0,0 @@
-
-
-
-   /simple
-

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/W=
EB-INF/web.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF=
/web.xml	2008-02-12 13:41:35 UTC (rev 9939)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF=
/web.xml	2008-02-12 18:47:37 UTC (rev 9940)
@@ -23,9 +23,9 @@
   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~=
~~~-->
 =

 
+         xmlns:xsi=3D"http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation=3D"http://java.sun.com/xml/ns/javaee http://ja=
va.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+         version=3D"2.5">
    
       ControllerFilter
       org.jboss.portal.portlet.test.jsp.ControllerFilter
@@ -48,6 +48,6 @@
    
    
       PortalServlet
-      /simple
+      /simple-portal
    
 

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/c=
ss/master.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/css/mas=
ter.css	2008-02-12 13:41:35 UTC (rev 9939)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/css/mas=
ter.css	2008-02-12 18:47:37 UTC (rev 9940)
@@ -82,10 +82,10 @@
 }
 =

 body,
-div,
-form,
-ul,
-li {
+   div,
+   form,
+   ul,
+   li {
    margin: 0;
    padding: 0;
 }
@@ -130,7 +130,6 @@
    padding: 0;
 }
 =

-
 /*-------------------------------Container Decoration*/
 =

 div#container>div.header {
@@ -139,31 +138,31 @@
 }
 =

 div#container div.header div.logo {
-   background-image: url( /simple/images/logo-header.gif );
+   background-image: url( /simple-portal/images/logo-header.gif );
    background-repeat: no-repeat;
    background-position: top left;
-   height:40px;
+   height: 40px;
 }
 =

 div#container div.header div.pc20 {
-    text-align: right;
+   text-align: right;
 }
 =

 div#container div.header div.pc20 img {
-    margin: 5px 10px 0 0;
+   margin: 5px 10px 0 0;
 }
 =

 div#container div.nav {
-   background-image: url( /simple/images/nav-bg.gif );
+   background-image: url( /simple-portal/images/nav-bg.gif );
    background-repeat: repeat-x;
    background-position: top left;
    border-top: 1px solid #878787;
    border-bottom: 1px solid #383838;
-   height:24px;
+   height: 24px;
 }
 =

 div#container div.nav ul {
-   height:24px;
+   height: 24px;
    margin: 0 0 0 10px;
 }
 =

@@ -171,34 +170,32 @@
    display: inline;
    float: left;
    text-align: center;
-   height: 24px;
-   /*border: 1px solid #929292;*/
+   height: 24px; /*border: 1px solid #929292;*/
 }
 =

 div#container div.nav ul li a,
-div#container div.nav ul li a:hover {
+   div#container div.nav ul li a:hover {
    display: block;
-   height:16px;
+   height: 16px;
    padding: 5px 14px 4px 14px;
    background-repeat: repeat-x;
    background-position: top left;
-   text-decoration:none;
+   text-decoration: none;
    font: bold 11px;
 }
 =

-div#container div.nav ul li a{
-   color: #fff;
-   /*background-image: url( /simple/images/inactive-button-bg.gif );*/
+div#container div.nav ul li a {
+   color: #fff; /*background-image: url( /simple-portal/images/inactive-bu=
tton-bg.gif );*/
 }
 =

 div#container div.nav ul li a:hover,
-div#container div.nav ul li a.selected{
+   div#container div.nav ul li a.selected {
    color: #fff;
-   background-image: url( /simple/images/active-button2-bg.gif );
+   background-image: url( /simple-portal/images/active-button2-bg.gif );
 }
 =

 div#container div#content {
-   background-image: url( /simple/images/portal-bg.gif );
+   background-image: url( /simple-portal/images/portal-bg.gif );
    background-repeat: repeat-x;
    background-position: top left;
    min-height: 600px;
@@ -207,46 +204,46 @@
 =

 /*-------------------------------Portlet Decoration*/
 =

-div#container div#content div.portlet{
+div#container div#content div.portlet {
    border: 1px solid #969696;
    background-color: #e2e2e2;
    padding: 2px;
-   float:left;
-   margin:10px;
+   float: left;
+   margin: 10px;
    width: 95%;
 }
 =

-div#container div#content div.portlet-frame{
+div#container div#content div.portlet-frame {
    background-color: #fff;
    border: 1px solid #fff;
 }
 =

 div#container div#content div.portlet div.header {
-   background-image: url( /simple/images/portlet-titlebg.gif );
+   background-image: url( /simple-portal/images/portlet-titlebg.gif );
    background-repeat: repeat-x;
    background-position: top left;
-   height:20px;
+   height: 20px;
 }
 =

 div#container div#content div.portlet div.header div.header-layer {
-   background-image: url( /simple/images/portlet-title-rt-bg.gif );
+   background-image: url( /simple-portal/images/portlet-title-rt-bg.gif );
    background-repeat: no-repeat;
    background-position: top right;
-   height:20px;
+   height: 20px;
 }
 =

-div#container div#content div.portlet div.header div.header-layer div.titl=
e h2{
+div#container div#content div.portlet div.header div.header-layer div.titl=
e h2 {
    font: bold 12px Lucida Sans, Trebuchet, tahoma, sans-serif;
    color: #fff;
    padding: 2px;
 }
 =

-div#container div#content div.portlet div.header div.header-layer div.cont=
rols{
+div#container div#content div.portlet div.header div.header-layer div.cont=
rols {
    text-align: right;
    padding: 3px 0 0 0;
 }
 =

-div#container div#content div.portlet div.header div.header-layer div.cont=
rols span.mode-button{
+div#container div#content div.portlet div.header div.header-layer div.cont=
rols span.mode-button {
    text-align: right;
    padding: 0 5px 0 0;
 }
@@ -254,7 +251,7 @@
 div#container div#content div.portlet div.header div.header-layer div.cont=
rols span.mode-button a {
    color: #e1d77e;
    font: normal 11px;
-   text-decoration:none;
+   text-decoration: none;
 }
 =

 /*----------------------------------Error portlet*/
@@ -285,7 +282,7 @@
    color: #cc1100
 }
 =

-div.exception code{
+div.exception code {
    color: #33ff00;
 }
 =

@@ -308,5 +305,5 @@
 }
 =

 div.remote-container ul li a {
-   color: #332299 =

+   color: #332299
 }

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/l=
ayouts/header.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts=
/header.jsp	2008-02-12 13:41:35 UTC (rev 9939)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts=
/header.jsp	2008-02-12 18:47:37 UTC (rev 9940)
@@ -1,30 +1,32 @@
 <%@ taglib uri=3D"/WEB-INF/portal.tld" prefix=3D"portal" %>
 
 
+PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
 
-Portlet Container 2.0
-
-
-
-
-
-
+   Portlet Container 2.0
+   
+   
+   
+   
+   
+   
    
-
+   
 
 
 =

 
    
       
-      
+      
       

    
    <%@ include file=3D"nav/main.jsp" %>


--===============3289364875456279878==--

From portal-commits at lists.jboss.org Tue Feb 12 15:10:38 2008
Content-Type: multipart/mixed; boundary="===============0703422673029182705=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9941 -
 modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/portal/samples.
Date: Tue, 12 Feb 2008 15:10:38 -0500
Message-ID: 

--===============0703422673029182705==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: chris.laprun(a)jboss.com
Date: 2008-02-12 15:10:38 -0500 (Tue, 12 Feb 2008)
New Revision: 9941

Modified:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/portal=
/samples/RemoteControlResourcePortlet.java
Log:
- Removed preference code for now as it's not working.

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/portal/samples/RemoteControlResourcePortlet.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/porta=
l/samples/RemoteControlResourcePortlet.java	2008-02-12 18:47:37 UTC (rev 99=
40)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/porta=
l/samples/RemoteControlResourcePortlet.java	2008-02-12 20:10:38 UTC (rev 99=
41)
@@ -32,14 +32,14 @@
       renderResponse.setContentType("text/html");
       PrintWriter printWriter =3D renderResponse.getWriter();
       printWriter.print("");
+         "window.open(url, 'jbp_remote', 'width=3D400,height=3D200,scrolla=
ble=3Dyes')}");
       printWriter.print("Open remote control!");
-      String color =3D renderRequest.getPreferences().getValue("color", "0=
00");
+      /*String color =3D renderRequest.getPreferences().getValue("color", =
"000");
       printWriter.print("Preferred color:  ");
+         + color + ";'> ");*/
    }
 =

    @Override
@@ -47,7 +47,7 @@
    {
       resourceResponse.setContentType("text/html");
       PrintWriter writer =3D resourceResponse.getWriter();
-      resourceRequest.getPreferences().setValue("color", COLORS[COLOR_INDE=
X++ % 8]);
+//      resourceRequest.getPreferences().setValue("color", COLORS[COLOR_IN=
DEX++ % 8]);
       writer.print("" +
          "");
       PortletURL url =3D resourceResponse.createRenderURL();


--===============0703422673029182705==--

From portal-commits at lists.jboss.org Tue Feb 12 16:43:55 2008
Content-Type: multipart/mixed; boundary="===============6613809314447957602=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9942 - in modules/common/trunk:
 build and 3 other directories.
Date: Tue, 12 Feb 2008 16:43:54 -0500
Message-ID: 

--===============6613809314447957602==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: bdaw
Date: 2008-02-12 16:43:53 -0500 (Tue, 12 Feb 2008)
New Revision: 9942

Modified:
   modules/common/trunk/build/pom.xml
   modules/common/trunk/common/pom.xml
   modules/common/trunk/mc/pom.xml
   modules/common/trunk/pom.xml
   modules/common/trunk/portal/pom.xml
Log:
version update to 1.2.0-Beta1 =




Modified: modules/common/trunk/build/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/common/trunk/build/pom.xml	2008-02-12 20:10:38 UTC (rev 9941)
+++ modules/common/trunk/build/pom.xml	2008-02-12 21:43:53 UTC (rev 9942)
@@ -10,7 +10,7 @@
    module-parent
    pom
    JBoss Portal Modules Common
-   1.2.0-SNAPSHOT
+   1.2.0-Beta1
    http://labs.jboss.com/jbossportal
 =

    

Modified: modules/common/trunk/common/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/common/trunk/common/pom.xml	2008-02-12 20:10:38 UTC (rev 9941)
+++ modules/common/trunk/common/pom.xml	2008-02-12 21:43:53 UTC (rev 9942)
@@ -3,7 +3,7 @@
    
       org.jboss.portal.common
       module-parent
-      1.2.0-SNAPSHOT
+      1.2.0-Beta1
       ../build/pom.xml
    
    4.0.0

Modified: modules/common/trunk/mc/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/common/trunk/mc/pom.xml	2008-02-12 20:10:38 UTC (rev 9941)
+++ modules/common/trunk/mc/pom.xml	2008-02-12 21:43:53 UTC (rev 9942)
@@ -3,7 +3,7 @@
    
       org.jboss.portal.common
       module-parent
-      1.2.0-SNAPSHOT
+      1.2.0-Beta1
       ../build/pom.xml
    
    4.0.0

Modified: modules/common/trunk/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/common/trunk/pom.xml	2008-02-12 20:10:38 UTC (rev 9941)
+++ modules/common/trunk/pom.xml	2008-02-12 21:43:53 UTC (rev 9942)
@@ -5,7 +5,7 @@
    module-aggregator
    pom
    JBoss Portal Modules Common (aggregator)
-   1.2.0-SNAPSHOT
+   1.2.0-Beta1
 =

    
       

Modified: modules/common/trunk/portal/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/common/trunk/portal/pom.xml	2008-02-12 20:10:38 UTC (rev 9941)
+++ modules/common/trunk/portal/pom.xml	2008-02-12 21:43:53 UTC (rev 9942)
@@ -3,7 +3,7 @@
    
       org.jboss.portal.common
       module-parent
-      1.2.0-SNAPSHOT
+      1.2.0-Beta1
       ../build/pom.xml
    
    4.0.0


--===============6613809314447957602==--

From portal-commits at lists.jboss.org Tue Feb 12 16:56:00 2008
Content-Type: multipart/mixed; boundary="===============7300407028968974508=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN:  r9944 - modules/common/tags.
Date: Tue, 12 Feb 2008 16:56:00 -0500
Message-ID: 

--===============7300407028968974508==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: bdaw
Date: 2008-02-12 16:56:00 -0500 (Tue, 12 Feb 2008)
New Revision: 9944

Added:
   modules/common/tags/JBP_COMMON_1_2_0_BETA1/
Log:
tag 1.2.0-Beta1



Copied: modules/common/tags/JBP_COMMON_1_2_0_BETA1 (from rev 9943, modules/=
common/trunk)


--===============7300407028968974508==--

From portal-commits at lists.jboss.org Tue Feb 12 17:05:48 2008
Content-Type: multipart/mixed; boundary="===============7664317441974969084=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9946 - modules/web/trunk/build.
Date: Tue, 12 Feb 2008 17:05:48 -0500
Message-ID: 

--===============7664317441974969084==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: bdaw
Date: 2008-02-12 17:05:48 -0500 (Tue, 12 Feb 2008)
New Revision: 9946

Modified:
   modules/web/trunk/build/pom.xml
Log:
update common module version to 1.2.0-Beta1



Modified: modules/web/trunk/build/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/web/trunk/build/pom.xml	2008-02-12 22:03:43 UTC (rev 9945)
+++ modules/web/trunk/build/pom.xml	2008-02-12 22:05:48 UTC (rev 9946)
@@ -36,7 +36,7 @@
       2.0.0.CR3
       3.6-beta
       2.2.1.GA
-      1.2.0-SNAPSHOT
+      1.2.0-Beta1
       1.2.0-SNAPSHOT
       1.2.14
       1.1.1


--===============7664317441974969084==--

From portal-commits at lists.jboss.org Tue Feb 12 17:18:32 2008
Content-Type: multipart/mixed; boundary="===============3204472964645821351=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9947 -
 modules/portlet/trunk/build.
Date: Tue, 12 Feb 2008 17:18:31 -0500
Message-ID: 

--===============3204472964645821351==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: bdaw
Date: 2008-02-12 17:18:31 -0500 (Tue, 12 Feb 2008)
New Revision: 9947

Modified:
   modules/portlet/trunk/build/pom.xml
Log:
update common to 1.2.0-Beta1

Modified: modules/portlet/trunk/build/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/build/pom.xml	2008-02-12 22:05:48 UTC (rev 9946)
+++ modules/portlet/trunk/build/pom.xml	2008-02-12 22:18:31 UTC (rev 9947)
@@ -39,7 +39,7 @@
       2.0.0.CR5
       3.6-beta
       2.2.1.GA
-      1.2.0-SNAPSHOT
+      1.2.0-Beta1
       1.2.0-SNAPSHOT
       1.2.0-Beta1
       1.2.14


--===============3204472964645821351==--

From portal-commits at lists.jboss.org Tue Feb 12 18:09:19 2008
Content-Type: multipart/mixed; boundary="===============4469513960000598818=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9948 - in
 modules/portlet/trunk/test/src: test and 1 other directories.
Date: Tue, 12 Feb 2008 18:09:19 -0500
Message-ID: 

--===============4469513960000598818==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: chris.laprun(a)jboss.com
Date: 2008-02-12 18:09:19 -0500 (Tue, 12 Feb 2008)
New Revision: 9948

Removed:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/
Modified:
   modules/portlet/trunk/test/src/test/build.xml
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/=
web.xml
Log:
- Added missing libraries for Tomcat.
- Fixed improper packaging of portlets (was fine with AS but not Tomcat).
- Removed useless SimplePortalServlet.

Modified: modules/portlet/trunk/test/src/test/build.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/build.xml	2008-02-12 22:18:31 UTC (=
rev 9947)
+++ modules/portlet/trunk/test/src/test/build.xml	2008-02-12 23:09:19 UTC (=
rev 9948)
@@ -753,10 +753,6 @@
          
       
 =

-      
-         
-      
-
       
       
 =

@@ -768,7 +764,8 @@
             
             
             
-            
+            
+            
          
       
       
@@ -794,6 +791,8 @@
 =

       
          
+      
+      
          
       
@@ -803,14 +802,19 @@
 =

       
          
-         
       
+      
+         
+      
       
          
       
 =

       
          
+      
+      
          
       
@@ -820,6 +824,8 @@
 =

       
          
+      
+      
          
       
       
@@ -828,6 +834,8 @@
 =

       
          
+      
+      
          
       
       

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/W=
EB-INF/web.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF=
/web.xml	2008-02-12 22:18:31 UTC (rev 9947)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF=
/web.xml	2008-02-12 23:09:19 UTC (rev 9948)
@@ -42,12 +42,4 @@
       org.jboss.portal.web.impl.tomcat.TC6ContainerServlet<=
/servlet-class>
       0
    
-   
-      PortalServlet
-      org.jboss.portal.simple.SimplePortalServlet
-   
-   
-      PortalServlet
-      /simple-portal
-   
 


--===============4469513960000598818==--

From portal-commits at lists.jboss.org Tue Feb 12 18:24:49 2008
Content-Type: multipart/mixed; boundary="===============9043940056537783208=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9949 -
 modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo.
Date: Tue, 12 Feb 2008 18:24:49 -0500
Message-ID: 

--===============9043940056537783208==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: chris.laprun(a)jboss.com
Date: 2008-02-12 18:24:48 -0500 (Tue, 12 Feb 2008)
New Revision: 9949

Modified:
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/wik=
ipedia.jsp
Log:
- Added page encoding attribute (but does not seem to fix encoding issues).=
 Re-formatted.

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/d=
emo/wikipedia.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/wi=
kipedia.jsp	2008-02-12 23:09:19 UTC (rev 9948)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/wi=
kipedia.jsp	2008-02-12 23:24:48 UTC (rev 9949)
@@ -1,37 +1,85 @@
-<%@ page contentType=3D"text/html" %>
+<%@ page contentType=3D"text/html" pageEncoding=3D"UTF-8" %>
 <%@ page language=3D"java" %>
 <%@ taglib prefix=3D"jbp" tagdir=3D"/WEB-INF/tags/portal" %>
 <%@ taglib uri=3D"/WEB-INF/portal.tld" prefix=3D"portal" %>
 <%@ page isELIgnored=3D"false" %>
 =

-   <%@ include file=3D"/layouts/header.jsp" %>
+<%@ include file=3D"/layouts/header.jsp" %>
 =

-      
-         
-          
-            
-               
-            
-             St. Augustine, Florida
-             St. Augustine is the county seat of St. Johns County [1], =
Florida, in the United States. It is the oldest continuously occupied Europ=
ean-established city, and the oldest port in the continental United States.=
[2] St. Augustine lies in a region of Florida known as The First Coast, whi=
ch extends from Amelia Island in the north, south to Jacksonville, St. Augu=
stine and Palm Coast. According to the 2000 census, the city population was=
 11,592; in 2004, the population estimated by the U.S. Census Bureau was 12=
,157 [1].
-             

-             St. Augustine was founded by the Spanish in 1565.[2] The f=
irst Christian worship service held in a permanent settlement in the contin=
ental United States was a Catholic Mass celebrated in St. Augustine. A few =
settlements were founded prior to St. Augustine but all failed, including t=
he original Pensacola colony in West Florida, founded by Trist=EF=BF=BDn de=
 Luna y Arellano in 1559, with the area abandoned in 1561 due to hurricanes=
, famine and warring tribes, and Fort Caroline in what is today Jacksonvill=
e, Florida, in 1564. The city was founded by the Spanish admiral Pedro Men=
=EF=BF=BDndez de Avil=EF=BF=BDs on September 8, 1565. Men=EF=BF=BDndez firs=
t sighted land on August 28, the feast day of Augustine of Hippo, and conse=
quently named the settlement San Agust=EF=BF=BDn. Mart=EF=BF=BDn de Arg=EF=
=BF=BDelles was born here one year later in 1566, the first child of Europe=
an ancestry to be born in what is now the continental United States. This c=
ame 21 years before the English settlement at Roanoke Island in Virginia!
  Colony, and 42 years before the successful settlements of Santa Fe, New M=
exico, and Jamestown, Virginia. In all the territory under the jurisdiction=
 of the United States, only (European) settlements in Puerto Rico are older=
 than St. Augustine, with the oldest being Caparra, founded in 1508, whose =
inhabitants relocated and founded San Juan, in 1521.
-             
 In 1586 St. Augustine was attacked and burned by Sir Fr=
ancis Drake. In 1668 it was plundered by pirates and most of the inhabitant=
s were killed. In 1702 and 1740 it was unsuccessfully attacked by British f=
orces from their new colonies in the Carolinas and Georgia. The most seriou=
s of these came in the latter year, when James Oglethorpe of Georgia allied=
 himself with Ahaya the Cowkeeper, chief of the Alachua band of the Seminol=
e tribe to lay siege to the city.
-             

-             In 1763, the Treaty of Paris ended the French and Indian War =
and gave Florida and St. Augustine to the British, an acquisition the Briti=
sh had been unable to take by force and keep due to the strong fort there. =
St. Augustine came under British rule and served as a Loyalist colony durin=
g the American Revolutionary War. The Treaty of Paris in 1783 gave the Amer=
ican colonies north of Florida their independence, and ceded Florida to Spa=
in in recognition of Spanish efforts on behalf of the American colonies dur=
ing the war.
-             

-             Florida was under Spanish control again from 1784 to 1821. Du=
ring this time, Spain was being invaded by Napoleon and was struggling to r=
etain its colonies. Florida no longer held its past importance to Spain. Th=
e expanding United States, however, regarded Florida as vital to its intere=
sts. In 1821, the Adams-On=EF=BF=BDs Treaty peaceably turned the Spanish co=
lonies in Florida and, with them, St. Augustine, over to the United States.
-             

-             Florida was a United States territory until 1845 when it beca=
me a U.S. state. In 1861, the American Civil War began and Florida seceded =
from the Union and joined the Confederacy. Days before Florida seceded, sta=
te troops took the fort at St. Augustine from a small Union garrison (Janua=
ry 7, 1861). However, federal troops loyal to the United States Government =
quickly reoccupied the city (March 11, 1862) and remained in control throug=
hout the four-year-long war. In 1865, Florida rejoined the United States.
-             

-             Spanish Colonial era buildings still existing in the city inc=
lude the fortress Castillo de San Marcos. The fortress successfully repelle=
d the British attacks of the 18th century, served as a prison for the Nativ=
e American leader Osceola in 1837, and was occupied by Union troops during =
the American Civil War. It was removed from the Army's active duty rolls in=
 1900 after 205 years of service under five different flags. It is now the =
Castillo de San Marcos National Monument.
-             

-             In the late 19th century the railroad came to town, and led b=
y northeastern industrialist Henry Flagler, St. Augustine became a winter r=
esort for the very wealthy. A number of mansions and palatial grand hotels =
of this era still exist, some converted to other use, such as housing parts=
 of Flagler College and museums. Flagler went on to develop much more of Fl=
orida's east coast, including his Florida East Coast Railway which eventual=
ly reached Key West in 1912.
-             

-             The city is a popular tourist attraction, for the rich Spanis=
h Colonial Revival Style architectural heritage as well as elite 19th centu=
ry architecture. In 1938 the theme park Marineland opened just south of St.=
 Augustine, becoming one of Florida's first themed parks and setting the st=
age for the development of this industry in the following decades. The city=
 is also one terminus of the Old Spanish Trail, which in the 1920's linked =
St. Augustine, Florida, to San Diego, California with 3000 miles of roadway=
s.
-           =

-          
+
+   
+   
+      
+         
+      
+      St. Augustine, Florida
 =

-      
+      St. Augustine is the county seat of St. Johns County, Florida, in=
 the United States. It is the
+         oldest continuously occupied European-established city, and the o=
ldest port in the continental United
+         States. St. Augustine lies in a region of Florida known as The Fi=
rst Coast, which extends from
+         Amelia Island in the north, south to Jacksonville, St. Augustine =
and Palm Coast. According to the 2000
+         census, the city population was 11,592; in 2004, the population e=
stimated by the U.S. Census Bureau was
+         12,157.
 =

-   <%@ include file=3D"/layouts/footer.jsp" %>
\ No newline at end of file
+      St. Augustine was founded by the Spanish in 1565. The first Chris=
tian worship service held in a
+         permanent settlement in the continental United States was a Catho=
lic Mass celebrated in St. Augustine.
+         A few settlements were founded prior to St. Augustine but all fai=
led, including the original Pensacola
+         colony in West Florida, founded by Trist=C3=A1n de Luna y Arellan=
o in 1559, with the area abandoned in 1561
+         due to hurricanes, famine and warring tribes, and Fort Caroline i=
n what is today Jacksonville, Florida,
+         in 1564. The city was founded by the Spanish admiral Pedro Men=C3=
=A9ndez de Avil=C3=A9s on September 8, 1565.
+         Men=C3=A9ndez first sighted land on August 28, the feast day of A=
ugustine of Hippo, and consequently named
+         the settlement San Agust=C3=ADn. Mart=C3=ADn de Arg=C3=BCelles wa=
s born here one year later in 1566, the first child of
+         European ancestry to be born in what is now the continental Unite=
d States. This came 21 years before the
+         English settlement at Roanoke Island in Virginia Colony, and 42 y=
ears before the successful settlements
+         of Santa Fe, New Mexico, and Jamestown, Virginia. In all the terr=
itory under the jurisdiction of the
+         United States, only (European) settlements in Puerto Rico are old=
er than St. Augustine, with the oldest
+         being Caparra, founded in 1508, whose inhabitants relocated and f=
ounded San Juan, in 1521.
+
+      In 1586 St. Augustine was attacked and burned by Sir Francis Drak=
e. In 1668 it was plundered by pirates
+         and most of the inhabitants were killed. In 1702 and 1740 it was =
unsuccessfully attacked by British
+         forces from their new colonies in the Carolinas and Georgia. The =
most serious of these came in the
+         latter year, when James Oglethorpe of Georgia allied himself with=
 Ahaya the Cowkeeper, chief of the
+         Alachua band of the Seminole tribe to lay siege to the city.
+
+      In 1763, the Treaty of Paris ended the French and Indian War and =
gave Florida and St. Augustine to the
+         British, an acquisition the British had been unable to take by fo=
rce and keep due to the strong fort
+         there. St. Augustine came under British rule and served as a Loya=
list colony during the American
+         Revolutionary War. The Treaty of Paris in 1783 gave the American =
colonies north of Florida their
+         independence, and ceded Florida to Spain in recognition of Spanis=
h efforts on behalf of the American
+         colonies during the war.
+
+      Florida was under Spanish control again from 1784 to 1821. During=
 this time, Spain was being invaded by
+         Napoleon and was struggling to retain its colonies. Florida no lo=
nger held its past importance to Spain.
+         The expanding United States, however, regarded Florida as vital t=
o its interests. In 1821, the
+         Adams-On=C3=ADs Treaty peaceably turned the Spanish colonies in F=
lorida and, with them, St. Augustine, over
+         to the United States.
+
+      Florida was a United States territory until 1845 when it became a=
 U.S. state. In 1861, the American
+         Civil War began and Florida seceded from the Union and joined the=
 Confederacy. Days before Florida
+         seceded, state troops took the fort at St. Augustine from a small=
 Union garrison (January 7, 1861).
+         However, federal troops loyal to the United States Government qui=
ckly reoccupied the city (March 11,
+         1862) and remained in control throughout the four-year-long war. =
In 1865, Florida rejoined the United
+         States.
+
+      Spanish Colonial era buildings still existing in the city include=
 the fortress Castillo de San Marcos.
+         The fortress successfully repelled the British attacks of the 18t=
h century, served as a prison for the
+         Native American leader Osceola in 1837, and was occupied by Union=
 troops during the American Civil War.
+         It was removed from the Army's active duty rolls in 1900 after 20=
5 years of service under five different
+         flags. It is now the Castillo de San Marcos National Monument.
+
+      In the late 19th century the railroad came to town, and led by no=
rtheastern industrialist Henry Flagler,
+         St. Augustine became a winter resort for the very wealthy. A numb=
er of mansions and palatial grand
+         hotels of this era still exist, some converted to other use, such=
 as housing parts of Flagler College
+         and museums. Flagler went on to develop much more of Florida's ea=
st coast, including his Florida East
+         Coast Railway which eventually reached Key West in 1912.
+
+      The city is a popular tourist attraction, for the rich Spanish Co=
lonial Revival Style architectural
+         heritage as well as elite 19th century architecture. In 1938 the =
theme park Marineland opened just south
+         of St. Augustine, becoming one of Florida's first themed parks an=
d setting the stage for the development
+         of this industry in the following decades. The city is also one t=
erminus of the Old Spanish Trail, which
+         in the 1920's linked St. Augustine, Florida, to San Diego, Califo=
rnia with 3000 miles of roadways.
+   
+
+
+
+<%@ include file=3D"/layouts/footer.jsp" %>
\ No newline at end of file


--===============9043940056537783208==--

From portal-commits at lists.jboss.org Wed Feb 13 00:05:59 2008
Content-Type: multipart/mixed; boundary="===============1126338361574696468=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9950 - in
 modules/portlet/trunk/test/src: test/resources/simple-portal-war/demo and 1
 other directory.
Date: Wed, 13 Feb 2008 00:05:58 -0500
Message-ID: 

--===============1126338361574696468==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: wesleyhales
Date: 2008-02-13 00:05:58 -0500 (Wed, 13 Feb 2008)
New Revision: 9950

Modified:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/portal=
/samples/basic/HeaderPortlet.java
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/dem=
o3.jsp
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/hom=
e.jsp
Log:
start of ajax portlet

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/portal/samples/basic/HeaderPortlet.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/porta=
l/samples/basic/HeaderPortlet.java	2008-02-12 23:24:48 UTC (rev 9949)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/porta=
l/samples/basic/HeaderPortlet.java	2008-02-13 05:05:58 UTC (rev 9950)
@@ -45,25 +45,51 @@
       ResourceURL resourceURL =3D resp.createResourceURL();
 =

       //
-      Element elt =3D resp.createElement("script");
-      elt.setAttribute("type", "text/javascript");
-      elt.setAttribute("src", resourceURL.toString());
-      elt.appendChild(elt.getOwnerDocument().createTextNode(""));
-      resp.addProperty("script", elt);
+//      Element elt =3D resp.createElement("script");
+//      elt.setAttribute("type", "text/javascript");
+//      elt.setAttribute("src", resourceURL.toString());
+//      elt.appendChild(elt.getOwnerDocument().createTextNode(""));
+//      resp.addProperty("script", elt);
 =

       //
       resp.setContentType("text/html");
       PrintWriter writer =3D resp.getWriter();
-      writer.print("Click me to trigger script");
+      writer.print("" +
+         "" +
+         "");
+//         "" +
+//         "Cl=
ick me to trigger script" +
+         resourceURL.setParameter("prodId","1");
+         writer.print("Product 1
");
+
+         resourceURL.setParameter("prodId","2");
+         writer.print("Product 2
");
+
+         resourceURL.setParameter("prodId","3");
+         writer.print("Product 3
");
+
+         writer.print("" +
+         "
" +
+         "Product Details");
    }
 =

    public void serveResource(ResourceRequest req, ResourceResponse resp) t=
hrows PortletException, IOException
    {
       String namespace =3Dresp.getNamespace();
-      resp.setContentType("text/javascript");
+      //resp.setContentType("application/json");
+      resp.setContentType("text/html");
       PrintWriter writer =3D resp.getWriter();
-      writer.print("function " + namespace  + "_handle() { " +
-         "new Effect.Grow(document.getElementById('header-portlet')) }");
+
+      writer.print("" + req.getParameter("prodId") +"");
+
       writer.close();
    }
 }

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/d=
emo/demo3.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/de=
mo3.jsp	2008-02-12 23:24:48 UTC (rev 9949)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/de=
mo3.jsp	2008-02-13 05:05:58 UTC (rev 9950)
@@ -5,7 +5,7 @@
 <%@ page isELIgnored=3D"false" %>
 =

 <%@ include file=3D"/layouts/header.jsp" %>
-
+               =

 
    
    
@@ -14,9 +14,11 @@
             
             
                
+
                
+
             
+
    
 
-
 <%@ include file=3D"/layouts/footer.jsp" %>
\ No newline at end of file

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/d=
emo/home.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/ho=
me.jsp	2008-02-12 23:24:48 UTC (rev 9949)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/ho=
me.jsp	2008-02-13 05:05:58 UTC (rev 9950)
@@ -7,7 +7,14 @@
    <%@ include file=3D"/layouts/header.jsp" %>
 =

       
-         =

+         
+            
+
+            
+            
+
+            
+         
       
 =

    <%@ include file=3D"/layouts/footer.jsp" %>
\ No newline at end of file


--===============1126338361574696468==--

From portal-commits at lists.jboss.org Wed Feb 13 03:11:27 2008
Content-Type: multipart/mixed; boundary="===============0968496407894117594=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9951 -
 docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
Date: Wed, 13 Feb 2008 03:11:26 -0500
Message-ID: 

--===============0968496407894117594==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mmcallis
Date: 2008-02-13 03:11:26 -0500 (Wed, 13 Feb 2008)
New Revision: 9951

Modified:
   docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorial=
s.xml
Log:
5.2.1.5. Building your Portlet minor revisions


Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/t=
utorials.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutoria=
ls.xml	2008-02-13 05:05:58 UTC (rev 9950)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutoria=
ls.xml	2008-02-13 08:11:26 UTC (rev 9951)
@@ -515,13 +515,13 @@
 
         
 	
-		To display certain content or a file, use the cms content-type, with the <content-uri> element being the path to the file in the CMS. This behavior is=
 pluggable, and it is possible to plug in almost any kind of content.
+		To display certain content or a file, use the cms content-type, with the <content-uri> element being the path to the file in the CMS. This behavior is=
 pluggable: you can plug in almost any type of content.
           =

          
          
             Building your Portlet
             
-		    A pre-compiled HelloWorldPortlet/helloworldportlet.war file is created after extracting the HelloWorldPorlet.zip file. To manually build the <=
filename>helloworldportlet.war file:
+		    A pre-compiled HelloWorldPortlet/helloworldportlet.war file is created after extracting the HelloWorldPorlet.zip=
 file. To manually build the helloworldportlet.war file:
 	    
 	    
 		    
@@ -545,18 +545,18 @@
 		    
 	    
             
-		    Expanding the helloworldportlet.war allows you =
to deploy the portlet as an expanded directory, which makes development eas=
ier. This gives you access to the XML descriptors, resource files, JSF, and=
 JSP pages. To expand the helloworldportlet.war file:
+		    Expanding the helloworldportlet.war allows you =
to deploy the portlet as an expanded directory, which makes development eas=
ier. As well, it gives you access to the XML descriptors, resource files, J=
SF, and JSP pages. To expand the helloworldportlet.war=
 file:
 	    
 	    
 		    
 			    
 				    
-					    If you do not have the HelloWorldPortlet/helloworldport=
let.war file, change into the run the HelloWorldPortle=
t/ directory and run the ant deploy command t=
o create it.
+					    If you do not have the HelloWorldPortlet/helloworldport=
let.war file, change into the HelloWorldPortlet/ directory, and run the ant deploy command. This cr=
eates a helloworldportlet.war file.
 				    
 			    
 			    
 				    
-					    Change into the HelloWorldPortlet/ directory=
 and run the ant explode command:
+					    To expand the war file, change into the HelloWorldPortl=
et/ directory, and run the ant explode comman=
d:
 				    
 				    
 					    
@@ -579,7 +579,7 @@
                
        	     
 	     
-		     The expanded directory and the XML descriptors are located in the <=
filename>HelloWorldPortlet/output/lib/exploded/helloworldportlet.war/ directory. Touching the web.xml file will let an=
y live JBoss AS instance know that it needs to hot re-deploy the web applic=
ation.
+		     The expanded war file and the XML descriptors are located in the HelloWorldPortlet/output/lib/exploded/helloworldportlet.war/ directory.
             
          
          
@@ -594,6 +594,8 @@
              warUrl=3D.../tmp/deploy/tmp35219helloworldportlet-exp.war/]]>=

                Pointing your browser to http://localhost:8080/portal/,
                should yield a view of our HelloWorldPortlet, added to the =
default page of Portal:
+	       =

+	       
                
                   
                      


--===============0968496407894117594==--

From portal-commits at lists.jboss.org Wed Feb 13 12:15:27 2008
Content-Type: multipart/mixed; boundary="===============3595808016741445729=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9953 - in
 modules/web/trunk/web/src/main/java/org/jboss/portal/web: impl/tomcat and 1
 other directory.
Date: Wed, 13 Feb 2008 12:15:25 -0500
Message-ID: 

--===============3595808016741445729==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: chris.laprun(a)jboss.com
Date: 2008-02-13 12:15:25 -0500 (Wed, 13 Feb 2008)
New Revision: 9953

Modified:
   modules/web/trunk/web/src/main/java/org/jboss/portal/web/ServletContaine=
r.java
   modules/web/trunk/web/src/main/java/org/jboss/portal/web/impl/tomcat/TC6=
ServletContainerContext.java
Log:
- Replaced output to sysout by logging.

Modified: modules/web/trunk/web/src/main/java/org/jboss/portal/web/ServletC=
ontainer.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/web/trunk/web/src/main/java/org/jboss/portal/web/ServletContain=
er.java	2008-02-13 14:45:12 UTC (rev 9952)
+++ modules/web/trunk/web/src/main/java/org/jboss/portal/web/ServletContain=
er.java	2008-02-13 17:15:25 UTC (rev 9953)
@@ -22,6 +22,7 @@
  *************************************************************************=
*****/
 package org.jboss.portal.web;
 =

+import org.jboss.logging.Logger;
 import org.jboss.portal.web.spi.ServletContainerContext;
 import org.jboss.portal.web.spi.WebAppContext;
 =

@@ -29,12 +30,12 @@
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.InputStream;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
-import java.util.HashMap;
-import java.io.InputStream;
-import java.io.IOException;
 =

 /**
  * A static registry for the servlet container context.
@@ -44,6 +45,7 @@
  */
 public class ServletContainer
 {
+   private final static Logger log =3D Logger.getLogger(ServletContainer.c=
lass);
 =

    /** . */
    private final Object lock =3D new Object();
@@ -58,15 +60,15 @@
    private RegistrationImpl registration;
 =

    /**
-    * Register a servlet container context. The registration is considered=
 as successful if no existing context
-    * is already registered.
+    * Register a servlet container context. The registration is considered=
 as successful if no existing context is
+    * already registered.
     *
     * @param context the servlet container context to register
     * @throws IllegalArgumentException if the context is null
     */
    public void register(ServletContainerContext context)
    {
-      synchronized(lock)
+      synchronized (lock)
       {
          if (context =3D=3D null)
          {
@@ -87,7 +89,7 @@
 =

    public boolean addWebAppListener(WebAppListener listener)
    {
-      synchronized(lock)
+      synchronized (lock)
       {
          if (listener =3D=3D null)
          {
@@ -110,7 +112,7 @@
 =

    public boolean removeWebAppListener(WebAppListener listener)
    {
-      synchronized(lock)
+      synchronized (lock)
       {
          if (listener =3D=3D null)
          {
@@ -147,7 +149,7 @@
 =

    private void fireEvent(WebAppEvent event)
    {
-      for (Iterator i =3D listeners.iterator();i.hasNext();)
+      for (Iterator i =3D listeners.iterator(); i.hasNext();)
       {
          safeFireEvent((WebAppListener)i.next(), event);
       }
@@ -157,10 +159,10 @@
     * Generic detyped request dispatch to a servlet context using the incl=
ude mechanism.
     *
     * @param targetServletContext the target servlet context to dispatch to
-    * @param request the request valid in the current servlet context
-    * @param response the response valid in the current servlet context
-    * @param callback the callback to perform after the dispatch operation
-    * @param handback the handback object to provide
+    * @param request              the request valid in the current servlet=
 context
+    * @param response             the response valid in the current servle=
t context
+    * @param callback             the callback to perform after the dispat=
ch operation
+    * @param handback             the handback object to provide
     * @return any object
     * @throws Exception any exception
     */
@@ -207,7 +209,7 @@
          {
             throw new IllegalStateException("Disposed registration");
          }
-         synchronized(container.lock)
+         synchronized (container.lock)
          {
             if (webAppContext =3D=3D null)
             {
@@ -220,14 +222,14 @@
             //
             if (container.webAppMap.containsKey(key))
             {
-               System.out.println("Web application " + key + " is already =
registered");
+               log.debug("Web application " + key + " is already registere=
d");
                return false;
             }
             else
             {
                try
                {
-                  System.out.println("Web application " + key + " registra=
tion");
+                  log.debug("Web application " + key + " registration");
                   webAppContext.start();
                   WebAppImpl webApp =3D new WebAppImpl(webAppContext);
                   container.webAppMap.put(key, webApp);
@@ -236,7 +238,7 @@
                }
                catch (Exception e)
                {
-                  System.out.println("Was not able to start web app contex=
t "+ key);
+                  log.debug("Was not able to start web app context " + key=
);
                   e.printStackTrace();
                   return false;
                }
@@ -250,7 +252,7 @@
          {
             throw new IllegalStateException("Disposed registration");
          }
-         synchronized(container.lock)
+         synchronized (container.lock)
          {
             if (webAppId =3D=3D null)
             {
@@ -261,14 +263,14 @@
             WebAppImpl webApp =3D (WebAppImpl)container.webAppMap.remove(w=
ebAppId);
             if (webApp !=3D null)
             {
-               System.out.println("Web application " + webAppId + " cleanu=
p");
+               log.debug("Web application " + webAppId + " cleanup");
                container.fireEvent(new WebAppLifeCycleEvent(webApp, WebApp=
LifeCycleEvent.REMOVED));
                webApp.context.stop();
                return true;
             }
             else
             {
-               System.out.println("Web application " + webAppId + " was no=
t registered");
+               log.debug("Web application " + webAppId + " was not registe=
red");
                return false;
             }
          }
@@ -280,7 +282,7 @@
          {
             throw new IllegalStateException("Disposed registration");
          }
-         synchronized(container.lock)
+         synchronized (container.lock)
          {
             // Unregister all web apps
             for (Iterator i =3D container.webAppMap.values().iterator(); i=
.hasNext();)
@@ -311,9 +313,7 @@
       }
    }
 =

-   /**
-    * Implementation of the WebApp interface.
-    */
+   /** Implementation of the WebApp interface. */
    private static class WebAppImpl implements WebApp
    {
 =


Modified: modules/web/trunk/web/src/main/java/org/jboss/portal/web/impl/tom=
cat/TC6ServletContainerContext.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/web/trunk/web/src/main/java/org/jboss/portal/web/impl/tomcat/TC=
6ServletContainerContext.java	2008-02-13 14:45:12 UTC (rev 9952)
+++ modules/web/trunk/web/src/main/java/org/jboss/portal/web/impl/tomcat/TC=
6ServletContainerContext.java	2008-02-13 17:15:25 UTC (rev 9953)
@@ -22,27 +22,28 @@
  *************************************************************************=
*****/
 package org.jboss.portal.web.impl.tomcat;
 =

-import org.jboss.portal.web.RequestDispatchCallback;
-import org.jboss.portal.web.impl.DefaultServletContainerFactory;
-import org.jboss.portal.web.command.CommandDispatcher;
-import org.jboss.portal.web.spi.ServletContainerContext;
 import org.apache.catalina.Container;
+import org.apache.catalina.ContainerEvent;
+import org.apache.catalina.ContainerListener;
+import org.apache.catalina.Context;
 import org.apache.catalina.Engine;
 import org.apache.catalina.Host;
-import org.apache.catalina.ContainerEvent;
-import org.apache.catalina.Context;
-import org.apache.catalina.ContainerListener;
 import org.apache.catalina.Lifecycle;
+import org.apache.catalina.LifecycleEvent;
 import org.apache.catalina.LifecycleListener;
-import org.apache.catalina.LifecycleEvent;
+import org.jboss.logging.Logger;
+import org.jboss.portal.web.RequestDispatchCallback;
+import org.jboss.portal.web.command.CommandDispatcher;
+import org.jboss.portal.web.impl.DefaultServletContainerFactory;
+import org.jboss.portal.web.spi.ServletContainerContext;
 =

 import javax.servlet.ServletContext;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.HashSet;
 import java.util.Set;
-import java.util.HashSet;
-import java.io.IOException;
 =

 /**
  * An implementation of the ServletContainerContext for Tomca=
t.
@@ -52,6 +53,7 @@
  */
 public class TC6ServletContainerContext implements ServletContainerContext=
, ContainerListener, LifecycleListener
 {
+   private final static Logger log =3D Logger.getLogger(TC6ServletContaine=
rContext.class);
 =

    /** . */
    private final CommandDispatcher dispatcher =3D new CommandDispatcher();
@@ -185,9 +187,8 @@
    }
 =

    /**
-    * Register an host for registration which means that we fire events fo=
r all the contexts it
-    * contains and we subscribe for its life cycle events. If the host is =
already monitored
-    * nothing is done.
+    * Register an host for registration which means that we fire events fo=
r all the contexts it contains and we
+    * subscribe for its life cycle events. If the host is already monitore=
d nothing is done.
     *
     * @param host the host to register for monitoring
     */
@@ -281,7 +282,7 @@
    {
       try
       {
-         System.out.println("Context added " + context.getPath());
+         log.debug("Context added " + context.getPath());
          TC6WebAppContext webAppContext =3D new TC6WebAppContext(context);
 =

          //


--===============3595808016741445729==--

From portal-commits at lists.jboss.org Wed Feb 13 12:34:09 2008
Content-Type: multipart/mixed; boundary="===============2509975241632012980=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9954 - in
 branches/JBoss_Portal_Branch_2_6:
 core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default and 1
 other directory.
Date: Wed, 13 Feb 2008 12:34:08 -0500
Message-ID: 

--===============2509975241632012980==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: chris.laprun(a)jboss.com
Date: 2008-02-13 12:34:08 -0500 (Wed, 13 Feb 2008)
New Revision: 9954

Modified:
   branches/JBoss_Portal_Branch_2_6/cms/src/resources/portal-cms-sar/defaul=
t-content/default/index.html
   branches/JBoss_Portal_Branch_2_6/core-cms/src/bin/portal-cms-sar/portal/=
cms/conf/default-content/default/index.html
Log:
- Improved HTML (id is an identifier and, as its name implies should only b=
e used once in the document ^_^), added alt tags where it made sense.

Modified: branches/JBoss_Portal_Branch_2_6/cms/src/resources/portal-cms-sar=
/default-content/default/index.html
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/JBoss_Portal_Branch_2_6/cms/src/resources/portal-cms-sar/defau=
lt-content/default/index.html	2008-02-13 17:15:25 UTC (rev 9953)
+++ branches/JBoss_Portal_Branch_2_6/cms/src/resources/portal-cms-sar/defau=
lt-content/default/index.html	2008-02-13 17:34:08 UTC (rev 9954)
@@ -14,7 +14,7 @@
       margin-bottom: 30px;
    }
 =

-   #welcomegreyboxTD {
+   .welcomegreyboxTD {
       border-left: 1px solid #d5d5d5;
       padding-left: 15px;
    }
@@ -27,12 +27,14 @@
 =

 
-      
+      
    =

    
 
-
+
 JBoss Portal provides an open source platform for ho=
sting and serving a portal Web interface,
    publishing and managing its content, and customizing its experience. Wh=
ile most packaged Portal frameworks help
    enterprises launch Portals more quickly, only JBoss Portal delivers the=
 benefits of a zero-cost open source license
@@ -45,11 +47,11 @@
 =

             
JBoss Inc. offers various support services tailored to fit =
your needs. Explore
                support and service options for JBoss Portal.
-         PortletSwap
+         PortletSwap
 =

             Po=
rtletswap.com is an open community sponsored
                by JBoss, Inc. to facilitate the exchange of portlets and l=
ayouts for use in JBoss Portal.
-         Project Informatio=
n
+         Project Informa=
tion
 =

             Learn more about the JBoss=
 Portal project, on-going development, open
                issues, and our
@@ -61,42 +63,4 @@
 
Thank you for downloading and deploying JBoss Portal. We hope your enjo=
y working with it as much as we enjoy
    developing it!
 Baci e abbracci,

-   The JBoss Portal Team.
-
-
+   The JBoss Portal Team.
\ No newline at end of file

Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/bin/portal-cms-sar/=
portal/cms/conf/default-content/default/index.html
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/bin/portal-cms-sar/portal=
/cms/conf/default-content/default/index.html	2008-02-13 17:15:25 UTC (rev 9=
953)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/bin/portal-cms-sar/portal=
/cms/conf/default-content/default/index.html	2008-02-13 17:34:08 UTC (rev 9=
954)
@@ -12,7 +12,7 @@
       margin-bottom: 30px;
    }
 =

-   #welcomegreyboxTD {
+   .welcomegreyboxTD {
    }
 =

    #welcomegreybox h3 {
@@ -22,15 +22,16 @@
 
 =

 
-  
+   
 
 =

-
+
 JBoss Portal provides an open source platform for ho=
sting and serving a portal Web interface,
    publishing and managing its content, and customizing its experience. Wh=
ile most packaged Portal frameworks help
    enterprises launch Portals more quickly, only JBoss Portal delivers the=
 benefits of a zero-cost open source license
    combined with a flexible and scalable underling platform.
-

+

 
    
@@ -38,11 +39,11 @@
 =

             JBoss Inc. offers various support services tailored to fit =
your needs. Explore
                support and service options for JBoss Portal.
-         
-         
+         
+      
+   
+

Modified: modules/portlet/trunk/docs/user-guide/en/modules/introduction.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/docs/user-guide/en/modules/introduction.xml	2008-=
02-15 01:56:01 UTC (rev 9981)
+++ modules/portlet/trunk/docs/user-guide/en/modules/introduction.xml	2008-=
02-15 01:58:37 UTC (rev 9982)
@@ -6,14 +6,44 @@
          Vietjulien(a)jboss.org
+      
+         Chris
+         Laprun
+         chris.laprun(a)jboss.com
+      Introduction
       Motivation
-      
+      JBoss Portlet Container is the next generation portlet contain=
er on which future versions of JBoss Portal,
+         and the JBoss Portal platform will be based. It provides a standa=
rd-compliant implementation of the JSR-286
+         Portlet 2.0 specification. It has been developed with reusability=
 in mind so that advanced users, who don't
+         require a full-fledged portal, can leverage the portlet managemen=
t services it provides in their own
+         applications. JBoss Portlet Container is available through the bu=
siness-friendly LGPL open source license.
+      
    
-      Principles
-      
+      Audience
+      JBoss Portlet Container is targeted at developers and advanced=
 users who want to be able to deploy
+         portlet-based applications but don't need a full-fledged portal.
+      
    
+   
+      Simple Portal: showcasing JBoss Portlet Container
+      A simple portal has been built on top of the base portlet cont=
ainer. A JSP taglib is also provided to make
+         it easy to display portlet content in JSP pages. We also provide =
samples of portlets implementing some of the
+         advanced capabilities of JSR-286.
+      
+   
+   
+      Resources
+      
+         
+            Project=
 website
+         
+         
+            Project Wi=
ki
+         
+      
+   


--===============2618200536948200204==--

From portal-commits at lists.jboss.org Thu Feb 14 20:59:07 2008
Content-Type: multipart/mixed; boundary="===============4826876701479897851=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9983 -
 modules/portlet/trunk/docs/user-guide/en/images.
Date: Thu, 14 Feb 2008 20:59:07 -0500
Message-ID: 

--===============4826876701479897851==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: chris.laprun(a)jboss.com
Date: 2008-02-14 20:59:07 -0500 (Thu, 14 Feb 2008)
New Revision: 9983

Added:
   modules/portlet/trunk/docs/user-guide/en/images/simple-portal.png
Log:
- Forgot to add image.

Added: modules/portlet/trunk/docs/user-guide/en/images/simple-portal.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: modules/portlet/trunk/docs/user-guide/en/images/simple=
-portal.png
___________________________________________________________________
Name: svn:mime-type
   + image/png


--===============4826876701479897851==--

From portal-commits at lists.jboss.org Thu Feb 14 21:42:16 2008
Content-Type: multipart/mixed; boundary="===============7157852480339302607=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9984 -
 docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
Date: Thu, 14 Feb 2008 21:42:15 -0500
Message-ID: 

--===============7157852480339302607==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mmcallis
Date: 2008-02-14 21:42:15 -0500 (Thu, 14 Feb 2008)
New Revision: 9984

Modified:
   docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorial=
s.xml
Log:
5.2.2.4. JSP Files and the Portlet Tag Library
minor punctuation and tag revisions


Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/t=
utorials.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutoria=
ls.xml	2008-02-15 01:59:07 UTC (rev 9983)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutoria=
ls.xml	2008-02-15 02:42:15 UTC (rev 9984)
@@ -773,7 +773,7 @@
 
 
 	
-		The doView implementation is responsible for dispatch=
ing to the appropriate JSP, HelloWorldJSPPortlet/WEB-INF/jsp/view=
.jsp, or HelloWorldJSPPortlet/WEB-INF/jsp/view2.jsp, depending on the existence of the yourname par=
ameter passed in from processAction.
+		The doView implementation is responsible for dispatch=
ing to the appropriate JSP, HelloWorldJSPPortlet/WEB-INF/jsp/view=
.jsp or HelloWorldJSPPortlet/WEB-INF/jsp/view2.jsp, depending on the existence of the yourname para=
meter passed in from processAction.
 	
 
 
@@ -835,7 +835,7 @@
 
 	
 		Calling defineObjects makes available implicit object=
s in the JSP, such as
-		renderRequest, actionRequest, portletConfig.
+		renderRequest, actionRequest, and =
portletConfig.
 	
 
 
@@ -845,7 +845,7 @@
 
 
 	
-		A HTML form is created. This form posts to the URL defined by the portle=
t taglib. In this example, an actionURL is=
 created, that activates the processAction method, which=
 passes the input parameters in the form.
+		A HTML form is created. This form posts to the URL defined by the portle=
t taglib. In this example, an actionURL is=
 created, that activates the processAction method, which=
 passes the input parameters from the form.
 	
 
 


--===============7157852480339302607==--

From portal-commits at lists.jboss.org Thu Feb 14 23:44:18 2008
Content-Type: multipart/mixed; boundary="===============0746784965338610595=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9985 -
 docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
Date: Thu, 14 Feb 2008 23:44:18 -0500
Message-ID: 

--===============0746784965338610595==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mmcallis
Date: 2008-02-14 23:44:18 -0500 (Thu, 14 Feb 2008)
New Revision: 9985

Modified:
   docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorial=
s.xml
Log:
5.2.2.5. Building and deploying your portlet
revising with more content so that it is consistent with =

5.2.1. Deploying your First Portlet
*** this will break the book***, but I wanted a backup :)


Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/t=
utorials.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutoria=
ls.xml	2008-02-15 02:42:15 UTC (rev 9984)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutoria=
ls.xml	2008-02-15 04:44:18 UTC (rev 9985)
@@ -137,7 +137,7 @@
       -->
 =

       
-         Deploying your First Portlet
+         Deploying your first Portlet
          
             Introduction
             
@@ -518,7 +518,7 @@
          
             Building your Portlet
             
-		    A pre-compiled HelloWorldPortlet/helloworldportlet.war file is created after extracting the HelloWorldPortlet.zi=
p file. To manually build the helloworldportlet.war file:
+		    The HelloWorldPortlet.zip file contains a pre-c=
ompiled helloworldportlet.war file; however, to manual=
ly build the helloworldportlet.war file:
 	    
 	    
 		    
@@ -534,7 +534,7 @@
 			    
 			    
 				    
-					    Run the ant deploy command:
+					    Run the ant deploy command. On Microsoft Windo=
ws, the output will be similar to the following:
 				    
 				    
                				
@@ -543,6 +543,9 @@
 						
 					
 				    
+				    
+					    Note: the directory names will be different for your system.
+				 
 			    
 		    
 	    
@@ -553,12 +556,12 @@
 		    
 			    
 				    
-					    If you do not have the HelloWorldPortlet/helloworldport=
let.war file, change into the HelloWorldPortlet/ directory, and run the ant deploy command. This cr=
eates a helloworldportlet.war file.
+					    If you do not have the HelloWorldPortlet/helloworldport=
let.war file, change into the HelloWorldPortlet/ directory, and run the ant deploy command. This cr=
eates the helloworldportlet.war file.
 				    
 			    
 			    
 				    
-					    To expand the war file, change into the HelloWorldPortl=
et/ directory, and run the ant explode comman=
d:
+					    To expand the war file, change into the HelloWorldPortl=
et/ directory, and run the ant explode comman=
d. On Microsoft Windows, the output will be similar to the following:
 				    
 				    
 					    
@@ -567,6 +570,9 @@
 						    
               				 
 				 
+				 
+					 Note: the directory names will be different for your system.
+				 
 			    
 		    
 	    
@@ -863,7 +869,95 @@
 
          
          
-            Building and deploying your portlet
+            Building your Portlet
+	    
+		    The HelloWorldJSPPortlet.zip file contains a pr=
e-compiled helloworldjspportlet.war file; however, to =
manually build the helloworldjspportlet.war file:
+	    
+	    
+		 
+			    
+				    
+					    Change into the HelloWorldJSPPortlet/ direct=
ory, and remove the existing helloworldjspportlet.war =
file.
+				    
+			    
+			    
+				    
+					    If required, edit the HelloWorldJSPPortlet/src/main/org=
/jboss/portlet/hello/HelloWorldJSPPortlet.java file, and the XML=
 descriptors in the HelloWorldJSPPortlet/src/resources/helloworld=
jspportlet-war/WEB-INF directory.
+				    
+			    
+			    
+				    
+					    Run the ant deploy command. On Linux, the outp=
ut will be similar to the following:
+				    
+				    
+					    
+						    
+							    
+						    
+					    
+				    
+			    
+		    
+	    
+		
+			Note: the directory names will be different for your system.
+		 =

+	    
+		    Expanding the helloworldjspportlet.war file all=
ows you to deploy the portlet as an expanded directory, which makes develop=
ment easier. As well, it gives you access to the XML descriptors, resource =
files, JSF, and JSP pages. To expand the helloworldjspportlet.war=
 file:
+	    
+	    
+		    
+			    
+				    
+					    If you do not have the HelloWorldJSPPortlet/helloworldj=
spportlet.war file, change into the HelloWorldJSPPortl=
et/ directory, and run the ant deploy command=
. This creates the helloworldjspportlet.war file.
+				    
+			    
+			    
+				    
+					    To expand the war file, change into the HelloWorldJSPPo=
rtlet/ directory, and run the ant explode com=
mand. On Linux, the output will be similar to the following:
+				    
+				    
+					    
+						    
+							    
+						    
+               				    
+				    
+			    
+		    
+	    
+	    
+		    Note: the directory names will be different for your system.
+	    
+	    
+		    The ant explode command creates a directory struc=
ture such as the following:
+	    
+	    
+		    
+			    
+				    
+			    
+                    
+	    
+	    
+		    The expanded war file and the XML descriptors are located in the HelloWorldPortlet/output/lib/exploded/helloworldportlet.war/ directory.
+	    
+		    =

+		    =

+
+	    =

+	    =

+	    =

+	    =

+	    =

+	    =

+	    =

+	    =

+	    =

+	    =

+	    =

+	    =

+	    =

             If you have downloaded the sample, you can execute the b=
uild.xml with ant or inside your IDE.
                Executing the deploy target will compile=
 all source files and produce a
                helloworldjspportlet.war file in a way s=
imilar to what we saw in
@@ -873,7 +967,7 @@
                The explode target will produce the foll=
owing:
                
                   
-                     
+			  
                   
                
             


--===============0746784965338610595==--

From portal-commits at lists.jboss.org Fri Feb 15 00:51:47 2008
Content-Type: multipart/mixed; boundary="===============5868062823940616632=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9986 -
 docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
Date: Fri, 15 Feb 2008 00:51:47 -0500
Message-ID: 

--===============5868062823940616632==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mmcallis
Date: 2008-02-15 00:51:47 -0500 (Fri, 15 Feb 2008)
New Revision: 9986

Modified:
   docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorial=
s.xml
Log:
revising 5.2.2. An example JSP Portlet
adding: 5.2.2.5. Building your JSP Portlet, 5.2.2.6. Deploying your JSP Por=
tlet
to be consistent with 5.2.1.5. Building your Portlet


Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/t=
utorials.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutoria=
ls.xml	2008-02-15 04:44:18 UTC (rev 9985)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutoria=
ls.xml	2008-02-15 05:51:47 UTC (rev 9986)
@@ -869,7 +869,7 @@
 
          
          
-            Building your Portlet
+            Building your JSP Portlet
 	    
 		    The HelloWorldJSPPortlet.zip file contains a pr=
e-compiled helloworldjspportlet.war file; however, to =
manually build the helloworldjspportlet.war file:
 	    
@@ -940,8 +940,55 @@
                     
 	    
 	    
-		    The expanded war file and the XML descriptors are located in the HelloWorldPortlet/output/lib/exploded/helloworldportlet.war/ directory.
+		    The expanded war file and the XML descriptors are located in the HelloWorldJSPPortlet/output/lib/exploded/helloworldjspportlet.war/ directory.
 	    
+    
+    
+	    Deploying your JSP Portlet
+	    
+		    If you did not expand the helloworldjspportlet.war file, copy the HelloWorldJSPPortlet/helloworldjspportlet.war<=
/filename> file into the correct JBoss AS or JBoss EAP deploy/ directory. If you expanded the helloworldjspportlet.war<=
/filename> file, copy the HelloWorldJSPPortlet/output/lib/explode=
d/helloworldjspportlet.war/ directory into the correct JBoss AS =
or JBoss EAP deploy/ directory. For example, if you ar=
e using JBoss AS, copy the war file or the expanded directory into the $JBOSS_HOME/server/default/deploy/ directory.
+	    
+	    
+		    Performing this step on a running instance of JBoss AS or JBoss EAP,=
 and JBoss Portal, will trigger a hot-deploy of the portlet:
+	    
+	    
+
+
+
+
+	To see the HelloWorldJSPPortlet, navigate to http://localhost:8080/portal=
/, or, if the default JBoss Portal page is already open, refresh the page. =
The HelloWorldJSPPortlett is added to the bottom of the default JBoss Porta=
l page:
+
+
+	
+		
+			
+		
+       
+
+
+	To re-deploy the portlet, for example, if you have made changes to any of=
 the XML descriptors, touch the $JBOSS_HOME/server/configuration/deploy/hel=
loworldjspportlet.war/WEB-INF/web.xml file. On Linux, run the following com=
mand to re-deploy the HelloWorldJSPPortlet:
+
+
+
+touch $JBOSS_HOME/server/configuration/deploy//=
helloworldjspportlet.war/WEB-INF/web.xml
+
+
+
+	Re-deploying the HelloWorldJSPPortlet will produce output to the JBoss AS=
 or JBoss EAP console, similar to the following:
+
+
+
+
+
+ 
          
             Package Content
             


--===============5868062823940616632==--

From portal-commits at lists.jboss.org Fri Feb 15 01:27:59 2008
Content-Type: multipart/mixed; boundary="===============2188501369660900239=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9987 -
 docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/images/tutorials/jsp_portlet.
Date: Fri, 15 Feb 2008 01:27:58 -0500
Message-ID: 

--===============2188501369660900239==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mmcallis
Date: 2008-02-15 01:27:57 -0500 (Fri, 15 Feb 2008)
New Revision: 9987

Added:
   docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/images/tutorials=
/jsp_portlet/jsp_ant_deploy.png
   docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/images/tutorials=
/jsp_portlet/jsp_ant_explode.png
Log:
adding image files for =

5.2.1.5. Building your Portlet
5.2.1.6. Deploying your Portlet


Added: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/images/tutor=
ials/jsp_portlet/jsp_ant_deploy.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/e=
n/images/tutorials/jsp_portlet/jsp_ant_deploy.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/images/tutor=
ials/jsp_portlet/jsp_ant_explode.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/e=
n/images/tutorials/jsp_portlet/jsp_ant_explode.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream


--===============2188501369660900239==--

From portal-commits at lists.jboss.org Fri Feb 15 01:32:35 2008
Content-Type: multipart/mixed; boundary="===============8749659118211654079=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9988 -
 docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
Date: Fri, 15 Feb 2008 01:32:35 -0500
Message-ID: 

--===============8749659118211654079==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mmcallis
Date: 2008-02-15 01:32:34 -0500 (Fri, 15 Feb 2008)
New Revision: 9988

Modified:
   docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorial=
s.xml
Log:
accidentally commented out  5.2.3. A simple Sun's JSF Reference Implementat=
ion (RI) portlet on JBoss AS 4.2
appears again


Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/t=
utorials.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutoria=
ls.xml	2008-02-15 06:27:57 UTC (rev 9987)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutoria=
ls.xml	2008-02-15 06:32:34 UTC (rev 9988)
@@ -986,50 +986,8 @@
 warUrl=3D.../deploy/helloworldjspportlet.war/]]>
 
 
- 
+          =

          
             Package Content
             


--===============8749659118211654079==--

From portal-commits at lists.jboss.org Fri Feb 15 03:15:41 2008
Content-Type: multipart/mixed; boundary="===============0004490671856905212=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9989 -
 docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
Date: Fri, 15 Feb 2008 03:15:41 -0500
Message-ID: 

--===============0004490671856905212==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mmcallis
Date: 2008-02-15 03:15:41 -0500 (Fri, 15 Feb 2008)
New Revision: 9989

Modified:
   docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorial=
s.xml
Log:
revising 5.2.2. An example JSP Portlet


Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/t=
utorials.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutoria=
ls.xml	2008-02-15 06:32:34 UTC (rev 9988)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutoria=
ls.xml	2008-02-15 08:15:41 UTC (rev 9989)
@@ -534,7 +534,7 @@
 			    
 			    
 				    
-					    Run the ant deploy command. On Microsoft Windo=
ws, the output will be similar to the following:
+					    Change into HelloWorldPortlet/ directory, an=
d run the ant deploy command. On Microsoft Windows, the =
output will be similar to the following:
 				    
 				    
                				
@@ -543,12 +543,12 @@
 						
 					
 				    
-				    
-					    Note: the directory names will be different for your system.
-				 
 			    
 		    
 	    
+	    
+		    Note: the directory names will be different for your system.
+	    
             
 		    Expanding the helloworldportlet.war file allows=
 you to deploy the portlet as an expanded directory, which makes developmen=
t easier. As well, it gives you access to the XML descriptors, resource fil=
es, JSF, and JSP pages. To expand the helloworldportlet.war file:
 	    
@@ -570,13 +570,13 @@
 						    
               				 
 				 
-				 
-					 Note: the directory names will be different for your system.
-				 
 			    
 		    
 	    
 	    
+		    Note: the directory names will be different for your system.
+	    
+	    
 		    The ant explode command creates a directory struc=
ture such as the following:
 	    
 	    
@@ -587,7 +587,7 @@
                
        	     
 	     
-		     The expanded war file and the XML descriptors are located in the HelloWorldPortlet/output/lib/exploded/helloworldportlet.war/ directory.
+		     The expanded war file and the XML descriptors are located in the HelloWorldPortlet/output/lib/exploded/helloworldportlet.war/WEB-INF=
/ directory.
             
          
          
@@ -882,12 +882,12 @@
 			    
 			    
 				    
-					    If required, edit the HelloWorldJSPPortlet/src/main/org=
/jboss/portlet/hello/HelloWorldJSPPortlet.java file, and the XML=
 descriptors in the HelloWorldJSPPortlet/src/resources/helloworld=
jspportlet-war/WEB-INF directory.
+					    If required, edit the HelloWorldJSPPortlet/src/main/org=
/jboss/portlet/hello/HelloWorldJSPPortlet.java file, and the XML=
 descriptors in the HelloWorldJSPPortlet/src/resources/helloworld=
jspportlet-war/WEB-INF/ directory.
 				    
 			    
 			    
 				    
-					    Run the ant deploy command. On Linux, the outp=
ut will be similar to the following:
+					    Change into HelloWorldJSPPortlet/ directory,=
 and run the ant deploy command. On Linux, the output wi=
ll be similar to the following:
 				    
 				    
 					    
@@ -940,7 +940,7 @@
                     
 	    
 	    
-		    The expanded war file and the XML descriptors are located in the HelloWorldJSPPortlet/output/lib/exploded/helloworldjspportlet.war/ directory.
+		    The expanded war file and the XML descriptors are located in the HelloWorldJSPPortlet/output/lib/exploded/helloworldjspportlet.war/WE=
B-INF/ directory.
 	    
     
     
@@ -958,7 +958,7 @@
 
 
 
-	To see the HelloWorldJSPPortlet, navigate to http://localhost:8080/portal=
/, or, if the default JBoss Portal page is already open, refresh the page. =
The HelloWorldJSPPortlett is added to the bottom of the default JBoss Porta=
l page:
+	To see the HelloWorldJSPPortlet, navigate to , or, if the default JBoss Portal page is already =
open, refresh the page. The HelloWorldJSPPortlet is added to the bottom of =
the default JBoss Portal page:
 
 
 	
@@ -989,7 +989,7 @@
 
 
       
-         A simple Sun's JSF Reference Implementation (RI) portlet o=
n JBoss AS 4.2
+         A Sun JSF Reference Implementation (RI) portlet
          
             Introduction
             This section will introduce the reader to deploying a si=
mple JSF portlet in JBoss Portal, using


--===============0004490671856905212==--

From portal-commits at lists.jboss.org Fri Feb 15 06:57:45 2008
Content-Type: multipart/mixed; boundary="===============3807324227554852375=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN:  r9990 - modules/portlet/tags.
Date: Fri, 15 Feb 2008 06:57:43 -0500
Message-ID: 

--===============3807324227554852375==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-15 06:57:43 -0500 (Fri, 15 Feb 2008)
New Revision: 9990

Added:
   modules/portlet/tags/JBP_PORTLET_2_0_0_BETA1/
Log:
tagging portlet container 2.0.0 beta 1

Copied: modules/portlet/tags/JBP_PORTLET_2_0_0_BETA1 (from rev 9983, module=
s/portlet/trunk)


--===============3807324227554852375==--

From portal-commits at lists.jboss.org Fri Feb 15 14:27:12 2008
Content-Type: multipart/mixed; boundary="===============5548764229459943337=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9991 - modules/portlet/trunk/docs.
Date: Fri, 15 Feb 2008 14:27:11 -0500
Message-ID: 

--===============5548764229459943337==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-15 14:27:11 -0500 (Fri, 15 Feb 2008)
New Revision: 9991

Removed:
   modules/portlet/trunk/docs/docbook-support/
Modified:
   modules/portlet/trunk/docs/
Log:
use svn:externals instead of direct docbook for docbook support


Property changes on: modules/portlet/trunk/docs
___________________________________________________________________
Name: svn:externals
   + docbook-support http://anonsvn.jboss.org/repos/portal/tools/docbook/su=
pport/
docbook-support/styles http://anonsvn.jboss.org/repos/portal/tools/docbook/=
styles/renaissance/



--===============5548764229459943337==--

From portal-commits at lists.jboss.org Fri Feb 15 15:16:12 2008
Content-Type: multipart/mixed; boundary="===============4617353322753592687=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9992 - in demo/trunk:
 conf/core-cms and 2 other directories.
Date: Fri, 15 Feb 2008 15:16:12 -0500
Message-ID: 

--===============4617353322753592687==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: thomas.heute(a)jboss.com
Date: 2008-02-15 15:16:12 -0500 (Fri, 15 Feb 2008)
New Revision: 9992

Added:
   demo/trunk/portlets/seamBooking/
   demo/trunk/portlets/seamBooking/seamEAR.ear
Modified:
   demo/trunk/build.properties
   demo/trunk/build.xml
   demo/trunk/conf/core-cms/jboss-service.xml
Log:


Modified: demo/trunk/build.properties
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- demo/trunk/build.properties	2008-02-15 19:27:11 UTC (rev 9991)
+++ demo/trunk/build.properties	2008-02-15 20:16:12 UTC (rev 9992)
@@ -1,7 +1,7 @@
 # Location of the JBoss Portal + 4.0.5 AS bundle
-portal.bundle.url=3D/home/theute/Portal/workspace_2.6/demo/jboss-portal-2.=
6.3-bundled.zip
+portal.bundle.url=3D/home/theute/Downloads/jboss-portal-2.6.4-bundled.zip
 # Name used as top directory in the bundle
-portal.name.dir=3Djboss-portal-2.6.3
+portal.name.dir=3Djboss-portal-2.6.4
 # Where to create the demo website and associated tgz file
 destination.dir=3D/home/theute/Portal/demoWebsite
 # Where to put temporary files during the construction of the portal demo

Modified: demo/trunk/build.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- demo/trunk/build.xml	2008-02-15 19:27:11 UTC (rev 9991)
+++ demo/trunk/build.xml	2008-02-15 20:16:12 UTC (rev 9992)
@@ -113,6 +113,11 @@
 		
 	
 =

+        
+                
+        
+                =

+
 	
 		
 		
@@ -137,8 +142,8 @@
 	=

 	
+          update-context,install-objectsdescriptor, install-wsrpdescriptor=
, install-jbossforums, install-seamBooking, install-jbosswiki, activate-wor=
kflow, default-cms-content">
 		
 	
 =

-
\ No newline at end of file
+

Modified: demo/trunk/conf/core-cms/jboss-service.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- demo/trunk/conf/core-cms/jboss-service.xml	2008-02-15 19:27:11 UTC (rev=
 9991)
+++ demo/trunk/conf/core-cms/jboss-service.xml	2008-02-15 20:16:12 UTC (rev=
 9992)
@@ -24,9 +24,11 @@
 
 =

    
+   
+   
+
+   jboss.jca:service=3DDataSourceBinding,name=3DPortalDS
       portal:service=3DJAASLoginModule
       portal:service=3DHibernate,type=3DCMS
-      portal:service=3DModule,type=3DIdentityServiceControlle=
r
-      =

+      cms.pm.cache:service=3DTreeCache
+      portal:service=3DAuthorizationManager,type=3Dcms
+
       
       portal:service=3DApprovePublish,type=3DWorkflow
-      =

+
       portal:service=3DInterceptorStackFactory,type=3DCms
       true
       portal/cms/conf/default-c=
ontent/default/
       en
       PortalRepository
       ${jboss.server.data.dir}${/}portal${/}cm=
s${/}conf      =

-      java:/portal/IdentitySess=
ionFactory
       
          
             
    
-   =

+          name=3D"cms.pm.cache:service=3DTreeCache">   =

            jboss:service=3DNaming
            jboss:service=3DTransactionManager
            portal:service=3DHibernate,type=3DCMS
-           portal:service=3DCMS
-
       
@@ -431,7 +431,7 @@
      false
      false
     
-   =

+
    
    portal:service=3DInterceptor,type=3DCms,nam=
e=3DACL
          portal:service=3DInterceptor,type=3DCms,nam=
e=3DApprovalWorkflow
       
-    =

-    =

+   
+
    
    
        =

+      
+      admin  =

       portal:service=3DModule,type=3DIdentityServiceControlle=
r     =

    
-   =

+
    
    portal:service=3DHibernate,type=3DCMS
       portal:service=3DModule,type=3DIdentityServiceController      =

    
-   =

+
    
    portal:commandFactory=3DCMSObject
+      portal:service=3DPortalAuthorizationMana=
gerFactory
+      portal:container=3DInstance
    
+
+   
+   
+      
+      
+      	portal:service=3DWorkflow,type=3DWorkflowService
+      
+      
+      	portal:service=3DModule,type=3DIdentityServiceController
+      
+      
+      
+      	
+  	   		 
+		      
+		      				      		=

+		        
+		        
+		          
+		            
+		            
+		            		=

+		            
+		            
+		            		=

+		            
+		          		          =

+		          		          		      =
	  =

+	              	               =
        =

+		        			      =

+		        		          =

+		     		      		      			      =

+      	]]>
+      
+      
+      false
+      
+      Admin
+      java:portal/ApprovePublishWorkflow
+
+      
+      
+        =

+   =

 

Added: demo/trunk/portlets/seamBooking/seamEAR.ear
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: demo/trunk/portlets/seamBooking/seamEAR.ear
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream


--===============4617353322753592687==--

From portal-commits at lists.jboss.org Fri Feb 15 16:13:25 2008
Content-Type: multipart/mixed; boundary="===============2517949382331822871=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9993 - in
 modules/portlet/tags/JBP_PORTLET_2_0_0_BETA1: test/src/test and 1 other
 directory.
Date: Fri, 15 Feb 2008 16:13:25 -0500
Message-ID: 

--===============2517949382331822871==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-15 16:13:25 -0500 (Fri, 15 Feb 2008)
New Revision: 9993

Modified:
   modules/portlet/tags/JBP_PORTLET_2_0_0_BETA1/build/pom.xml
   modules/portlet/tags/JBP_PORTLET_2_0_0_BETA1/test/src/test/build.xml
Log:
make beta1 tag not use snapshots........

Modified: modules/portlet/tags/JBP_PORTLET_2_0_0_BETA1/build/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/tags/JBP_PORTLET_2_0_0_BETA1/build/pom.xml	2008-02-15 2=
0:16:12 UTC (rev 9992)
+++ modules/portlet/tags/JBP_PORTLET_2_0_0_BETA1/build/pom.xml	2008-02-15 2=
1:13:25 UTC (rev 9993)
@@ -39,7 +39,7 @@
       3.6-beta
       2.2.1.GA
       1.2.0-Beta1
-      1.2.0-SNAPSHOT
+      1.2.0-Beta1
       1.2.0-Beta1
       1.2.14
       1.1.1
@@ -95,7 +95,7 @@
             
                org.jboss.unit
                jboss-unit-tooling-maven2
-               1.2.0-SNAPSHOT
+               1.2.0-Beta1
             
          
       

Modified: modules/portlet/tags/JBP_PORTLET_2_0_0_BETA1/test/src/test/build.=
xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/tags/JBP_PORTLET_2_0_0_BETA1/test/src/test/build.xml	20=
08-02-15 20:16:12 UTC (rev 9992)
+++ modules/portlet/tags/JBP_PORTLET_2_0_0_BETA1/test/src/test/build.xml	20=
08-02-15 21:13:25 UTC (rev 9993)
@@ -407,9 +407,6 @@
          
          
          
-         
-         
-         
          
          
          
@@ -446,8 +443,6 @@
          
          
          
-         
-         
          
          
          
@@ -604,6 +599,9 @@
             
             
 =

+            
+            
+
             
             
             


--===============2517949382331822871==--

From portal-commits at lists.jboss.org Fri Feb 15 16:23:23 2008
Content-Type: multipart/mixed; boundary="===============7066694522735320273=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9994 - in demo/trunk: conf and 1
 other directory.
Date: Fri, 15 Feb 2008 16:23:23 -0500
Message-ID: 

--===============7066694522735320273==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: thomas.heute(a)jboss.com
Date: 2008-02-15 16:23:23 -0500 (Fri, 15 Feb 2008)
New Revision: 9994

Modified:
   demo/trunk/build.xml
   demo/trunk/conf/default-object.xml
Log:


Modified: demo/trunk/build.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- demo/trunk/build.xml	2008-02-15 21:13:25 UTC (rev 9993)
+++ demo/trunk/build.xml	2008-02-15 21:23:23 UTC (rev 9994)
@@ -110,6 +110,7 @@
 		
 			
 		
+                
 		
 	
 =


Modified: demo/trunk/conf/default-object.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- demo/trunk/conf/default-object.xml	2008-02-15 21:13:25 UTC (rev 9993)
+++ demo/trunk/conf/default-object.xml	2008-02-15 21:23:23 UTC (rev 9994)
@@ -270,7 +270,7 @@
    			
    				WeatherPortletWindow
    				WeatherPortletInstance
-   				left
+   				center
    				0
    			
    		


--===============7066694522735320273==--

From portal-commits at lists.jboss.org Fri Feb 15 16:29:46 2008
Content-Type: multipart/mixed; boundary="===============5054982360174304295=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9995 - in modules/portlet/trunk:
 test/src/test and 1 other directory.
Date: Fri, 15 Feb 2008 16:29:46 -0500
Message-ID: 

--===============5054982360174304295==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-15 16:29:46 -0500 (Fri, 15 Feb 2008)
New Revision: 9995

Modified:
   modules/portlet/trunk/build/pom.xml
   modules/portlet/trunk/test/src/test/build.xml
Log:
remove snapshot from portlet trunk for now

Modified: modules/portlet/trunk/build/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/build/pom.xml	2008-02-15 21:23:23 UTC (rev 9994)
+++ modules/portlet/trunk/build/pom.xml	2008-02-15 21:29:46 UTC (rev 9995)
@@ -39,7 +39,7 @@
       3.6-beta
       2.2.1.GA
       1.2.0-Beta1
-      1.2.0-SNAPSHOT
+      1.2.0-Beta1
       1.2.0-Beta1
       1.2.14
       1.1.1
@@ -95,7 +95,7 @@
             
                org.jboss.unit
                jboss-unit-tooling-maven2
-               1.2.0-SNAPSHOT
+               1.2.0-Beta1
             
          
       

Modified: modules/portlet/trunk/test/src/test/build.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/build.xml	2008-02-15 21:23:23 UTC (=
rev 9994)
+++ modules/portlet/trunk/test/src/test/build.xml	2008-02-15 21:29:46 UTC (=
rev 9995)
@@ -407,9 +407,6 @@
          
          
          
-         
-         
-         
          
          
          
@@ -446,8 +443,6 @@
          
          
          
-         
-         
          
          
          
@@ -604,6 +599,9 @@
             
             
 =

+            
+            
+
             
             
             


--===============5054982360174304295==--

From portal-commits at lists.jboss.org Fri Feb 15 16:44:14 2008
Content-Type: multipart/mixed; boundary="===============7238846020160241159=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9996 - in demo/trunk:
 portlets/jbosswiki and 1 other directory.
Date: Fri, 15 Feb 2008 16:44:13 -0500
Message-ID: 

--===============7238846020160241159==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: thomas.heute(a)jboss.com
Date: 2008-02-15 16:44:13 -0500 (Fri, 15 Feb 2008)
New Revision: 9996

Added:
   demo/trunk/portlets/jbosswiki/portlet-instances.xml
Modified:
   demo/trunk/build.xml
Log:


Modified: demo/trunk/build.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- demo/trunk/build.xml	2008-02-15 21:29:46 UTC (rev 9995)
+++ demo/trunk/build.xml	2008-02-15 21:44:13 UTC (rev 9996)
@@ -111,7 +111,8 @@
 			
 		
                 
-		
+		
+                
 	
 =

         

Added: demo/trunk/portlets/jbosswiki/portlet-instances.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- demo/trunk/portlets/jbosswiki/portlet-instances.xml	                   =
     (rev 0)
+++ demo/trunk/portlets/jbosswiki/portlet-instances.xml	2008-02-15 21:44:13=
 UTC (rev 9996)
@@ -0,0 +1,10 @@
+
+
+   
+      overwrite
+      
+         WikiPortletInstance
+         wikiportlet.WikiPortlet
+      
+   
+
\ No newline at end of file


--===============7238846020160241159==--

From portal-commits at lists.jboss.org Fri Feb 15 21:54:58 2008
Content-Type: multipart/mixed; boundary="===============2541235356316430933=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9997 -
 docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
Date: Fri, 15 Feb 2008 21:54:58 -0500
Message-ID: 

--===============2541235356316430933==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mmcallis
Date: 2008-02-15 21:54:58 -0500 (Fri, 15 Feb 2008)
New Revision: 9997

Modified:
   docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorial=
s.xml
Log:
revising 5.2.3. An example Sun JSF Reference Implementation (RI) Portle
*** this will break the book until later commits ***


Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/t=
utorials.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutoria=
ls.xml	2008-02-15 21:44:13 UTC (rev 9996)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutoria=
ls.xml	2008-02-16 02:54:58 UTC (rev 9997)
@@ -141,7 +141,7 @@
          
             Introduction
             
-		    This section describes how to deploy a portlet for JBoss Portal. Bef=
ore proceeding, download the HelloWorldPortlet from JBoss PortletSwap.
 	    
          
@@ -264,7 +264,10 @@
                
            
            
-		   The following is an example of the HelloWorldPortlet/WEB-IN=
F/portlet.xml file. In order to create the WEB-INF/ and META-INF/ directories, extract the helloworldportlet.war file.This file must adhere to its defi=
nition in the JSR-168 Portlet Specification. You may define more than one p=
ortlet application in this file:
+		    To create the WEB-INF/ and META-INF/<=
/filename> directories, extract the helloworldportlet.war file.
+	    
+	    
+		    The following is an example of the HelloWorldPortlet/WEB-I=
NF/portlet.xml file. This file must adhere to its definition in =
the JSR-168 Portlet Specification. You may define more than one portlet app=
lication in this file:
 	   
 	   
 
             Introduction
 	    
-		    This section describes how to deploy a JSP portlet for JBoss Portal.=
 Before proceeding, download the HelloWorldJSP=
Portlet from JBos=
s PortletSwap. The HelloWorldJSPPortlet demonstrates how to use JSP=
s for view rendering, and the portlet taglib for generating links.
+		    This section describes how to deploy a JSP portlet in JBoss Portal. =
Before proceeding, download the HelloWorldJSPP=
ortlet from JBoss=
 PortletSwap. The HelloWorldJSPPortlet demonstrates how to use JSPs=
 for view rendering, and the portlet tag library (taglib) for generating li=
nks.
             
          
          
-            Package Content
+            Package Structure
             
 		    The application descriptors for the HelloWorldJSPPortlet portlet are=
 similar to those from the HelloWorldPortlet (). See  for further =
information about application descriptors.
 	    
 	    
-		    The following is an example of the directory structure of the HelloW=
orldJSPPortlet portlet. The HelloWorldJSPPortlet portlet contains the tradi=
tional portlet and JBoss Portal specific application descriptors. In order =
to create the WEB-INF/ and META-INF/ directories, extract the helloworldjspportlet.war =
file.
+		    The HelloWorldJSPPortlet portlet contains the traditional portlet an=
d JBoss Portal specific application descriptors. The following is an exampl=
e of the directory structure of the HelloWorldJSPPortlet portlet:
 	    
 	    
                
@@ -658,9 +661,12 @@
                   
                
             
+	    
+		    To create the WEB-INF/ and META-INF/<=
/filename> directories, extract the helloworldjspportlet.war file.
+	    
          
          
-            Portlet Class
+            Portlet Classes
             
 		    The HelloWorldJSPPortlet contai=
ns the HelloWorldJSPPortlet/src/main/org/jboss/portlet/hello/Hell=
oWorldJSPPortlet.java file:
 	    
@@ -789,7 +795,7 @@
          
             JSP Files and the Portlet Tag Library
             
-		    The HelloWorldJSPPortlet/WEB-INF/jsp/view.jsp a=
nd HelloWorldJSPPortlet/WEB-INF/jsp/view2.jsp JSP file=
s are included in the HelloWorldJSPPortlet portlet. The view.jsp<=
/filename> file allows a user to input their name. This is then posted to t=
he processAction method in the portlet cla=
ss, which is set as a aResponse.setRenderParameter. The render method, doView, is invoked, which dispatches to the view2.jsp JSP:
+		    The HelloWorldJSPPortlet/WEB-INF/jsp/view.jsp a=
nd HelloWorldJSPPortlet/WEB-INF/jsp/view2.jsp JSP file=
s are included in the HelloWorldJSPPortlet portlet. The view.jsp<=
/filename> file allows a user to input their name. This is then posted to t=
he processAction method in the portlet cla=
ss, which is set as a aResponse.setRenderParameter. The doView render method is invoked, which dispatches to the view2.jsp JSP:
 	    
 	    
                
@@ -831,7 +837,7 @@
 
 
 	
-		Define the portlet tag library (taglib). You do not need to bundle the p=
ortlet taglib - JBoss Portal handles this for you.
+		Define the portlet taglib. You do not need to bundle the portlet taglib =
- JBoss Portal handles this for you.
 	
 
 
@@ -861,7 +867,7 @@
 
 
 	
-		You can create a link to the doView met=
hod by creating a renderURL, that passes t=
he yourname parameter.
+		You can create a link to the doView met=
hod by creating a renderURL, which passes =
the yourname parameter.
 	
 
 
@@ -972,7 +978,7 @@
 
 
 
-touch $JBOSS_HOME/server/configuration/deploy//=
helloworldjspportlet.war/WEB-INF/web.xml
+touch $JBOSS_HOME/server/configuration/deploy/h=
elloworldjspportlet.war/WEB-INF/web.xml
 
 
 
@@ -989,43 +995,59 @@
 
 
       
-         A Sun JSF Reference Implementation (RI) portlet
+         An example Sun JSF Reference Implementation (RI) Portlet</=
title>
          <sect3>
             <title>Introduction
-            This section will introduce the reader to deploying a si=
mple JSF portlet in JBoss Portal, using
-               Apache's MyFaces JSF implementation on JBoss AS 4.2.x. It r=
equires you download the HelloWorldJSFSunRIPortlet
-               from PortletSwap.com, using this link:
-               http://anonsvn.jboss.org/=
repos/portletswap/portlets/2_6/bundles/HelloWorldJSFSunRIPortlet.zip.
+            
+		    This section describes how to deploy a JSF portlet in JBoss Portal, =
using the Apache MyFaces JSF implementation on JBoss AS or JBoss EAP. Befor=
e proceeding, download the HelloWorldJSFS=
unRIPortlet from =
JBoss PortletSwap.
             
           =

          
-            Package Content
+            Package Structure
+	    
+		    JBoss Portal requires certain descriptors to be included in a portle=
t WAR file. Some of these descriptors are defined by the JSR-168 Portlet Sp=
ecification, and others are specific to JBoss Portal. Like a typical JSF ap=
plication, the HelloWorldJSFSunRIPortlet package contains a faces=
-config.xml file, that defines managed-beans, converters, valida=
tors, navigation rules, and so on. The following is an example of the direc=
tory structure of the HelloWorldJSFSunRIPortlet portlet:
+	    
             
                
                   
                      
                   
                
-               Like a typical JSF application, we also package our faces-c=
onfig.xml that defines our
-               managed-beans, converters, validators, navigation rules, et=
c...
-               JBoss Application Server version 4.2.x bundles Sun's =
JSF Reference Implementation (RI) in
-                  JBOSS_HOME/server/default/deploy/jboss-web.depl=
oyer/jsf-libs/. As a result,
-                  you do not need to package Sun RI's libraries with your =
portlet application.
+             
+	     
+		     To create the WEB-INF/ and META-INF/=
 directories, extract the helloworldjsfsunriportlet.war file.
+	     
+	     
+               
+		       Bundled Sun JSF RI
+		       
+			       JBoss AS version 4.2.x and JBoss EAP =
bundle Sun's JSF RI in the
+                  $JBOSS_HOME/server/default/deploy/jboss-web.de=
ployer/jsf-libs/ directory. Therefore, you do not need to packag=
e the Sun JSF RI libraries with your portlet application.
+	               
                
             
-            For the sake of brevity, we only discuss the po=
rtlet.xml and
-               faces-config.xml descriptors here. For d=
iscussion on the other descriptors, please
-               view  or the c=
hapter on descriptors:
-               .
+    
+    
+	    Application Descriptors
+            
+		    For brevity, only the portlet.xml, fa=
ces-config.xml, and web.xml descriptors are=
 defined. For more information on other discriptors, refer to  and .
+	    
+	    
+		    The following is an example of the directory structure of the HelloW=
orldJSFSunRIPortlet portlet:
+	    
+	    
                
                   
                      
                   
                
-               
-                  
-                     portlet.xml
-
+       
+       
+	       The following is an example of the HelloWorldJSFSunRIPor=
tlet/WEB-INF/portlet.xml file. This file must adhere to its defi=
nition in the JSR-168 Portlet Specification. You may define more than one p=
ortlet application in this file:
+       
+       
+
 HelloWorld JSF Portlet
       
    
-]]>
-                        This file must adhere to its definition in the Por=
tlet Specification. You may define more than
-                        one portlet application in this file. Now let's lo=
ok at the portions that deal with our use of
-                        JSF:
-                        
-                           
-                              
-                                 c=
om.sun.faces.portlet.FacesPortlet]]>
-                                 Here we specify that com.sun.faces.portle=
t.FacesPortlet will handle all requests/responses from our
-                                 users. This class is part of jsf-portlet.=
jar as explained later.
-                              
-                           
-                           
-                              
-                                 We need to initialize the portlet with a =
default view page for it to render, much like
-                                 a welcome page:
-                                 
+]]>
+
+	
+	
+		
+			com.sun.faces.portlet.FacesPortlet]]>
+
+
+	
+		This specifies that the com.sun.faces.portlet.FacesPortl=
et handles all requests and responses from users. This cla=
ss is part of the HelloWorldJSFSunRIPortlet/WEB-INF/lib/jsf-portl=
et.jar file.
+	
+
+
+
    com.sun.faces.portlet.INIT_VIEW
    /WEB-INF/jsp/index.jsp
-]]>
-                              
-                           
-                        
-                     
-                  
+]]>
+
+
+	
+		You must initializes the portlet with a default view page to render, sim=
ilar to the default JBoss Portal page.
+	
+
+
+
+                          =

                   
                      faces-config.xml
 


--===============2541235356316430933==--

From portal-commits at lists.jboss.org Fri Feb 15 23:01:17 2008
Content-Type: multipart/mixed; boundary="===============5464103666281618717=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9998 -
 docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
Date: Fri, 15 Feb 2008 23:01:16 -0500
Message-ID: 

--===============5464103666281618717==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mmcallis
Date: 2008-02-15 23:01:16 -0500 (Fri, 15 Feb 2008)
New Revision: 9998

Modified:
   docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorial=
s.xml
Log:
5.2.3.3. Application Descriptors
revising, replacing itemizedlist with variable
trying to make it more consistent with =

5.2.1.4. Application Descriptors


Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/t=
utorials.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutoria=
ls.xml	2008-02-16 02:54:58 UTC (rev 9997)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutoria=
ls.xml	2008-02-16 04:01:16 UTC (rev 9998)
@@ -1093,12 +1093,15 @@
 		You must initializes the portlet with a default view page to render, sim=
ilar to the default JBoss Portal page.
 	
 
-
+
+
 
-                          =

-                  
-                     faces-config.xml
-
+
+	The following is an example HelloWorldJSFSunRIPortlet/WEB-INF/f=
aces-config.xml file:
+
+
+
 
@@ -1115,16 +1118,18 @@
          /WEB-INF/jsp/result.jsp
       
    
-]]>
-                        There is nothing special about the faces-=
config.xml file included here. This
-                        application would work just as well outside of a p=
ortlet as it would inside a portlet container.
-                        In the above lines, we define a basic Use=
r Bean and a navigation rule to
-                        handle the submittal of the original form on index.jsp.
-                     
-                  
-                  
-                     web.xml
-
+]]>
+
+
+
+	Without the faces-config.xml, the application would =
work the same outside of the portlet, as it would inside a portlet containe=
r. In this exampel, a basic user bean, <managed-bean-nam=
e>user</managed-bean-name>, and a navigation <navigation-rule> rule are defined, whic=
h handle submitting the original form in the HelloWorldJSFSunRIPo=
rtlet/WEB-INF/jsp/index.jsp file.
+
+
+	The following is an example of the HelloWorldJSFSunRIPortlet/WE=
B-INF/web.xml file:
+
+
+
 
@@ -1144,18 +1149,20 @@
         *.jsf
     
 =

-]]>
-                        For the Sun RI, this definition is mandatory to as=
sociate jsf extension with the faces servlet.
-                     
-                  
-                  
-                     jsf-portlet.jar This library=
 that can be downloaded here: https://jsfportletbridge.dev.java.net/=
servlets/ProjectDocumentList
-                     contains the classes for the JSF-Portlet bridge. Sinc=
e they are not included with the JSF
-                     implementation (unlike myfaces) neither in JBoss AS, =
it is required to have this library available
-                     in the package.
-                  
-               
-            
+]]>
+
+
+
+	For the Sun JSF RI, this definition is mandatory to associate .=
jsf extensions with the faces servlet.
+
+
+	
+		Classes for the JSF-Portlet bridge are not included
+		
+			The classes for the JSF-Portlet bridge are not included with the JSF im=
plementation (unlike Apache MyFaces), JBoss AS, or JBoss EAP. This library =
must be available in your application package. Navigate to the JSF=
-Portlet bridge webpage to download the JSF-Portlet bridge library.
+		
+	
+
          
          
             Building and deploying your portlet


--===============5464103666281618717==--

From portal-commits at lists.jboss.org Sat Feb 16 00:05:06 2008
Content-Type: multipart/mixed; boundary="===============7681845069019466206=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9999 -
 docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
Date: Sat, 16 Feb 2008 00:05:05 -0500
Message-ID: 

--===============7681845069019466206==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mmcallis
Date: 2008-02-16 00:05:05 -0500 (Sat, 16 Feb 2008)
New Revision: 9999

Modified:
   docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorial=
s.xml
Log:
minor corrections/revisions
5.2.3. An example Sun JSF Reference Implementation (RI) Portlet


Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/t=
utorials.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutoria=
ls.xml	2008-02-16 04:01:16 UTC (rev 9998)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutoria=
ls.xml	2008-02-16 05:05:05 UTC (rev 9999)
@@ -974,7 +974,7 @@
        
 
 
-	To re-deploy the portlet, for example, if you have made changes to any of=
 the XML descriptors, touch the $JBOSS_HOME/server/configuration/deploy/hel=
loworldjspportlet.war/WEB-INF/web.xml file. On Linux, run the following com=
mand to re-deploy the HelloWorldJSPPortlet:
+	To re-deploy the portlet, for example, if you have made changes to any of=
 the XML descriptors, touch the $JBOSS_HOME/server/c=
onfiguration/deploy/helloworldjspportlet.war/WEB-INF/web.xml<=
/filename> file. On Linux, run the following command to re-deploy the Hello=
WorldJSPPortlet:
 
 
 
@@ -999,13 +999,13 @@
          
             Introduction
             
-		    This section describes how to deploy a JSF portlet in JBoss Portal, =
using the Apache MyFaces JSF implementation on JBoss AS or JBoss EAP. Befor=
e proceeding, download the HelloWorldJSFS=
unRIPortlet from =
JBoss PortletSwap.
+		    This section describes how to deploy a JSF portlet in JBoss Portal, =
using the Apache MyFaces JSF implementation in JBoss AS or JBoss EAP. Befor=
e proceeding, download the HelloWorldJSFS=
unRIPortlet from =
JBoss PortletSwap.
             
           =

          
             Package Structure
 	    
-		    JBoss Portal requires certain descriptors to be included in a portle=
t WAR file. Some of these descriptors are defined by the JSR-168 Portlet Sp=
ecification, and others are specific to JBoss Portal. Like a typical JSF ap=
plication, the HelloWorldJSFSunRIPortlet package contains a faces=
-config.xml file, that defines managed-beans, converters, valida=
tors, navigation rules, and so on. The following is an example of the direc=
tory structure of the HelloWorldJSFSunRIPortlet portlet:
+		    JBoss Portal requires certain descriptors to be included in a portle=
t WAR file. Some of these descriptors are defined by the JSR-168 Portlet Sp=
ecification, and others are specific to JBoss Portal. Like a typical JSF ap=
plication, the HelloWorldJSFSunRIPortlet package contains a faces=
-config.xml file that defines managed-beans, converters, validat=
ors, navigation rules, and so on. The following is an example of the direct=
ory structure of the HelloWorldJSFSunRIPortlet portlet:
 	    
             
                
@@ -1015,7 +1015,7 @@
                
              
 	     
-		     To create the WEB-INF/ and META-INF/=
 directories, extract the helloworldjsfsunriportlet.war file.
+		     To create the WEB-INF/ and META-INF/=
 directories, extract the helloworldjsfsunriportlet.wa=
r file.
 	     
 	     
                
@@ -1030,18 +1030,8 @@
     
 	    Application Descriptors
             
-		    For brevity, only the portlet.xml, fa=
ces-config.xml, and web.xml descriptors are=
 defined. For more information on other discriptors, refer to  and .
+		    For brevity, only the portlet.xml, fa=
ces-config.xml, and web.xml descriptors are=
 described here. For more information about application descriptors, refer =
to  and .
 	    
-	    
-		    The following is an example of the directory structure of the HelloW=
orldJSFSunRIPortlet portlet:
-	    
-	    
-               
-                  
-                     
-                  
-               
-       
        
 	       The following is an example of the HelloWorldJSFSunRIPor=
tlet/WEB-INF/portlet.xml file. This file must adhere to its defi=
nition in the JSR-168 Portlet Specification. You may define more than one p=
ortlet application in this file:
        
@@ -1078,7 +1068,7 @@
 
 
 	
-		This specifies that the com.sun.faces.portlet.FacesPortl=
et handles all requests and responses from users. This cla=
ss is part of the HelloWorldJSFSunRIPortlet/WEB-INF/lib/jsf-portl=
et.jar file.
+		This specifies that the com.sun.faces.portlet.FacesPortl=
et handles all requests and responses from the users. This=
 class is part of the HelloWorldJSFSunRIPortlet/WEB-INF/lib/jsf-p=
ortlet.jar file.
 	
 
 
@@ -1090,7 +1080,7 @@
 
 
 	
-		You must initializes the portlet with a default view page to render, sim=
ilar to the default JBoss Portal page.
+		You must initialize the portlet with a default page to render, similar t=
o what is done with the default JBoss Portal page.
 	
 
 
@@ -1122,10 +1112,10 @@
 
 
 
-	Without the faces-config.xml, the application would =
work the same outside of the portlet, as it would inside a portlet containe=
r. In this exampel, a basic user bean, <managed-bean-nam=
e>user</managed-bean-name>, and a navigation <navigation-rule> rule are defined, whic=
h handle submitting the original form in the HelloWorldJSFSunRIPo=
rtlet/WEB-INF/jsp/index.jsp file.
+	Without the faces-config.xml file, the application w=
ould work the same outside of the portlet, as it would inside a portlet con=
tainer. In this example, a basic user bean, <managed-bea=
n-name>user</managed-bean-name>, and a navigation=
 rule are defined, which handle submitting the original form in the HelloWorldJSFSunRIPortlet/WEB-INF/jsp/index.jsp file.
 
 
-	The following is an example of the HelloWorldJSFSunRIPortlet/WE=
B-INF/web.xml file:
+	The following is an example of the Faces Servlet section from the HelloWorldJSFSunRIPortlet/WEB-INF/web.x=
ml file:
 
 
 
 
 
-	For the Sun JSF RI, this definition is mandatory to associate .=
jsf extensions with the faces servlet.
+	For the Sun JSF RI, this definition is mandatory to associate files with =
.jsf extensions with the Apache MyFaces servlet.
 
 
 	
 		Classes for the JSF-Portlet bridge are not included
 		
-			The classes for the JSF-Portlet bridge are not included with the JSF im=
plementation (unlike Apache MyFaces), JBoss AS, or JBoss EAP. This library =
must be available in your application package. Navigate to the JSF=
-Portlet bridge webpage to download the JSF-Portlet bridge library.
+			Unlike Apache MyFaces, the classes for the JSF-Portlet bridge are not i=
ncluded with the JSF implementation, JBoss AS, or JBoss EAP. This library m=
ust be available in your application package. Navigate to the JSF-Po=
rtlet bridge webpage to download the JSF-Portlet bridge library.
 		
 	
 


--===============7681845069019466206==--

From portal-commits at lists.jboss.org Sat Feb 16 01:20:27 2008
Content-Type: multipart/mixed; boundary="===============5133479651549738608=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r10000 - in
 docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en:
 images/tutorials/jsp_portlet and 1 other directories.
Date: Sat, 16 Feb 2008 01:20:27 -0500
Message-ID: 

--===============5133479651549738608==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mmcallis
Date: 2008-02-16 01:20:27 -0500 (Sat, 16 Feb 2008)
New Revision: 10000

Added:
   docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/images/tutorials=
/jsf_portlet/jsf_ant_deploy.png
   docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/images/tutorials=
/jsf_portlet/jsf_ant_explode.png
Modified:
   docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/images/tutorials=
/jsp_portlet/jsp_ant_explode.png
   docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorial=
s.xml
Log:
5.2.3. An example Sun JSF Reference Implementation (RI) Portlet
* adding images of ant deploy and ant explode
* fixing my images that had a black line
* revising 5.2.3 to be consistent with 5.2.1. Deploying your first Portlet
and 5.2.2. An example JSP Portlet


Added: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/images/tutor=
ials/jsf_portlet/jsf_ant_deploy.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/e=
n/images/tutorials/jsf_portlet/jsf_ant_deploy.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/images/tutor=
ials/jsf_portlet/jsf_ant_explode.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/e=
n/images/tutorials/jsf_portlet/jsf_ant_explode.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/images/tu=
torials/jsp_portlet/jsp_ant_explode.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)

Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/t=
utorials.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutoria=
ls.xml	2008-02-16 05:05:05 UTC (rev 9999)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutoria=
ls.xml	2008-02-16 06:20:27 UTC (rev 10000)
@@ -1155,34 +1155,114 @@
 
          
          
-            Building and deploying your portlet
-            If you have downloaded the sample, you can execute the b=
uild.xml with ant or inside your IDE.
-               Executing ant will compile all source fi=
les and produce a
-               helloworldjspportlet.war file in a way s=
imilar to what we saw in
-               .
+		 Building your JSF Portlet
+		 
+			 The HelloWorldJSFSunRIPortlet.zip file contains a=
 pre-compiled helloworldjsfsunriportlet.war file; howe=
ver, to manually build the helloworldjsfsunriportlet.war file:
+	         
+		 
+			 
+				 
+					 
+						 Change into the HHelloWorldJSFSunRIPortlet dir=
ectory, and remove the existing helloworldjsfsunriportlet.war file.
+					 
+				 
+				 
+					 
+						 If required, edit the HelloWorldJSFSunRIPortlet/src/main/=
org/jboss/portlet/hello/bean/User.java file, and the XML descrip=
tors in the HelloWorldJSFSunRIPortlet/src/resources/helloworldjsf=
sunriportlet-war/WEB-INF/ directory.
+					 
+				 
+				 
+					 
+						 Change into HelloWorldJSFSunRIPortlet/ directo=
ry, and run the ant deploy command. On Linux, the output=
 will be similar to the following:
+					 
+					 
+						 
+							 
+								 
+							 
+						 
+					 
+				 
+			 
+		 
+		 
+			 Note: the directory names will be different for your system.
+	    
+	    
+		    Expanding the helloworldjsfsunriportlet.war fil=
e allows you to deploy the portlet as an expanded directory, which makes de=
velopment easier. As well, it gives you access to the XML descriptors, reso=
urce files, JSF, and JSP pages. To expand the helloworldjsfsunrip=
ortlet.war file:
+	    
+	    
+		    
+			    
+				    
+					    If you do not have the HelloWorldJSFSunRIPortlet/hellow=
orldjsfsunriportlet.war file, change into the HelloWor=
ldJSFSunRIPortlet/ directory, and run the ant deploy command. This creates the helloworldjsfsunriportlet.war file.
+				    
+			    
+			    
+				    
+					    To expand the war file, change into the HelloWorldJSFSu=
nRIPortlet/ directory, and run the ant explode command. On Linux, the output will be similar to the following:
+				    
+				    
+					    
+						    
+							    
+						    
+					    
+				    
+			    
+		    
+	    
+	    
+		    Note: the directory names will be different for your system.
+	    
+	    
+		    The expanded war file and the XML descriptors are located in the HelloWorldJSFSunRIPortlet/output/lib/exploded/helloworldjsfsunriport=
let.war directory.
             
-            
-            
-               Deploying the portlet is as easy as copying/moving the helloworldjspportlet.war file
-               to the server deploy directory. We can t=
hen see our portlet on the Portal default
-               page (http://l=
ocalhost:8080/portal/):
-               
-                  
-                     
-                  
-               
-            
-         
-      
+	    
+		    To re-deploy the portlet, for example, if you have made changes to a=
ny of the XML descriptors, touch the $JBOSS_HOME/server/configuration/deploy/helloworldjsfsunriportlet.war/WEB-IN=
F/web.xml file. On Linux, run the following command to re-deploy=
 the HelloWorldPortlet:
+	    
+	    
+
+touch $JBOSS_HOME/server/configuration/deploy/h=
elloworldjsfsunriportlet.war/WEB-INF/web.xml
+
+	   
+	   
+		   Re-deploying the HelloWorldJSFPortlet will produce output to the JBos=
s AS or JBoss EAP console, similar to the following:
+	   
+	   
+
+
+	   
+   
+
       
       
-         A simple MyFaces JSF Portlet on JBoss AS 4.2
+         An example Apache MyFaces JSF Portlet
          
             Introduction
-            This section will introduce the reader to deploying a si=
mple JSF portlet in JBoss Portal, using
-               Apache's MyFaces JSF implementation on JBoss AS 4.2. It req=
uires you download the HelloWorldJSFMyFaces42Portlet
-               from PortletSwap.com, using this link:
-               http://anonsvn.jboss.=
org/repos/portletswap/portlets/2_6/bundles/HelloWorldJSFMyFaces42Portlet.zi=
p.
-               There are actually different ways to do it, one would be to=
 use MyFaces globally for the whole server and replace the Sun RI
-               libraries by the myFaces ones, but in this section the port=
let will not affect the application server and embed its
-               own libraries.
-            
+	    
+		    This section describes how to deploy a JSF portlet in JBoss Portal, =
using the Apache MyFaces JSF implementation in JBoss AS or JBoss EAP. Befor=
e proceeding, download the HelloWorld=
JSFMyFaces42Portlet from JBoss PortletSwap.
+	    
+	    
+		    Apache MyFaces can be used globally for the entire server, replacing=
 the Sun JSF RI libraries, but the HelloWorldJSFMyFaces42Portlet uses its o=
wn libraries, and will not affect the application server.
+	    
          
          
-            Package Content
+            Package Structure
+	    
+		    JBoss Portal requires certain descriptors to be included in a portle=
t WAR file. Some of these descriptors are defined by the JSR-168 Portlet Sp=
ecification, and others are specific to JBoss Portal. Like a typical JSF ap=
plication, the HelloWorldJSFMyFaces42Portlet package contains a f=
aces-config.xml file that defines managed-beans, converters, val=
idators, navigation rules, and so on. The following is an example of the di=
rectory structure of the HelloWorldJSFMyFaces42Portlet portlet:
+	    
             
                
                   
                      
                   
                
-               Like a typical JSF application, we also package our faces-c=
onfig.xml that defines our
-               managed-beans, converters, validators, navigation rules, et=
c...
-               The WEB-INF/lib must contain the MyFac=
es libraries along with dependent libraries.
+              
+	      
+		      To create the WEB-INF/ and META-INF=
/ directories, extract the helloworldjsfmyfacesportlet=
.war file. The WEB-INF/lib/ directory must =
contain the MyFaces libraries, along with the dependent libraries.
             
+    
+    
+	    Application Descriptors
             For the sake of brevity, we only discuss the po=
rtlet.xml, web.xml and
                faces-config.xml descriptors here. For d=
iscussion on the other descriptors, please
                view  or the c=
hapter on descriptors:
@@ -1441,12 +1446,15 @@
             
          
          
-            Building and deploying your portlet
+            Building your Apache MyFaces JSF Porlet
             If you have downloaded the sample, you can execute the b=
uild.xml with ant or inside your IDE.
                Executing ant will compile all source fi=
les and produce a
                helloworldjsfportlet.war file in a way s=
imilar to what we saw in
                .
             
+    
+    
+	    Deploying your Apache MyFaces JSF Portlet
             
                Deploying the portlet is as easy as copying/moving the helloworldjsfmyfacesportlet.war file
                to the server deploy directory. We can t=
hen see our portlet on the Portal default


--===============1680793742671664088==--

From portal-commits at lists.jboss.org Sun Feb 17 21:28:34 2008
Content-Type: multipart/mixed; boundary="===============0212284040436605100=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r10009 -
 docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
Date: Sun, 17 Feb 2008 21:28:34 -0500
Message-ID: 

--===============0212284040436605100==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mmcallis
Date: 2008-02-17 21:28:34 -0500 (Sun, 17 Feb 2008)
New Revision: 10009

Modified:
   docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorial=
s.xml
Log:
periodic backup
revising 5.2.4. A simple MyFaces JSF Portlet on JBoss AS 4.2
*** this will break the book until later commits ***


Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/t=
utorials.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutoria=
ls.xml	2008-02-18 01:52:50 UTC (rev 10008)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutoria=
ls.xml	2008-02-18 02:28:34 UTC (rev 10009)
@@ -1348,14 +1348,15 @@
     
     
 	    Application Descriptors
-            For the sake of brevity, we only discuss the po=
rtlet.xml, web.xml and
-               faces-config.xml descriptors here. For d=
iscussion on the other descriptors, please
-               view  or the c=
hapter on descriptors:
-               .
-               
-                  
-                     portlet.xml
-
+	    
+		    For brevity, only the portlet.xml, fa=
ces-config.xml, and web.xml descriptors are=
 described here. For more information about application descriptors, refer =
to  and .
+	    
+	    
+		    The following is an example of the HelloWorldJSFMyFaces42P=
ortlet/WEB-INF/portlet.xml file. This file must adhere to its de=
finition in the JSR-168 Portlet Specification. You may define more than one=
 portlet application in this file:
+	    
+	    
+
 HelloWorld JSF Portlet
       
    
-]]>
-                        This file must adhere to its definition in the Por=
tlet Specification. You may define more than
-                        one portlet application in this file. Now let's lo=
ok at the portions that deal with our use of
-                        JSF:
-                        
-                           
-                              
-                                 o=
rg.apache.myfaces.portlet.MyFacesGenericPortlet]]>
-                                 Here we specify that MyFacesGenericPortle=
t will handle all requests/responses from our
-                                 users. There is therefore no need to deve=
lop a specific portlet class, MyFaces
-                                 providing a generic implementation bridgi=
ng the JSF and portlet worlds.
-                                 If you wanted to add more functiona=
lity to your JSF portlet, not included in the
-                                    MyFacesGenericPortlet, you could subla=
ss it and create your own Class.
-                              
-                           
-                           
-                              
-                                 We need to initialize the portlet with a =
default view page for it to render, much like
-                                 a welcome page:
-                                 
+]]>
+
+
+
+	
+		org.apache.myfaces.portlet.MyFacesGenericPortlet]]>
+
+
+	
+		Here we specify that MyFacesGenericPortlet will handle all requests/resp=
onses from our
+		users. There is therefore no need to develop a specific portlet class, M=
yFaces
+		providing a generic implementation bridging the JSF and portlet worlds.
+		If you wanted to add more functionality to your JSF portlet,=
 not included in the
+		MyFacesGenericPortlet, you could sublass it and create your own Class.
+	
+
+
+
    default-view
    /WEB-INF/jsp/index.jsp
-]]>
-                              
-                           
-                        
-                     
-                  
-                  
-                     web.xml
+]]>
+
+
+	
+		We need to initialize the portlet with a default view page for it to ren=
der, much like
+		a welcome page:
+	
+
+
+
+
+
+	The following is an example HelloWorldJSFMyFaces42Portlet/WEB-I=
NF/faces-config.xml file:
+
+
+
+
+
+   
+      Basic UserBean
+      user
+      org.jboss.portlet.hello.bean.User
+      session
+   
+   
+      
+      done
+      /WEB-INF/jsp/result.jsp
+      
+   
+]]>
+	=

+	=

+	web.xml
 
    org.jboss.jbossfaces.WAR_BUNDLES_JSF_IMPL
    true


--===============0212284040436605100==--

From portal-commits at lists.jboss.org Sun Feb 17 23:12:51 2008
Content-Type: multipart/mixed; boundary="===============1947981454157156793=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r10010 -
 docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
Date: Sun, 17 Feb 2008 23:12:51 -0500
Message-ID: 

--===============1947981454157156793==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mmcallis
Date: 2008-02-17 23:12:51 -0500 (Sun, 17 Feb 2008)
New Revision: 10010

Modified:
   docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorial=
s.xml
Log:
5.2.4. An example Apache MyFaces JSF Portlet
revising to make more consistent with 5.2.1. Deploying your first Portlet


Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/t=
utorials.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutoria=
ls.xml	2008-02-18 02:28:34 UTC (rev 10009)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutoria=
ls.xml	2008-02-18 04:12:51 UTC (rev 10010)
@@ -1084,6 +1084,18 @@
 	
 
 
+
+    text/html
+    VIEW
+]]>
+		     
+			     
+				     The <supports> element all=
ows you to declare all the markup types your portlet supports in the render method. This is accomplished via the
+				     <mime-type> element, which=
 is required for every portlet. The declared MIME types must match the capa=
bility of the portlet. As well, it allows you to pair which modes and windo=
w states are supported for each markup type. All portlets must support the =
VIEW portlet mode, so this does not have to be declared. Use <mime-type> to define which markup type your portl=
et supports, which in this example, is text/html. This section tells the portal that it will only output text and HTM=
L, and that it only supports the VIEW mode.
+			     
+
+
 
 
 
@@ -1343,7 +1355,7 @@
                
               
 	      
-		      To create the WEB-INF/ and META-INF=
/ directories, extract the helloworldjsfmyfacesportlet=
.war file. The WEB-INF/lib/ directory must =
contain the MyFaces libraries, along with the dependent libraries.
+		      To create the WEB-INF/ and META-INF=
/ directories, extract the helloworldjsfmyfacesportlet=
.war file. The WEB-INF/lib/ directory must =
contain the Apache MyFaces libraries, along with the dependent libraries.
             
     
     
@@ -1387,11 +1399,7 @@
 
 
 	
-		Here we specify that MyFacesGenericPortlet will handle all requests/resp=
onses from our
-		users. There is therefore no need to develop a specific portlet class, M=
yFaces
-		providing a generic implementation bridging the JSF and portlet worlds.
-		If you wanted to add more functionality to your JSF portlet,=
 not included in the
-		MyFacesGenericPortlet, you could sublass it and create your own Class.
+		This specifies that the org.apache.myfaces.portlet.MyFac=
esGenericPortlet handles all requests and responses from t=
he users. Therefore, there is no need to develop a specific portlet class, =
as Apache MyFaces provides a generic implementation which bridges the JSF a=
nd portlet worlds.
 	
 
 
@@ -1403,14 +1411,33 @@
 
 
 	
-		We need to initialize the portlet with a default view page for it to ren=
der, much like
-		a welcome page:
+		You must initialize the portlet with a default page to render, similar t=
o a welcome page.
 	
 
 
+
+    text/html
+    VIEW
+]]>
+		     
+			     
+				     The <supports> element all=
ows you to declare all the markup types your portlet supports in the render method. This is accomplished via the
+				     <mime-type> element, which=
 is required for every portlet. The declared MIME types must match the capa=
bility of the portlet. As well, it allows you to pair which modes and windo=
w states are supported for each markup type. All portlets must support the =
VIEW portlet mode, so this does not have to be declared. Use <mime-type> to define which markup type your portl=
et supports, which in this example, is text/html. This section tells the portal that it will only output text and HTM=
L, and that it only supports the VIEW mode.
+			     
+
+
 
 
 
+	
+		Adding Functionality to a Apache MyFaces JSF Porlet
+		
+			To add functionality to a Apache MyFaces JSF Porlet, sub-class it and c=
reate your own class.
+		
+	
+
+
 	The following is an example HelloWorldJSFMyFaces42Portlet/WEB-I=
NF/faces-config.xml file:
 
 
@@ -1433,48 +1460,26 @@
       
    
 ]]>
-	=

-	=

-	web.xml
-
+
+
+	
+		Without the faces-config.xml file, the application =
would work the same outside of the portlet as it would inside a portlet con=
tainer. In this example, a basic user bean, <managed-bea=
n-name>user</managed-bean-name>, and a navigation=
 rule are defined, which handle the submission of the original form in the =
HelloWorldJSFMyFaces42Portlet/WEB-INF/jsp/index.jsp fi=
le.
+	
+
+	The following is an example of the Faces Servlet section from the HelloWo=
rldJSFMyFaces42Portlet/WEB-INF/web.xml file:
+
+
+
    org.jboss.jbossfaces.WAR_BUNDLES_JSF_IMPL
    true
-]]>
-                        We need this extra parameter to let the applicatio=
n server know that the package embeds its own libraries.
-                        It will avoid collision with the Sun RI JSF librar=
ies bundled with JBoss AS.
-                        More details on this procedure can be found at =
http://wiki.jboss.org/wiki/Wiki.jsp?page=3DJBossFaces.
-                     
-                  
-                  
-                     faces-config.xml
-
-
-
-   
-      Basic UserBean
-      user
-      org.jboss.portlet.hello.bean.User
-      session
-   
-   
-      
-         done
-         /WEB-INF/jsp/result.jsp
-      
-   
-]]>
-                        There is nothing special about the faces-=
config.xml file included here. This
-                        application would work just as well outside of a p=
ortlet as it would inside a portlet container.
-                        In the above lines, we define a basic Use=
r Bean and a navigation rule to
-                        handle the submittal of the original form on index.jsp.
-                     
-                  
-               
-            
-         
+]]>
+
+
+
+	These extra parameters let the application server know that the portlet e=
mbeds its own libraries. This avoids collision with the Sun JSF RI librarie=
s bundled with JBoss AS And JBoss EAP. For further details, refer to the Apache M=
yFaces page on the JBoss Wiki.
+
+
          
             Building your Apache MyFaces JSF Porlet
             If you have downloaded the sample, you can execute the b=
uild.xml with ant or inside your IDE.


--===============1947981454157156793==--

From portal-commits at lists.jboss.org Mon Feb 18 01:04:58 2008
Content-Type: multipart/mixed; boundary="===============6145940216133660122=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r10011 -
 docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
Date: Mon, 18 Feb 2008 01:04:53 -0500
Message-ID: 

--===============6145940216133660122==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mmcallis
Date: 2008-02-18 01:04:52 -0500 (Mon, 18 Feb 2008)
New Revision: 10011

Modified:
   docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorial=
s.xml
Log:
5.2.4. An example Apache MyFaces JSF Portlet
minor revisions, fixing my spelling errors


Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/t=
utorials.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutoria=
ls.xml	2008-02-18 04:12:51 UTC (rev 10010)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutoria=
ls.xml	2008-02-18 06:04:52 UTC (rev 10011)
@@ -1466,7 +1466,7 @@
 		Without the faces-config.xml file, the application =
would work the same outside of the portlet as it would inside a portlet con=
tainer. In this example, a basic user bean, <managed-bea=
n-name>user</managed-bean-name>, and a navigation=
 rule are defined, which handle the submission of the original form in the =
HelloWorldJSFMyFaces42Portlet/WEB-INF/jsp/index.jsp fi=
le.
 	
 
-	The following is an example of the Faces Servlet section from the HelloWo=
rldJSFMyFaces42Portlet/WEB-INF/web.xml file:
+	The following is an example of the <context-parm> section from the HelloWorldJSFMyFaces42Portlet/WE=
B-INF/web.xml file:
 
 
 
 
 
-	These extra parameters let the application server know that the portlet e=
mbeds its own libraries. This avoids collision with the Sun JSF RI librarie=
s bundled with JBoss AS And JBoss EAP. For further details, refer to the Apache M=
yFaces page on the JBoss Wiki.
+	These extra parameters let the application server know that the portlet e=
mbeds its own libraries. This avoids collision with the Sun JSF RI librarie=
s bundled with JBoss AS And JBoss EAP. For more information, refer to the <=
ulink url=3D"http://wiki.jboss.org/wiki/Wiki.jsp?page=3DJBossFaces">Apache =
MyFaces page on the JBoss Wiki.
 
 
          


--===============6145940216133660122==--

From portal-commits at lists.jboss.org Mon Feb 18 03:25:42 2008
Content-Type: multipart/mixed; boundary="===============8999360715345881624=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r10012 -
 docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
Date: Mon, 18 Feb 2008 03:25:42 -0500
Message-ID: 

--===============8999360715345881624==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mmcallis
Date: 2008-02-18 03:25:42 -0500 (Mon, 18 Feb 2008)
New Revision: 10012

Modified:
   docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorial=
s.xml
Log:
5.2.4.4. Building your Apache MyFaces JSF Porlet
revising and adding content to make this section
consistent with 5.2.2.5. Building your JSP Portlet


Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/t=
utorials.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutoria=
ls.xml	2008-02-18 06:04:52 UTC (rev 10011)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutoria=
ls.xml	2008-02-18 08:25:42 UTC (rev 10012)
@@ -1431,9 +1431,9 @@
 
 
 	
-		Adding Functionality to a Apache MyFaces JSF Porlet
+		Adding Functionality to an Apache MyFaces JSF Porlet
 		
-			To add functionality to a Apache MyFaces JSF Porlet, sub-class it and c=
reate your own class.
+			To add functionality to an Apache MyFaces JSF Porlet, sub-class it and =
create your own class.
 		
 	
 
@@ -1482,11 +1482,68 @@
 
          
             Building your Apache MyFaces JSF Porlet
-            If you have downloaded the sample, you can execute the b=
uild.xml with ant or inside your IDE.
-               Executing ant will compile all source fi=
les and produce a
-               helloworldjsfportlet.war file in a way s=
imilar to what we saw in
-               .
-            
+	    
+		    The HelloWorldJSFMyFaces42Portlet.zip file cont=
ains a pre-compiled helloworldjsfmyfacesportlet.war fi=
le; however, to manually build the helloworldjsfmyfacesportlet.wa=
r file:
+	    
+	    
+		    
+			    
+				    
+					    Change into the HelloWorldJSFMyFaces42Portlet/ directory, and remove the existing helloworldjsfmyfacesportlet=
.war file.
+				    
+			    
+			    
+				    
+					    If required, edit the HelloWorldJSFMyFaces42Portlet/src=
/main/org/jboss/portlet/hello/bean/User.java file, and the appli=
cation descriptors in the HelloWorldJSFMyFaces42Portlet/src/resou=
rces/helloworldjsfmyfacesportlet-war/WEB-INF/ directory.
+				    
+			    
+			    
+				    
+					    Change into HelloWorldJSFMyFaces42Portlet/ d=
irectory, and run the ant deploy command. On Linux, the =
output will be similar to the following:
+				    
+				    
+					    
+						    
+							    
+						    
+					    
+				    
+			    
+		    
+	    
+	    
+		    Note: the directory names will be different for your system.
+	    
+	    
+		    Expanding the helloworldjsfmyfacesportlet.war f=
ile allows you to deploy the portlet as an expanded directory, which makes =
development easier. As well, it gives you access to the application descrip=
tors, resource files, JSF, and JSP pages. To expand the helloworl=
djsfmyfacesportlet.war file:
+	    
+	    
+		    
+			    
+				    
+					    If you do not have the HelloWorldJSFMyFaces42Portlet/he=
lloworldjsfmyfacesportlet.war file, change into the He=
lloWorldJSFMyFaces42Portlet/ directory, and run the ant=
 deploy command. This creates the helloworldjsfmyfacesp=
ortlet.war file.
+				    
+			    
+			    
+				    
+					    To expand the WAR file, change into the HelloWorldJSFMy=
Faces42Portlet/ directory, and run the ant explode command. On Linux, the output will be similar to the following:
+				    
+				    
+					    
+						    
+							    
+						    
+					    
+				    
+			    
+		    
+	    
+	    
+		    Note: the directory names will be different for your system.
+	    
+	    
+		    The expanded WAR file and the application descriptors are located in=
 the HelloWorldJSFMyFaces42Portlet/output/lib/exploded/helloworld=
jsfmyfacesportlet.war/WEB-INF/ directory.
+	    
     
     
 	    Deploying your Apache MyFaces JSF Portlet


--===============8999360715345881624==--

From portal-commits at lists.jboss.org Mon Feb 18 03:26:22 2008
Content-Type: multipart/mixed; boundary="===============7058659493011720951=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r10013 -
 docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/images/tutorials/jsf_portlet.
Date: Mon, 18 Feb 2008 03:26:22 -0500
Message-ID: 

--===============7058659493011720951==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mmcallis
Date: 2008-02-18 03:26:22 -0500 (Mon, 18 Feb 2008)
New Revision: 10013

Added:
   docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/images/tutorials=
/jsf_portlet/myfaces_ant_deploy.png
   docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/images/tutorials=
/jsf_portlet/myfaces_ant_explode.png
Log:
adding images for ant deploy and explode
5.2.4.4. Building your Apache MyFaces JSF Porlet


Added: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/images/tutor=
ials/jsf_portlet/myfaces_ant_deploy.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/e=
n/images/tutorials/jsf_portlet/myfaces_ant_deploy.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/images/tutor=
ials/jsf_portlet/myfaces_ant_explode.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/e=
n/images/tutorials/jsf_portlet/myfaces_ant_explode.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream


--===============7058659493011720951==--

From portal-commits at lists.jboss.org Mon Feb 18 06:21:09 2008
Content-Type: multipart/mixed; boundary="===============1936542540757329291=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r10014 - in modules/portlet/trunk:
 controller/src/main/java/org/jboss/portal/portlet/controller and 13 other
 directories.
Date: Mon, 18 Feb 2008 06:21:09 -0500
Message-ID: 

--===============1936542540757329291==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-18 06:21:08 -0500 (Mon, 18 Feb 2008)
New Revision: 10014

Added:
   modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/=
controller/
   modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/=
controller/EventControllerContextSupport.java
   modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/=
controller/PortletControllerContextSupport.java
   modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/=
controller/PortletControllerTestCase.java
   modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/=
controller/PortletInvocationContextSupport.java
   modules/portlet/trunk/controller/src/test/resources/local-jboss-unit.xml
   modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/
   modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/sup=
port/
   modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/sup=
port/PortletInvokerSupport.java
   modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/sup=
port/PortletSupport.java
Removed:
   modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portle=
t/state/PortletInvokerSupport.java
   modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portle=
t/state/PortletSupport.java
Modified:
   modules/portlet/trunk/controller/pom.xml
   modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/=
controller/PortletController.java
   modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/=
controller/PortletRequestHandler.java
   modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/=
controller/PortletResourceRequestHandler.java
   modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/=
controller/RequestHandler.java
   modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/=
controller/event/Event.java
   modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/=
controller/request/ContainerRequest.java
   modules/portlet/trunk/federation/src/test/java/org/jboss/portal/test/por=
tlet/federation/FederatingPortletInvokerTestCase.java
   modules/portlet/trunk/federation/src/test/java/org/jboss/portal/test/por=
tlet/federation/OneInvokerNoPortletsTestCase.java
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/sta=
te/consumer/ConsumerPortlet.java
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/sta=
te/consumer/ConsumerPortletInvoker.java
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/sta=
te/producer/ProducerPortlet.java
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/sta=
te/producer/ProducerPortletInvoker.java
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/sup=
port/info/EventInfoSupport.java
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/sup=
port/info/EventingInfoSupport.java
   modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portle=
t/state/AbstractStatefulPortletInvokerTestCase.java
   modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portle=
t/state/ConsumerStatefulPortletInvokerTestCase.java
   modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portle=
t/state/ProducerStatefulPortletInvokerTestCase.java
Log:
started to add test case for portlet controller + refactor some stuff to be=
 reused in portlet controller test cases

Modified: modules/portlet/trunk/controller/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/controller/pom.xml	2008-02-18 08:26:22 UTC (rev 1=
0013)
+++ modules/portlet/trunk/controller/pom.xml	2008-02-18 11:21:08 UTC (rev 1=
0014)
@@ -20,6 +20,22 @@
          jar
       
 =

+      
+
+      
+         org.jboss.unit
+         jboss-unit-remote
+         test
+      
+
+      
+         org.jboss.portal.portlet
+         portlet-portlet
+         ${project.version}
+         test-jar
+         test
+      
+
       
       
    
       
-      
+      
+      
    
 =

    

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/W=
EB-INF/jboss-beans.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF=
/jboss-beans.xml	2008-02-19 10:58:39 UTC (rev 10025)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF=
/jboss-beans.xml	2008-02-19 11:39:23 UTC (rev 10026)
@@ -91,7 +91,8 @@
    
    
       
-      
+      
+      
    
 =

    


--===============6098656336510097220==--

From portal-commits at lists.jboss.org Tue Feb 19 07:08:49 2008
Content-Type: multipart/mixed; boundary="===============5747218388318320173=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r10027 - in modules/portlet/trunk:
 portlet/src/main/java/org/jboss/portal/portlet/container/managed and 3 other
 directories.
Date: Tue, 19 Feb 2008 07:08:49 -0500
Message-ID: 

--===============5747218388318320173==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-19 07:08:48 -0500 (Tue, 19 Feb 2008)
New Revision: 10027

Added:
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/con=
tainer/managed/
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/con=
tainer/managed/ManagedPortletApplication.java
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/con=
tainer/managed/ManagedPortletContainer.java
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/con=
tainer/managed/PortletApplicationRegistrationContext.java
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/con=
tainer/managed/PortletApplicationRegistry.java
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/con=
tainer/managed/PortletApplicationRegistryListener.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/K=
ernelPortletApplication.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/K=
ernelPortletContainer.java
Removed:
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/con=
tainer/PortletApplicationRegistrationContext.java
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/con=
tainer/PortletApplicationRegistry.java
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/con=
tainer/PortletApplicationRegistryListener.java
Modified:
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/imp=
l/container/PortletApplicationContextImpl.java
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/imp=
l/container/PortletApplicationRegistryImpl.java
   modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portle=
t/info/AbstractInfoTest.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/P=
ortletApplicationDeployer.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/P=
ortletApplicationDeployment.java
Log:
start to revamp the container registry to something more managed

Deleted: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portl=
et/container/PortletApplicationRegistrationContext.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/co=
ntainer/PortletApplicationRegistrationContext.java	2008-02-19 11:39:23 UTC =
(rev 10026)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/co=
ntainer/PortletApplicationRegistrationContext.java	2008-02-19 12:08:48 UTC =
(rev 10027)
@@ -1,47 +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.portlet.container;
-
-/**
- * @author Julien Viet
- * @version $Revision: 1.1 $
- */
-public interface PortletApplicationRegistrationContext
-{
-
-   /**
-    * Register a portlet.
-    *
-    * @param portletContainer the portlet container
-    */
-   void registerPortlet(PortletContainer portletContainer);
-
-   /**
-    * Unregister a portlet.
-    *
-    * @param portletContainer the portlet container
-    */
-   void unregisterPortlet(PortletContainer portletContainer);
-
-
-}

Deleted: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portl=
et/container/PortletApplicationRegistry.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/co=
ntainer/PortletApplicationRegistry.java	2008-02-19 11:39:23 UTC (rev 10026)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/co=
ntainer/PortletApplicationRegistry.java	2008-02-19 12:08:48 UTC (rev 10027)
@@ -1,69 +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.portlet.container;
-
-import java.util.Collection;
-
-/**
- * @author Julien Viet
- * @author Thomas Heute
- * @version $Revision: 6699 $
- */
-public interface PortletApplicationRegistry
-{
-   /**
-    * Register a portlet application.
-    *
-    * @param portletApplication the portlet application to register
-    * @throws IllegalArgumentException if the portlet application is null =
or already registered
-    */
-   PortletApplicationRegistrationContext registerPortletApplication(Portle=
tApplication portletApplication) throws IllegalArgumentException;
-
-   /**
-    * Unregister a portlet application.
-    *
-    * @param portletApplication the portlet application to unregister
-    * @throws IllegalArgumentException if the portlet application is null =
or not registered
-    */
-   void unregisterPortletApplication(PortletApplication portletApplication=
) throws IllegalArgumentException;
-
-   /** Return an immutable list all the known portlet application in the r=
egistry. */
-   Collection getPortletApplications();
-
-   /** Return a portlet app using its id or null if it does not exist. */
-   PortletApplication getPortletApplication(String id);
-
-   /**
-    * Adds a portlet container registry listener.
-    *
-    * @param listener
-    */
-   void addListener(PortletApplicationRegistryListener listener);
-
-   /**
-    * Removes a portlet container registry listener.
-    *
-    * @param listener
-    */
-   void removeListener(PortletApplicationRegistryListener listener);
-}

Deleted: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portl=
et/container/PortletApplicationRegistryListener.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/co=
ntainer/PortletApplicationRegistryListener.java	2008-02-19 11:39:23 UTC (re=
v 10026)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/co=
ntainer/PortletApplicationRegistryListener.java	2008-02-19 12:08:48 UTC (re=
v 10027)
@@ -1,41 +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.portlet.container;
-
-/**
- * @author Thomas Heute
- */
-public interface PortletApplicationRegistryListener
-{
-
-   /**
-    * A portlet container has been registered.
-    */
-   void portletContainerRegistered(PortletContainer portletContainer);
-
-   /**
-    * A portlet container has been unregistered. =

-    */
-   void portletContainerUnregistered(PortletContainer portletContainer);
-
-}

Added: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet=
/container/managed/ManagedPortletApplication.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/co=
ntainer/managed/ManagedPortletApplication.java	                        (rev=
 0)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/co=
ntainer/managed/ManagedPortletApplication.java	2008-02-19 12:08:48 UTC (rev=
 10027)
@@ -0,0 +1,42 @@
+/*************************************************************************=
*****
+ * 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.container.managed;
+
+import java.util.Collection;
+
+/**
+ * @author Julien Viet
+ * @version $Revision: 630 $
+ */
+public interface ManagedPortletApplication
+{
+
+   String getId();
+
+   void managedStart() throws Exception;
+
+   void managedStop();
+
+   Collection getManagedPortletContaine=
rs();
+
+}

Added: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet=
/container/managed/ManagedPortletContainer.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/co=
ntainer/managed/ManagedPortletContainer.java	                        (rev 0)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/co=
ntainer/managed/ManagedPortletContainer.java	2008-02-19 12:08:48 UTC (rev 1=
0027)
@@ -0,0 +1,44 @@
+/*************************************************************************=
*****
+ * 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.container.managed;
+
+import org.jboss.portal.portlet.info.PortletInfo;
+
+/**
+ * @author Julien Viet
+ * @version $Revision: 630 $
+ */
+public interface ManagedPortletContainer
+{
+
+   String getId();
+
+   PortletInfo getPortletInfo();
+
+   ManagedPortletApplication getManagedPortletApplication();
+
+   void managedStart() throws Exception;
+
+   void managedStop();
+
+}

Added: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet=
/container/managed/PortletApplicationRegistrationContext.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/co=
ntainer/managed/PortletApplicationRegistrationContext.java	                =
        (rev 0)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/co=
ntainer/managed/PortletApplicationRegistrationContext.java	2008-02-19 12:08=
:48 UTC (rev 10027)
@@ -0,0 +1,49 @@
+/*************************************************************************=
*****
+ * 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.portlet.container.managed;
+
+import org.jboss.portal.portlet.container.PortletContainer;
+
+/**
+ * @author Julien Viet
+ * @version $Revision: 1.1 $
+ */
+public interface PortletApplicationRegistrationContext
+{
+
+   /**
+    * Register a portlet.
+    *
+    * @param portletContainer the portlet container
+    */
+   void registerPortlet(PortletContainer portletContainer);
+
+   /**
+    * Unregister a portlet.
+    *
+    * @param portletContainer the portlet container
+    */
+   void unregisterPortlet(PortletContainer portletContainer);
+
+
+}

Added: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet=
/container/managed/PortletApplicationRegistry.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/co=
ntainer/managed/PortletApplicationRegistry.java	                        (re=
v 0)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/co=
ntainer/managed/PortletApplicationRegistry.java	2008-02-19 12:08:48 UTC (re=
v 10027)
@@ -0,0 +1,71 @@
+/*************************************************************************=
*****
+ * 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.portlet.container.managed;
+
+import org.jboss.portal.portlet.container.PortletApplication;
+
+import java.util.Collection;
+
+/**
+ * @author Julien Viet
+ * @author Thomas Heute
+ * @version $Revision: 6699 $
+ */
+public interface PortletApplicationRegistry
+{
+   /**
+    * Register a portlet application.
+    *
+    * @param portletApplication the portlet application to register
+    * @throws IllegalArgumentException if the portlet application is null =
or already registered
+    */
+   PortletApplicationRegistrationContext registerPortletApplication(Portle=
tApplication portletApplication) throws IllegalArgumentException;
+
+   /**
+    * Unregister a portlet application.
+    *
+    * @param portletApplication the portlet application to unregister
+    * @throws IllegalArgumentException if the portlet application is null =
or not registered
+    */
+   void unregisterPortletApplication(PortletApplication portletApplication=
) throws IllegalArgumentException;
+
+   /** Return an immutable list all the known portlet application in the r=
egistry. */
+   Collection getPortletApplications();
+
+   /** Return a portlet app using its id or null if it does not exist. */
+   PortletApplication getPortletApplication(String id);
+
+   /**
+    * Adds a portlet container registry listener.
+    *
+    * @param listener
+    */
+   void addListener(PortletApplicationRegistryListener listener);
+
+   /**
+    * Removes a portlet container registry listener.
+    *
+    * @param listener
+    */
+   void removeListener(PortletApplicationRegistryListener listener);
+}


Property changes on: modules/portlet/trunk/portlet/src/main/java/org/jboss/=
portal/portlet/container/managed/PortletApplicationRegistry.java
___________________________________________________________________
Name: svn:executable
   + *

Added: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet=
/container/managed/PortletApplicationRegistryListener.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/co=
ntainer/managed/PortletApplicationRegistryListener.java	                   =
     (rev 0)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/co=
ntainer/managed/PortletApplicationRegistryListener.java	2008-02-19 12:08:48=
 UTC (rev 10027)
@@ -0,0 +1,43 @@
+/*************************************************************************=
*****
+ * 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.portlet.container.managed;
+
+import org.jboss.portal.portlet.container.PortletContainer;
+
+/**
+ * @author Thomas Heute
+ */
+public interface PortletApplicationRegistryListener
+{
+
+   /**
+    * A portlet container has been registered.
+    */
+   void portletContainerRegistered(PortletContainer portletContainer);
+
+   /**
+    * A portlet container has been unregistered. =

+    */
+   void portletContainerUnregistered(PortletContainer portletContainer);
+
+}

Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/port=
let/impl/container/PortletApplicationContextImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/container/PortletApplicationContextImpl.java	2008-02-19 11:39:23 UTC (re=
v 10026)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/container/PortletApplicationContextImpl.java	2008-02-19 12:08:48 UTC (re=
v 10027)
@@ -23,8 +23,8 @@
 package org.jboss.portal.portlet.impl.container;
 =

 import org.jboss.portal.portlet.container.PortletApplicationContext;
-import org.jboss.portal.portlet.container.PortletApplicationRegistrationCo=
ntext;
-import org.jboss.portal.portlet.container.PortletApplicationRegistry;
+import org.jboss.portal.portlet.container.managed.PortletApplicationRegist=
rationContext;
+import org.jboss.portal.portlet.container.managed.PortletApplicationRegist=
ry;
 import org.jboss.portal.portlet.container.PortletContainer;
 import org.jboss.portal.portlet.impl.jsr168.PortletApplicationImpl;
 import org.jboss.portal.portlet.impl.jsr168.spi.PortletAPIFactory;

Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/port=
let/impl/container/PortletApplicationRegistryImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/container/PortletApplicationRegistryImpl.java	2008-02-19 11:39:23 UTC (r=
ev 10026)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/container/PortletApplicationRegistryImpl.java	2008-02-19 12:08:48 UTC (r=
ev 10027)
@@ -22,10 +22,10 @@
  *************************************************************************=
*****/
 package org.jboss.portal.portlet.impl.container;
 =

-import org.jboss.portal.portlet.container.PortletApplicationRegistry;
-import org.jboss.portal.portlet.container.PortletApplicationRegistrationCo=
ntext;
+import org.jboss.portal.portlet.container.managed.PortletApplicationRegist=
ry;
+import org.jboss.portal.portlet.container.managed.PortletApplicationRegist=
rationContext;
 import org.jboss.portal.portlet.container.PortletApplication;
-import org.jboss.portal.portlet.container.PortletApplicationRegistryListen=
er;
+import org.jboss.portal.portlet.container.managed.PortletApplicationRegist=
ryListener;
 import org.jboss.portal.portlet.container.PortletContainer;
 =

 import java.util.ArrayList;

Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test=
/portlet/info/AbstractInfoTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portl=
et/info/AbstractInfoTest.java	2008-02-19 11:39:23 UTC (rev 10026)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portl=
et/info/AbstractInfoTest.java	2008-02-19 12:08:48 UTC (rev 10027)
@@ -22,7 +22,7 @@
  *************************************************************************=
*****/
 package org.jboss.portal.test.portlet.info;
 =

-import org.jboss.portal.portlet.container.PortletApplicationRegistry;
+import org.jboss.portal.portlet.container.managed.PortletApplicationRegist=
ry;
 import org.jboss.unit.info.TestInfo;
 import org.jboss.unit.info.impl.SimpleTestSuiteInfo;
 import org.jboss.unit.remote.driver.RemoteTestDriver;

Copied: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/t=
est/KernelPortletApplication.java (from rev 10026, modules/portlet/trunk/te=
st/src/main/java/org/jboss/portal/portlet/test/ManagedPortletApplication.ja=
va)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
KernelPortletApplication.java	                        (rev 0)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
KernelPortletApplication.java	2008-02-19 12:08:48 UTC (rev 10027)
@@ -0,0 +1,136 @@
+/*************************************************************************=
*****
+ * 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;
+
+import org.jboss.portal.portlet.container.PortletApplicationContext;
+import org.jboss.portal.portlet.container.PortletApplication;
+import org.jboss.portal.portlet.container.managed.ManagedPortletApplicatio=
n;
+import org.jboss.portal.portlet.container.managed.ManagedPortletContainer;
+import org.jboss.portal.web.WebApp;
+import org.jboss.portal.common.NotYetImplemented;
+
+import javax.servlet.ServletContext;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+
+/**
+ * @author Julien Viet
+ * @version $Revision: 630 $
+ */
+public class KernelPortletApplication implements PortletApplicationContext=
, ManagedPortletApplication
+{
+
+   /** . */
+   private final WebApp webApp;
+
+   /** . */
+   private PortletApplication portletApplication;
+
+   /** . */
+   private final Map kernelPortletContaine=
rs;
+
+   public KernelPortletApplication(WebApp webApp)
+   {
+      this.webApp =3D webApp;
+      this.portletApplication =3D null;
+      this.kernelPortletContainers =3D new HashMap();
+   }
+
+   public void addKernelPortletContainer(KernelPortletContainer kernelPort=
letContainer)
+   {
+      kernelPortletContainers.put(kernelPortletContainer.getPortletContain=
er().getId(), kernelPortletContainer);
+   }
+
+   public void removeKernelPortletContainer(KernelPortletContainer kernelP=
ortletContainer)
+   {
+      kernelPortletContainers.remove(kernelPortletContainer.getPortletCont=
ainer().getId());
+   }
+
+   public PortletApplication getPortletApplication()
+   {
+      return portletApplication;
+   }
+
+   public void setPortletApplication(PortletApplication portletApplication)
+   {
+      this.portletApplication =3D portletApplication;
+   }
+
+   public void start() throws Exception
+   {
+   }
+
+   public void stop()
+   {
+   }
+
+   // PortletApplicationContext ******************************************=
**********************************************
+
+   public ServletContext getServletContext()
+   {
+      return webApp.getServletContext();
+   }
+
+   public String getContextPath()
+   {
+      return webApp.getContextPath();
+   }
+
+   public ClassLoader getClassLoader()
+   {
+      return webApp.getClassLoader();
+   }
+
+   public void invokeStart() throws Exception
+   {
+      throw new NotYetImplemented();
+   }
+
+   public void invokeStop()
+   {
+      throw new NotYetImplemented();
+   }
+
+   //
+
+   public String getId()
+   {
+      return portletApplication.getId();
+   }
+
+   public void managedStart() throws Exception
+   {
+      throw new NotYetImplemented();
+   }
+
+   public void managedStop()
+   {
+      throw new NotYetImplemented();
+   }
+
+   public Collection getManagedPortletC=
ontainers()
+   {
+      return kernelPortletContainers.values();
+   }
+}

Copied: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/t=
est/KernelPortletContainer.java (from rev 10026, modules/portlet/trunk/test=
/src/main/java/org/jboss/portal/portlet/test/ManagedPortletContainer.java)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
KernelPortletContainer.java	                        (rev 0)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
KernelPortletContainer.java	2008-02-19 12:08:48 UTC (rev 10027)
@@ -0,0 +1,111 @@
+/*************************************************************************=
*****
+ * 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;
+
+import org.jboss.portal.portlet.container.PortletContainerContext;
+import org.jboss.portal.portlet.container.PortletContainer;
+import org.jboss.portal.portlet.container.managed.ManagedPortletContainer;
+import org.jboss.portal.portlet.container.managed.ManagedPortletApplicatio=
n;
+import org.jboss.portal.portlet.info.PortletInfo;
+import org.jboss.portal.common.NotYetImplemented;
+
+/**
+ * @author Julien Viet
+ * @version $Revision: 630 $
+ */
+public class KernelPortletContainer implements PortletContainerContext, Ma=
nagedPortletContainer
+{
+
+   /** . */
+   private PortletContainer portletContainer;
+
+   /** . */
+   private KernelPortletApplication kernelPortletApplication;
+
+   public KernelPortletApplication getKernelPortletApplication()
+   {
+      return kernelPortletApplication;
+   }
+
+   public void setKernelPortletApplication(KernelPortletApplication kernel=
PortletApplication)
+   {
+      this.kernelPortletApplication =3D kernelPortletApplication;
+   }
+
+   public PortletContainer getPortletContainer()
+   {
+      return portletContainer;
+   }
+
+   public void setPortletContainer(PortletContainer portletContainer)
+   {
+      this.portletContainer =3D portletContainer;
+   }
+
+   public void start() throws Exception
+   {
+   }
+
+   public void stop()
+   {
+   }
+
+   //
+
+   public void invokeStart() throws Exception
+   {
+      throw new NotYetImplemented();
+   }
+
+   public void invokeStop()
+   {
+      throw new NotYetImplemented();
+   }
+
+   //
+
+   public String getId()
+   {
+      return portletContainer.getId();
+   }
+
+   public ManagedPortletApplication getManagedPortletApplication()
+   {
+      return kernelPortletApplication;
+   }
+
+   public PortletInfo getPortletInfo()
+   {
+      return portletContainer.getInfo();
+   }
+
+   public void managedStart() throws Exception
+   {
+      throw new NotYetImplemented();
+   }
+
+   public void managedStop()
+   {
+      throw new NotYetImplemented();
+   }
+}

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/PortletApplicationDeployer.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
PortletApplicationDeployer.java	2008-02-19 11:39:23 UTC (rev 10026)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
PortletApplicationDeployer.java	2008-02-19 12:08:48 UTC (rev 10027)
@@ -28,8 +28,8 @@
 import org.jboss.kernel.spi.dependency.KernelControllerContextAware;
 import org.jboss.portal.common.io.IOTools;
 import org.jboss.portal.portlet.container.PortletApplication;
-import org.jboss.portal.portlet.container.PortletApplicationRegistrationCo=
ntext;
-import org.jboss.portal.portlet.container.PortletApplicationRegistry;
+import org.jboss.portal.portlet.container.managed.PortletApplicationRegist=
rationContext;
+import org.jboss.portal.portlet.container.managed.PortletApplicationRegist=
ry;
 import org.jboss.portal.portlet.container.PortletContainer;
 import org.jboss.portal.portlet.impl.metadata.PortletApplication10MetaData;
 import static org.jboss.portal.portlet.impl.metadata.PortletMetaDataConsta=
nts.PORTLET_JSR_168_NS;
@@ -100,8 +100,8 @@
    private ClassLoader classLoader;
 =

    /** . */
-   private final Map registrationContextMap =3D
-      new HashMap();
+   private final Map registrationContextMap =3D
+      new HashMap();
 =

    public PortletApplicationRegistry getRegistry()
    {
@@ -270,35 +270,35 @@
    }
 =

    /** Called by MC to install application. */
-   public void addManagedPortletApplication(ManagedPortletApplication mana=
gedPortletApplication)
+   public void addManagedPortletApplication(KernelPortletApplication kerne=
lPortletApplication)
    {
-      PortletApplication portletApplication =3D managedPortletApplication.=
getPortletApplication();
+      PortletApplication portletApplication =3D kernelPortletApplication.g=
etPortletApplication();
       PortletApplicationRegistrationContext context =3D registry.registerP=
ortletApplication(portletApplication);
-      registrationContextMap.put(managedPortletApplication, context);
+      registrationContextMap.put(kernelPortletApplication, context);
    }
 =

    /** Called by MC to install container. */
-   public void addManagedPortletContainer(ManagedPortletContainer managedP=
ortletContainer)
+   public void addManagedPortletContainer(KernelPortletContainer kernelPor=
tletContainer)
    {
-      ManagedPortletApplication managedPortletApplication =3D managedPortl=
etContainer.getManagedPortletApplication();
-      PortletApplicationRegistrationContext context =3D registrationContex=
tMap.get(managedPortletApplication);
-      PortletContainer portletContainer =3D managedPortletContainer.getPor=
tletContainer();
+      KernelPortletApplication kernelPortletApplication =3D kernelPortletC=
ontainer.getKernelPortletApplication();
+      PortletApplicationRegistrationContext context =3D registrationContex=
tMap.get(kernelPortletApplication);
+      PortletContainer portletContainer =3D kernelPortletContainer.getPort=
letContainer();
       context.registerPortlet(portletContainer);
    }
 =

    /** Called by MC to uninstall application. */
-   public void removeManagedPortletApplication(ManagedPortletApplication m=
anagedPortletApplication)
+   public void removeManagedPortletApplication(KernelPortletApplication ke=
rnelPortletApplication)
    {
-      PortletApplication portletApplication =3D managedPortletApplication.=
getPortletApplication();
+      PortletApplication portletApplication =3D kernelPortletApplication.g=
etPortletApplication();
       registry.unregisterPortletApplication(portletApplication);
    }
 =

    /** Called by MC to uninstall container. */
-   public void removeManagedPortletContainer(ManagedPortletContainer manag=
edPortletContainer)
+   public void removeManagedPortletContainer(KernelPortletContainer kernel=
PortletContainer)
    {
-      ManagedPortletApplication managedPortletApplication =3D managedPortl=
etContainer.getManagedPortletApplication();
-      PortletApplicationRegistrationContext context =3D registrationContex=
tMap.get(managedPortletApplication);
-      PortletContainer portletContainer =3D managedPortletContainer.getPor=
tletContainer();
+      KernelPortletApplication kernelPortletApplication =3D kernelPortletC=
ontainer.getKernelPortletApplication();
+      PortletApplicationRegistrationContext context =3D registrationContex=
tMap.get(kernelPortletApplication);
+      PortletContainer portletContainer =3D kernelPortletContainer.getPort=
letContainer();
       context.unregisterPortlet(portletContainer);
    }
 }

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/PortletApplicationDeployment.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
PortletApplicationDeployment.java	2008-02-19 11:39:23 UTC (rev 10026)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
PortletApplicationDeployment.java	2008-02-19 12:08:48 UTC (rev 10027)
@@ -88,9 +88,9 @@
       this.installed =3D new LinkedHashMap();
    }
 =

-   public AbstractBeanMetaData createManagedPortletContainerMetaData(Strin=
g managedPortletContainerId)
+   public AbstractBeanMetaData createKernelPortletContainerMetaData(String=
 kernelPortletContainerId)
    {
-      AbstractBeanMetaData beanMD =3D new AbstractBeanMetaData(managedPort=
letContainerId, ManagedPortletContainer.class.getName());
+      AbstractBeanMetaData beanMD =3D new AbstractBeanMetaData(kernelPortl=
etContainerId, KernelPortletContainer.class.getName());
 =

       //
       AbstractConstructorMetaData ctorMD =3D new AbstractConstructorMetaDa=
ta();
@@ -110,9 +110,9 @@
       return beanMD;
    }
 =

-   public AbstractBeanMetaData createManagedPortletApplicationMetaData(Str=
ing managedPortletApplicationId)
+   public AbstractBeanMetaData createKernelPortletApplicationMetaData(Stri=
ng kernelPortletApplicationId)
    {
-      AbstractBeanMetaData beanMD =3D new AbstractBeanMetaData(managedPort=
letApplicationId, ManagedPortletApplication.class.getName());
+      AbstractBeanMetaData beanMD =3D new AbstractBeanMetaData(kernelPortl=
etApplicationId, KernelPortletApplication.class.getName());
 =

       //
       AbstractConstructorMetaData ctorMD =3D new AbstractConstructorMetaDa=
ta();
@@ -192,7 +192,7 @@
       String portletApplicationId =3D "PortletApplication[" + webApp.getCo=
ntextPath() + "]";
 =

       //
-      String managedPortletApplicationId =3D "ManagedPortletApplication[" =
+ webApp.getContextPath() + "]";
+      String kernelPortletApplicationId =3D "KernelPortletApplication[" + =
webApp.getContextPath() + "]";
 =

       //
       ContainerInfoBuilderContext builderContext =3D new ContainerInfoBuil=
derContextImpl(metaData, webApp);
@@ -207,21 +207,21 @@
       {
          //
          String portletContainerId =3D "PortletContainer[" + webApp.getCon=
textPath() + "," + containerInfo.getName() + "]";
-         String managedPortletContainerId =3D "ManagedPortletContainer[" +=
 webApp.getContextPath() + "," + containerInfo.getName() + "]";
+         String kernelPortletContainerId =3D "KernelPortletContainer[" + w=
ebApp.getContextPath() + "," + containerInfo.getName() + "]";
 =

          //
          AbstractBeanMetaData portletContainerMD =3D createPortletContaine=
rMetaData(portletContainerId, containerInfo);
-         AbstractBeanMetaData managedPortletContainerMD =3D createManagedP=
ortletContainerMetaData(managedPortletContainerId);
+         AbstractBeanMetaData kernelPortletContainerMD =3D createKernelPor=
tletContainerMetaData(kernelPortletContainerId);
 =

          //
-         AbstractDependencyValueMetaData portletContainerContextDependency=
MD =3D new AbstractDependencyValueMetaData(managedPortletContainerId);
+         AbstractDependencyValueMetaData portletContainerContextDependency=
MD =3D new AbstractDependencyValueMetaData(kernelPortletContainerId);
          portletContainerContextDependencyMD.setDependentState(ControllerS=
tate.INSTANTIATED);
          portletContainerMD.getProperties().add(new AbstractPropertyMetaDa=
ta("context", portletContainerContextDependencyMD));
 =

          //
          AbstractDependencyValueMetaData portletContainerDependencyMD =3D =
new AbstractDependencyValueMetaData(portletContainerId);
          portletContainerDependencyMD.setDependentState(ControllerState.ST=
ART);
-         managedPortletContainerMD.getProperties().add(new AbstractPropert=
yMetaData("portletContainer", portletContainerDependencyMD));
+         kernelPortletContainerMD.getProperties().add(new AbstractProperty=
MetaData("portletContainer", portletContainerDependencyMD));
 =

          //
          AbstractDependencyValueMetaData portletApplicationDependencyMD =
=3D new AbstractDependencyValueMetaData(portletApplicationId);
@@ -242,51 +242,51 @@
          uninstallPortletContainerMD.setParameters(Collections.singletonLi=
st((ParameterMetaData)new AbstractParameterMetaData(new ThisValueMetaData()=
)));
          uninstallPortletContainerMD.setMethodName("removeContainer");
          uninstallPortletContainerMD.setDependentState(ControllerState.STA=
RT);
-         managedPortletContainerMD.getUninstalls().add(uninstallPortletCon=
tainerMD);
+         kernelPortletContainerMD.getUninstalls().add(uninstallPortletCont=
ainerMD);
 =

-         // Inject the managed portlet application in the managed portlet =
container
-         AbstractDependencyValueMetaData managedPortletApplicationDependen=
cyMD =3D new AbstractDependencyValueMetaData(managedPortletApplicationId);
-         managedPortletApplicationDependencyMD.setDependentState(Controlle=
rState.START);
-         managedPortletContainerMD.getProperties().add(new AbstractPropert=
yMetaData("managedPortletApplication", managedPortletApplicationDependencyM=
D));
+         // Inject the kernel portlet application in the kernel portlet co=
ntainer
+         AbstractDependencyValueMetaData kernelPortletApplicationDependenc=
yMD =3D new AbstractDependencyValueMetaData(kernelPortletApplicationId);
+         kernelPortletApplicationDependencyMD.setDependentState(Controller=
State.START);
+         kernelPortletContainerMD.getProperties().add(new AbstractProperty=
MetaData("kernelPortletApplication", kernelPortletApplicationDependencyMD));
 =

-         // Install the managed portlet container on the managed portlet a=
pplication
-         AbstractInstallMetaData installManagedPortletContainerMD =3D new =
AbstractInstallMetaData();
-         installManagedPortletContainerMD.setBean(managedPortletApplicatio=
nId);
-         installManagedPortletContainerMD.setParameters(Collections.single=
tonList((ParameterMetaData)new AbstractParameterMetaData(new ThisValueMetaD=
ata())));
-         installManagedPortletContainerMD.setMethodName("addManagedPortlet=
Container");
-         installManagedPortletContainerMD.setDependentState(ControllerStat=
e.START);
-         managedPortletContainerMD.getInstalls().add(installManagedPortlet=
ContainerMD);
+         // Install the kernel portlet container on the kernel portlet app=
lication
+         AbstractInstallMetaData installKernelPortletContainerMD =3D new A=
bstractInstallMetaData();
+         installKernelPortletContainerMD.setBean(kernelPortletApplicationI=
d);
+         installKernelPortletContainerMD.setParameters(Collections.singlet=
onList((ParameterMetaData)new AbstractParameterMetaData(new ThisValueMetaDa=
ta())));
+         installKernelPortletContainerMD.setMethodName("addKernelPortletCo=
ntainer");
+         installKernelPortletContainerMD.setDependentState(ControllerState=
.START);
+         kernelPortletContainerMD.getInstalls().add(installKernelPortletCo=
ntainerMD);
 =

-         // Uninstall the managed portlet container from the managed portl=
et application
-         AbstractInstallMetaData uninstallManagedPortletContainerMD =3D ne=
w AbstractInstallMetaData();
-         uninstallManagedPortletContainerMD.setBean(managedPortletApplicat=
ionId);
-         uninstallManagedPortletContainerMD.setParameters(Collections.sing=
letonList((ParameterMetaData)new AbstractParameterMetaData(new ThisValueMet=
aData())));
-         uninstallManagedPortletContainerMD.setMethodName("removeManagedPo=
rtletContainer");
-         uninstallManagedPortletContainerMD.setDependentState(ControllerSt=
ate.START);
-         managedPortletContainerMD.getUninstalls().add(uninstallManagedPor=
tletContainerMD);
+         // Uninstall the kernel portlet container from the kernel portlet=
 application
+         AbstractInstallMetaData uninstallKernelPortletContainerMD =3D new=
 AbstractInstallMetaData();
+         uninstallKernelPortletContainerMD.setBean(kernelPortletApplicatio=
nId);
+         uninstallKernelPortletContainerMD.setParameters(Collections.singl=
etonList((ParameterMetaData)new AbstractParameterMetaData(new ThisValueMeta=
Data())));
+         uninstallKernelPortletContainerMD.setMethodName("removeKernelPort=
letContainer");
+         uninstallKernelPortletContainerMD.setDependentState(ControllerSta=
te.START);
+         kernelPortletContainerMD.getUninstalls().add(uninstallKernelPortl=
etContainerMD);
 =

          //
          toInstall.add(portletContainerMD);
-         toInstall.add(managedPortletContainerMD);
+         toInstall.add(kernelPortletContainerMD);
       }
 =

       //
       AbstractBeanMetaData portletApplicationMD =3D createPortletApplicati=
onMetaData(builder.getApplication(), portletApplicationId);
-      AbstractBeanMetaData managedPortletApplicationMD =3D createManagedPo=
rtletApplicationMetaData(managedPortletApplicationId);
+      AbstractBeanMetaData kernelPortletApplicationMD =3D createKernelPort=
letApplicationMetaData(kernelPortletApplicationId);
 =

       //
-      AbstractDependencyValueMetaData portletApplicationContextDependencyM=
D =3D new AbstractDependencyValueMetaData(managedPortletApplicationId);
+      AbstractDependencyValueMetaData portletApplicationContextDependencyM=
D =3D new AbstractDependencyValueMetaData(kernelPortletApplicationId);
       portletApplicationContextDependencyMD.setDependentState(ControllerSt=
ate.INSTANTIATED);
       portletApplicationMD.getProperties().add(new AbstractPropertyMetaDat=
a("context", portletApplicationContextDependencyMD));
 =

       //
       AbstractDependencyValueMetaData portletApplicationDependencyMD =3D n=
ew AbstractDependencyValueMetaData(portletApplicationId);
       portletApplicationDependencyMD.setDependentState(ControllerState.STA=
RT);
-      managedPortletApplicationMD.getProperties().add(new AbstractProperty=
MetaData("portletApplication", portletApplicationDependencyMD));
+      kernelPortletApplicationMD.getProperties().add(new AbstractPropertyM=
etaData("portletApplication", portletApplicationDependencyMD));
 =

       //
       toInstall.add(portletApplicationMD);
-      toInstall.add(managedPortletApplicationMD);
+      toInstall.add(kernelPortletApplicationMD);
 =

       // Install beans
       for (AbstractBeanMetaData beanMetaData : toInstall)


--===============5747218388318320173==--

From portal-commits at lists.jboss.org Tue Feb 19 07:14:38 2008
Content-Type: multipart/mixed; boundary="===============0290719142322621702=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r10028 -
 modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/container.
Date: Tue, 19 Feb 2008 07:14:38 -0500
Message-ID: 

--===============0290719142322621702==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-19 07:14:38 -0500 (Tue, 19 Feb 2008)
New Revision: 10028

Removed:
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/imp=
l/container/PortletApplicationContextImpl.java
Log:
remove very obsolete class

Deleted: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portl=
et/impl/container/PortletApplicationContextImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/container/PortletApplicationContextImpl.java	2008-02-19 12:08:48 UTC (re=
v 10027)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/container/PortletApplicationContextImpl.java	2008-02-19 12:14:38 UTC (re=
v 10028)
@@ -1,204 +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.portlet.impl.container;
-
-import org.jboss.portal.portlet.container.PortletApplicationContext;
-import org.jboss.portal.portlet.container.managed.PortletApplicationRegist=
rationContext;
-import org.jboss.portal.portlet.container.managed.PortletApplicationRegist=
ry;
-import org.jboss.portal.portlet.container.PortletContainer;
-import org.jboss.portal.portlet.impl.jsr168.PortletApplicationImpl;
-import org.jboss.portal.portlet.impl.jsr168.spi.PortletAPIFactory;
-import org.jboss.portal.portlet.impl.jsr168.spi.PortletInfoFactory;
-import org.jboss.portal.portlet.impl.metadata.PortletApplication10MetaData;
-import org.jboss.portal.portlet.metadata.JBossApplicationMetaData;
-import org.jboss.portal.common.FixMe;
-
-import javax.servlet.ServletContext;
-
-/**
- * @author Julien Viet
- * @version $Revision: 6697 $
- */
-public class PortletApplicationContextImpl implements PortletApplicationCo=
ntext
-{
-
-   /** . */
-   private final PortletAPIFactory portletAPIFactory;
-
-   /** . */
-   private final PortletApplication10MetaData portletAppMD;
-
-   /** . */
-   private final JBossApplicationMetaData jbossAppMD;
-
-   /** . */
-   private final ServletContext servletContext;
-
-   /** . */
-   private final ClassLoader classLoader;
-
-   /** . */
-   private PortletApplicationImpl portletApp;
-
-   /** . */
-   private PortletApplicationRegistry registry;
-
-   /** . */
-   private PortletApplicationRegistrationContext registrationContext;
-   =

-   /** . */
-   private String contextPath;
-
-   public PortletApplicationContextImpl(
-      PortletApplicationRegistry registry,
-      PortletAPIFactory portletAPIFactory,
-      PortletInfoFactory portletInfoFactory,
-      PortletApplication10MetaData portletAppMD,
-      JBossApplicationMetaData jbossAppMD,
-      ServletContext servletContext,
-      ClassLoader classLoader,
-      String contextPath)
-   {
-      this.registry =3D registry;
-      this.portletAPIFactory =3D portletAPIFactory;
-      this.portletAppMD =3D portletAppMD;
-      this.jbossAppMD =3D jbossAppMD;
-      this.servletContext =3D servletContext;
-      this.classLoader =3D classLoader;
-      this.contextPath =3D contextPath;
-   }
-
-   public PortletApplicationImpl getPortletApplication()
-   {
-      return portletApp;
-   }
-
-   // PortletApplicationContext implementation ***************************=
**********************************************
-
-   public void invokeStart() throws Exception
-   {
-      throw new FixMe("Not used anymore for now, check or reimplement in 2=
.6");
-/*
-      portletApp =3D new PortletApplicationImpl(portletAppMD, jbossAppMD, =
this, portletAPIFactory);
-      portletApp.start();
-
-      //
-      registrationContext =3D registry.registerPortletApplication(portletA=
pp);
-
-      // Fixme here need the web App
-      ContainerInfoBuilderContext builderContext =3D new ContainerInfoBuil=
derContextImpl(portletAppMD, null);
-      ContainerInfoBuilder builder =3D new ContainerInfoBuilder(portletApp=
MD, builderContext);
-      builder.build();
-
-      //
-      for (ContainerPortletInfo containerInfo : builder.getPortlets())
-      {
-//         JBossPortletMetaData jBossPortletMD =3D null;
-//         if (jbossAppMD !=3D null)
-//         {
-//            jBossPortletMD =3D (JBossPortletMetaData)jbossAppMD.getPortl=
ets().get(portletMD.getName());
-//         }
-
-
-         //
-         PortletContainerImpl container =3D new PortletContainerImpl(conta=
inerInfo);
-
-         //
-         container.setApplication(portletApp);
-         portletApp.addContainer(container);
-
-         //
-         try
-         {
-            container.start();
-            registrationContext.registerPortlet(container);
-         }
-         catch (Exception e)
-         {
-            e.printStackTrace();
-         }
-      }
-*/
-   }
-
-   public void invokeStop()
-   {
-      // if the portlet application wasn't properly started, we shouldn't =
be trying to stop it
-      if (portletApp !=3D null)
-      {
-         for (PortletContainer container : portletApp.getPortletContainers=
())
-         {
-            try
-            {
-               registrationContext.unregisterPortlet(container);
-               container.stop();
-            }
-            catch (Exception e)
-            {
-               e.printStackTrace();
-            }
-
-            //
-            portletApp.removeContainer(container);
-            container.setApplication(null);
-         }
-
-         //
-         registry.unregisterPortletApplication(portletApp);
-         portletApp.stop();
-
-         //
-         portletApp =3D null;
-         registrationContext =3D null;
-      }
-   }
-
-   public void startPortletContainer(String portletName) throws Exception
-   {
-      PortletContainer container =3D portletApp.getPortletContainer(portle=
tName);
-      container.start();
-      registrationContext.registerPortlet(container);
-   }
-
-   public void stopPortletContainer(String portletName)
-   {
-      PortletContainer container =3D portletApp.getPortletContainer(portle=
tName);
-      registrationContext.unregisterPortlet(container);
-      container.stop();
-   }
-
-   public ServletContext getServletContext()
-   {
-      return servletContext;
-   }
-
-   public String getContextPath()
-   {
-      return contextPath;
-   }
-   =

-   public ClassLoader getClassLoader()
-   {
-      return classLoader;
-   }
-}


--===============0290719142322621702==--

From portal-commits at lists.jboss.org Tue Feb 19 08:23:47 2008
Content-Type: multipart/mixed; boundary="===============5885457738525842751=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r10029 - in modules/portlet/trunk:
 portlet/src/main/java/org/jboss/portal/portlet/impl/container and 4 other
 directories.
Date: Tue, 19 Feb 2008 08:23:47 -0500
Message-ID: 

--===============5885457738525842751==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-19 08:23:47 -0500 (Tue, 19 Feb 2008)
New Revision: 10029

Removed:
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/con=
tainer/managed/PortletApplicationRegistrationContext.java
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/con=
tainer/managed/PortletApplicationRegistryListener.java
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/imp=
l/container/PortletApplicationRegistryImpl.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/M=
anagedPortletApplication.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/M=
anagedPortletContainer.java
Modified:
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/con=
tainer/managed/ManagedPortletApplication.java
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/con=
tainer/managed/ManagedPortletContainer.java
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/con=
tainer/managed/PortletApplicationRegistry.java
   modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portle=
t/info/CacheInfoTest.java
   modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portle=
t/info/CapabilitiesInfoTest.java
   modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portle=
t/info/MetaInfoTest.java
   modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portle=
t/info/ModeInfoTest.java
   modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portle=
t/info/PortletInfoTest.java
   modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portle=
t/info/PreferenceInfoTest.java
   modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portle=
t/info/SecurityInfoTest.java
   modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portle=
t/info/SessionInfoTest.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/K=
ernelPortletApplication.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/K=
ernelPortletContainer.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/P=
ortletApplicationDeployer.java
   modules/portlet/trunk/test/src/test/resources/portlet-test-war/WEB-INF/j=
boss-beans.xml
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/=
jboss-beans.xml
Log:
consolidate the portlet application registry with the managed objects

Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/port=
let/container/managed/ManagedPortletApplication.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/co=
ntainer/managed/ManagedPortletApplication.java	2008-02-19 12:14:38 UTC (rev=
 10028)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/co=
ntainer/managed/ManagedPortletApplication.java	2008-02-19 13:23:47 UTC (rev=
 10029)
@@ -39,4 +39,6 @@
 =

    Collection getManagedPortletContaine=
rs();
 =

+   ManagedPortletContainer getManagedPortletContainer(String portletContai=
nerId);
+
 }

Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/port=
let/container/managed/ManagedPortletContainer.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/co=
ntainer/managed/ManagedPortletContainer.java	2008-02-19 12:14:38 UTC (rev 1=
0028)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/co=
ntainer/managed/ManagedPortletContainer.java	2008-02-19 13:23:47 UTC (rev 1=
0029)
@@ -33,7 +33,7 @@
 =

    String getId();
 =

-   PortletInfo getPortletInfo();
+   PortletInfo getInfo();
 =

    ManagedPortletApplication getManagedPortletApplication();
 =


Deleted: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portl=
et/container/managed/PortletApplicationRegistrationContext.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/co=
ntainer/managed/PortletApplicationRegistrationContext.java	2008-02-19 12:14=
:38 UTC (rev 10028)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/co=
ntainer/managed/PortletApplicationRegistrationContext.java	2008-02-19 13:23=
:47 UTC (rev 10029)
@@ -1,49 +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.portlet.container.managed;
-
-import org.jboss.portal.portlet.container.PortletContainer;
-
-/**
- * @author Julien Viet
- * @version $Revision: 1.1 $
- */
-public interface PortletApplicationRegistrationContext
-{
-
-   /**
-    * Register a portlet.
-    *
-    * @param portletContainer the portlet container
-    */
-   void registerPortlet(PortletContainer portletContainer);
-
-   /**
-    * Unregister a portlet.
-    *
-    * @param portletContainer the portlet container
-    */
-   void unregisterPortlet(PortletContainer portletContainer);
-
-
-}

Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/port=
let/container/managed/PortletApplicationRegistry.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/co=
ntainer/managed/PortletApplicationRegistry.java	2008-02-19 12:14:38 UTC (re=
v 10028)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/co=
ntainer/managed/PortletApplicationRegistry.java	2008-02-19 13:23:47 UTC (re=
v 10029)
@@ -22,8 +22,6 @@
  *************************************************************************=
*****/
 package org.jboss.portal.portlet.container.managed;
 =

-import org.jboss.portal.portlet.container.PortletApplication;
-
 import java.util.Collection;
 =

 /**
@@ -33,39 +31,20 @@
  */
 public interface PortletApplicationRegistry
 {
-   /**
-    * Register a portlet application.
-    *
-    * @param portletApplication the portlet application to register
-    * @throws IllegalArgumentException if the portlet application is null =
or already registered
-    */
-   PortletApplicationRegistrationContext registerPortletApplication(Portle=
tApplication portletApplication) throws IllegalArgumentException;
 =

    /**
-    * Unregister a portlet application.
+    * Return an immutable list all the known portlet application in the re=
gistry.
     *
-    * @param portletApplication the portlet application to unregister
-    * @throws IllegalArgumentException if the portlet application is null =
or not registered
+    * @return the registered portlet applications
     */
-   void unregisterPortletApplication(PortletApplication portletApplication=
) throws IllegalArgumentException;
+   Collection getManagedPortletApplic=
ations();
 =

-   /** Return an immutable list all the known portlet application in the r=
egistry. */
-   Collection getPortletApplications();
-
-   /** Return a portlet app using its id or null if it does not exist. */
-   PortletApplication getPortletApplication(String id);
-
    /**
-    * Adds a portlet container registry listener.
+    * Return a portlet app using its id or null if it does not exist.
     *
-    * @param listener
+    * @param id the portlet application id =

+    * @return a specified registered portlet application
     */
-   void addListener(PortletApplicationRegistryListener listener);
+   ManagedPortletApplication getManagedPortletApplication(String id);
 =

-   /**
-    * Removes a portlet container registry listener.
-    *
-    * @param listener
-    */
-   void removeListener(PortletApplicationRegistryListener listener);
 }

Deleted: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portl=
et/container/managed/PortletApplicationRegistryListener.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/co=
ntainer/managed/PortletApplicationRegistryListener.java	2008-02-19 12:14:38=
 UTC (rev 10028)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/co=
ntainer/managed/PortletApplicationRegistryListener.java	2008-02-19 13:23:47=
 UTC (rev 10029)
@@ -1,43 +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.portlet.container.managed;
-
-import org.jboss.portal.portlet.container.PortletContainer;
-
-/**
- * @author Thomas Heute
- */
-public interface PortletApplicationRegistryListener
-{
-
-   /**
-    * A portlet container has been registered.
-    */
-   void portletContainerRegistered(PortletContainer portletContainer);
-
-   /**
-    * A portlet container has been unregistered. =

-    */
-   void portletContainerUnregistered(PortletContainer portletContainer);
-
-}

Deleted: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portl=
et/impl/container/PortletApplicationRegistryImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/container/PortletApplicationRegistryImpl.java	2008-02-19 12:14:38 UTC (r=
ev 10028)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/container/PortletApplicationRegistryImpl.java	2008-02-19 13:23:47 UTC (r=
ev 10029)
@@ -1,249 +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.portlet.impl.container;
-
-import org.jboss.portal.portlet.container.managed.PortletApplicationRegist=
ry;
-import org.jboss.portal.portlet.container.managed.PortletApplicationRegist=
rationContext;
-import org.jboss.portal.portlet.container.PortletApplication;
-import org.jboss.portal.portlet.container.managed.PortletApplicationRegist=
ryListener;
-import org.jboss.portal.portlet.container.PortletContainer;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author Julien Viet
- * @author Thomas Heute
- * @version $Revision: 6720 $
- */
-public class PortletApplicationRegistryImpl implements PortletApplicationR=
egistry
-{
-
-   /** . */
-   private Map portletApplications =3D new Has=
hMap();
-
-   /** . */
-   private Map portletContainers =3D new H=
ashMap();
-   =

-   /** . */
-   private List listeners =3D new Arra=
yList();
-
-   public PortletApplicationRegistrationContext registerPortletApplication=
(PortletApplication portletApplication)
-   {
-      if (portletApplication =3D=3D null)
-      {
-         throw new IllegalArgumentException("No null portlet app accepted"=
);
-      }
-      synchronized (this)
-      {
-         String key =3D portletApplication.getId();
-         if (portletApplications.containsKey(key))
-         {
-            throw new IllegalArgumentException("This portlet app is alread=
y registered: " + key);
-         }
-         PortletApplicationRegistrationContext ctx =3D new PortletApplicat=
ionRegistrationContextImpl(portletApplication);
-         Map webAppsCopy =3D new HashMap(portletApplications);
-         webAppsCopy.put(key, portletApplication);
-         portletApplications =3D webAppsCopy;
-         return ctx;
-      }
-   }
-
-   public void unregisterPortletApplication(PortletApplication portletAppl=
ication)
-   {
-      if (portletApplication =3D=3D null)
-      {
-         throw new IllegalArgumentException("No null portlet app accepted"=
);
-      }
-      synchronized (this)
-      {
-         String key =3D portletApplication.getId();
-         if (!portletApplications.containsKey(key))
-         {
-            throw new IllegalArgumentException("This portlet app does not =
exist here: " + key);
-         }
-         Map webAppsCopy =3D new HashMap(portletApplications);
-         webAppsCopy.remove(key);
-         portletApplications =3D webAppsCopy;
-      }
-   }
-
-   public Collection getPortletApplications()
-   {
-      return Collections.unmodifiableCollection(portletApplications.values=
());
-   }
-
-   public PortletApplication getPortletApplication(String id)
-   {
-      return portletApplications.get(id);
-   }
-
-   public void addListener(PortletApplicationRegistryListener listener)
-   {
-      if (listener =3D=3D null)
-      {
-         throw new IllegalArgumentException("No null listener accepted");
-      }
-      else
-      {
-         synchronized (this)
-         {
-            listeners.add(listener);
-         }
-      }
-   }
-
-   public void removeListener(PortletApplicationRegistryListener listener)
-   {
-      if (listener =3D=3D null)
-      {
-         throw new IllegalArgumentException("No null listener accepted");
-      }
-      else
-      {
-         synchronized (this)
-         {
-            listeners.remove(listener);
-         }
-      }
-   }
-
-   private void fireRegisterPortletContainerEvent(PortletContainer portlet)
-   {
-      for (PortletApplicationRegistryListener listener : listeners)
-      {
-         listener.portletContainerRegistered(portlet);
-      }
-   }
-
-   private void fireUnregisterPortletContainerEvent(PortletContainer portl=
et)
-   {
-      for (PortletApplicationRegistryListener listener : listeners)
-      {
-         listener.portletContainerUnregistered(portlet);
-      }
-   }
-
-   private static class ContainerKey
-   {
-      /** . */
-      private final String applicationId;
-
-      /** . */
-      private final String containerId;
-
-      public ContainerKey(PortletContainer container)
-      {
-         this.applicationId =3D container.getApplication().getId();
-         this.containerId =3D container.getId();
-      }
-
-      public boolean equals(Object obj)
-      {
-         if (obj =3D=3D this)
-         {
-            return true;
-         }
-         if (obj instanceof ContainerKey)
-         {
-            ContainerKey that =3D (ContainerKey)obj;
-            return applicationId.equals(that.applicationId) && containerId=
.equals(containerId);
-         }
-         return false;
-      }
-
-      public int hashCode()
-      {
-         return applicationId.hashCode() & containerId.hashCode();
-      }
-   }
-
-   private class PortletApplicationRegistrationContextImpl implements Port=
letApplicationRegistrationContext
-   {
-
-      /** . */
-      private PortletApplication portletApplication;
-
-      /** . */
-      private boolean active;
-
-      public PortletApplicationRegistrationContextImpl(PortletApplication =
portletApplication)
-      {
-         this.portletApplication =3D portletApplication;
-         this.active =3D true;
-      }
-
-      public void registerPortlet(PortletContainer portletContainer)
-      {
-         if (portletContainer =3D=3D null)
-         {
-            throw new IllegalArgumentException("No null portlet accepted");
-         }
-         if (portletContainer.getApplication() !=3D portletApplication)
-         {
-            throw new IllegalArgumentException("The container does not bel=
ong to the application owning the registration");
-         }
-         if (!active)
-         {
-            throw new IllegalStateException("Not anymore active");
-         }
-         synchronized (this)
-         {
-            Map componentsCopy =3D new Has=
hMap(portletContainers);
-            componentsCopy.put(new ContainerKey(portletContainer), portlet=
Container);
-            portletContainers =3D componentsCopy;
-
-            //
-            fireRegisterPortletContainerEvent(portletContainer);
-         }
-      }
-
-      public void unregisterPortlet(PortletContainer portletContainer)
-      {
-         if (portletContainer =3D=3D null)
-         {
-            throw new IllegalArgumentException("No null portlet accepted");
-         }
-         if (portletContainer.getApplication() !=3D portletApplication)
-         {
-            throw new IllegalArgumentException("The container does not bel=
ong to the application owning the registration");
-         }
-         if (!active)
-         {
-            throw new IllegalStateException("Not anymore active");
-         }
-         synchronized (this)
-         {
-            Map componentsCopy =3D new Has=
hMap(portletContainers);
-            ContainerKey key =3D new ContainerKey(portletContainer);
-            componentsCopy.remove(key);
-            portletContainers =3D componentsCopy;
-            fireUnregisterPortletContainerEvent(portletContainer);
-         }
-      }
-   }
-}

Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test=
/portlet/info/CacheInfoTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portl=
et/info/CacheInfoTest.java	2008-02-19 12:14:38 UTC (rev 10028)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portl=
et/info/CacheInfoTest.java	2008-02-19 13:23:47 UTC (rev 10029)
@@ -22,7 +22,7 @@
  *************************************************************************=
*****/
 package org.jboss.portal.test.portlet.info;
 =

-import org.jboss.portal.portlet.container.PortletContainer;
+import org.jboss.portal.portlet.container.managed.ManagedPortletContainer;
 import org.jboss.portal.portlet.info.CacheInfo;
 import org.jboss.portal.portlet.info.PortletInfo;
 =

@@ -42,7 +42,7 @@
 =

    public void execute()
    {
-      PortletContainer container =3D registry.getPortletApplication("/test=
-info").getPortletContainer("CachePortlet");
+      ManagedPortletContainer container =3D registry.getManagedPortletAppl=
ication("/test-info").getManagedPortletContainer("CachePortlet");
       PortletInfo info =3D container.getInfo();
       CacheInfo cacheInfo =3D info.getCache();
       assertEquals(65, cacheInfo.getExpirationSecs());

Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test=
/portlet/info/CapabilitiesInfoTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portl=
et/info/CapabilitiesInfoTest.java	2008-02-19 12:14:38 UTC (rev 10028)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portl=
et/info/CapabilitiesInfoTest.java	2008-02-19 13:23:47 UTC (rev 10029)
@@ -25,7 +25,7 @@
 =

 import org.jboss.portal.Mode;
 import org.jboss.portal.WindowState;
-import org.jboss.portal.portlet.container.PortletContainer;
+import org.jboss.portal.portlet.container.managed.ManagedPortletContainer;
 import org.jboss.portal.portlet.info.CapabilitiesInfo;
 import org.jboss.portal.portlet.info.ModeInfo;
 import org.jboss.portal.portlet.info.PortletInfo;
@@ -52,7 +52,7 @@
 =

    public void execute()
    {
-      PortletContainer container =3D registry.getPortletApplication("/test=
-info").getPortletContainer("CapabilitiesPortlet");
+      ManagedPortletContainer container =3D registry.getManagedPortletAppl=
ication("/test-info").getManagedPortletContainer("CapabilitiesPortlet");
       PortletInfo info =3D container.getInfo();
       CapabilitiesInfo capInfo =3D info.getCapabilities();
 =


Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test=
/portlet/info/MetaInfoTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portl=
et/info/MetaInfoTest.java	2008-02-19 12:14:38 UTC (rev 10028)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portl=
et/info/MetaInfoTest.java	2008-02-19 13:23:47 UTC (rev 10029)
@@ -23,7 +23,7 @@
 package org.jboss.portal.test.portlet.info;
 =

 import org.jboss.portal.common.i18n.LocalizedString;
-import org.jboss.portal.portlet.container.PortletContainer;
+import org.jboss.portal.portlet.container.managed.ManagedPortletContainer;
 import org.jboss.portal.portlet.info.MetaInfo;
 import org.jboss.portal.portlet.info.PortletInfo;
 =

@@ -45,7 +45,7 @@
 =

    public void execute()
    {
-      PortletContainer container =3D registry.getPortletApplication("/test=
-info").getPortletContainer("NoBundlePortlet");
+      ManagedPortletContainer container =3D registry.getManagedPortletAppl=
ication("/test-info").getManagedPortletContainer("NoBundlePortlet");
       PortletInfo info =3D container.getInfo();
       MetaInfo metaInfo =3D info.getMeta();
 =


Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test=
/portlet/info/ModeInfoTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portl=
et/info/ModeInfoTest.java	2008-02-19 12:14:38 UTC (rev 10028)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portl=
et/info/ModeInfoTest.java	2008-02-19 13:23:47 UTC (rev 10029)
@@ -23,7 +23,7 @@
 package org.jboss.portal.test.portlet.info;
 =

 import org.jboss.portal.Mode;
-import org.jboss.portal.portlet.container.PortletContainer;
+import org.jboss.portal.portlet.container.managed.ManagedPortletContainer;
 import org.jboss.portal.portlet.info.CapabilitiesInfo;
 import org.jboss.portal.portlet.info.ModeInfo;
 =

@@ -47,8 +47,8 @@
 =

    public void execute()
    {
-      PortletContainer container1 =3D registry.getPortletApplication("/tes=
t-info").getPortletContainer("ModePortlet1");
-      PortletContainer container2 =3D registry.getPortletApplication("/tes=
t-info").getPortletContainer("ModePortlet2");
+      ManagedPortletContainer container1 =3D registry.getManagedPortletApp=
lication("/test-info").getManagedPortletContainer("ModePortlet1");
+      ManagedPortletContainer container2 =3D registry.getManagedPortletApp=
lication("/test-info").getManagedPortletContainer("ModePortlet2");
       CapabilitiesInfo capaInfo =3D container1.getInfo().getCapabilities();
 =

       //Portlet 1 with VIEW, EDIT, HELP

Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test=
/portlet/info/PortletInfoTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portl=
et/info/PortletInfoTest.java	2008-02-19 12:14:38 UTC (rev 10028)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portl=
et/info/PortletInfoTest.java	2008-02-19 13:23:47 UTC (rev 10029)
@@ -22,7 +22,7 @@
  *************************************************************************=
*****/
 package org.jboss.portal.test.portlet.info;
 =

-import org.jboss.portal.portlet.container.PortletContainer;
+import org.jboss.portal.portlet.container.managed.ManagedPortletContainer;
 import org.jboss.portal.portlet.info.PortletInfo;
 =

 import static org.jboss.unit.api.Assert.*;
@@ -42,7 +42,7 @@
    public void execute()
    {
       //This asserts only .isRemotable() as rest is checked in other tests
-      PortletContainer container =3D registry.getPortletApplication("/test=
-info").getPortletContainer("RemotablePortlet1");
+      ManagedPortletContainer container =3D registry.getManagedPortletAppl=
ication("/test-info").getManagedPortletContainer("RemotablePortlet1");
       PortletInfo info =3D container.getInfo();
       assertEquals(Boolean.TRUE, info.isRemotable());
 =

@@ -54,11 +54,11 @@
       assertNotNull(info.getSecurity());
       assertNotNull(info.getSession());
 =

-      container =3D registry.getPortletApplication("/test-info").getPortle=
tContainer("RemotablePortlet2");
+      container =3D registry.getManagedPortletApplication("/test-info").ge=
tManagedPortletContainer("RemotablePortlet2");
       info =3D container.getInfo();
       assertEquals(Boolean.FALSE, info.isRemotable());
 =

-      container =3D registry.getPortletApplication("/test-info").getPortle=
tContainer("RemotablePortlet3");
+      container =3D registry.getManagedPortletApplication("/test-info").ge=
tManagedPortletContainer("RemotablePortlet3");
       info =3D container.getInfo();
       assertEquals(Boolean.TRUE, info.isRemotable());
    }

Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test=
/portlet/info/PreferenceInfoTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portl=
et/info/PreferenceInfoTest.java	2008-02-19 12:14:38 UTC (rev 10028)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portl=
et/info/PreferenceInfoTest.java	2008-02-19 13:23:47 UTC (rev 10029)
@@ -22,7 +22,7 @@
  *************************************************************************=
*****/
 package org.jboss.portal.test.portlet.info;
 =

-import org.jboss.portal.portlet.container.PortletContainer;
+import org.jboss.portal.portlet.container.managed.ManagedPortletContainer;
 import org.jboss.portal.portlet.impl.info.ContainerPreferenceInfo;
 import org.jboss.portal.portlet.impl.info.ContainerPreferencesInfo;
 import org.jboss.portal.portlet.info.PortletInfo;
@@ -46,7 +46,7 @@
 =

    public void execute()
    {
-      PortletContainer container =3D registry.getPortletApplication("/test=
-info").getPortletContainer("PreferenceInfoPortlet");
+      ManagedPortletContainer container =3D registry.getManagedPortletAppl=
ication("/test-info").getManagedPortletContainer("PreferenceInfoPortlet");
 =

       //
       PortletInfo info =3D container.getInfo();

Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test=
/portlet/info/SecurityInfoTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portl=
et/info/SecurityInfoTest.java	2008-02-19 12:14:38 UTC (rev 10028)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portl=
et/info/SecurityInfoTest.java	2008-02-19 13:23:47 UTC (rev 10029)
@@ -23,7 +23,7 @@
 package org.jboss.portal.test.portlet.info;
 =

 import org.jboss.portal.portlet.TransportGuarantee;
-import org.jboss.portal.portlet.container.PortletContainer;
+import org.jboss.portal.portlet.container.managed.ManagedPortletContainer;
 import org.jboss.portal.portlet.info.PortletInfo;
 import org.jboss.portal.portlet.info.SecurityInfo;
 =

@@ -45,7 +45,7 @@
    {
       //This asserts only .isRemotable() as rest is checked in other tests
 =

-      PortletContainer container =3D registry.getPortletApplication("/test=
-info").getPortletContainer("SecuredPortlet1");
+      ManagedPortletContainer container =3D registry.getManagedPortletAppl=
ication("/test-info").getManagedPortletContainer("SecuredPortlet1");
       PortletInfo info =3D container.getInfo();
       SecurityInfo secInfo =3D info.getSecurity();
 =

@@ -56,7 +56,7 @@
       assertTrue(secInfo.containsTransportGuarantee(TransportGuarantee.NON=
E));
 =

 =

-      container =3D registry.getPortletApplication("/test-info").getPortle=
tContainer("SecuredPortlet2");
+      container =3D registry.getManagedPortletApplication("/test-info").ge=
tManagedPortletContainer("SecuredPortlet2");
       info =3D container.getInfo();
 =

       secInfo =3D info.getSecurity();
@@ -66,7 +66,7 @@
       assertTrue(secInfo.containsTransportGuarantee(TransportGuarantee.NON=
E));
 =

 =

-      container =3D registry.getPortletApplication("/test-info").getPortle=
tContainer("SecuredPortlet3");
+      container =3D registry.getManagedPortletApplication("/test-info").ge=
tManagedPortletContainer("SecuredPortlet3");
       info =3D container.getInfo();
       secInfo =3D info.getSecurity();
       assertEquals(2, secInfo.getTransportGuarantees().size());

Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test=
/portlet/info/SessionInfoTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portl=
et/info/SessionInfoTest.java	2008-02-19 12:14:38 UTC (rev 10028)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portl=
et/info/SessionInfoTest.java	2008-02-19 13:23:47 UTC (rev 10029)
@@ -22,7 +22,7 @@
  *************************************************************************=
*****/
 package org.jboss.portal.test.portlet.info;
 =

-import org.jboss.portal.portlet.container.PortletContainer;
+import org.jboss.portal.portlet.container.managed.ManagedPortletContainer;
 import org.jboss.portal.portlet.info.PortletInfo;
 import org.jboss.portal.portlet.info.SessionInfo;
 =

@@ -42,7 +42,7 @@
 =

    public void execute()
    {
-      PortletContainer container =3D registry.getPortletApplication("/test=
-info").getPortletContainer("DistributedPortlet1");
+      ManagedPortletContainer container =3D registry.getManagedPortletAppl=
ication("/test-info").getManagedPortletContainer("DistributedPortlet1");
       PortletInfo info =3D container.getInfo();
       SessionInfo sessionInfo =3D info.getSession();
       assertNotNull(sessionInfo);
@@ -50,7 +50,7 @@
       assertEquals(Boolean.TRUE, distributed);
 =

 =

-      container =3D registry.getPortletApplication("/test-info").getPortle=
tContainer("DistributedPortlet2");
+      container =3D registry.getManagedPortletApplication("/test-info").ge=
tManagedPortletContainer("DistributedPortlet2");
       info =3D container.getInfo();
       sessionInfo =3D info.getSession();
       assertNotNull(sessionInfo);

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/KernelPortletApplication.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
KernelPortletApplication.java	2008-02-19 12:14:38 UTC (rev 10028)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
KernelPortletApplication.java	2008-02-19 13:23:47 UTC (rev 10029)
@@ -133,4 +133,9 @@
    {
       return kernelPortletContainers.values();
    }
+
+   public ManagedPortletContainer getManagedPortletContainer(String portle=
tContainerId)
+   {
+      return kernelPortletContainers.get(portletContainerId);
+   }
 }

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/KernelPortletContainer.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
KernelPortletContainer.java	2008-02-19 12:14:38 UTC (rev 10028)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
KernelPortletContainer.java	2008-02-19 13:23:47 UTC (rev 10029)
@@ -94,7 +94,7 @@
       return kernelPortletApplication;
    }
 =

-   public PortletInfo getPortletInfo()
+   public PortletInfo getInfo()
    {
       return portletContainer.getInfo();
    }

Deleted: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/=
test/ManagedPortletApplication.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
ManagedPortletApplication.java	2008-02-19 12:14:38 UTC (rev 10028)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
ManagedPortletApplication.java	2008-02-19 13:23:47 UTC (rev 10029)
@@ -1,111 +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;
-
-import org.jboss.portal.portlet.container.PortletApplicationContext;
-import org.jboss.portal.portlet.container.PortletApplication;
-import org.jboss.portal.web.WebApp;
-import org.jboss.portal.common.NotYetImplemented;
-
-import javax.servlet.ServletContext;
-import java.util.Map;
-import java.util.HashMap;
-
-/**
- * @author Julien Viet
- * @version $Revision: 630 $
- */
-public class ManagedPortletApplication implements PortletApplicationContext
-{
-
-   /** . */
-   private final WebApp webApp;
-
-   /** . */
-   private PortletApplication portletApplication;
-
-   /** . */
-   private final Map managedPortletContai=
ners;
-
-   public ManagedPortletApplication(WebApp webApp)
-   {
-      this.webApp =3D webApp;
-      this.portletApplication =3D null;
-      this.managedPortletContainers =3D new HashMap();
-   }
-
-   public void addManagedPortletContainer(ManagedPortletContainer managedP=
ortletContainer)
-   {
-      managedPortletContainers.put(managedPortletContainer.getPortletConta=
iner().getId(), managedPortletContainer);
-   }
-
-   public void removeManagedPortletContainer(ManagedPortletContainer manag=
edPortletContainer)
-   {
-      managedPortletContainers.remove(managedPortletContainer.getPortletCo=
ntainer().getId());
-   }
-
-   public PortletApplication getPortletApplication()
-   {
-      return portletApplication;
-   }
-
-   public void setPortletApplication(PortletApplication portletApplication)
-   {
-      this.portletApplication =3D portletApplication;
-   }
-
-   public void start() throws Exception
-   {
-   }
-
-   public void stop()
-   {
-   }
-
-   // PortletApplicationContext ******************************************=
**********************************************
-
-   public ServletContext getServletContext()
-   {
-      return webApp.getServletContext();
-   }
-
-   public String getContextPath()
-   {
-      return webApp.getContextPath();
-   }
-
-   public ClassLoader getClassLoader()
-   {
-      return webApp.getClassLoader();
-   }
-
-   public void invokeStart() throws Exception
-   {
-      throw new NotYetImplemented();
-   }
-
-   public void invokeStop()
-   {
-      throw new NotYetImplemented();
-   }
-}

Deleted: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/=
test/ManagedPortletContainer.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
ManagedPortletContainer.java	2008-02-19 12:14:38 UTC (rev 10028)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
ManagedPortletContainer.java	2008-02-19 13:23:47 UTC (rev 10029)
@@ -1,81 +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;
-
-import org.jboss.portal.portlet.container.PortletContainerContext;
-import org.jboss.portal.portlet.container.PortletContainer;
-import org.jboss.portal.common.NotYetImplemented;
-
-/**
- * @author Julien Viet
- * @version $Revision: 630 $
- */
-public class ManagedPortletContainer implements PortletContainerContext
-{
-
-   /** . */
-   private PortletContainer portletContainer;
-
-   /** . */
-   private ManagedPortletApplication managedPortletApplication;
-
-   public ManagedPortletApplication getManagedPortletApplication()
-   {
-      return managedPortletApplication;
-   }
-
-   public void setManagedPortletApplication(ManagedPortletApplication mana=
gedPortletApplication)
-   {
-      this.managedPortletApplication =3D managedPortletApplication;
-   }
-
-   public PortletContainer getPortletContainer()
-   {
-      return portletContainer;
-   }
-
-   public void setPortletContainer(PortletContainer portletContainer)
-   {
-      this.portletContainer =3D portletContainer;
-   }
-
-   public void start() throws Exception
-   {
-   }
-
-   public void stop()
-   {
-   }
-
-   //
-
-   public void invokeStart() throws Exception
-   {
-      throw new NotYetImplemented();
-   }
-
-   public void invokeStop()
-   {
-      throw new NotYetImplemented();
-   }
-}

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/PortletApplicationDeployer.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
PortletApplicationDeployer.java	2008-02-19 12:14:38 UTC (rev 10028)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
PortletApplicationDeployer.java	2008-02-19 13:23:47 UTC (rev 10029)
@@ -27,10 +27,8 @@
 import org.jboss.kernel.spi.dependency.KernelControllerContext;
 import org.jboss.kernel.spi.dependency.KernelControllerContextAware;
 import org.jboss.portal.common.io.IOTools;
-import org.jboss.portal.portlet.container.PortletApplication;
-import org.jboss.portal.portlet.container.managed.PortletApplicationRegist=
rationContext;
 import org.jboss.portal.portlet.container.managed.PortletApplicationRegist=
ry;
-import org.jboss.portal.portlet.container.PortletContainer;
+import org.jboss.portal.portlet.container.managed.ManagedPortletApplicatio=
n;
 import org.jboss.portal.portlet.impl.metadata.PortletApplication10MetaData;
 import static org.jboss.portal.portlet.impl.metadata.PortletMetaDataConsta=
nts.PORTLET_JSR_168_NS;
 import static org.jboss.portal.portlet.impl.metadata.PortletMetaDataConsta=
nts.PORTLET_JSR_286_NS;
@@ -54,12 +52,13 @@
 import java.net.URL;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Collection;
 =

 /**
  * @author Julien Viet
  * @version $Revision: 1.1 $
  */
-public class PortletApplicationDeployer implements WebAppListener, KernelC=
ontrollerContextAware
+public class PortletApplicationDeployer implements WebAppListener, KernelC=
ontrollerContextAware, PortletApplicationRegistry
 {
 =

    static
@@ -100,8 +99,7 @@
    private ClassLoader classLoader;
 =

    /** . */
-   private final Map registrationContextMap =3D
-      new HashMap();
+   private final Map applications =3D ne=
w HashMap();
 =

    public PortletApplicationRegistry getRegistry()
    {
@@ -269,36 +267,53 @@
       return null;
    }
 =

-   /** Called by MC to install application. */
-   public void addManagedPortletApplication(KernelPortletApplication kerne=
lPortletApplication)
+   /**
+    * Called by MC to install application.
+    *
+    * @param kernelPortletApplication kernel portlet application
+    */
+   public void addKernelPortletApplication(KernelPortletApplication kernel=
PortletApplication)
    {
-      PortletApplication portletApplication =3D kernelPortletApplication.g=
etPortletApplication();
-      PortletApplicationRegistrationContext context =3D registry.registerP=
ortletApplication(portletApplication);
-      registrationContextMap.put(kernelPortletApplication, context);
+      applications.put(kernelPortletApplication.getId(), kernelPortletAppl=
ication);
    }
 =

-   /** Called by MC to install container. */
-   public void addManagedPortletContainer(KernelPortletContainer kernelPor=
tletContainer)
+   /**
+    * Called by MC to uninstall application.
+    *
+    * @param kernelPortletApplication kernel portlet application
+    */
+   public void removeKernelPortletApplication(KernelPortletApplication ker=
nelPortletApplication)
    {
-      KernelPortletApplication kernelPortletApplication =3D kernelPortletC=
ontainer.getKernelPortletApplication();
-      PortletApplicationRegistrationContext context =3D registrationContex=
tMap.get(kernelPortletApplication);
-      PortletContainer portletContainer =3D kernelPortletContainer.getPort=
letContainer();
-      context.registerPortlet(portletContainer);
+      applications.remove(kernelPortletApplication.getId());
    }
 =

-   /** Called by MC to uninstall application. */
-   public void removeManagedPortletApplication(KernelPortletApplication ke=
rnelPortletApplication)
+   /**
+    * Called by MC to install application.
+    *
+    * @param kernelPortletContainer kernel portlet container
+    */
+   public void addKernelPortletContainer(KernelPortletContainer kernelPort=
letContainer)
    {
-      PortletApplication portletApplication =3D kernelPortletApplication.g=
etPortletApplication();
-      registry.unregisterPortletApplication(portletApplication);
+      // To be used for life cycle events
    }
 =

-   /** Called by MC to uninstall container. */
-   public void removeManagedPortletContainer(KernelPortletContainer kernel=
PortletContainer)
+   /**
+    * Called by MC to uninstall application.
+    *
+    * @param kernelPortletContainer kernel portlet container
+    */
+   public void removeKernelPortletContainer(KernelPortletContainer kernelP=
ortletContainer)
    {
-      KernelPortletApplication kernelPortletApplication =3D kernelPortletC=
ontainer.getKernelPortletApplication();
-      PortletApplicationRegistrationContext context =3D registrationContex=
tMap.get(kernelPortletApplication);
-      PortletContainer portletContainer =3D kernelPortletContainer.getPort=
letContainer();
-      context.unregisterPortlet(portletContainer);
+      // To be used for life cycle events
    }
+
+   public Collection getManagedPortle=
tApplications()
+   {
+      return applications.values();
+   }
+
+   public ManagedPortletApplication getManagedPortletApplication(String id)
+   {
+      return applications.get(id);
+   }
 }

Modified: modules/portlet/trunk/test/src/test/resources/portlet-test-war/WE=
B-INF/jboss-beans.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/portlet-test-war/WEB-INF/=
jboss-beans.xml	2008-02-19 12:14:38 UTC (rev 10028)
+++ modules/portlet/trunk/test/src/test/resources/portlet-test-war/WEB-INF/=
jboss-beans.xml	2008-02-19 13:23:47 UTC (rev 10029)
@@ -34,18 +34,13 @@
       
    
 =

-   
-   
-
    
-      
       
       
-      
-      
-      
-      
+      
+      
+      
+      
    
 =

    

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/W=
EB-INF/jboss-beans.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF=
/jboss-beans.xml	2008-02-19 12:14:38 UTC (rev 10028)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF=
/jboss-beans.xml	2008-02-19 13:23:47 UTC (rev 10029)
@@ -23,17 +23,12 @@
   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~=
~~~-->
 
 =

-   
-   
-
    
-      
       
-      
-      
-      
-      
+      
+      
+      
+      
    
 =

    


--===============5885457738525842751==--

From portal-commits at lists.jboss.org Tue Feb 19 09:07:51 2008
Content-Type: multipart/mixed; boundary="===============4707639697514135940=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r10030 - in
 modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet:
 container and 2 other directories.
Date: Tue, 19 Feb 2008 09:07:51 -0500
Message-ID: 

--===============4707639697514135940==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-19 09:07:50 -0500 (Tue, 19 Feb 2008)
New Revision: 10030

Added:
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/con=
tainer/object/
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/con=
tainer/object/PortletApplicationObject.java
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/con=
tainer/object/PortletContainerObject.java
Modified:
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/asp=
ects/portlet/ValveInterceptor.java
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/con=
tainer/PortletApplication.java
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/con=
tainer/PortletContainer.java
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/con=
tainer/PortletContainerInvoker.java
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/imp=
l/jsr168/PortletApplicationImpl.java
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/imp=
l/jsr168/PortletContainerImpl.java
Log:
- move wiring / service concerns of application/containers to dedicated int=
erfaces

Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/port=
let/aspects/portlet/ValveInterceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/as=
pects/portlet/ValveInterceptor.java	2008-02-19 13:23:47 UTC (rev 10029)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/as=
pects/portlet/ValveInterceptor.java	2008-02-19 14:07:50 UTC (rev 10030)
@@ -22,12 +22,10 @@
  *************************************************************************=
*****/
 package org.jboss.portal.portlet.aspects.portlet;
 =

-import org.jboss.portal.common.concurrent.Valve;
 import org.jboss.portal.common.invocation.InvocationException;
-import org.jboss.portal.portlet.container.PortletApplication;
-import org.jboss.portal.portlet.container.PortletApplicationContext;
 import org.jboss.portal.portlet.container.PortletContainer;
 import org.jboss.portal.portlet.container.PortletContainerInvoker;
+import org.jboss.portal.portlet.container.PortletContainerContext;
 import org.jboss.portal.portlet.invocation.PortletInterceptor;
 import org.jboss.portal.portlet.invocation.PortletInvocation;
 import org.jboss.portal.portlet.invocation.response.PortletInvocationRespo=
nse;
@@ -45,47 +43,27 @@
  */
 public class ValveInterceptor extends PortletInterceptor
 {
+
    protected Object invoke(PortletInvocation invocation) throws Exception,=
 InvocationException
    {
-/*
-      PortletContainer container =3D (PortletContainer)invocation.getAttri=
bute(PortletInvocation.INVOCATION_SCOPE, PortletContainerInvoker.PORTLET_CO=
NTAINER);
-      Valve valve =3D container.getValve();
+      PortletInvocationResponse response =3D (PortletInvocationResponse)in=
vocation.invokeNext();
 =

-      // Try to aquire the valve
-      if (valve.beforeInvocation())
+      // Stop the container if necessary
+      if (response instanceof UnavailableResponse)
       {
-         PortletInvocationResponse response =3D null;
+         // This call will wait until all the current threads have exited =
the component valve.
+         // Perhaps this should be done asynchronously as it may lead to a=
 long delay ?
+         // It could be made parametrizable too, so the deployer can choos=
e what mode is preferable
+         PortletContainer container =3D (PortletContainer)invocation.getAt=
tribute(PortletInvocation.INVOCATION_SCOPE, PortletContainerInvoker.PORTLET=
_CONTAINER);
 =

-         try
-         {
-            response =3D (PortletInvocationResponse)invocation.invokeNext(=
);
-         }
-         finally
-         {
-            // Release the valve
-            valve.afterInvocation();
-         }
+         // Get the context
+         PortletContainerContext context =3D container.getContext();
 =

-         // Stop the container if necessary
-         if (response instanceof UnavailableResponse)
-         {
-            // This call will wait until all the current threads have exit=
ed the component valve.
-            // Perhaps this should be done asynchronously as it may lead t=
o a long delay ?
-            // It could be made parametrizable too, so the deployer can ch=
oose what mode is preferable
-            PortletApplication application =3D container.getApplication();
-            PortletApplicationContext applicationContext =3D application.g=
etContext();
-            applicationContext.stopPortletContainer(container.getId());
-         }
-
-         //
-         return response;
+         // Invoke stop
+         context.invokeStop();
       }
-      else
-      {
-         return new UnavailableResponse();
-      }
-*/
 =

-      return invocation.invokeNext();
+      //
+      return response;
    }
 }

Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/port=
let/container/PortletApplication.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/co=
ntainer/PortletApplication.java	2008-02-19 13:23:47 UTC (rev 10029)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/co=
ntainer/PortletApplication.java	2008-02-19 14:07:50 UTC (rev 10030)
@@ -22,6 +22,7 @@
  *************************************************************************=
*****/
 package org.jboss.portal.portlet.container;
 =

+import javax.servlet.ServletContext;
 import java.util.Collection;
 =

 /**
@@ -40,34 +41,6 @@
    String getId();
 =

    /**
-    * Set the context required by that application.
-    *
-    * @param context the context
-    */
-   void setContext(PortletApplicationContext context);
-
-   /**
-    * Returns the context related to this application.
-    *
-    * @return the context
-    */
-   PortletApplicationContext getContext();
-
-   /**
-    * Wire a container.
-    *
-    * @param container the container
-    */
-   void addContainer(PortletContainer container);
-
-   /**
-    * Unwire a container.
-    *
-    * @param container the container
-    */
-   void removeContainer(PortletContainer container);
-
-   /**
     * Returns the set of related portlet containers.
     *
     * @return the portlet containers
@@ -82,15 +55,7 @@
     */
    PortletContainer getPortletContainer(String containerId);
 =

-   /**
-    * Starts the application only. It does not take care of starting its c=
omponents.
-    *
-    * @throws Exception any exception preventing the start
-    */
-   void start() throws Exception;
+   PortletApplicationContext getContext();
 =

-   /**
-    * Stops the application only. It does not take care of stopping its co=
mponents.
-    */
-   void stop();
+
 }

Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/port=
let/container/PortletContainer.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/co=
ntainer/PortletContainer.java	2008-02-19 13:23:47 UTC (rev 10029)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/co=
ntainer/PortletContainer.java	2008-02-19 14:07:50 UTC (rev 10030)
@@ -22,7 +22,6 @@
  *************************************************************************=
*****/
 package org.jboss.portal.portlet.container;
 =

-import org.jboss.portal.common.concurrent.Valve;
 import org.jboss.portal.common.invocation.InvocationException;
 import org.jboss.portal.portlet.PortletInvokerException;
 import org.jboss.portal.portlet.info.PortletInfo;
@@ -51,27 +50,6 @@
    PortletInfo getInfo();
 =

    /**
-    * Wire the application.
-    *
-    * @param application the related application
-    */
-   void setApplication(PortletApplication application);
-
-   /**
-    * Returns the wired application.
-    *
-    * @return the application
-    */
-   PortletApplication getApplication();
-
-   /**
-    * Wire the portlet container context.
-    *
-    * @param context the context
-    */
-   void setContext(PortletContainerContext context);
-
-   /**
     * Invoke the portlet container.
     *
     * @param invocation the portlet invocation
@@ -82,14 +60,11 @@
    PortletInvocationResponse dispatch(PortletInvocation invocation) throws=
 PortletInvokerException, InvocationException;
 =

    /**
-    * Starts the portlet container.
+    * Returns the wired application.
     *
-    * @throws Exception any exception preventing the start
+    * @return the application
     */
-   void start() throws Exception;
+   PortletApplication getApplication();
 =

-   /**
-    * Stops the portlet container.
-    */
-   void stop();
+   PortletContainerContext getContext();
 }

Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/port=
let/container/PortletContainerInvoker.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/co=
ntainer/PortletContainerInvoker.java	2008-02-19 13:23:47 UTC (rev 10029)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/co=
ntainer/PortletContainerInvoker.java	2008-02-19 14:07:50 UTC (rev 10030)
@@ -119,11 +119,11 @@
       this.portlets =3D portlets;
    }
 =

-   public synchronized void start() throws Exception
+   public void start() throws Exception
    {
    }
 =

-   public synchronized void stop() throws Exception
+   public void stop() throws Exception
    {
    }
 =


Added: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet=
/container/object/PortletApplicationObject.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/co=
ntainer/object/PortletApplicationObject.java	                        (rev 0)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/co=
ntainer/object/PortletApplicationObject.java	2008-02-19 14:07:50 UTC (rev 1=
0030)
@@ -0,0 +1,77 @@
+/*************************************************************************=
*****
+ * 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.container.object;
+
+import org.jboss.portal.portlet.container.PortletApplicationContext;
+import org.jboss.portal.portlet.container.PortletContainer;
+import org.jboss.portal.portlet.container.PortletApplication;
+
+/**
+ * Contains life cycle and wiring details for the kernel environment.
+ * =

+ * @author Julien Viet
+ * @version $Revision: 630 $
+ */
+public interface PortletApplicationObject extends PortletApplication
+{
+
+   /**
+    * Set the context required by that application.
+    *
+    * @param context the context
+    */
+   void setContext(PortletApplicationContext context);
+
+   /**
+    * Returns the context related to this application.
+    *
+    * @return the context
+    */
+   PortletApplicationContext getContext();
+
+   /**
+    * Wire a container.
+    *
+    * @param container the container
+    */
+   void addContainer(PortletContainer container);
+
+   /**
+    * Unwire a container.
+    *
+    * @param container the container
+    */
+   void removeContainer(PortletContainer container);
+
+   /**
+    * Starts the application only. It does not take care of starting its c=
omponents.
+    *
+    * @throws Exception any exception preventing the start
+    */
+   void start() throws Exception;
+
+   /**
+    * Stops the application only. It does not take care of stopping its co=
mponents.
+    */
+   void stop();
+}

Added: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet=
/container/object/PortletContainerObject.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/co=
ntainer/object/PortletContainerObject.java	                        (rev 0)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/co=
ntainer/object/PortletContainerObject.java	2008-02-19 14:07:50 UTC (rev 100=
30)
@@ -0,0 +1,63 @@
+/*************************************************************************=
*****
+ * 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.container.object;
+
+import org.jboss.portal.portlet.container.PortletApplication;
+import org.jboss.portal.portlet.container.PortletContainerContext;
+import org.jboss.portal.portlet.container.PortletContainer;
+
+/**
+ * Contains life cycle and wiring details for the kernel environment.
+ * =

+ * @author Julien Viet
+ * @version $Revision: 630 $
+ */
+public interface PortletContainerObject extends PortletContainer
+{
+
+   /**
+    * Wire the application.
+    *
+    * @param application the related application
+    */
+   void setApplication(PortletApplication application);
+
+   /**
+    * Wire the portlet container context.
+    *
+    * @param context the context
+    */
+   void setContext(PortletContainerContext context);
+
+   /**
+    * Starts the portlet container.
+    *
+    * @throws Exception any exception preventing the start
+    */
+   void start() throws Exception;
+
+   /**
+    * Stops the portlet container.
+    */
+   void stop();
+}

Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/port=
let/impl/jsr168/PortletApplicationImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/jsr168/PortletApplicationImpl.java	2008-02-19 13:23:47 UTC (rev 10029)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/jsr168/PortletApplicationImpl.java	2008-02-19 14:07:50 UTC (rev 10030)
@@ -35,6 +35,7 @@
 import org.jboss.portal.portlet.container.PortletApplicationContext;
 import org.jboss.portal.portlet.container.PortletContainer;
 import org.jboss.portal.portlet.container.PortletInitializationException;
+import org.jboss.portal.portlet.container.object.PortletApplicationObject;
 import org.jboss.portal.portlet.LifeCyclePhase;
 import org.apache.log4j.Logger;
 =

@@ -59,7 +60,7 @@
  * @author Julien Viet
  * @version $Revision: 7226 $
  */
-public class PortletApplicationImpl implements PortletApplication
+public class PortletApplicationImpl implements PortletApplicationObject
 {
 =

    private static final EnumMap> phaseToType =3D

Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/port=
let/impl/jsr168/PortletContainerImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/jsr168/PortletContainerImpl.java	2008-02-19 13:23:47 UTC (rev 10029)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/jsr168/PortletContainerImpl.java	2008-02-19 14:07:50 UTC (rev 10030)
@@ -28,9 +28,9 @@
 import org.jboss.portal.portlet.PortletInvokerException;
 import org.jboss.portal.portlet.aspects.portlet.ContextDispatcherIntercept=
or;
 import org.jboss.portal.portlet.container.PortletApplication;
-import org.jboss.portal.portlet.container.PortletContainer;
 import org.jboss.portal.portlet.container.PortletInitializationException;
 import org.jboss.portal.portlet.container.PortletContainerContext;
+import org.jboss.portal.portlet.container.object.PortletContainerObject;
 import org.jboss.portal.portlet.impl.jsr168.api.ActionRequestImpl;
 import org.jboss.portal.portlet.impl.jsr168.api.ActionResponseImpl;
 import org.jboss.portal.portlet.impl.jsr168.api.PortletConfigImpl;
@@ -91,7 +91,7 @@
  * @author Julien Viet
  * @version $Revision: 6365 $
  */
-public class PortletContainerImpl implements PortletContainer
+public class PortletContainerImpl implements PortletContainerObject
 {
 =

    /** Logger. */
@@ -164,6 +164,11 @@
       this.context =3D context;
    }
 =

+   public PortletContainerContext getContext()
+   {
+      return context;
+   }
+
    public ContainerPortletInfo getInfo()
    {
       if (started)
@@ -428,6 +433,26 @@
 =

    public PortletInvocationResponse dispatch(PortletInvocation invocation)=
 throws PortletInvokerException, InvocationException
    {
+      if (valve.beforeInvocation())
+      {
+         try
+         {
+            return invokeDispatch(invocation);
+         }
+         finally
+         {
+            // Release the valve
+            valve.afterInvocation();
+         }
+      }
+      else
+      {
+         return new UnavailableResponse();
+      }
+   }
+
+   private PortletInvocationResponse invokeDispatch(PortletInvocation invo=
cation) throws PortletInvokerException, InvocationException
+   {
       HttpServletRequest dreq =3D invocation.getDispatchedRequest();
       HttpServletResponse dresp =3D invocation.getDispatchedResponse();
 =



--===============4707639697514135940==--

From portal-commits at lists.jboss.org Tue Feb 19 13:03:32 2008
Content-Type: multipart/mixed; boundary="===============4803855467066121046=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r10031 - in
 modules/web/trunk/web/src: test and 4 other directories.
Date: Tue, 19 Feb 2008 13:03:32 -0500
Message-ID: 

--===============4803855467066121046==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-19 13:03:31 -0500 (Tue, 19 Feb 2008)
New Revision: 10031

Modified:
   modules/web/trunk/web/src/main/java/org/jboss/portal/web/impl/tomcat/TC6=
ServletContainerContext.java
   modules/web/trunk/web/src/test/build.xml
   modules/web/trunk/web/src/test/java/org/jboss/portal/test/web/WebAppRegi=
stry.java
   modules/web/trunk/web/src/test/java/org/jboss/portal/test/web/spi/SPITes=
tCase.java
   modules/web/trunk/web/src/test/resources/support/jboss-4.2-generic/serve=
r-war/WEB-INF/web.xml
   modules/web/trunk/web/src/test/resources/support/tomcat-6.0-generic/serv=
er-war/WEB-INF/web.xml
Log:
JBPORTAL-1903 : The web application containing the integration SPI does not=
 participate in the life cycle of the web SPI

Modified: modules/web/trunk/web/src/main/java/org/jboss/portal/web/impl/tom=
cat/TC6ServletContainerContext.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/web/trunk/web/src/main/java/org/jboss/portal/web/impl/tomcat/TC=
6ServletContainerContext.java	2008-02-19 14:07:50 UTC (rev 10030)
+++ modules/web/trunk/web/src/main/java/org/jboss/portal/web/impl/tomcat/TC=
6ServletContainerContext.java	2008-02-19 18:03:31 UTC (rev 10031)
@@ -36,6 +36,7 @@
 import org.jboss.portal.web.command.CommandDispatcher;
 import org.jboss.portal.web.impl.DefaultServletContainerFactory;
 import org.jboss.portal.web.spi.ServletContainerContext;
+import org.apache.catalina.core.StandardContext;
 =

 import javax.servlet.ServletContext;
 import javax.servlet.ServletException;
@@ -59,10 +60,10 @@
    private final CommandDispatcher dispatcher =3D new CommandDispatcher();
 =

    /** The monitored hosts. */
-   private final Set monitoredHosts =3D new HashSet();
+   private final Set monitoredHosts =3D new HashSet();
 =

    /** The monitored contexts. */
-   private final Set monitoredContexts =3D new HashSet();
+   private final Set monitoredContexts =3D new HashSet();
 =

    /** . */
    private final Engine engine;
@@ -111,9 +112,9 @@
             unregisterHost(host);
          }
       }
-      else if (event.getData() instanceof Context)
+      else if (event.getData() instanceof StandardContext)
       {
-         Context context =3D (Context)event.getData();
+         StandardContext context =3D (StandardContext)event.getData();
 =

          //
          if (Container.ADD_CHILD_EVENT.equals(event.getType()))
@@ -151,9 +152,8 @@
 =

       //
       Container[] childrenContainers =3D engine.findChildren();
-      for (int i =3D 0; i < childrenContainers.length; i++)
+      for (Container childContainer : childrenContainers)
       {
-         Container childContainer =3D childrenContainers[i];
          if (childContainer instanceof Host)
          {
             Host host =3D (Host)childContainer;
@@ -171,9 +171,8 @@
 =

       //
       Container[] childrenContainers =3D engine.findChildren();
-      for (int i =3D 0; i < childrenContainers.length; i++)
+      for (Container childContainer : childrenContainers)
       {
-         Container childContainer =3D childrenContainers[i];
          if (childContainer instanceof Host)
          {
             Host host =3D (Host)childContainer;
@@ -197,12 +196,11 @@
       if (!monitoredHosts.contains(host.getName()))
       {
          Container[] childrenContainers =3D host.findChildren();
-         for (int i =3D 0; i < childrenContainers.length; i++)
+         for (Container childContainer : childrenContainers)
          {
-            Container childContainer =3D childrenContainers[i];
-            if (childContainer instanceof Context)
+            if (childContainer instanceof StandardContext)
             {
-               Context context =3D (Context)childContainer;
+               StandardContext context =3D (StandardContext)childContainer;
                registerContext(context);
             }
          }
@@ -226,29 +224,25 @@
 =

          //
          Container[] childrenContainers =3D host.findChildren();
-         for (int i =3D 0; i < childrenContainers.length; i++)
+         for (Container childContainer : childrenContainers)
          {
-            Container childContainer =3D childrenContainers[i];
             if (childContainer instanceof Context)
             {
-               Context context =3D (Context)childContainer;
+               StandardContext context =3D (StandardContext)childContainer;
                unregisterContext(context);
             }
          }
       }
    }
 =

-   private void registerContext(Context context)
+   private void registerContext(StandardContext context)
    {
       if (!monitoredContexts.contains(context.getName()))
       {
-         if (context instanceof Lifecycle)
-         {
-            ((Lifecycle)context).addLifecycleListener(this);
-         }
+         context.addLifecycleListener(this);
 =

          //
-         if (context.getAvailable())
+         if (context.getState() =3D=3D 1)
          {
             start(context);
          }
@@ -258,7 +252,7 @@
       }
    }
 =

-   private void unregisterContext(Context context)
+   private void unregisterContext(StandardContext context)
    {
       if (monitoredContexts.contains(context.getName()))
       {
@@ -271,10 +265,7 @@
          }
 =

          //
-         if (context instanceof Lifecycle)
-         {
-            ((Lifecycle)context).removeLifecycleListener(this);
-         }
+         context.removeLifecycleListener(this);
       }
    }
 =


Modified: modules/web/trunk/web/src/test/build.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/web/trunk/web/src/test/build.xml	2008-02-19 14:07:50 UTC (rev 1=
0030)
+++ modules/web/trunk/web/src/test/build.xml	2008-02-19 18:03:31 UTC (rev 1=
0031)
@@ -572,21 +572,21 @@
          
          
          
-         
+         
          
       
       
          
          
          
-         
+         
          
       
       
          
          
          
-         
+         
          
       
    

Modified: modules/web/trunk/web/src/test/java/org/jboss/portal/test/web/Web=
AppRegistry.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/web/trunk/web/src/test/java/org/jboss/portal/test/web/WebAppReg=
istry.java	2008-02-19 14:07:50 UTC (rev 10030)
+++ modules/web/trunk/web/src/test/java/org/jboss/portal/test/web/WebAppReg=
istry.java	2008-02-19 18:03:31 UTC (rev 10031)
@@ -39,7 +39,7 @@
 {
 =

    /** . */
-   final Map map =3D new HashMap();
+   final Map map =3D new HashMap();
 =

    public void onEvent(WebAppEvent event)
    {
@@ -64,10 +64,10 @@
       {
          throw new IllegalArgumentException();
       }
-      return (WebApp)map.get(key);
+      return map.get(key);
    }
 =

-   public Set getKeys()
+   public Set getKeys()
    {
       return map.keySet();
    }

Modified: modules/web/trunk/web/src/test/java/org/jboss/portal/test/web/spi=
/SPITestCase.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/web/trunk/web/src/test/java/org/jboss/portal/test/web/spi/SPITe=
stCase.java	2008-02-19 14:07:50 UTC (rev 10030)
+++ modules/web/trunk/web/src/test/java/org/jboss/portal/test/web/spi/SPITe=
stCase.java	2008-02-19 18:03:31 UTC (rev 10031)
@@ -48,7 +48,6 @@
 import java.io.IOException;
 import java.util.Set;
 import java.util.HashSet;
-import java.util.Collection;
 =

 /**
  * @author Julien Viet
@@ -70,6 +69,13 @@
    {
       if (getRequestCount() =3D=3D 1)
       {
+         // Check that this web app is here
+         String key =3D req.getContextPath();
+         if (!keys.contains(key))
+         {
+            fail("The current test web app with key " + key + " is not see=
n as deployed among " + keys);
+         }
+
          // Should try
          ServletContext appContext =3D testServlet.getServletContext().get=
Context("/test-spi-app");
 =

@@ -147,7 +153,7 @@
          // Register and save the deployed web apps
          registry =3D new WebAppRegistry();
          container.addWebAppListener(registry);
-         keys =3D new HashSet((Collection)regist=
ry.getKeys());
+         keys =3D new HashSet(registry.getKeys());
 =

          // Deploy the application web app
          return new DeployResponse("test-spi-app.war");
@@ -155,7 +161,7 @@
       else if (getRequestCount() =3D=3D 0)
       {
          // Compute the difference with the previous deployed web apps
-         Set diff =3D new HashSet((Collection)re=
gistry.getKeys());
+         Set diff =3D new HashSet(registry.getKeys());
          diff.removeAll(keys);
 =

          // It should be 1

Modified: modules/web/trunk/web/src/test/resources/support/jboss-4.2-generi=
c/server-war/WEB-INF/web.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/web/trunk/web/src/test/resources/support/jboss-4.2-generic/serv=
er-war/WEB-INF/web.xml	2008-02-19 14:07:50 UTC (rev 10030)
+++ modules/web/trunk/web/src/test/resources/support/jboss-4.2-generic/serv=
er-war/WEB-INF/web.xml	2008-02-19 18:03:31 UTC (rev 10031)
@@ -42,8 +42,17 @@
       org.jboss.portal.test.web.TestServlet
       0
    
+   
+      BootstrapServlet
+      org.jboss.portal.web.impl.generic.PortletContainerBoo=
tstrapServlet
+      0
+   
    
       TestServlet
       /
    
+   
+      BootstrapServlet
+      /jbossportlet
+   
 

Modified: modules/web/trunk/web/src/test/resources/support/tomcat-6.0-gener=
ic/server-war/WEB-INF/web.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/web/trunk/web/src/test/resources/support/tomcat-6.0-generic/ser=
ver-war/WEB-INF/web.xml	2008-02-19 14:07:50 UTC (rev 10030)
+++ modules/web/trunk/web/src/test/resources/support/tomcat-6.0-generic/ser=
ver-war/WEB-INF/web.xml	2008-02-19 18:03:31 UTC (rev 10031)
@@ -42,8 +42,17 @@
       org.jboss.portal.test.web.TestServlet
       0
    
+   
+      BootstrapServlet
+      org.jboss.portal.web.impl.generic.PortletContainerBoo=
tstrapServlet
+      0
+   
    
       TestServlet
       /
    
+   
+      BootstrapServlet
+      /jbossportlet
+   
 


--===============4803855467066121046==--

From portal-commits at lists.jboss.org Tue Feb 19 13:09:38 2008
Content-Type: multipart/mixed; boundary="===============0775801057776478359=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r10032 - modules/web/trunk/build.
Date: Tue, 19 Feb 2008 13:09:37 -0500
Message-ID: 

--===============0775801057776478359==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-19 13:09:37 -0500 (Tue, 19 Feb 2008)
New Revision: 10032

Modified:
   modules/web/trunk/build/pom.xml
Log:
it's rather SNAPSHOT than 1.2.Beta1

Modified: modules/web/trunk/build/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/web/trunk/build/pom.xml	2008-02-19 18:03:31 UTC (rev 10031)
+++ modules/web/trunk/build/pom.xml	2008-02-19 18:09:37 UTC (rev 10032)
@@ -18,7 +18,7 @@
   4.0.0
   org.jboss.portal.web
   module-parent
-  1.2.0-Beta1
+  1.2.0-SNAPSHOT
   pom
   JBoss Portal Test Module
   http://www.jboss.com/products/jbossmc


--===============0775801057776478359==--

From portal-commits at lists.jboss.org Tue Feb 19 13:37:26 2008
Content-Type: multipart/mixed; boundary="===============0346805279964874407=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r10033 - in modules/web/trunk: web
 and 2 other directories.
Date: Tue, 19 Feb 2008 13:37:26 -0500
Message-ID: 

--===============0346805279964874407==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-19 13:37:25 -0500 (Tue, 19 Feb 2008)
New Revision: 10033

Modified:
   modules/web/trunk/pom.xml
   modules/web/trunk/web/pom.xml
   modules/web/trunk/web/src/main/java/org/jboss/portal/web/impl/tomcat/TC6=
ServletContainerContext.java
   modules/web/trunk/web/src/test/build.xml
Log:
hopefully now it's right

Modified: modules/web/trunk/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/web/trunk/pom.xml	2008-02-19 18:09:37 UTC (rev 10032)
+++ modules/web/trunk/pom.xml	2008-02-19 18:37:25 UTC (rev 10033)
@@ -5,7 +5,7 @@
    module-aggregator
    pom
    JBoss Portal Web Module
-   1.2.0-Beta1
+   1.2.0-SNAPSHOT
    http://labs.jboss.com/jbossportal
 =

    

Modified: modules/web/trunk/web/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/web/trunk/web/pom.xml	2008-02-19 18:09:37 UTC (rev 10032)
+++ modules/web/trunk/web/pom.xml	2008-02-19 18:37:25 UTC (rev 10033)
@@ -3,7 +3,7 @@
    
       org.jboss.portal.web
       module-parent
-      1.2.0-Beta1
+      1.2.0-SNAPSHOT
       ../build/pom.xml
    
    4.0.0

Modified: modules/web/trunk/web/src/main/java/org/jboss/portal/web/impl/tom=
cat/TC6ServletContainerContext.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/web/trunk/web/src/main/java/org/jboss/portal/web/impl/tomcat/TC=
6ServletContainerContext.java	2008-02-19 18:09:37 UTC (rev 10032)
+++ modules/web/trunk/web/src/main/java/org/jboss/portal/web/impl/tomcat/TC=
6ServletContainerContext.java	2008-02-19 18:37:25 UTC (rev 10033)
@@ -226,7 +226,7 @@
          Container[] childrenContainers =3D host.findChildren();
          for (Container childContainer : childrenContainers)
          {
-            if (childContainer instanceof Context)
+            if (childContainer instanceof StandardContext)
             {
                StandardContext context =3D (StandardContext)childContainer;
                unregisterContext(context);
@@ -259,7 +259,7 @@
          monitoredContexts.remove(context.getName());
 =

          //
-         if (context.getAvailable())
+         if (context.getState() =3D=3D 1)
          {
             stop(context);
          }

Modified: modules/web/trunk/web/src/test/build.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/web/trunk/web/src/test/build.xml	2008-02-19 18:09:37 UTC (rev 1=
0032)
+++ modules/web/trunk/web/src/test/build.xml	2008-02-19 18:37:25 UTC (rev 1=
0033)
@@ -190,9 +190,6 @@
          
          
          
-         
-         
-         
          
          
          
@@ -215,9 +212,6 @@
          
          
          
-         
-         
-         
          
          
          
@@ -241,9 +235,6 @@
          
          
          
-         
-         
-         
          
          
          
@@ -262,9 +253,6 @@
          
          
          
-         
-         
-         
          
          
          
@@ -283,9 +271,6 @@
          
          
          
-         
-         
-         
          
          
          
@@ -398,6 +383,7 @@
          action=3D"start"
          wait=3D"${cargo.wait}">
          
+
             
             
             
@@ -508,6 +494,11 @@
          action=3D"start"
          wait=3D"${cargo.wait}">
          
+
+            
+            
+            
+
             
             
             


--===============0346805279964874407==--

From portal-commits at lists.jboss.org Tue Feb 19 16:16:52 2008
Content-Type: multipart/mixed; boundary="===============1494609786192654169=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r10034 - in modules/portlet/trunk:
 portlet/src/main/java/org/jboss/portal/portlet/container/managed and 7 other
 directories.
Date: Tue, 19 Feb 2008 16:16:52 -0500
Message-ID: 

--===============1494609786192654169==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-19 16:16:51 -0500 (Tue, 19 Feb 2008)
New Revision: 10034

Added:
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/con=
tainer/managed/ManagedObject.java
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/con=
tainer/managed/ManagedObjectStatus.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/portal=
/admin/
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/portal=
/admin/ui/
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/portal=
/admin/ui/AdminPortlet.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/K=
ernelObject.java
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/=
portlet.xml
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/adm=
in.jsp
Modified:
   modules/portlet/trunk/build/pom.xml
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/con=
tainer/managed/ManagedPortletApplication.java
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/con=
tainer/managed/ManagedPortletContainer.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/K=
ernelPortletApplication.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/K=
ernelPortletContainer.java
   modules/portlet/trunk/test/src/test/build.xml
Log:
- start to build small UI for displaying managed container object status, n=
eed to add life cycle change

Modified: modules/portlet/trunk/build/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/build/pom.xml	2008-02-19 18:37:25 UTC (rev 10033)
+++ modules/portlet/trunk/build/pom.xml	2008-02-19 21:16:51 UTC (rev 10034)
@@ -39,7 +39,7 @@
       3.6-beta
       2.2.1.GA
       1.2.0-Beta1
-      1.2.0-Beta1
+      1.2.0-SNAPSHOT
       1.2.0-Beta1
       1.2.14
       1.1.1

Added: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet=
/container/managed/ManagedObject.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/co=
ntainer/managed/ManagedObject.java	                        (rev 0)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/co=
ntainer/managed/ManagedObject.java	2008-02-19 21:16:51 UTC (rev 10034)
@@ -0,0 +1,38 @@
+/*************************************************************************=
*****
+ * 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.container.managed;
+
+/**
+ * @author Julien Viet
+ * @version $Revision: 630 $
+ */
+public interface ManagedObject
+{
+
+   ManagedObjectStatus getStatus();
+
+   void managedStart() throws Exception;
+
+   void managedStop();
+   =

+}

Added: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet=
/container/managed/ManagedObjectStatus.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/co=
ntainer/managed/ManagedObjectStatus.java	                        (rev 0)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/co=
ntainer/managed/ManagedObjectStatus.java	2008-02-19 21:16:51 UTC (rev 10034)
@@ -0,0 +1,34 @@
+/*************************************************************************=
*****
+ * 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.container.managed;
+
+/**
+ * @author Julien Viet
+ * @version $Revision: 630 $
+ */
+public enum ManagedObjectStatus
+{
+
+   STOPPED, STARTED, FAILED
+
+}

Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/port=
let/container/managed/ManagedPortletApplication.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/co=
ntainer/managed/ManagedPortletApplication.java	2008-02-19 18:37:25 UTC (rev=
 10033)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/co=
ntainer/managed/ManagedPortletApplication.java	2008-02-19 21:16:51 UTC (rev=
 10034)
@@ -28,17 +28,14 @@
  * @author Julien Viet
  * @version $Revision: 630 $
  */
-public interface ManagedPortletApplication
+public interface ManagedPortletApplication extends ManagedObject
 {
 =

    String getId();
 =

-   void managedStart() throws Exception;
-
-   void managedStop();
-
    Collection getManagedPortletContaine=
rs();
 =

    ManagedPortletContainer getManagedPortletContainer(String portletContai=
nerId);
+   =

 =

 }

Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/port=
let/container/managed/ManagedPortletContainer.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/co=
ntainer/managed/ManagedPortletContainer.java	2008-02-19 18:37:25 UTC (rev 1=
0033)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/co=
ntainer/managed/ManagedPortletContainer.java	2008-02-19 21:16:51 UTC (rev 1=
0034)
@@ -28,7 +28,7 @@
  * @author Julien Viet
  * @version $Revision: 630 $
  */
-public interface ManagedPortletContainer
+public interface ManagedPortletContainer extends ManagedObject
 {
 =

    String getId();
@@ -37,8 +37,4 @@
 =

    ManagedPortletApplication getManagedPortletApplication();
 =

-   void managedStart() throws Exception;
-
-   void managedStop();
-
 }

Added: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/po=
rtal/admin/ui/AdminPortlet.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/porta=
l/admin/ui/AdminPortlet.java	                        (rev 0)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/porta=
l/admin/ui/AdminPortlet.java	2008-02-19 21:16:51 UTC (rev 10034)
@@ -0,0 +1,66 @@
+/*************************************************************************=
*****
+ * 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.portal.admin.ui;
+
+import org.jboss.portal.portlet.container.managed.PortletApplicationRegist=
ry;
+import org.jboss.portal.portlet.container.managed.ManagedPortletApplicatio=
n;
+import org.jboss.portal.portlet.container.managed.ManagedPortletContainer;
+
+import javax.portlet.GenericPortlet;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+import javax.portlet.PortletException;
+import java.io.IOException;
+import java.io.PrintWriter;
+
+/**
+ * @author Julien Viet
+ * @version $Revision: 630 $
+ */
+public class AdminPortlet extends GenericPortlet
+{
+
+   protected void doView(RenderRequest req, RenderResponse resp) throws Po=
rtletException, IOException
+   {
+
+      resp.setContentType("text/html");
+
+      PrintWriter writer =3D resp.getWriter();
+
+      // Use an alias
+      PortletApplicationRegistry registry =3D (PortletApplicationRegistry)=
getPortletContext().getAttribute("PortletApplicationDeployer");
+
+      for (ManagedPortletApplication application : registry.getManagedPort=
letApplications())
+      {
+         writer.print("Application " + application.getId() + " " +=
 application.getStatus() + "
");
+         for (ManagedPortletContainer container : application.getManagedPo=
rtletContainers())
+         {
+            writer.print("Container " + container.getId() + " " + cont=
ainer.getStatus() + "");
+         }
+         writer.print("");
+      }
+
+      writer.close();
+
+   }
+}

Added: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/te=
st/KernelObject.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
KernelObject.java	                        (rev 0)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
KernelObject.java	2008-02-19 21:16:51 UTC (rev 10034)
@@ -0,0 +1,125 @@
+/*************************************************************************=
*****
+ * 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;
+
+import org.jboss.kernel.spi.dependency.KernelControllerContextAware;
+import org.jboss.kernel.spi.dependency.KernelControllerContext;
+import org.jboss.dependency.spi.ControllerState;
+import org.jboss.portal.portlet.container.managed.ManagedObject;
+import org.jboss.portal.portlet.container.managed.ManagedObjectStatus;
+
+import java.lang.reflect.UndeclaredThrowableException;
+
+/**
+ * @author Julien Viet
+ * @version $Revision: 630 $
+ */
+public class KernelObject implements ManagedObject, KernelControllerContex=
tAware
+{
+
+   /** . */
+   private KernelControllerContext controllerContext;
+
+   public final void setKernelControllerContext(KernelControllerContext co=
ntrollerContext) throws Exception
+   {
+      this.controllerContext =3D controllerContext;
+   }
+
+   public final void unsetKernelControllerContext(KernelControllerContext =
controllerContext) throws Exception
+   {
+      this.controllerContext =3D null;
+   }
+
+   public final ManagedObjectStatus getStatus()
+   {
+      ControllerState state =3D controllerContext.getState();
+
+      //
+      if (state =3D=3D ControllerState.INSTALLED)
+      {
+         return ManagedObjectStatus.STARTED;
+      }
+      else if (state =3D=3D ControllerState.ERROR)
+      {
+         return ManagedObjectStatus.FAILED;
+      }
+      else
+      {
+         return ManagedObjectStatus.STOPPED;
+      }
+   }
+
+   public final void managedStart() throws Exception
+   {
+      controllerStart();
+   }
+
+   public final void managedStop()
+   {
+      controllerStop();
+   }
+
+   protected final void controllerStart() throws Exception
+   {
+      if (controllerContext =3D=3D null)
+      {
+         throw new IllegalStateException("No under the controller of the k=
ernel");
+      }
+
+      //
+      try
+      {
+         controllerContext.getController().change(controllerContext, Contr=
ollerState.INSTALLED);
+      }
+      catch (Throwable throwable)
+      {
+         if (throwable instanceof Exception)
+         {
+            throw ((Exception)throwable);
+         }
+         if (throwable instanceof Error)
+         {
+            throw ((Error)throwable);
+         }
+         throw new UndeclaredThrowableException(throwable);
+      }
+   }
+
+   protected final void controllerStop()
+   {
+      if (controllerContext =3D=3D null)
+      {
+         throw new IllegalStateException("No under the controller of the k=
ernel");
+      }
+
+      //
+      try
+      {
+         controllerContext.getController().change(controllerContext, Contr=
ollerState.CREATE);
+      }
+      catch (Throwable throwable)
+      {
+         throwable.printStackTrace();
+      }
+   }
+}

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/KernelPortletApplication.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
KernelPortletApplication.java	2008-02-19 18:37:25 UTC (rev 10033)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
KernelPortletApplication.java	2008-02-19 21:16:51 UTC (rev 10034)
@@ -27,7 +27,6 @@
 import org.jboss.portal.portlet.container.managed.ManagedPortletApplicatio=
n;
 import org.jboss.portal.portlet.container.managed.ManagedPortletContainer;
 import org.jboss.portal.web.WebApp;
-import org.jboss.portal.common.NotYetImplemented;
 =

 import javax.servlet.ServletContext;
 import java.util.Map;
@@ -38,7 +37,7 @@
  * @author Julien Viet
  * @version $Revision: 630 $
  */
-public class KernelPortletApplication implements PortletApplicationContext=
, ManagedPortletApplication
+public class KernelPortletApplication extends KernelObject implements Port=
letApplicationContext, ManagedPortletApplication
 {
 =

    /** . */
@@ -104,12 +103,12 @@
 =

    public void invokeStart() throws Exception
    {
-      throw new NotYetImplemented();
+      controllerStart();
    }
 =

    public void invokeStop()
    {
-      throw new NotYetImplemented();
+      controllerStop();
    }
 =

    //
@@ -119,16 +118,6 @@
       return portletApplication.getId();
    }
 =

-   public void managedStart() throws Exception
-   {
-      throw new NotYetImplemented();
-   }
-
-   public void managedStop()
-   {
-      throw new NotYetImplemented();
-   }
-
    public Collection getManagedPortletC=
ontainers()
    {
       return kernelPortletContainers.values();

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/KernelPortletContainer.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
KernelPortletContainer.java	2008-02-19 18:37:25 UTC (rev 10033)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
KernelPortletContainer.java	2008-02-19 21:16:51 UTC (rev 10034)
@@ -27,13 +27,12 @@
 import org.jboss.portal.portlet.container.managed.ManagedPortletContainer;
 import org.jboss.portal.portlet.container.managed.ManagedPortletApplicatio=
n;
 import org.jboss.portal.portlet.info.PortletInfo;
-import org.jboss.portal.common.NotYetImplemented;
 =

 /**
  * @author Julien Viet
  * @version $Revision: 630 $
  */
-public class KernelPortletContainer implements PortletContainerContext, Ma=
nagedPortletContainer
+public class KernelPortletContainer extends KernelObject implements Portle=
tContainerContext, ManagedPortletContainer
 {
 =

    /** . */
@@ -74,12 +73,12 @@
 =

    public void invokeStart() throws Exception
    {
-      throw new NotYetImplemented();
+      controllerStart();
    }
 =

    public void invokeStop()
    {
-      throw new NotYetImplemented();
+      controllerStop();
    }
 =

    //
@@ -98,14 +97,4 @@
    {
       return portletContainer.getInfo();
    }
-
-   public void managedStart() throws Exception
-   {
-      throw new NotYetImplemented();
-   }
-
-   public void managedStop()
-   {
-      throw new NotYetImplemented();
-   }
 }

Modified: modules/portlet/trunk/test/src/test/build.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/build.xml	2008-02-19 18:37:25 UTC (=
rev 10033)
+++ modules/portlet/trunk/test/src/test/build.xml	2008-02-19 21:16:51 UTC (=
rev 10034)
@@ -721,7 +721,7 @@
 =

 =

       
-         
+         
       
 =

       

Added: modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-=
INF/portlet.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF=
/portlet.xml	                        (rev 0)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF=
/portlet.xml	2008-02-19 21:16:51 UTC (rev 10034)
@@ -0,0 +1,45 @@
+
+
+
+
+   
+      Administration Portlet
+      AdminPortlet
+      Admin Portlet
+      org.jboss.portal.portlet.portal.admin.ui.AdminPortlet=

+      
+         text/html
+         VIEW
+      
+      
+         Admin Portlet
+         admin
+      
+   
+
+
+

Added: modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo=
/admin.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/ad=
min.jsp	                        (rev 0)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/ad=
min.jsp	2008-02-19 21:16:51 UTC (rev 10034)
@@ -0,0 +1,14 @@
+<%@ page contentType=3D"text/html" %>
+<%@ page language=3D"java" %>
+<%@ taglib prefix=3D"jbp" tagdir=3D"/WEB-INF/tags/portal" %>
+<%@ taglib uri=3D"/WEB-INF/portal.tld" prefix=3D"portal" %>
+<%@ page isELIgnored=3D"false" %>
+
+<%@ include file=3D"/layouts/header.jsp" %>
+               =

+
+
+   
+
+
+<%@ include file=3D"/layouts/footer.jsp" %>
\ No newline at end of file


--===============1494609786192654169==--

From portal-commits at lists.jboss.org Tue Feb 19 17:18:45 2008
Content-Type: multipart/mixed; boundary="===============0069894541444499242=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r10035 - in modules/portlet/trunk:
 portlet/src/main/java/org/jboss/portal/portlet/container and 4 other
 directories.
Date: Tue, 19 Feb 2008 17:17:41 -0500
Message-ID: 

--===============0069894541444499242==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-19 17:17:41 -0500 (Tue, 19 Feb 2008)
New Revision: 10035

Modified:
   modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/=
controller/PortletRequestHandler.java
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/con=
tainer/PortletApplication.java
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/imp=
l/jsr168/PortletAPIFactoryImpl.java
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/imp=
l/jsr168/PortletContainerImpl.java
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/imp=
l/jsr168/api/ActionRequestImpl.java
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/imp=
l/jsr168/api/ClientDataRequestImpl.java
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/imp=
l/jsr168/api/EventRequestImpl.java
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/imp=
l/jsr168/api/PortletRequestImpl.java
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/imp=
l/jsr168/api/RenderRequestImpl.java
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/imp=
l/jsr168/api/ResourceRequestImpl.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/portal=
/admin/ui/AdminPortlet.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/K=
ernelPortletApplication.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/K=
ernelPortletContainer.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/P=
ortletApplicationDeployment.java
Log:
reduce the number of kernel beans

Modified: modules/portlet/trunk/controller/src/main/java/org/jboss/portal/p=
ortlet/controller/PortletRequestHandler.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet=
/controller/PortletRequestHandler.java	2008-02-19 21:16:51 UTC (rev 10034)
+++ modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet=
/controller/PortletRequestHandler.java	2008-02-19 22:17:41 UTC (rev 10035)
@@ -267,7 +267,12 @@
          }
 =

          //
-         ParameterMap publicNS =3D pageState.getPublicNavigationalState(po=
rtletRequest.getWindowId());
+         ParameterMap publicNS =3D null;
+         if (pageState !=3D null)
+         {
+            publicNS =3D pageState.getPublicNavigationalState(portletReque=
st.getWindowId());
+         }
+
          PortletInvocationContext portletInvocationContext =3D context.cre=
atePortletInvocationContext(portletRequest.getWindowId(), pageState);
          ActionInvocation actionInvocation =3D new ActionInvocation(portle=
tInvocationContext);
 =


Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/port=
let/container/PortletApplication.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/co=
ntainer/PortletApplication.java	2008-02-19 21:16:51 UTC (rev 10034)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/co=
ntainer/PortletApplication.java	2008-02-19 22:17:41 UTC (rev 10035)
@@ -45,7 +45,7 @@
     *
     * @return the portlet containers
     */
-   Collection getPortletContainers();
+   Collection getPortletContainers();
 =

    /**
     * Returns a specific container or null if it does not exist

Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/port=
let/impl/jsr168/PortletAPIFactoryImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/jsr168/PortletAPIFactoryImpl.java	2008-02-19 21:16:51 UTC (rev 10034)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/jsr168/PortletAPIFactoryImpl.java	2008-02-19 22:17:41 UTC (rev 10035)
@@ -44,7 +44,7 @@
 {
    public ActionRequestImpl createActionRequest(ActionInvocation invocatio=
n)
    {
-      return new ActionRequestImpl(invocation);
+      return new ActionRequestImpl(null, invocation);
    }
 =

    public ActionResponseImpl createActionResponse(ActionInvocation invocat=
ion, ActionRequestImpl actionRequest)
@@ -54,7 +54,7 @@
 =

    public EventRequestImpl createEventRequest(EventInvocation invocation)
    {
-      return new EventRequestImpl(invocation);
+      return new EventRequestImpl(null, invocation);
    }
 =

    public EventResponseImpl createEventResponse(EventInvocation invocation=
, EventRequestImpl eventRequest)
@@ -64,7 +64,7 @@
 =

    public RenderRequestImpl createRenderRequest(RenderInvocation invocatio=
n)
    {
-      return new RenderRequestImpl(invocation);
+      return new RenderRequestImpl(null, invocation);
    }
 =

    public RenderResponseImpl createRenderResponse(RenderInvocation invocat=
ion, RenderRequestImpl renderRequest)
@@ -74,7 +74,7 @@
 =

    public ResourceRequestImpl createResourceRequest(ResourceInvocation inv=
ocation)
    {
-      return new ResourceRequestImpl(invocation);
+      return new ResourceRequestImpl(null, invocation);
    }
 =

    public ResourceResponseImpl createResourceResponse(ResourceInvocation i=
nvocation, ResourceRequestImpl renderRequest)

Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/port=
let/impl/jsr168/PortletContainerImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/jsr168/PortletContainerImpl.java	2008-02-19 21:16:51 UTC (rev 10034)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/jsr168/PortletContainerImpl.java	2008-02-19 22:17:41 UTC (rev 10035)
@@ -463,28 +463,28 @@
       FilterChainImpl chain;
       if (invocation instanceof ActionInvocation)
       {
-         req =3D new ActionRequestImpl((ActionInvocation)invocation);
+         req =3D new ActionRequestImpl(this, (ActionInvocation)invocation);
          resp =3D new ActionResponseImpl((ActionInvocation)invocation, req=
);
          phase =3D "ACTION_PHASE";
          chain =3D new FilterChainImpl(actionFilterList, Act=
ionFilter.class);
       }
       else if (invocation instanceof RenderInvocation)
       {
-         req =3D new RenderRequestImpl((RenderInvocation)invocation);
+         req =3D new RenderRequestImpl(this, (RenderInvocation)invocation);
          resp =3D new RenderResponseImpl((RenderInvocation)invocation, req=
);
          phase =3D "RENDER_PHASE";
          chain =3D new FilterChainImpl(renderFilterList, Ren=
derFilter.class);
       }
       else if (invocation instanceof EventInvocation)
       {
-         req =3D new EventRequestImpl((EventInvocation)invocation);
+         req =3D new EventRequestImpl(this, (EventInvocation)invocation);
          resp =3D new EventResponseImpl((EventInvocation)invocation, req);
          phase =3D "EVENT_PHASE";
          chain =3D new FilterChainImpl(eventFilterList, Event=
Filter.class);
       }
       else if (invocation instanceof ResourceInvocation)
       {
-         req =3D new ResourceRequestImpl((ResourceInvocation)invocation);
+         req =3D new ResourceRequestImpl(this, (ResourceInvocation)invocat=
ion);
          resp =3D new ResourceResponseImpl((ResourceInvocation)invocation,=
 req);
          phase =3D "RESOURCE_SERVING_PHASE";
          chain =3D new FilterChainImpl(resourceFilterList,=
 ResourceFilter.class);

Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/port=
let/impl/jsr168/api/ActionRequestImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/jsr168/api/ActionRequestImpl.java	2008-02-19 21:16:51 UTC (rev 10034)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/jsr168/api/ActionRequestImpl.java	2008-02-19 22:17:41 UTC (rev 10035)
@@ -23,6 +23,7 @@
 package org.jboss.portal.portlet.impl.jsr168.api;
 =

 import org.jboss.portal.portlet.invocation.ActionInvocation;
+import org.jboss.portal.portlet.impl.jsr168.PortletContainerImpl;
 =

 import javax.portlet.ActionRequest;
 =

@@ -32,8 +33,8 @@
  */
 public class ActionRequestImpl extends ClientDataRequestImpl implements Ac=
tionRequest
 {
-   public ActionRequestImpl(ActionInvocation invocation)
+   public ActionRequestImpl(PortletContainerImpl container, ActionInvocati=
on invocation)
    {
-      super(invocation);
+      super(container, invocation);
    }
 }

Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/port=
let/impl/jsr168/api/ClientDataRequestImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/jsr168/api/ClientDataRequestImpl.java	2008-02-19 21:16:51 UTC (rev 10034)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/jsr168/api/ClientDataRequestImpl.java	2008-02-19 22:17:41 UTC (rev 10035)
@@ -25,6 +25,7 @@
 import org.jboss.portal.portlet.invocation.ActionInvocation;
 import org.jboss.portal.portlet.invocation.ResourceInvocation;
 import org.jboss.portal.portlet.spi.RequestContext;
+import org.jboss.portal.portlet.impl.jsr168.PortletContainerImpl;
 =

 import javax.portlet.ClientDataRequest;
 import java.io.InputStream;
@@ -42,17 +43,17 @@
    /** . */
    protected final RequestContext requestContext;
 =

-   public ClientDataRequestImpl(ActionInvocation invocation)
+   public ClientDataRequestImpl(PortletContainerImpl container, ActionInvo=
cation invocation)
    {
-      super(invocation);
+      super(container, invocation);
 =

       //
       this.requestContext =3D invocation.getRequestContext();
    }
 =

-   public ClientDataRequestImpl(ResourceInvocation invocation)
+   public ClientDataRequestImpl(PortletContainerImpl container, ResourceIn=
vocation invocation)
    {
-      super(invocation);
+      super(container, invocation);
 =

       //
       this.requestContext =3D invocation.getRequestContext();

Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/port=
let/impl/jsr168/api/EventRequestImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/jsr168/api/EventRequestImpl.java	2008-02-19 21:16:51 UTC (rev 10034)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/jsr168/api/EventRequestImpl.java	2008-02-19 22:17:41 UTC (rev 10035)
@@ -23,6 +23,7 @@
 package org.jboss.portal.portlet.impl.jsr168.api;
 =

 import org.jboss.portal.portlet.invocation.EventInvocation;
+import org.jboss.portal.portlet.impl.jsr168.PortletContainerImpl;
 =

 import javax.portlet.EventRequest;
 import javax.portlet.Event;
@@ -40,9 +41,9 @@
    /** . */
    private EventInvocation eventInvocation;
 =

-   public EventRequestImpl(EventInvocation invocation)
+   public EventRequestImpl(PortletContainerImpl container, EventInvocation=
 invocation)
    {
-      super(invocation);
+      super(container, invocation);
 =

       //
       this.eventInvocation =3D invocation;

Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/port=
let/impl/jsr168/api/PortletRequestImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/jsr168/api/PortletRequestImpl.java	2008-02-19 21:16:51 UTC (rev 10034)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/jsr168/api/PortletRequestImpl.java	2008-02-19 22:17:41 UTC (rev 10035)
@@ -138,9 +138,8 @@
    /** . */
    private final String contextPath;
 =

-   public PortletRequestImpl(PortletInvocation invocation)
+   public PortletRequestImpl(PortletContainerImpl container, PortletInvoca=
tion invocation)
    {
-      PortletContainerImpl container =3D (PortletContainerImpl)invocation.=
getAttribute(PortletInvocation.INVOCATION_SCOPE, PortletContainerInvoker.PO=
RTLET_CONTAINER);
       int mode =3D this instanceof RenderRequest ? PortletPreferencesImpl.=
RENDER : PortletPreferencesImpl.ACTION;
       PropertyContext prefs =3D (PropertyContext)invocation.getAttribute(P=
ortletInvocation.INVOCATION_SCOPE, PropertyContext.PREFERENCES_ATTRIBUTE);
       PreferencesValidator validator =3D container.getPreferencesValidator=
();

Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/port=
let/impl/jsr168/api/RenderRequestImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/jsr168/api/RenderRequestImpl.java	2008-02-19 21:16:51 UTC (rev 10034)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/jsr168/api/RenderRequestImpl.java	2008-02-19 22:17:41 UTC (rev 10035)
@@ -23,6 +23,7 @@
 package org.jboss.portal.portlet.impl.jsr168.api;
 =

 import org.jboss.portal.portlet.invocation.RenderInvocation;
+import org.jboss.portal.portlet.impl.jsr168.PortletContainerImpl;
 import org.jboss.portal.common.NotYetImplemented;
 import org.jboss.portal.common.util.MultiValuedPropertyMap;
 =

@@ -39,9 +40,9 @@
    /** . */
    private final String validationToken;
 =

-   public RenderRequestImpl(RenderInvocation invocation)
+   public RenderRequestImpl(PortletContainerImpl container, RenderInvocati=
on invocation)
    {
-      super(invocation);
+      super(container, invocation);
 =

       //
       this.validationToken =3D invocation.getValidationToken();

Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/port=
let/impl/jsr168/api/ResourceRequestImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/jsr168/api/ResourceRequestImpl.java	2008-02-19 21:16:51 UTC (rev 10034)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/jsr168/api/ResourceRequestImpl.java	2008-02-19 22:17:41 UTC (rev 10035)
@@ -24,6 +24,7 @@
 =

 import org.jboss.portal.portlet.invocation.ResourceInvocation;
 import org.jboss.portal.portlet.impl.jsr168.ResourceRequestParameterMap;
+import org.jboss.portal.portlet.impl.jsr168.PortletContainerImpl;
 import org.jboss.portal.common.util.MultiValuedPropertyMap;
 import org.jboss.portal.common.util.ParameterMap;
 =

@@ -41,9 +42,9 @@
    /** . */
    private final ResourceInvocation resourceInvocation;
 =

-   public ResourceRequestImpl(ResourceInvocation invocation)
+   public ResourceRequestImpl(PortletContainerImpl container, ResourceInvo=
cation invocation)
    {
-      super(invocation);
+      super(container, invocation);
 =

       //
       this.resourceInvocation =3D invocation;

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/portal/admin/ui/AdminPortlet.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/porta=
l/admin/ui/AdminPortlet.java	2008-02-19 21:16:51 UTC (rev 10034)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/porta=
l/admin/ui/AdminPortlet.java	2008-02-19 22:17:41 UTC (rev 10035)
@@ -30,6 +30,9 @@
 import javax.portlet.RenderRequest;
 import javax.portlet.RenderResponse;
 import javax.portlet.PortletException;
+import javax.portlet.ActionRequest;
+import javax.portlet.ActionResponse;
+import javax.portlet.PortletURL;
 import java.io.IOException;
 import java.io.PrintWriter;
 =

@@ -40,6 +43,58 @@
 public class AdminPortlet extends GenericPortlet
 {
 =

+   public void processAction(ActionRequest req, ActionResponse resp) throw=
s PortletException, IOException
+   {
+
+      String lifeCycle =3D req.getParameter("lifecycle");
+
+      //
+      String applicationId =3D req.getParameter("application");
+
+      //
+      if (applicationId !=3D null)
+      {
+         // Use an alias
+         PortletApplicationRegistry registry =3D (PortletApplicationRegist=
ry)getPortletContext().getAttribute("PortletApplicationDeployer");
+
+         //
+         ManagedPortletApplication application =3D registry.getManagedPort=
letApplication(applicationId);
+
+         //
+         String containerId =3D req.getParameter("container");
+
+         //
+         if (containerId !=3D null)
+         {
+            final ManagedPortletContainer container =3D application.getMan=
agedPortletContainer(containerId);
+
+            //
+            if ("start".equals(lifeCycle))
+            {
+               try
+               {
+                  container.managedStart();
+               }
+               catch (Exception e)
+               {
+                  e.printStackTrace();
+               }
+            }
+            else if ("stop".equals(lifeCycle))
+            {
+               // Async stop otherwise it is not possible to stop the admi=
n portlet (self deadlock)
+               new Thread()
+               {
+                  public void run()
+                  {
+                     container.managedStop();
+                  }
+               }.start();
+            }
+         }
+      }
+   }
+
    protected void doView(RenderRequest req, RenderResponse resp) throws Po=
rtletException, IOException
    {
 =

@@ -52,10 +107,26 @@
 =

       for (ManagedPortletApplication application : registry.getManagedPort=
letApplications())
       {
+         PortletURL url =3D resp.createActionURL();
+         url.setParameter("application", application.getId());
+
+         //
          writer.print("Application " + application.getId() + " " +=
 application.getStatus() + "
");
+
+         //
          for (ManagedPortletContainer container : application.getManagedPo=
rtletContainers())
          {
-            writer.print("Container " + container.getId() + " " + cont=
ainer.getStatus() + "");
+
+            url.setParameter("container", container.getId());
+
+            url.setParameter("lifecycle", "stop");
+            String stopURL =3D url.toString();
+
+            url.setParameter("lifecycle", "start");
+            String startURL =3D url.toString();
+
+            writer.print("Container " + container.getId() + " " + cont=
ainer.getStatus() + "Start Stop=
" +  "");
          }
          writer.print("");
       }

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/KernelPortletApplication.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
KernelPortletApplication.java	2008-02-19 21:16:51 UTC (rev 10034)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
KernelPortletApplication.java	2008-02-19 22:17:41 UTC (rev 10035)
@@ -24,8 +24,15 @@
 =

 import org.jboss.portal.portlet.container.PortletApplicationContext;
 import org.jboss.portal.portlet.container.PortletApplication;
+import org.jboss.portal.portlet.container.PortletContainer;
+import org.jboss.portal.portlet.container.object.PortletApplicationObject;
 import org.jboss.portal.portlet.container.managed.ManagedPortletApplicatio=
n;
 import org.jboss.portal.portlet.container.managed.ManagedPortletContainer;
+import org.jboss.portal.portlet.impl.info.ContainerPortletApplicationInfo;
+import org.jboss.portal.portlet.impl.metadata.PortletApplication10MetaData;
+import org.jboss.portal.portlet.impl.jsr168.spi.PortletAPIFactory;
+import org.jboss.portal.portlet.impl.jsr168.PortletApplicationImpl;
+import org.jboss.portal.portlet.metadata.JBossApplicationMetaData;
 import org.jboss.portal.web.WebApp;
 =

 import javax.servlet.ServletContext;
@@ -37,32 +44,46 @@
  * @author Julien Viet
  * @version $Revision: 630 $
  */
-public class KernelPortletApplication extends KernelObject implements Port=
letApplicationContext, ManagedPortletApplication
+public class KernelPortletApplication extends KernelObject implements Port=
letApplicationContext, ManagedPortletApplication, PortletApplication
 {
 =

    /** . */
    private final WebApp webApp;
 =

    /** . */
-   private PortletApplication portletApplication;
+   final PortletApplicationObject portletApplication;
 =

    /** . */
    private final Map kernelPortletContaine=
rs;
 =

-   public KernelPortletApplication(WebApp webApp)
+   public KernelPortletApplication(
+      ContainerPortletApplicationInfo info,
+      PortletApplication10MetaData metaData,
+      JBossApplicationMetaData jbossMetaData,
+      PortletAPIFactory portletAPIFactory,
+      WebApp webApp)
    {
       this.webApp =3D webApp;
-      this.portletApplication =3D null;
+      this.portletApplication =3D new PortletApplicationImpl(info, metaDat=
a, jbossMetaData, portletAPIFactory);
       this.kernelPortletContainers =3D new HashMap();
+
+      //
+      portletApplication.setContext(this);
    }
 =

    public void addKernelPortletContainer(KernelPortletContainer kernelPort=
letContainer)
    {
       kernelPortletContainers.put(kernelPortletContainer.getPortletContain=
er().getId(), kernelPortletContainer);
+
+      //
+      portletApplication.addContainer(kernelPortletContainer.portletContai=
ner);
    }
 =

    public void removeKernelPortletContainer(KernelPortletContainer kernelP=
ortletContainer)
    {
+      portletApplication.removeContainer(kernelPortletContainer.portletCon=
tainer);
+
+      //
       kernelPortletContainers.remove(kernelPortletContainer.getPortletCont=
ainer().getId());
    }
 =

@@ -71,17 +92,14 @@
       return portletApplication;
    }
 =

-   public void setPortletApplication(PortletApplication portletApplication)
-   {
-      this.portletApplication =3D portletApplication;
-   }
-
    public void start() throws Exception
    {
+      portletApplication.start();
    }
 =

    public void stop()
    {
+      portletApplication.stop();
    }
 =

    // PortletApplicationContext ******************************************=
**********************************************
@@ -127,4 +145,21 @@
    {
       return kernelPortletContainers.get(portletContainerId);
    }
+
+   // PortletApplication *************************************************=
**********************************************
+
+   public Collection getPortletContainers()
+   {
+      return kernelPortletContainers.values();
+   }
+
+   public PortletContainer getPortletContainer(String containerId)
+   {
+      return kernelPortletContainers.get(containerId);
+   }
+
+   public PortletApplicationContext getContext()
+   {
+      return this;
+   }
 }

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/KernelPortletContainer.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
KernelPortletContainer.java	2008-02-19 21:16:51 UTC (rev 10034)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
KernelPortletContainer.java	2008-02-19 22:17:41 UTC (rev 10035)
@@ -24,23 +24,39 @@
 =

 import org.jboss.portal.portlet.container.PortletContainerContext;
 import org.jboss.portal.portlet.container.PortletContainer;
+import org.jboss.portal.portlet.container.PortletApplication;
+import org.jboss.portal.portlet.container.object.PortletContainerObject;
 import org.jboss.portal.portlet.container.managed.ManagedPortletContainer;
 import org.jboss.portal.portlet.container.managed.ManagedPortletApplicatio=
n;
 import org.jboss.portal.portlet.info.PortletInfo;
+import org.jboss.portal.portlet.invocation.response.PortletInvocationRespo=
nse;
+import org.jboss.portal.portlet.invocation.PortletInvocation;
+import org.jboss.portal.portlet.PortletInvokerException;
+import org.jboss.portal.portlet.impl.info.ContainerPortletInfo;
+import org.jboss.portal.portlet.impl.jsr168.PortletContainerImpl;
+import org.jboss.portal.common.invocation.InvocationException;
 =

 /**
  * @author Julien Viet
  * @version $Revision: 630 $
  */
-public class KernelPortletContainer extends KernelObject implements Portle=
tContainerContext, ManagedPortletContainer
+public class KernelPortletContainer extends KernelObject implements Portle=
tContainerContext, ManagedPortletContainer, PortletContainer
 {
 =

    /** . */
-   private PortletContainer portletContainer;
+   final PortletContainerObject portletContainer;
 =

    /** . */
    private KernelPortletApplication kernelPortletApplication;
 =

+   public KernelPortletContainer(ContainerPortletInfo info)
+   {
+      portletContainer =3D new PortletContainerImpl(info);
+
+      //
+      portletContainer.setContext(this);
+   }
+
    public KernelPortletApplication getKernelPortletApplication()
    {
       return kernelPortletApplication;
@@ -49,6 +65,16 @@
    public void setKernelPortletApplication(KernelPortletApplication kernel=
PortletApplication)
    {
       this.kernelPortletApplication =3D kernelPortletApplication;
+
+      //
+      if (kernelPortletApplication !=3D null)
+      {
+         portletContainer.setApplication(kernelPortletApplication.portletA=
pplication);
+      }
+      else
+      {
+         portletContainer.setApplication(null);
+      }
    }
 =

    public PortletContainer getPortletContainer()
@@ -56,17 +82,14 @@
       return portletContainer;
    }
 =

-   public void setPortletContainer(PortletContainer portletContainer)
-   {
-      this.portletContainer =3D portletContainer;
-   }
-
    public void start() throws Exception
    {
+      portletContainer.start();
    }
 =

    public void stop()
    {
+      portletContainer.stop();
    }
 =

    //
@@ -88,6 +111,8 @@
       return portletContainer.getId();
    }
 =

+   //
+
    public ManagedPortletApplication getManagedPortletApplication()
    {
       return kernelPortletApplication;
@@ -97,4 +122,21 @@
    {
       return portletContainer.getInfo();
    }
+
+   // PortletContainer implementation ************************************=
**********************************************
+
+   public PortletInvocationResponse dispatch(PortletInvocation invocation)=
 throws PortletInvokerException, InvocationException
+   {
+      return portletContainer.dispatch(invocation);
+   }
+
+   public PortletApplication getApplication()
+   {
+      return kernelPortletApplication;
+   }
+
+   public PortletContainerContext getContext()
+   {
+      return this;
+   }
 }

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/PortletApplicationDeployment.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
PortletApplicationDeployment.java	2008-02-19 21:16:51 UTC (rev 10034)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
PortletApplicationDeployment.java	2008-02-19 22:17:41 UTC (rev 10035)
@@ -44,8 +44,6 @@
 import org.jboss.portal.portlet.impl.info.ContainerPortletApplicationInfo;
 import org.jboss.portal.portlet.impl.info.ContainerPortletInfo;
 import org.jboss.portal.portlet.impl.jsr168.ContainerInfoBuilderContextImp=
l;
-import org.jboss.portal.portlet.impl.jsr168.PortletApplicationImpl;
-import org.jboss.portal.portlet.impl.jsr168.PortletContainerImpl;
 import org.jboss.portal.portlet.impl.jsr168.spi.PortletAPIFactory;
 import org.jboss.portal.portlet.impl.metadata.PortletApplication10MetaData;
 import org.jboss.portal.portlet.metadata.JBossApplicationMetaData;
@@ -88,13 +86,13 @@
       this.installed =3D new LinkedHashMap();
    }
 =

-   public AbstractBeanMetaData createKernelPortletContainerMetaData(String=
 kernelPortletContainerId)
+   public AbstractBeanMetaData createKernelPortletContainerMetaData(String=
 kernelPortletContainerId, ContainerPortletInfo portletInfo)
    {
       AbstractBeanMetaData beanMD =3D new AbstractBeanMetaData(kernelPortl=
etContainerId, KernelPortletContainer.class.getName());
 =

       //
       AbstractConstructorMetaData ctorMD =3D new AbstractConstructorMetaDa=
ta();
-      ctorMD.setParameters(new ArrayList());
+      ctorMD.setParameters(Tools.toList((ParameterMetaData)new AbstractPar=
ameterMetaData(ContainerPortletInfo.class.getName(), portletInfo)));
       beanMD.setConstructor(ctorMD);
 =

       //
@@ -110,61 +108,18 @@
       return beanMD;
    }
 =

-   public AbstractBeanMetaData createKernelPortletApplicationMetaData(Stri=
ng kernelPortletApplicationId)
+   public AbstractBeanMetaData createKernelPortletApplicationMetaData(Cont=
ainerPortletApplicationInfo portletApplicationInfo, String kernelPortletApp=
licationId)
    {
       AbstractBeanMetaData beanMD =3D new AbstractBeanMetaData(kernelPortl=
etApplicationId, KernelPortletApplication.class.getName());
 =

       //
       AbstractConstructorMetaData ctorMD =3D new AbstractConstructorMetaDa=
ta();
-      ctorMD.setParameters(Tools.toList((ParameterMetaData)new AbstractPar=
ameterMetaData(WebApp.class.getName(), webApp)));
-      beanMD.setConstructor(ctorMD);
-
-      //
-      beanMD.setProperties(new HashSet());
-      beanMD.setInstalls(new ArrayList());
-      beanMD.setUninstalls(new ArrayList());
-
-      //
-      beanMD.setStart(new AbstractLifecycleMetaData("start"));
-      beanMD.setStop(new AbstractLifecycleMetaData("stop"));
-
-      //
-      return beanMD;
-   }
-
-   public AbstractBeanMetaData createPortletContainerMetaData(String portl=
etContainerId, ContainerPortletInfo portletInfo)
-   {
-      AbstractBeanMetaData beanMD =3D new AbstractBeanMetaData(portletCont=
ainerId, PortletContainerImpl.class.getName());
-
-      //
-      AbstractConstructorMetaData ctorMD =3D new AbstractConstructorMetaDa=
ta();
-      ctorMD.setParameters(Tools.toList((ParameterMetaData)new AbstractPar=
ameterMetaData(ContainerPortletInfo.class.getName(), portletInfo)));
-      beanMD.setConstructor(ctorMD);
-
-      //
-      beanMD.setProperties(new HashSet());
-      beanMD.setInstalls(new ArrayList());
-      beanMD.setUninstalls(new ArrayList());
-
-      //
-      beanMD.setStart(new AbstractLifecycleMetaData("start"));
-      beanMD.setStop(new AbstractLifecycleMetaData("stop"));
-
-      //
-      return beanMD;
-   }
-
-   public AbstractBeanMetaData createPortletApplicationMetaData(ContainerP=
ortletApplicationInfo portletApplicationInfo, String portletApplicationId)
-   {
-      AbstractBeanMetaData beanMD =3D new AbstractBeanMetaData(portletAppl=
icationId, PortletApplicationImpl.class.getName());
-
-      //
-      AbstractConstructorMetaData ctorMD =3D new AbstractConstructorMetaDa=
ta();
       ctorMD.setParameters(Tools.toList(
          (ParameterMetaData)new AbstractParameterMetaData(ContainerPortlet=
ApplicationInfo.class.getName(), portletApplicationInfo),
          new AbstractParameterMetaData(PortletApplication10MetaData.class.=
getName(), metaData),
          new AbstractParameterMetaData(JBossApplicationMetaData.class.getN=
ame(), (Object)null),
-         new AbstractParameterMetaData(PortletAPIFactory.class.getName(), =
new AbstractDependencyValueMetaData("PortletAPIFactory"))));
+         new AbstractParameterMetaData(PortletAPIFactory.class.getName(), =
new AbstractDependencyValueMetaData("PortletAPIFactory")),
+         new AbstractParameterMetaData(WebApp.class.getName(), webApp)));
       beanMD.setConstructor(ctorMD);
 =

       //
@@ -189,12 +144,9 @@
       KernelController controller =3D kernel.getController();
 =

       //
-      String portletApplicationId =3D "PortletApplication[" + webApp.getCo=
ntextPath() + "]";
+      String kernelPortletApplicationId =3D "PortletApplication[" + webApp=
.getContextPath() + "]";
 =

       //
-      String kernelPortletApplicationId =3D "KernelPortletApplication[" + =
webApp.getContextPath() + "]";
-
-      //
       ContainerInfoBuilderContext builderContext =3D new ContainerInfoBuil=
derContextImpl(metaData, webApp);
       ContainerInfoBuilder builder =3D new ContainerInfoBuilder(metaData, =
builderContext);
       builder.build();
@@ -206,44 +158,11 @@
       for (ContainerPortletInfo containerInfo : builder.getPortlets())
       {
          //
-         String portletContainerId =3D "PortletContainer[" + webApp.getCon=
textPath() + "," + containerInfo.getName() + "]";
-         String kernelPortletContainerId =3D "KernelPortletContainer[" + w=
ebApp.getContextPath() + "," + containerInfo.getName() + "]";
+         String kernelPortletContainerId =3D "PortletContainer[" + webApp.=
getContextPath() + "," + containerInfo.getName() + "]";
 =

          //
-         AbstractBeanMetaData portletContainerMD =3D createPortletContaine=
rMetaData(portletContainerId, containerInfo);
-         AbstractBeanMetaData kernelPortletContainerMD =3D createKernelPor=
tletContainerMetaData(kernelPortletContainerId);
+         AbstractBeanMetaData kernelPortletContainerMD =3D createKernelPor=
tletContainerMetaData(kernelPortletContainerId, containerInfo);
 =

-         //
-         AbstractDependencyValueMetaData portletContainerContextDependency=
MD =3D new AbstractDependencyValueMetaData(kernelPortletContainerId);
-         portletContainerContextDependencyMD.setDependentState(ControllerS=
tate.INSTANTIATED);
-         portletContainerMD.getProperties().add(new AbstractPropertyMetaDa=
ta("context", portletContainerContextDependencyMD));
-
-         //
-         AbstractDependencyValueMetaData portletContainerDependencyMD =3D =
new AbstractDependencyValueMetaData(portletContainerId);
-         portletContainerDependencyMD.setDependentState(ControllerState.ST=
ART);
-         kernelPortletContainerMD.getProperties().add(new AbstractProperty=
MetaData("portletContainer", portletContainerDependencyMD));
-
-         //
-         AbstractDependencyValueMetaData portletApplicationDependencyMD =
=3D new AbstractDependencyValueMetaData(portletApplicationId);
-         portletApplicationDependencyMD.setDependentState(ControllerState.=
START);
-         portletContainerMD.getProperties().add(new AbstractPropertyMetaDa=
ta("application", portletApplicationDependencyMD));
-
-         // Install the portlet container on the portlet application
-         AbstractInstallMetaData installPortletContainerMD =3D new Abstrac=
tInstallMetaData();
-         installPortletContainerMD.setBean(portletApplicationId);
-         installPortletContainerMD.setParameters(Collections.singletonList=
((ParameterMetaData)new AbstractParameterMetaData(new ThisValueMetaData()))=
);
-         installPortletContainerMD.setMethodName("addContainer");
-         installPortletContainerMD.setDependentState(ControllerState.START=
);
-         portletContainerMD.getInstalls().add(installPortletContainerMD);
-
-         // Uninstall the portlet container from the portlet application
-         AbstractInstallMetaData uninstallPortletContainerMD =3D new Abstr=
actInstallMetaData();
-         uninstallPortletContainerMD.setBean(portletApplicationId);
-         uninstallPortletContainerMD.setParameters(Collections.singletonLi=
st((ParameterMetaData)new AbstractParameterMetaData(new ThisValueMetaData()=
)));
-         uninstallPortletContainerMD.setMethodName("removeContainer");
-         uninstallPortletContainerMD.setDependentState(ControllerState.STA=
RT);
-         kernelPortletContainerMD.getUninstalls().add(uninstallPortletCont=
ainerMD);
-
          // Inject the kernel portlet application in the kernel portlet co=
ntainer
          AbstractDependencyValueMetaData kernelPortletApplicationDependenc=
yMD =3D new AbstractDependencyValueMetaData(kernelPortletApplicationId);
          kernelPortletApplicationDependencyMD.setDependentState(Controller=
State.START);
@@ -266,26 +185,13 @@
          kernelPortletContainerMD.getUninstalls().add(uninstallKernelPortl=
etContainerMD);
 =

          //
-         toInstall.add(portletContainerMD);
          toInstall.add(kernelPortletContainerMD);
       }
 =

       //
-      AbstractBeanMetaData portletApplicationMD =3D createPortletApplicati=
onMetaData(builder.getApplication(), portletApplicationId);
-      AbstractBeanMetaData kernelPortletApplicationMD =3D createKernelPort=
letApplicationMetaData(kernelPortletApplicationId);
+      AbstractBeanMetaData kernelPortletApplicationMD =3D createKernelPort=
letApplicationMetaData(builder.getApplication(), kernelPortletApplicationId=
);
 =

       //
-      AbstractDependencyValueMetaData portletApplicationContextDependencyM=
D =3D new AbstractDependencyValueMetaData(kernelPortletApplicationId);
-      portletApplicationContextDependencyMD.setDependentState(ControllerSt=
ate.INSTANTIATED);
-      portletApplicationMD.getProperties().add(new AbstractPropertyMetaDat=
a("context", portletApplicationContextDependencyMD));
-
-      //
-      AbstractDependencyValueMetaData portletApplicationDependencyMD =3D n=
ew AbstractDependencyValueMetaData(portletApplicationId);
-      portletApplicationDependencyMD.setDependentState(ControllerState.STA=
RT);
-      kernelPortletApplicationMD.getProperties().add(new AbstractPropertyM=
etaData("portletApplication", portletApplicationDependencyMD));
-
-      //
-      toInstall.add(portletApplicationMD);
       toInstall.add(kernelPortletApplicationMD);
 =

       // Install beans
@@ -356,10 +262,6 @@
 =

       //
       log.debug("Uninstalled");
-
-      //
-//      portletApplicationControllerContext =3D null;
-//      portletContainerControllerContexts =3D null;
    }
 =

    private void logBeanFailure(KernelControllerContext context)


--===============0069894541444499242==--

From portal-commits at lists.jboss.org Tue Feb 19 19:03:59 2008
Content-Type: multipart/mixed; boundary="===============2251640609357309006=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r10036 - in
 modules/portlet/trunk/test/src:
 test/resources/portal/samples/basic-war/WEB-INF and 1 other directories.
Date: Tue, 19 Feb 2008 19:03:59 -0500
Message-ID: 

--===============2251640609357309006==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-19 19:03:59 -0500 (Tue, 19 Feb 2008)
New Revision: 10036

Modified:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/P=
ortletApplicationDeployment.java
   modules/portlet/trunk/test/src/test/resources/portal/samples/basic-war/W=
EB-INF/portlet.xml
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/dem=
o3.jsp
Log:
add a couple of stuff

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/test/PortletApplicationDeployment.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
PortletApplicationDeployment.java	2008-02-19 22:17:41 UTC (rev 10035)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/=
PortletApplicationDeployment.java	2008-02-20 00:03:59 UTC (rev 10036)
@@ -155,6 +155,12 @@
       List toInstall =3D new ArrayList();
 =

       //
+      AbstractBeanMetaData kernelPortletApplicationMD =3D createKernelPort=
letApplicationMetaData(builder.getApplication(), kernelPortletApplicationId=
);
+
+      //
+      toInstall.add(kernelPortletApplicationMD);
+
+      //
       for (ContainerPortletInfo containerInfo : builder.getPortlets())
       {
          //
@@ -165,7 +171,7 @@
 =

          // Inject the kernel portlet application in the kernel portlet co=
ntainer
          AbstractDependencyValueMetaData kernelPortletApplicationDependenc=
yMD =3D new AbstractDependencyValueMetaData(kernelPortletApplicationId);
-         kernelPortletApplicationDependencyMD.setDependentState(Controller=
State.START);
+//         kernelPortletApplicationDependencyMD.setDependentState(Controll=
erState.START);
          kernelPortletContainerMD.getProperties().add(new AbstractProperty=
MetaData("kernelPortletApplication", kernelPortletApplicationDependencyMD));
 =

          // Install the kernel portlet container on the kernel portlet app=
lication
@@ -173,7 +179,7 @@
          installKernelPortletContainerMD.setBean(kernelPortletApplicationI=
d);
          installKernelPortletContainerMD.setParameters(Collections.singlet=
onList((ParameterMetaData)new AbstractParameterMetaData(new ThisValueMetaDa=
ta())));
          installKernelPortletContainerMD.setMethodName("addKernelPortletCo=
ntainer");
-         installKernelPortletContainerMD.setDependentState(ControllerState=
.START);
+//         installKernelPortletContainerMD.setState(ControllerState.st);
          kernelPortletContainerMD.getInstalls().add(installKernelPortletCo=
ntainerMD);
 =

          // Uninstall the kernel portlet container from the kernel portlet=
 application
@@ -181,19 +187,13 @@
          uninstallKernelPortletContainerMD.setBean(kernelPortletApplicatio=
nId);
          uninstallKernelPortletContainerMD.setParameters(Collections.singl=
etonList((ParameterMetaData)new AbstractParameterMetaData(new ThisValueMeta=
Data())));
          uninstallKernelPortletContainerMD.setMethodName("removeKernelPort=
letContainer");
-         uninstallKernelPortletContainerMD.setDependentState(ControllerSta=
te.START);
+//         uninstallKernelPortletContainerMD.setState(ControllerState.INST=
ANTIATED);
          kernelPortletContainerMD.getUninstalls().add(uninstallKernelPortl=
etContainerMD);
 =

          //
          toInstall.add(kernelPortletContainerMD);
       }
 =

-      //
-      AbstractBeanMetaData kernelPortletApplicationMD =3D createKernelPort=
letApplicationMetaData(builder.getApplication(), kernelPortletApplicationId=
);
-
-      //
-      toInstall.add(kernelPortletApplicationMD);
-
       // Install beans
       for (AbstractBeanMetaData beanMetaData : toInstall)
       {

Modified: modules/portlet/trunk/test/src/test/resources/portal/samples/basi=
c-war/WEB-INF/portlet.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/portal/samples/basic-war/=
WEB-INF/portlet.xml	2008-02-19 22:17:41 UTC (rev 10035)
+++ modules/portlet/trunk/test/src/test/resources/portal/samples/basic-war/=
WEB-INF/portlet.xml	2008-02-20 00:03:59 UTC (rev 10036)
@@ -34,7 +34,7 @@
         text/html
       
       
-         ExceptionPortlet
+         Exception portlet
       
    
 =

@@ -48,8 +48,22 @@
          text/javascript
       
       
-         HeaderPortlet
+         Header portlet
       
    
 =

+   
+      FailDuringInitPortlet
+      org.jboss.portal.portlet.portal.samples.basic.FailDur=
ingInitPortlet
+      
+        text/html
+      
+      
+         text/javascript
+      
+      
+         Fail during init portlet
+      
+   
+
 

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/d=
emo/demo3.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/de=
mo3.jsp	2008-02-19 22:17:41 UTC (rev 10035)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/de=
mo3.jsp	2008-02-20 00:03:59 UTC (rev 10036)
@@ -14,9 +14,10 @@
                
             
             
+
                
-
                
+               
 =

             
 =



--===============2251640609357309006==--

From portal-commits at lists.jboss.org Tue Feb 19 19:40:48 2008
Content-Type: multipart/mixed; boundary="===============2708056706837410820=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r10037 - in
 modules/common/trunk/common/src: test/java/org/jboss/portal/test/common/util
 and 1 other directory.
Date: Tue, 19 Feb 2008 19:40:46 -0500
Message-ID: 

--===============2708056706837410820==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: chris.laprun(a)jboss.com
Date: 2008-02-19 19:40:46 -0500 (Tue, 19 Feb 2008)
New Revision: 10037

Modified:
   modules/common/trunk/common/src/main/java/org/jboss/portal/common/util/C=
ollectionMap.java
   modules/common/trunk/common/src/main/java/org/jboss/portal/common/util/L=
istMap.java
   modules/common/trunk/common/src/main/java/org/jboss/portal/common/util/S=
etMap.java
   modules/common/trunk/common/src/test/java/org/jboss/portal/test/common/u=
til/CollectionMapTestCase.java
Log:
- JBPORTAL-1833: SetMap now properly uses comparator, added test case.

Modified: modules/common/trunk/common/src/main/java/org/jboss/portal/common=
/util/CollectionMap.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/common/trunk/common/src/main/java/org/jboss/portal/common/util/=
CollectionMap.java	2008-02-20 00:03:59 UTC (rev 10036)
+++ modules/common/trunk/common/src/main/java/org/jboss/portal/common/util/=
CollectionMap.java	2008-02-20 00:40:46 UTC (rev 10037)
@@ -22,13 +22,14 @@
  *************************************************************************=
*****/
 package org.jboss.portal.common.util;
 =

-import java.util.Map;
+import java.io.Serializable;
 import java.util.Collection;
-import java.util.Iterator;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
 import java.util.Set;
-import java.io.Serializable;
 =

 /**
  * A map of collections.
@@ -41,13 +42,15 @@
 =

    /** The underlying map. */
    private final Map> map;
+   /** An optional comparator. */
+   protected Comparator comparator;
 =

    public CollectionMap()
    {
       map =3D init(null);
    }
 =

-   public CollectionMap(SetMap other) throws IllegalArgumentException
+   public CollectionMap(CollectionMap other) throws IllegalArgumentE=
xception
    {
       if (other =3D=3D null)
       {
@@ -56,6 +59,31 @@
       map =3D init(other);
    }
 =

+   public CollectionMap(CollectionMap other, Comparator comparato=
r) throws IllegalArgumentException
+   {
+      this(other);
+      initComparator(comparator);
+   }
+
+   public CollectionMap(Comparator comparator)
+   {
+      this();
+
+      initComparator(comparator);
+   }
+
+   private void initComparator(Comparator comparator)
+   {
+      //
+      if (comparator =3D=3D null)
+      {
+         throw new IllegalArgumentException("No null comparator allowed");
+      }
+
+      //
+      this.comparator =3D comparator;
+   }
+
    /**
     * Add an object in the set keyed under the specified key.
     *
@@ -78,9 +106,7 @@
       add(collection, o);
    }
 =

-   /**
-    * Return the set of keys.
-    */
+   /** Return the set of keys. */
    public final Set keySet()
    {
       return map.keySet();
@@ -156,9 +182,7 @@
       }
    }
 =

-   /**
-    * Return the collection specified by the key.
-    */
+   /** Return the collection specified by the key. */
    public Collection get(K key)
    {
       return map.get(key);
@@ -194,10 +218,12 @@
             {
                return iterator.hasNext();
             }
+
             public V next()
             {
                return iterator.next();
             }
+
             public void remove()
             {
                iterator.remove();
@@ -232,9 +258,8 @@
    protected abstract void add(Collection c, V o);
 =

    /**
-    * Removes an object from the collection. The type of the object to rem=
ove is intentionnally
-    * Object and not the parameterized type  =
because the Collection
-    * interface is designed that way.
+    * Removes an object from the collection. The type of the object to rem=
ove is intentionnally Object and
+    * not the parameterized type  because the Collection interface is designed that way.
     *
     * @param c the collection to remove from
     * @param o the object to remove

Modified: modules/common/trunk/common/src/main/java/org/jboss/portal/common=
/util/ListMap.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/common/trunk/common/src/main/java/org/jboss/portal/common/util/=
ListMap.java	2008-02-20 00:03:59 UTC (rev 10036)
+++ modules/common/trunk/common/src/main/java/org/jboss/portal/common/util/=
ListMap.java	2008-02-20 00:40:46 UTC (rev 10037)
@@ -22,12 +22,11 @@
  *************************************************************************=
*****/
 package org.jboss.portal.common.util;
 =

-import java.util.Collection;
-import java.util.Comparator;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
-import java.util.Set;
 =

 /**
  * @author Julien Viet
@@ -36,9 +35,6 @@
 public class ListMap extends CollectionMap
 {
 =

-   /** An optional comparator. */
-   protected Comparator comparator;
-
    public ListMap()
    {
    }
@@ -50,35 +46,15 @@
 =

    public ListMap(SetMap other, Comparator comparator) throws Ill=
egalArgumentException
    {
-      super(other);
-
-      //
-      if (comparator =3D=3D null)
-      {
-         throw new IllegalArgumentException("No null comparator allowed");
-      }
-
-      //
-      this.comparator =3D comparator;
+      super(other, comparator);
    }
 =

    public ListMap(Comparator comparator)
    {
-      super();
-
-      //
-      if (comparator =3D=3D null)
-      {
-         throw new IllegalArgumentException("No null comparator allowed");
-      }
-
-      //
-      this.comparator =3D comparator;
+      super(comparator);
    }
 =

-   /**
-    * Return the list specified by the key.
-    */
+   /** Return the list specified by the key. */
    public List get(K key)
    {
       return (List)super.get(key);

Modified: modules/common/trunk/common/src/main/java/org/jboss/portal/common=
/util/SetMap.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/common/trunk/common/src/main/java/org/jboss/portal/common/util/=
SetMap.java	2008-02-20 00:03:59 UTC (rev 10036)
+++ modules/common/trunk/common/src/main/java/org/jboss/portal/common/util/=
SetMap.java	2008-02-20 00:40:46 UTC (rev 10037)
@@ -22,17 +22,15 @@
  *************************************************************************=
*****/
 package org.jboss.portal.common.util;
 =

+import java.util.Collection;
+import java.util.Comparator;
 import java.util.HashSet;
 import java.util.Set;
-import java.util.Comparator;
-import java.util.TreeSet;
 import java.util.SortedSet;
-import java.util.Collection;
-import java.util.Map;
+import java.util.TreeSet;
 =

 /**
- * A map of set. This object does not handle synchronization and use HashM=
ap and HashSet
- * as underlying data structures;
+ * A map of set. This object does not handle synchronization and use HashM=
ap and HashSet as underlying data structures;
  *
  * @author Julien Viet
  * @version $Revision: 7322 $
@@ -43,9 +41,6 @@
    /** Version. */
    static final long serialVersionUID =3D -7239767000556095977L;
 =

-   /** An optional comparator. */
-   protected Comparator comparator;
-
    public SetMap()
    {
    }
@@ -83,9 +78,7 @@
       this.comparator =3D comparator;
    }
 =

-   /**
-    * Return the set specified by the key.
-    */
+   /** Return the set specified by the key. */
    public Set get(K key)
    {
       return (Set)super.get(key);

Modified: modules/common/trunk/common/src/test/java/org/jboss/portal/test/c=
ommon/util/CollectionMapTestCase.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/common/trunk/common/src/test/java/org/jboss/portal/test/common/=
util/CollectionMapTestCase.java	2008-02-20 00:03:59 UTC (rev 10036)
+++ modules/common/trunk/common/src/test/java/org/jboss/portal/test/common/=
util/CollectionMapTestCase.java	2008-02-20 00:40:46 UTC (rev 10037)
@@ -28,6 +28,7 @@
 import org.jboss.portal.common.util.SetMap;
 =

 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.Iterator;
 import java.util.List;
 =

@@ -80,6 +81,54 @@
       testThrowNPE(new ListMap());
    }
 =

+   public void testSorting()
+   {
+      Comparator comp =3D new Comparator()
+      {
+         public int compare(Value o1, Value o2)
+         {
+            return o1.i - o2.i;
+         }
+      };
+
+      testComparatorSorting(new ListMap(comp));
+      testComparatorSorting(new SetMap(comp));
+   }
+
+   private void testComparatorSorting(CollectionMap map)
+   {
+      Value v1 =3D new Value(1);
+      Value v2 =3D new Value(2);
+      Value v3 =3D new Value(3);
+      Value v4 =3D new Value(4);
+
+      map.put(k1, v2);
+      map.put(k1, v4);
+      map.put(k1, v3);
+      map.put(k1, v1);
+
+      Iterator iterator =3D map.iterator(k1);
+      for (int i =3D 0; iterator.hasNext(); i++)
+      {
+         Value value =3D iterator.next();
+         switch (i)
+         {
+            case 0:
+               assertEquals(v1, value);
+               break;
+            case 1:
+               assertEquals(v2, value);
+               break;
+            case 2:
+               assertEquals(v3, value);
+               break;
+            case 3:
+               assertEquals(v4, value);
+               break;
+         }
+      }
+   }
+
    private void testNormal(CollectionMap map)
    {
       assertFalse(map.contains(k1, v1));
@@ -212,6 +261,22 @@
 =

    private static class Value
    {
+      int i;
+
+      private Value()
+      {
+      }
+
+      private Value(int i)
+      {
+         this.i =3D i;
+      }
+
+      @Override
+      public String toString()
+      {
+         return "Value " + i;
+      }
    }
 =

    private static class ValueExt extends Value


--===============2708056706837410820==--

From portal-commits at lists.jboss.org Tue Feb 19 21:33:20 2008
Content-Type: multipart/mixed; boundary="===============3345461836955573714=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r10038 -
 docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
Date: Tue, 19 Feb 2008 21:33:20 -0500
Message-ID: 

--===============3345461836955573714==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mmcallis
Date: 2008-02-19 21:33:20 -0500 (Tue, 19 Feb 2008)
New Revision: 10038

Modified:
   docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorial=
s.xml
Log:
minor corrections, with/in etc


Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/t=
utorials.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutoria=
ls.xml	2008-02-20 00:40:46 UTC (rev 10037)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutoria=
ls.xml	2008-02-20 02:33:20 UTC (rev 10038)
@@ -999,7 +999,7 @@
          
             Introduction
             
-		    This section describes how to deploy a JSF portlet in JBoss Portal, =
using the Apache MyFaces JSF implementation in JBoss AS or JBoss EAP. Befor=
e proceeding, download the HelloWorldJSFS=
unRIPortlet from =
JBoss PortletSwap.
+		    This section describes how to deploy a JSF portlet in JBoss Portal, =
using the Apache MyFaces JSF implementation in JBoss AS and JBoss EAP. Befo=
re proceeding, download the HelloWorldJSF=
SunRIPortlet from JBoss PortletSwap.
             
           =

          
@@ -1128,7 +1128,7 @@
 	Without the faces-config.xml file, the application w=
ould work the same outside of the portlet as it would inside a portlet cont=
ainer. In this example, a basic user bean, <managed-bean=
-name>user</managed-bean-name>, and a navigation =
rule are defined, which handle the submission of the original form in the <=
filename>HelloWorldJSFSunRIPortlet/WEB-INF/jsp/index.jsp file.
 
 
-	The following is an example of the Faces Servlet section from the HelloWorldJSFSunRIPortlet/WEB-INF/web.x=
ml file:
+	The following is an example of the Faces Servlet and Faces Servlet Mapping section=
s from the HelloWorldJSFSunRIPortlet/WEB-INF/web.xml f=
ile:
 
 
 
 
 
-	
-		*.jsf]]>
-
-
-	
-		For the Sun JSF RI, this definition is mandatory to associate files with=
 .jsf extensions with the Apache MyFaces servlet.
-	
-
-
-
+	For Sun JSF RI portlets, the Faces Servlet and Faces Servlet Mapping sections are =
required to associate files with the .jsf extension to=
 the Apache MyFaces servlet.
 
 
 	
 		Classes for the JSF-Portlet bridge are not included
 		
-			Unlike Apache MyFaces, the classes for the JSF-Portlet bridge are not i=
ncluded with the JSF implementation, JBoss AS, or JBoss EAP. This library m=
ust be available in your application package. Navigate to the JSF-Po=
rtlet bridge webpage to download the JSF-Portlet bridge library.
+			Unlike Apache MyFaces, the classes for the JSF-Portlet bridge are not i=
ncluded in the JSF implementation, JBoss AS, or JBoss EAP. This library mus=
t be available in your application package. Navigate to the JSF-Port=
let bridge webpage to download the JSF-Portlet bridge library.
 		
 	
 
@@ -1337,7 +1327,7 @@
          
             Introduction
 	    
-		    This section describes how to deploy a JSF portlet in JBoss Portal, =
using the Apache MyFaces JSF implementation in JBoss AS or JBoss EAP. Befor=
e proceeding, download the HelloWorld=
JSFMyFaces42Portlet from JBoss PortletSwap.
+		    This section describes how to deploy a JSF portlet in JBoss Portal, =
using the Apache MyFaces JSF implementation in JBoss AS and JBoss EAP. Befo=
re proceeding, download the HelloWorl=
dJSFMyFaces42Portlet from JBoss PortletSwap.
 	    
 	    
 		    Apache MyFaces can be used globally for the entire server, replacing=
 the Sun JSF RI libraries, but the HelloWorldJSFMyFaces42Portlet uses its o=
wn libraries, and will not affect the application server.


--===============3345461836955573714==--

From portal-commits at lists.jboss.org Tue Feb 19 22:19:56 2008
Content-Type: multipart/mixed; boundary="===============7947300385877022791=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r10039 -
 docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
Date: Tue, 19 Feb 2008 22:19:54 -0500
Message-ID: 

--===============7947300385877022791==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mmcallis
Date: 2008-02-19 22:19:54 -0500 (Tue, 19 Feb 2008)
New Revision: 10039

Modified:
   docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescr=
iptors.xml
Log:
start minor revisions for 6.1. Changes from previous releases


Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/x=
mldescriptors.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldesc=
riptors.xml	2008-02-20 02:33:20 UTC (rev 10038)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldesc=
riptors.xml	2008-02-20 03:19:54 UTC (rev 10039)
@@ -9,33 +9,38 @@
    
    XML Descriptors
    
-      Changes since previous releases
-      The previous releases of JBoss Portal did not have an external=
 schema to validate the various XML
-      descriptors although it was internally validated by the portal. Sinc=
e 2.6 we have worked on providing
-      Document Type Definition (DTD) for the various descriptors. The DTD =
validation will be only effective
-      if you XML descriptors declares it like that:
-      
+      Changes from previous releases
+      The previous releases of JBoss Portal did not have an external=
 schema to validate the various XML descriptors; however, it was internally=
 validated by the portal. Since JBoss Portal 2.6, a Document Type Definitio=
n (DTD) has been provided to validate descriptors.
+      
+      
+	      To use the DTD, add the following declaration to the start of the d=
esired descriptors:
+      
+      
+
 
-...]]>
-      If you do not perform the declaration then the previous mechan=
ism will be used. The main difference
-      between using the DTD and not is that the additional DTD validation =
is more strict specifically on the order
-      of the XML elements. The following example will be accepted without =
the DTD declaration and will not with the DTD
-      declaration:
-      
-
-   overwrite
-   default.default
-   ...
-]]>
-      The correct descriptor is rather:
-      
-
-   default.default
-   overwrite
-   ...
-]]>
+"http://www.jboss.org/portal/dtd/portal-object_2_6.dtd">]]>
+
+	
+      	
+		If you do not use the DTD declaration, the previous mechanism for XML va=
lidation will be used. The DTD is more strict, specifically with the order =
of the XML elements. For example, the following will be valid if you are no=
t using the DTD, but will be rejected if you are:
+	
+	
+overwrite
+default.default]]>
+
+       
+       
+	       The correct element order, and one which would be valid against th=
e DTD, would be as follows:
+       
+       
+default.default
+overwrite]]>
+
+       
       The various DTD available are:
       
          For -object.xml descriptors: "-//JBoss Portal//DTD Port=
al Object 2.6//EN"


--===============7947300385877022791==--

From portal-commits at lists.jboss.org Wed Feb 20 00:45:07 2008
Content-Type: multipart/mixed; boundary="===============4143424570026071761=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r10040 -
 docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
Date: Wed, 20 Feb 2008 00:45:06 -0500
Message-ID: 

--===============4143424570026071761==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mmcallis
Date: 2008-02-20 00:45:06 -0500 (Wed, 20 Feb 2008)
New Revision: 10040

Modified:
   docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescr=
iptors.xml
Log:
minor revisions/rephrasing
6.1. Changes from previous releases


Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/x=
mldescriptors.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldesc=
riptors.xml	2008-02-20 03:19:54 UTC (rev 10039)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldesc=
riptors.xml	2008-02-20 05:45:06 UTC (rev 10040)
@@ -24,7 +24,7 @@
 
 	
       	
-		If you do not use the DTD declaration, the previous mechanism for XML va=
lidation will be used. The DTD is more strict, specifically with the order =
of the XML elements. For example, the following will be valid if you are no=
t using the DTD, but will be rejected if you are:
+		If you do not use the DTD declaration, the previous mechanism for XML va=
lidation will be used. The DTD is more strict, specifically with the order =
of XML elements. The following is an example from a *-object.xml<=
/filename> descriptor, which will be valid if you are not using the DTD, bu=
t will be rejected if you are:
 	
 	
 overwrite]]>
 
        
-      The various DTD available are:
+      
+	      The following DTDs are available:
+      
+      
       
-         For -object.xml descriptors: "-//JBoss Portal//DTD Port=
al Object 2.6//EN"
-         For jboss-app.xml descriptors: "-//JBoss Portal//DTD JB=
oss Web Application 2.6//EN"
-         For jboss-portlet.xml descriptors: "-//JBoss Portal//DT=
D JBoss Portlet 2.6//EN"
-         For portlet-instances.xml descriptors: "-//JBoss Portal=
//DTD Portlet Instances 2.6//EN"
+         
+		 
+			 for -object.xml descriptors: "-//JBoss=
 Portal//DTD Portal Object 2.6//EN"
+		 
+	 
+         
+		 
+			 for jboss-app.xml descriptors: "-//JBo=
ss Portal//DTD JBoss Web Application 2.6//EN"
+		 
+	 
+         
+		 
+			 for jboss-portlet.xml descriptors: "-/=
/JBoss Portal//DTD JBoss Portlet 2.6//EN"
+		 
+	 
+         
+		 
+			 for portlet-instances.xml descriptors: "-//JBoss Portal//DTD Portlet Instances 2.6//EN"
+		 
+	 
       
-      Those files are available in the jboss-portal.sar/dt=
d/ folder
+
+
+	The files for the DTDs are located in the $JBOSS_HOME/server/configuration/deploy/jboss-portal.sar/dtd/ directory.
+
       
          JBoss Portlet DTD
          


--===============4143424570026071761==--

From portal-commits at lists.jboss.org Wed Feb 20 02:49:08 2008
Content-Type: multipart/mixed; boundary="===============4567403435021048883=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r10041 -
 docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
Date: Wed, 20 Feb 2008 02:49:08 -0500
Message-ID: 

--===============4567403435021048883==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mmcallis
Date: 2008-02-20 02:49:06 -0500 (Wed, 20 Feb 2008)
New Revision: 10041

Modified:
   docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescr=
iptors.xml
Log:
6.1.1. The JBoss Portlet DTD
replacing itemizedlist with variablelist
*** this will break the book until later commits ***


Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/x=
mldescriptors.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldesc=
riptors.xml	2008-02-20 05:45:06 UTC (rev 10040)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldesc=
riptors.xml	2008-02-20 07:49:06 UTC (rev 10041)
@@ -72,59 +72,83 @@
 	The files for the DTDs are located in the $JBOSS_HOME/server/configuration/deploy/jboss-portal.sar/dtd/ directory.
 
       
-         JBoss Portlet DTD
+         The JBoss Portlet DTD
          
-
+		 The following list refers to elements found in the JBoss Portlet DTD, <=
filename>$JBOSS_HOME/server/configuration/deploy=
/jboss-portal.sar/dtd/jboss-portlet_version_number.dtd:
+	 
+	 
+		 
+			 ]]>
+
 
-
-Element ]]>
-
-
-
-Element ]]>
-
+		Use the remotable element to configure =
the default behavior of portlets with respect to WSRP exposure: if no value=
 is given, the value is either the value globally defined at the portlet ap=
plication level, or false. Accepted values are true and false. =

+	
+	
+		You can configure specific settings for the portlet container for each p=
ortlet defined in the WEB-INF/portlet.xml file. Use th=
e service element to inject services into =
the portlet context of applications.
+	
+
+
+]]>
+
+
+	
+		Additional configuration for a portlet. The portlet-name=
 element defines the portlet name. It must match a portlet=
 defined in the WEB-INF/portlet.xml file for that appl=
ication.
+	
+	
+		Use the remotable element to configure =
the default behavior of portlets with respect to WSRP exposure: if no value=
 is given, the value is either the value globally defined at the portlet ap=
plication level, or false. Accepted values are true and false.
+	
+	
+		The trans-attribute element specifies t=
he behavior of the portlet when it is invoked at runtime, with respect to t=
he transactionnal context. Depending on how the portlet is
+invoked, a transaction may or may not exist before the portlet is invoked.=
 The portal transaction is usually present in the local context. By default=
, the value is NotSupported, which means t=
hat the portal transaction will be suspended for the duration of the portle=
t invocation.
+	
+	
+		The following example uses the portlet-name, remotable, and trans=
-attribute elements:
+	
+	
+
    MyPortlet
    true
    Required
-]]>
-
-
+]]>
+
+	
+
+
+]]>
-
-
-
+
+
+	
+		The portlet name.
+	
+
+
+]]>
-
-
-
+
+
+	
+		Use the remotable element to configure =
the default behavior of portlets with respect to WSRP exposure: if no value=
 is given, the value is either the value globally defined at the portlet ap=
plication level, or false. Accepted values are true and false.
+	
+
+
+]]>
-
+
+	
+		Use the ajax element to configure the A=
synchronous JavaScript and XML (AJAX) capabilities of the portlet. If a por=
tlet uses the true value for the partial-refresh element, then the portal uses parti=
al page refreshing, and only renders that portlet. If the p=
artial-refresh element uses a false value, the portal uses a full-page refresh when the portlet is r=
efreshed.
+	
+
+
+		=

+		=

+		=

+		The ajax tag allows to configure the ajax capabilities of the portlet. If
 the portlet is tagged as partial-refresh then the portal may use partial p=
age
 refreshing and render only that portlet. If the portlet partial-refresh va=
lue
 is false, then the portal will perform a full page refresh when the portle=
t is refreshed.]]>


--===============4567403435021048883==--

From portal-commits at lists.jboss.org Wed Feb 20 03:23:53 2008
Content-Type: multipart/mixed; boundary="===============4934105744121718571=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r10042 -
 docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
Date: Wed, 20 Feb 2008 03:23:53 -0500
Message-ID: 

--===============4934105744121718571==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mmcallis
Date: 2008-02-20 03:23:52 -0500 (Wed, 20 Feb 2008)
New Revision: 10042

Modified:
   docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescr=
iptors.xml
Log:
revising 6.1.1. The JBoss Portlet DTD
replacing itemizedlist with variablelist
*** this will break the book until later commits ***


Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/x=
mldescriptors.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldesc=
riptors.xml	2008-02-20 07:49:06 UTC (rev 10041)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldesc=
riptors.xml	2008-02-20 08:23:52 UTC (rev 10042)
@@ -145,55 +145,75 @@
 	
 
 
-		=

-		=

-		=

-		The ajax tag allows to configure the ajax capabilities of the portlet. If
-the portlet is tagged as partial-refresh then the portal may use partial p=
age
-refreshing and render only that portlet. If the portlet partial-refresh va=
lue
-is false, then the portal will perform a full page refresh when the portle=
t is refreshed.]]>
-
-
-Element ]]>
-
-
-
+]]>
+
+
+	
+		The authorized values for the partial-refresh element are true or false.
+	
+
+
+]]>
-
+
+	
+		This element configure the portlet session of the portlet. The distribut=
ed element instructs the container to distribute the session attributes usi=
ng the portal session replication. It applies only to local portlets are no=
t to remote portlets. The default value is false.
+	
+	
+		For example:
+	
+	
+
    true
-]]>
-
-
+]]>
+
+	
+
+
+]]>
-
-
-
+
+
+	
+		The authorized values for the distributed element are true or false.
+	
+
+
+]]>
-
+
+	
+		Defines how the portlet behaves with the transactionnal context. The def=
ault value is Never.
+	
+	
+		For example:
+	
+	
+
    Required
-]]>
-
-
+]]>
+
+	
+
+
+]]>
-=

-
-
+
+
+	
+		The trans-attribute value defines the transactionnal behavior. The accep=
ted values are Required, Mandatory, Never, Supports, NotSupported and Requi=
resNew.
+	
+
+
+]]>
+
+
 
 


--===============4934105744121718571==--

From portal-commits at lists.jboss.org Wed Feb 20 03:49:47 2008
Content-Type: multipart/mixed; boundary="===============4931587632248473903=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r10043 -
 docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
Date: Wed, 20 Feb 2008 03:49:47 -0500
Message-ID: 

--===============4931587632248473903==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mmcallis
Date: 2008-02-20 03:49:47 -0500 (Wed, 20 Feb 2008)
New Revision: 10043

Modified:
   docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescr=
iptors.xml
Log:
6.1.1. The JBoss Portlet DTD
finished changing itemizedlist to variablelist


Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/x=
mldescriptors.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldesc=
riptors.xml	2008-02-20 08:23:52 UTC (rev 10042)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldesc=
riptors.xml	2008-02-20 08:49:47 UTC (rev 10043)
@@ -119,7 +119,7 @@
 
 
 ]]>
+]]>
 
 
 	
@@ -128,7 +128,7 @@
 
 
 ]]>
+]]>
 
 
 	
@@ -137,7 +137,7 @@
 
 
 ]]>
+]]>
 
 
 	
@@ -155,7 +155,7 @@
 
 
 ]]>
+]]>
 
 
 	
@@ -174,7 +174,7 @@
 
 
 ]]>
+]]>
 
 
 	
@@ -183,7 +183,7 @@
 
 
 ]]>
+]]>
 
 
 	
@@ -202,7 +202,7 @@
 
 
 ]]>
+]]>
 
 
 	
@@ -211,62 +211,102 @@
 
 
 ]]>
+]]>
 
-
-
-
-
-Element ]]>
-
-
-
-Element ]]>
-
-
-
-Element ]]>
-
-
-
+
+	
+		Specify content which should be included in the portal aggregated page w=
hen the portlet
+is present on that page. This setting only applies when the portlet is use=
d in the local mode.
+	
+
+
+]]>
+
+
+	
+		No content is allowed inside an link element.
+	
+
+
+]]>
+
+
+	
+		The script header element can contain inline script definitions.
+	
+
+
+]]>
+
+
+	
+		No content is allowed for meta element.
+	
+
+
+]]>
-
+
+	
+		Declare a service that will be injected by the portlet container as an a=
ttribute of the portlet context.
+	
+	
+		For example:
+	
+	
+
    UserModule
    org.jboss.portal.identity.UserModule
    :service=3DModule,type=3DUser
-
-
-In the portlet it is then possible to use it by doing a lookup on the serv=
ice
-name, for example in the init() lifecycle method :
-
+]]>
+
+	
+	In the portlet it is then possible to use it by doing a lookup on t=
he service name, for example in the init() lifecycle method :
+	
+	
+
-
-
-Element ]]>
-
-
-
-Element ]]>
-
-
-
-Element ]]>
-
-
-
-         
+}]]>
+
+	
+
+
+]]>
+
+
+	
+		The service name that will be used to bind the service as a portlet cont=
ext attribute.
+	
+
+
+]]>
+
+
+	
+		The full qualified name of the interface that the service implements.
+	
+
+
+]]>
+
+
+	
+		The reference to the service. In the JMX Microkernel environment it cons=
ist of the JMX name of the service MBean. For an MBean reference if the dom=
ain is left out, then the current domain of the portal will be used.
+	
+
+
+
+
       
       
          Portlet Instance DTD


--===============4931587632248473903==--

From portal-commits at lists.jboss.org Wed Feb 20 06:56:13 2008
Content-Type: multipart/mixed; boundary="===============4533448562051613347=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r10044 - in
 modules/portlet/trunk/docs: user-guide and 1 other directory.
Date: Wed, 20 Feb 2008 06:56:13 -0500
Message-ID: 

--===============4533448562051613347==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: bdaw
Date: 2008-02-20 06:56:12 -0500 (Wed, 20 Feb 2008)
New Revision: 10044

Added:
   modules/portlet/trunk/docs/pom.xml
   modules/portlet/trunk/docs/user-guide/pom.xml
Removed:
   modules/portlet/trunk/docs/common/
   modules/portlet/trunk/docs/user-guide/build.xml
Log:
use maven support for docbook

Added: modules/portlet/trunk/docs/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/docs/pom.xml	                        (rev 0)
+++ modules/portlet/trunk/docs/pom.xml	2008-02-20 11:56:12 UTC (rev 10044)
@@ -0,0 +1,20 @@
+
+   4.0.0
+   
+      org.jboss.portal.portlet
+      module-parent
+      2.0-Beta1
+      ../build/pom.xml
+   
+   docs-aggregator
+   pom
+   JBoss Portal Portlet Docs Aggregator
+   2.0-Beta1
+   http://labs.jboss.com/jbossportal
+
+   
+      user-guide
+   
+
+

Deleted: modules/portlet/trunk/docs/user-guide/build.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/docs/user-guide/build.xml	2008-02-20 08:49:47 UTC=
 (rev 10043)
+++ modules/portlet/trunk/docs/user-guide/build.xml	2008-02-20 11:56:12 UTC=
 (rev 10044)
@@ -1,28 +0,0 @@
-
-
-   
-   
-
-   
-   
-
-   
-      
-         
-      
-   
-
-   
-      
-         
-      
-   
-
-   
-
-

Added: modules/portlet/trunk/docs/user-guide/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/docs/user-guide/pom.xml	                        (=
rev 0)
+++ modules/portlet/trunk/docs/user-guide/pom.xml	2008-02-20 11:56:12 UTC (=
rev 10044)
@@ -0,0 +1,68 @@
+
+
+    4.0.0
+
+    
+        org.jboss
+        documentation
+        1.0
+    
+   org.jboss.portal.portlet
+   user-guide-${translation}
+   2.0-Beta1
+   jdocbook
+   User_Guide_(${translation})
+
+
+   
+      
+         repository.jboss.org
+         JBoss Repository
+         default
+         http://repository.jboss.org/maven2/
+         
+            false
+         
+      
+      
+         snapshots.jboss.org
+         JBoss Snapshots Repository
+         default
+         http://snapshots.jboss.org/maven2/
+         
+            true
+         
+         
+            false
+         
+      
+   
+
+   
+      
+         repository.jboss.org
+         JBoss Repository
+         default
+         http://repository.jboss.org/maven2/
+         
+            false
+         
+      
+      
+         snapshots.jboss.org
+         JBoss Snapshots Repository
+         default
+         http://snapshots.jboss.org/maven2/
+         
+            true
+         
+         
+            false
+         
+      
+   
+    =

+
+


--===============4533448562051613347==--

From portal-commits at lists.jboss.org Wed Feb 20 06:59:56 2008
Content-Type: multipart/mixed; boundary="===============7222249326408823872=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r10045 -
 modules/portlet/trunk/docs.
Date: Wed, 20 Feb 2008 06:59:56 -0500
Message-ID: 

--===============7222249326408823872==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: bdaw
Date: 2008-02-20 06:59:56 -0500 (Wed, 20 Feb 2008)
New Revision: 10045

Modified:
   modules/portlet/trunk/docs/
Log:
disable docbook-support externals


Property changes on: modules/portlet/trunk/docs
___________________________________________________________________
Name: svn:externals
   - docbook-support http://anonsvn.jboss.org/repos/portal/tools/docbook/su=
pport/
docbook-support/styles http://anonsvn.jboss.org/repos/portal/tools/docbook/=
styles/renaissance/

   + =




--===============7222249326408823872==--

From portal-commits at lists.jboss.org Wed Feb 20 07:01:09 2008
Content-Type: multipart/mixed; boundary="===============8871841544932227575=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r10046 -
 modules/portlet/trunk/docs.
Date: Wed, 20 Feb 2008 07:01:08 -0500
Message-ID: 

--===============8871841544932227575==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: bdaw
Date: 2008-02-20 07:01:08 -0500 (Wed, 20 Feb 2008)
New Revision: 10046

Modified:
   modules/portlet/trunk/docs/
Log:
disable docbook-support externals


Property changes on: modules/portlet/trunk/docs
___________________________________________________________________
Name: svn:externals
   - =




--===============8871841544932227575==--

From portal-commits at lists.jboss.org Wed Feb 20 07:03:45 2008
Content-Type: multipart/mixed; boundary="===============7211371671764329986=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r10047 - modules/portlet/trunk.
Date: Wed, 20 Feb 2008 07:03:44 -0500
Message-ID: 

--===============7211371671764329986==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: bdaw
Date: 2008-02-20 07:03:43 -0500 (Wed, 20 Feb 2008)
New Revision: 10047

Modified:
   modules/portlet/trunk/pom.xml
Log:
add docs to maven build

Modified: modules/portlet/trunk/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/pom.xml	2008-02-20 12:01:08 UTC (rev 10046)
+++ modules/portlet/trunk/pom.xml	2008-02-20 12:03:43 UTC (rev 10047)
@@ -34,6 +34,7 @@
       federation
       management
       test
+      docs
    
 =

 


--===============7211371671764329986==--

From portal-commits at lists.jboss.org Wed Feb 20 07:14:27 2008
Content-Type: multipart/mixed; boundary="===============4187082749419983178=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r10048 - in modules/test/trunk:
 docs and 1 other directories.
Date: Wed, 20 Feb 2008 07:14:26 -0500
Message-ID: 

--===============4187082749419983178==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: bdaw
Date: 2008-02-20 07:14:26 -0500 (Wed, 20 Feb 2008)
New Revision: 10048

Added:
   modules/test/trunk/docs/pom.xml
   modules/test/trunk/docs/user-guide/pom.xml
Removed:
   modules/test/trunk/docs/user-guide/build.xml
Modified:
   modules/test/trunk/docs/
   modules/test/trunk/pom.xml
Log:
use maven to build docbook


Property changes on: modules/test/trunk/docs
___________________________________________________________________
Name: svn:externals
   - docbook-support http://anonsvn.jboss.org/repos/portal/tools/docbook/su=
pport/
docbook-support/styles http://anonsvn.jboss.org/repos/portal/tools/docbook/=
styles/renaissance/


Added: modules/test/trunk/docs/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/test/trunk/docs/pom.xml	                        (rev 0)
+++ modules/test/trunk/docs/pom.xml	2008-02-20 12:14:26 UTC (rev 10048)
@@ -0,0 +1,20 @@
+
+   4.0.0
+   
+      org.jboss.unit
+      module-parent
+      1.2.0-Beta1
+      ../build/pom.xml
+   
+   docs-aggregator
+   pom
+   JBoss Portal Portlet Docs Aggregator
+   1.2.0-Beta1
+   http://labs.jboss.com/jbossportal
+
+   
+      user-guide
+   
+
+

Deleted: modules/test/trunk/docs/user-guide/build.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/test/trunk/docs/user-guide/build.xml	2008-02-20 12:03:43 UTC (r=
ev 10047)
+++ modules/test/trunk/docs/user-guide/build.xml	2008-02-20 12:14:26 UTC (r=
ev 10048)
@@ -1,26 +0,0 @@
-
-
-    
-    
-
-    
-    
-
-    
-       
-          
-       
-    
-
-    
-        
-    
-        =

-    
-
-

Added: modules/test/trunk/docs/user-guide/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/test/trunk/docs/user-guide/pom.xml	                        (rev=
 0)
+++ modules/test/trunk/docs/user-guide/pom.xml	2008-02-20 12:14:26 UTC (rev=
 10048)
@@ -0,0 +1,67 @@
+
+
+    4.0.0
+
+    
+        org.jboss
+        documentation
+        1.0
+    
+
+   
+      
+         repository.jboss.org
+         JBoss Repository
+         default
+         http://repository.jboss.org/maven2/
+         
+            false
+         
+      
+      
+         snapshots.jboss.org
+         JBoss Snapshots Repository
+         default
+         http://snapshots.jboss.org/maven2/
+         
+            true
+         
+         
+            false
+         
+      
+   
+
+   
+      
+         repository.jboss.org
+         JBoss Repository
+         default
+         http://repository.jboss.org/maven2/
+         
+            false
+         
+      
+      
+         snapshots.jboss.org
+         JBoss Snapshots Repository
+         default
+         http://snapshots.jboss.org/maven2/
+         
+            true
+         
+         
+            false
+         
+      
+   
+    =

+   org.jboss.unit
+    user-guide-${translation}
+    1.2.0-SNAPSHOT
+    jdocbook
+    User_Guide_(${translation})
+
+

Modified: modules/test/trunk/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/test/trunk/pom.xml	2008-02-20 12:03:43 UTC (rev 10047)
+++ modules/test/trunk/pom.xml	2008-02-20 12:14:26 UTC (rev 10048)
@@ -35,7 +35,8 @@
       test/opends
       test/generic
       test/jboss
-      test/agent
+      test/agent
+      docs
    
 =

 


--===============4187082749419983178==--

From portal-commits at lists.jboss.org Wed Feb 20 07:16:50 2008
Content-Type: multipart/mixed; boundary="===============2420835759917837734=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r10049 -
 modules/test/trunk/docs/user-guide.
Date: Wed, 20 Feb 2008 07:16:50 -0500
Message-ID: 

--===============2420835759917837734==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: bdaw
Date: 2008-02-20 07:16:50 -0500 (Wed, 20 Feb 2008)
New Revision: 10049

Modified:
   modules/test/trunk/docs/user-guide/pom.xml
Log:
formatting

Modified: modules/test/trunk/docs/user-guide/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/test/trunk/docs/user-guide/pom.xml	2008-02-20 12:14:26 UTC (rev=
 10048)
+++ modules/test/trunk/docs/user-guide/pom.xml	2008-02-20 12:16:50 UTC (rev=
 10049)
@@ -59,9 +59,9 @@
    
     =

    org.jboss.unit
-    user-guide-${translation}
-    1.2.0-SNAPSHOT
-    jdocbook
-    User_Guide_(${translation})
+   user-guide-${translation}
+   1.2.0-SNAPSHOT
+   jdocbook
+   User_Guide_(${translation})
 =

 


--===============2420835759917837734==--

From portal-commits at lists.jboss.org Wed Feb 20 08:07:19 2008
Content-Type: multipart/mixed; boundary="===============4502570285123444493=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r10050 - in
 docs/branches/JBoss_Portal_Branch_2_6: quickstartuser and 2 other
 directories.
Date: Wed, 20 Feb 2008 08:07:19 -0500
Message-ID: 

--===============4502570285123444493==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: bdaw
Date: 2008-02-20 08:07:19 -0500 (Wed, 20 Feb 2008)
New Revision: 10050

Added:
   docs/branches/JBoss_Portal_Branch_2_6/pom.xml
   docs/branches/JBoss_Portal_Branch_2_6/quickstartuser/pom.xml
   docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/pom.xml
   docs/branches/JBoss_Portal_Branch_2_6/userGuide/pom.xml
Log:
add maven build

Added: docs/branches/JBoss_Portal_Branch_2_6/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- docs/branches/JBoss_Portal_Branch_2_6/pom.xml	                        (=
rev 0)
+++ docs/branches/JBoss_Portal_Branch_2_6/pom.xml	2008-02-20 13:07:19 UTC (=
rev 10050)
@@ -0,0 +1,16 @@
+
+   4.0.0
+   org.jboss.portal
+   docs-aggregator
+   pom
+   JBoss Portal Docs Aggregator
+   2.6.4-
+
+   
+      userGuide
+      referenceGuide
+      quickstartuser
+   
+
+

Added: docs/branches/JBoss_Portal_Branch_2_6/quickstartuser/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- docs/branches/JBoss_Portal_Branch_2_6/quickstartuser/pom.xml	          =
              (rev 0)
+++ docs/branches/JBoss_Portal_Branch_2_6/quickstartuser/pom.xml	2008-02-20=
 13:07:19 UTC (rev 10050)
@@ -0,0 +1,67 @@
+
+
+    4.0.0
+
+    
+        org.jboss
+        documentation
+        1.0
+    
+
+   
+      
+         repository.jboss.org
+         JBoss Repository
+         default
+         http://repository.jboss.org/maven2/
+         
+            false
+         
+      
+      
+         snapshots.jboss.org
+         JBoss Snapshots Repository
+         default
+         http://snapshots.jboss.org/maven2/
+         
+            true
+         
+         
+            false
+         
+      
+   
+
+   
+      
+         repository.jboss.org
+         JBoss Repository
+         default
+         http://repository.jboss.org/maven2/
+         
+            false
+         
+      
+      
+         snapshots.jboss.org
+         JBoss Snapshots Repository
+         default
+         http://snapshots.jboss.org/maven2/
+         
+            true
+         
+         
+            false
+         
+      
+   
+    =

+   org.jboss.portal
+   quickstartuser-${translation}
+   2.6.4
+   jdocbook
+   Quick_Start_User_(${translation})
+
+

Added: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/pom.xml	          =
              (rev 0)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/pom.xml	2008-02-20=
 13:07:19 UTC (rev 10050)
@@ -0,0 +1,67 @@
+
+
+    4.0.0
+
+    
+        org.jboss
+        documentation
+        1.0
+    
+
+   
+      
+         repository.jboss.org
+         JBoss Repository
+         default
+         http://repository.jboss.org/maven2/
+         
+            false
+         
+      
+      
+         snapshots.jboss.org
+         JBoss Snapshots Repository
+         default
+         http://snapshots.jboss.org/maven2/
+         
+            true
+         
+         
+            false
+         
+      
+   
+
+   
+      
+         repository.jboss.org
+         JBoss Repository
+         default
+         http://repository.jboss.org/maven2/
+         
+            false
+         
+      
+      
+         snapshots.jboss.org
+         JBoss Snapshots Repository
+         default
+         http://snapshots.jboss.org/maven2/
+         
+            true
+         
+         
+            false
+         
+      
+   
+    =

+   org.jboss.portal
+   referenceGuide-${translation}
+   2.6.4
+   jdocbook
+   Reference_Guide_(${translation})
+
+

Added: docs/branches/JBoss_Portal_Branch_2_6/userGuide/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- docs/branches/JBoss_Portal_Branch_2_6/userGuide/pom.xml	               =
         (rev 0)
+++ docs/branches/JBoss_Portal_Branch_2_6/userGuide/pom.xml	2008-02-20 13:0=
7:19 UTC (rev 10050)
@@ -0,0 +1,67 @@
+
+
+    4.0.0
+
+    
+        org.jboss
+        documentation
+        1.0
+    
+
+   
+      
+         repository.jboss.org
+         JBoss Repository
+         default
+         http://repository.jboss.org/maven2/
+         
+            false
+         
+      
+      
+         snapshots.jboss.org
+         JBoss Snapshots Repository
+         default
+         http://snapshots.jboss.org/maven2/
+         
+            true
+         
+         
+            false
+         
+      
+   
+
+   
+      
+         repository.jboss.org
+         JBoss Repository
+         default
+         http://repository.jboss.org/maven2/
+         
+            false
+         
+      
+      
+         snapshots.jboss.org
+         JBoss Snapshots Repository
+         default
+         http://snapshots.jboss.org/maven2/
+         
+            true
+         
+         
+            false
+         
+      
+   
+    =

+   org.jboss.portal
+   user-guide-${translation}
+   2.6.4
+   jdocbook
+   User_Guide_(${translation})
+
+


--===============4502570285123444493==--

From portal-commits at lists.jboss.org Wed Feb 20 12:04:09 2008
Content-Type: multipart/mixed; boundary="===============2731923582267823857=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r10051 - in branches/presentation:
 presentation and 4 other directories.
Date: Wed, 20 Feb 2008 12:04:09 -0500
Message-ID: 

--===============2731923582267823857==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: sohil.shah(a)jboss.com
Date: 2008-02-20 12:04:09 -0500 (Wed, 20 Feb 2008)
New Revision: 10051

Added:
   branches/presentation/presentation/src/main/org/jboss/portal/presentatio=
n/test/ajax/JBossUnitSandBox.java
   branches/presentation/presentation/src/resources/jboss-unit/
   branches/presentation/presentation/src/resources/jboss-unit/config/
   branches/presentation/presentation/src/resources/jboss-unit/config/jboss=
-unit.xml
Modified:
   branches/presentation/
   branches/presentation/presentation/build.xml
Log:
starting jboss-unit based test cases


Property changes on: branches/presentation
___________________________________________________________________
Name: svn:ignore
   - thirdparty
.classpath
.project
.settings
core-samples
cms
core-admin
core-cms
search
workflow
presentation-samples

   + thirdparty
.classpath
.project
.settings
core-samples
cms
core-admin
core-cms
search
workflow
presentation-samples
bin


Modified: branches/presentation/presentation/build.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/presentation/presentation/build.xml	2008-02-20 13:07:19 UTC (r=
ev 10050)
+++ branches/presentation/presentation/build.xml	2008-02-20 17:04:09 UTC (r=
ev 10051)
@@ -93,10 +93,13 @@
          
          
          
-      	
-      	
-      	
-      	
+      	 
+      	 
+      	 
+      	 
+      	 
+      	 
+      	 
       
 =

       
@@ -322,5 +325,14 @@
          
       
    
-
+      =

+   
+	    
+	   	
+	   	   
+	   			   	      =

+	   	      
+	   	   
+	   	
+   
 

Added: branches/presentation/presentation/src/main/org/jboss/portal/present=
ation/test/ajax/JBossUnitSandBox.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/presentation/presentation/src/main/org/jboss/portal/presentati=
on/test/ajax/JBossUnitSandBox.java	                        (rev 0)
+++ branches/presentation/presentation/src/main/org/jboss/portal/presentati=
on/test/ajax/JBossUnitSandBox.java	2008-02-20 17:04:09 UTC (rev 10051)
@@ -0,0 +1,38 @@
+/*************************************************************************=
*****
+ * 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.presentation.test.ajax;
+
+import org.jboss.unit.api.pojo.annotations.Test;
+
+/**
+ * @author Sohil Shah
+ *
+ */
+public class JBossUnitSandBox =

+{
+	@Test
+	public void test()
+	{
+		System.out.println("Simple JBossUnit Test in the PresentationFramework s=
uccessfully executed....");
+	}
+}

Added: branches/presentation/presentation/src/resources/jboss-unit/config/j=
boss-unit.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/presentation/presentation/src/resources/jboss-unit/config/jbos=
s-unit.xml	                        (rev 0)
+++ branches/presentation/presentation/src/resources/jboss-unit/config/jbos=
s-unit.xml	2008-02-20 17:04:09 UTC (rev 10051)
@@ -0,0 +1,11 @@
+
+
+   
+      
+         
+      
+   
+
\ No newline at end of file


--===============2731923582267823857==--

From portal-commits at lists.jboss.org Wed Feb 20 19:36:58 2008
Content-Type: multipart/mixed; boundary="===============4106476951145493082=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r10052 -
 docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
Date: Wed, 20 Feb 2008 19:36:58 -0500
Message-ID: 

--===============4106476951145493082==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mmcallis
Date: 2008-02-20 19:36:58 -0500 (Wed, 20 Feb 2008)
New Revision: 10052

Modified:
   docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescr=
iptors.xml
Log:
6.1.1. The JBoss Portlet DTD
revisions, minor corrections.
*** this will break the book until later commits ***


Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/x=
mldescriptors.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldesc=
riptors.xml	2008-02-20 17:04:09 UTC (rev 10051)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldesc=
riptors.xml	2008-02-21 00:36:58 UTC (rev 10052)
@@ -69,7 +69,7 @@
       
 
 
-	The files for the DTDs are located in the $JBOSS_HOME/server/configuration/deploy/jboss-portal.sar/dtd/ directory.
+	The DTDs are located in the $JBOSS_HOME/server/con=
figuration/deploy/jboss-portal.sar/dtd/ directory.
 
       
          The JBoss Portlet DTD
@@ -83,29 +83,29 @@
 
 
 	
-		Use the remotable element to configure =
the default behavior of portlets with respect to WSRP exposure: if no value=
 is given, the value is either the value globally defined at the portlet ap=
plication level, or false. Accepted values are true and false. =

+		Use the remotable element to configure =
the default behavior of portlets with respect to WSRP exposure: if no value=
 is given, the value is either the value globally defined at the portlet ap=
plication level, or false. Accepted values=
 are true and false. =

 	
 	
-		You can configure specific settings for the portlet container for each p=
ortlet defined in the WEB-INF/portlet.xml file. Use th=
e service element to inject services into =
the portlet context of applications.
+		You can configure specific settings for the portlet container for each p=
ortlet defined in the WEB-INF/portlet.xml file. Use th=
e <service> element to inject servic=
es into the portlet context of applications.
 	
 
 
 ]]>
+				     ]]>
 
 
 	
-		Additional configuration for a portlet. The portlet-name=
 element defines the portlet name. It must match a portlet=
 defined in the WEB-INF/portlet.xml file for that appl=
ication.
+		Additional configuration for the portlet. The <portle=
t-name> element defines the portlet name. It must match=
 a portlet defined in the WEB-INF/portlet.xml file for=
 that application.
 	
 	
-		Use the remotable element to configure =
the default behavior of portlets with respect to WSRP exposure: if no value=
 is given, the value is either the value globally defined at the portlet ap=
plication level, or false. Accepted values are true and false.
+		Use the <remotable> element to co=
nfigure the default behavior of portlets with respect to WSRP exposure: if =
no value is given, the value is either the value globally defined at the po=
rtlet application level, or false. Accepte=
d values are true and fals=
e.
 	
 	
-		The trans-attribute element specifies t=
he behavior of the portlet when it is invoked at runtime, with respect to t=
he transactionnal context. Depending on how the portlet is
+		The <trans-attribute> element spe=
cifies the behavior of the portlet when it is invoked at runtime, with resp=
ect to the transactionnal context. Depending on how the portlet is
 invoked, a transaction may or may not exist before the portlet is invoked.=
 The portal transaction is usually present in the local context. By default=
, the value is NotSupported, which means t=
hat the portal transaction will be suspended for the duration of the portle=
t invocation.
 	
 	
-		The following example uses the portlet-name, remotable, and trans=
-attribute elements:
+		The following example uses the <portlet-name>, <remotable>, and <trans-attribute> elements:
 	
 	
 
 
 ]]>
+]]>
 
 
 	
@@ -128,20 +128,20 @@
 
 
 ]]>
+]]>
 
 
 	
-		Use the remotable element to configure =
the default behavior of portlets with respect to WSRP exposure: if no value=
 is given, the value is either the value globally defined at the portlet ap=
plication level, or false. Accepted values are true and false.
+		Use the <remotable> element to co=
nfigure the default behavior of portlets with respect to WSRP exposure: if =
no value is given, the value is either the value globally defined at the po=
rtlet application level, or false. Accepte=
d values are true and fals=
e.
 	
 
 
 ]]>
+]]>
 
 
 	
-		Use the ajax element to configure the A=
synchronous JavaScript and XML (AJAX) capabilities of the portlet. If a por=
tlet uses the true value for the partial-refresh element, then the portal uses parti=
al page refreshing, and only renders that portlet. If the p=
artial-refresh element uses a false value, the portal uses a full-page refresh when the portlet is r=
efreshed.
+		Use the ajax element to configure the A=
synchronous JavaScript and XML (AJAX) capabilities of the portlet. If a por=
tlet uses the true value for the <partial-refresh> element, the portal uses pa=
rtial page refreshing and only renders that portlet. If the <partial-refresh> element uses a fa=
lse value, the portal uses a full-page refresh when the po=
rtlet is refreshed.
 	
 
 
@@ -150,15 +150,16 @@
 
 
 	
-		The authorized values for the partial-refresh element are true or false.
+		If a portlet uses the true value for th=
e <partial-refresh> element, the por=
tal uses partial page refreshing and only renders that portlet. If the <partial-refresh> element uses a false value, the portal uses a full-page refresh =
when the portlet is refreshed.
 	
 
 
 ]]>
+]]>
 
 
 	
+		The <session-config>
 		This element configure the portlet session of the portlet. The distribut=
ed element instructs the container to distribute the session attributes usi=
ng the portal session replication. It applies only to local portlets are no=
t to remote portlets. The default value is false.
 	
 	
@@ -248,7 +249,7 @@
 
 
 ]]>
+]]>
 
 
 	


--===============4106476951145493082==--

From portal-commits at lists.jboss.org Wed Feb 20 20:56:09 2008
Content-Type: multipart/mixed; boundary="===============6383047516141169741=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r10053 -
 docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
Date: Wed, 20 Feb 2008 20:56:09 -0500
Message-ID: 

--===============6383047516141169741==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mmcallis
Date: 2008-02-20 20:56:09 -0500 (Wed, 20 Feb 2008)
New Revision: 10053

Modified:
   docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescr=
iptors.xml
Log:
6.1.1. JBoss Portlet DTD
revising
*** this will break the book until later commits ***


Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/x=
mldescriptors.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldesc=
riptors.xml	2008-02-21 00:36:58 UTC (rev 10052)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldesc=
riptors.xml	2008-02-21 01:56:09 UTC (rev 10053)
@@ -83,7 +83,7 @@
 
 
 	
-		Use the remotable element to configure =
the default behavior of portlets with respect to WSRP exposure: if no value=
 is given, the value is either the value globally defined at the portlet ap=
plication level, or false. Accepted values=
 are true and false. =

+		Use the <remotable> element to co=
nfigure the default behavior of portlets with respect to WSRP exposure: if =
no value is given, the value is either the value globally defined at the po=
rtlet application level, or false. Accepte=
d values are true and fals=
e. =

 	
 	
 		You can configure specific settings for the portlet container for each p=
ortlet defined in the WEB-INF/portlet.xml file. Use th=
e <service> element to inject servic=
es into the portlet context of applications.
@@ -102,7 +102,7 @@
 	
 	
 		The <trans-attribute> element spe=
cifies the behavior of the portlet when it is invoked at runtime, with resp=
ect to the transactionnal context. Depending on how the portlet is
-invoked, a transaction may or may not exist before the portlet is invoked.=
 The portal transaction is usually present in the local context. By default=
, the value is NotSupported, which means t=
hat the portal transaction will be suspended for the duration of the portle=
t invocation.
+		invoked, a transaction may or may not exist before the portlet is invoke=
d. The portal transaction is usually present in the local context. By defau=
lt, the value is NotSupported, which means=
 that the portal transaction will be suspended for the duration of the port=
let invocation. Accepted values are Required, Mandatory, Never, Supports, Not=
Supported, and RequiresNew.
 	
 	
 		The following example uses the <portlet-name>, <remotable>, and <trans-attribute> elements:
@@ -159,11 +159,10 @@
 
 
 	
-		The <session-config>
-		This element configure the portlet session of the portlet. The distribut=
ed element instructs the container to distribute the session attributes usi=
ng the portal session replication. It applies only to local portlets are no=
t to remote portlets. The default value is false.
+		The <session-config> configures t=
he portlet session of the portlet. The <distributed><=
/computeroutput> element instructs the container to distribute the session =
attributes using the portal session replication. This only applies to local=
 portlets, not remote portlets. Accepted values are true and false. The default valu=
e is false.
 	
 	
-		For example:
+		The following is an example of the <session-config>=
; and <distributed>=
 elements: =

 	
 	
 
 
 	
-		The authorized values for the distributed element are true or false.
+		The <distributed> element instruc=
ts the container to distribute the session attributes using the portal sess=
ion replication. This only applies to local portlets, not remote portlets. =
Accepted values are true and false. The default value is false.
 	
 
 
@@ -188,10 +187,10 @@
 
 
 	
-		Defines how the portlet behaves with the transactionnal context. The def=
ault value is Never.
+		Define how the portlet behaves with the transactionnal context. The <trans-attribute> element specifies the =
behavior of the portlet when it is invoked at runtime, with respect to the =
transactionnal context. Depending on how the portlet is invoked, a transact=
ion may or may not exist before the portlet is invoked. The portal transact=
ion is usually present in the local context.
 	
 	
-		For example:
+		The following is an example of the <trans-attribute&g=
t; element:
 	
 	
 
 
 	
-		The trans-attribute value defines the transactionnal behavior. The accep=
ted values are Required, Mandatory, Never, Supports, NotSupported and Requi=
resNew.
+		The <trans-attribute> value defin=
es the transactionnal behavior. By default, the value is No=
tSupported, which means that the portal transaction will b=
e suspended for the duration of the portlet invocation. Accepted values are=
 Required, Mandatory, Never, Suppor=
ts, NotSupported, and RequiresNew.
 	
 
 
@@ -216,8 +215,7 @@
 
 
 	
-		Specify content which should be included in the portal aggregated page w=
hen the portlet
-is present on that page. This setting only applies when the portlet is use=
d in the local mode.
+		Specify content to be included in the portal aggregated page, when the p=
ortlet is present on that page. This setting only applies when the portlet =
is used in the local mode.
 	
 
 


--===============6383047516141169741==--

From portal-commits at lists.jboss.org Wed Feb 20 22:11:42 2008
Content-Type: multipart/mixed; boundary="===============6435047516439082066=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r10054 -
 docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
Date: Wed, 20 Feb 2008 22:11:41 -0500
Message-ID: 

--===============6435047516439082066==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mmcallis
Date: 2008-02-20 22:11:40 -0500 (Wed, 20 Feb 2008)
New Revision: 10054

Modified:
   docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescr=
iptors.xml
Log:
changing layout of 6.1.1. The JBoss Portlet DTD


Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/x=
mldescriptors.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldesc=
riptors.xml	2008-02-21 01:56:09 UTC (rev 10053)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldesc=
riptors.xml	2008-02-21 03:11:40 UTC (rev 10054)
@@ -91,7 +91,7 @@
 
 
 ]]>
+]]>
 
 
 	
@@ -116,12 +116,12 @@
 ]]>
 
 	
-
-
-
+]]>
-
-
+
+	
+
 	
 		The portlet name.
 	


--===============6435047516439082066==--

From portal-commits at lists.jboss.org Wed Feb 20 22:52:58 2008
Content-Type: multipart/mixed; boundary="===============9063733671893223755=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r10055 -
 docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
Date: Wed, 20 Feb 2008 22:52:58 -0500
Message-ID: 

--===============9063733671893223755==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mmcallis
Date: 2008-02-20 22:52:58 -0500 (Wed, 20 Feb 2008)
New Revision: 10055

Modified:
   docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescr=
iptors.xml
Log:
6.1.1. The JBoss Portlet DTD
revising use of lists/layout


Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/x=
mldescriptors.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldesc=
riptors.xml	2008-02-21 03:11:40 UTC (rev 10054)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldesc=
riptors.xml	2008-02-21 03:52:58 UTC (rev 10055)
@@ -125,12 +125,11 @@
 	
 		The portlet name.
 	
-
-
-
+]]>
-
-
+
+	
 	
 		Use the <remotable> element to co=
nfigure the default behavior of portlets with respect to WSRP exposure: if =
no value is given, the value is either the value globally defined at the po=
rtlet application level, or false. Accepte=
d values are true and fals=
e.
 	
@@ -143,12 +142,11 @@
 	
 		Use the ajax element to configure the A=
synchronous JavaScript and XML (AJAX) capabilities of the portlet. If a por=
tlet uses the true value for the <partial-refresh> element, the portal uses pa=
rtial page refreshing and only renders that portlet. If the <partial-refresh> element uses a fa=
lse value, the portal uses a full-page refresh when the po=
rtlet is refreshed.
 	
-
-
-
+]]>
-
-
+
+	
 	
 		If a portlet uses the true value for th=
e <partial-refresh> element, the por=
tal uses partial page refreshing and only renders that portlet. If the <partial-refresh> element uses a false value, the portal uses a full-page refresh =
when the portlet is refreshed.
 	
@@ -199,12 +197,11 @@
 ]]>
 
 	
-
-
-
+]]>
-
-
+
+	
 	
 		The <trans-attribute> value defin=
es the transactionnal behavior. By default, the value is No=
tSupported, which means that the portal transaction will b=
e suspended for the duration of the portlet invocation. Accepted values are=
 Required, Mandatory, Never, Suppor=
ts, NotSupported, and RequiresNew.
 	
@@ -215,32 +212,29 @@
 
 
 	
-		Specify content to be included in the portal aggregated page, when the p=
ortlet is present on that page. This setting only applies when the portlet =
is used in the local mode.
+		Specify content to be included in the portal aggregated page when the po=
rtlet is present on that page. This setting only applies when the portlet i=
s used in the local mode.
 	
-
-
-
+]]>
-
-
+
+	
 	
 		No content is allowed inside an link element.
 	
-
-
-
+]]>
-
-
+
+	
 	
 		The script header element can contain inline script definitions.
 	
-
-
-
+]]>
-
-
+
+	
 	
 		No content is allowed for meta element.
 	
@@ -275,30 +269,27 @@
 }]]>
 
 	
-
-
-
+]]>
-
-
+
+	
 	
 		The service name that will be used to bind the service as a portlet cont=
ext attribute.
 	
-
-
-
+]]>
-
-
+
+	
 	
 		The full qualified name of the interface that the service implements.
 	
-
-
-
+]]>
-
-
+
+	
 	
 		The reference to the service. In the JMX Microkernel environment it cons=
ist of the JMX name of the service MBean. For an MBean reference if the dom=
ain is left out, then the current domain of the portal will be used.
 	


--===============9063733671893223755==--

From portal-commits at lists.jboss.org Wed Feb 20 23:18:31 2008
Content-Type: multipart/mixed; boundary="===============2484879299891871957=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r10056 -
 docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
Date: Wed, 20 Feb 2008 23:18:31 -0500
Message-ID: 

--===============2484879299891871957==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mmcallis
Date: 2008-02-20 23:18:31 -0500 (Wed, 20 Feb 2008)
New Revision: 10056

Modified:
   docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescr=
iptors.xml
Log:
6.1.1. The JBoss Portlet DTD
trying to fix my mess


Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/x=
mldescriptors.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldesc=
riptors.xml	2008-02-21 03:52:58 UTC (rev 10055)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldesc=
riptors.xml	2008-02-21 04:18:31 UTC (rev 10056)
@@ -131,7 +131,7 @@
 
 	
 	
-		Use the <remotable> element to co=
nfigure the default behavior of portlets with respect to WSRP exposure: if =
no value is given, the value is either the value globally defined at the po=
rtlet application level, or false. Accepte=
d values are true and fals=
e.
+		Accepted values are true and false.
 	
 
 
@@ -169,19 +169,18 @@
 ]]>
 
 	
-
-
-]]>
-
-
 	
+]]>
+
+	
+	
 		The <distributed> element instruc=
ts the container to distribute the session attributes using the portal sess=
ion replication. This only applies to local portlets, not remote portlets. =
Accepted values are true and false. The default value is false.
 	
 
 
 ]]>
+]]>
 
 
 	
@@ -199,7 +198,7 @@
 	
 	
 ]]>
+]]>
 
 	
 	
@@ -208,7 +207,7 @@
 
 
 ]]>
+]]>
 
 
 	
@@ -216,7 +215,7 @@
 	
 	
 ]]>
+]]>
 
 	
 	
@@ -224,7 +223,7 @@
 	
 	
 ]]>
+]]>
 
 	
 	
@@ -232,7 +231,7 @@
 	
 	
 ]]>
+]]>
 
 	
 	
@@ -241,7 +240,7 @@
 
 
 ]]>
+]]>
 
 
 	
@@ -271,7 +270,7 @@
 	
 	
 ]]>
+]]>
 
 	
 	
@@ -279,7 +278,7 @@
 	
 	
 ]]>
+]]>
 
 	
 	
@@ -287,7 +286,7 @@
 	
 	
 ]]>
+]]>
 
 	
 	


--===============2484879299891871957==--

From portal-commits at lists.jboss.org Thu Feb 21 00:08:13 2008
Content-Type: multipart/mixed; boundary="===============7538125737423496599=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r10057 -
 docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
Date: Thu, 21 Feb 2008 00:08:12 -0500
Message-ID: 

--===============7538125737423496599==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mmcallis
Date: 2008-02-21 00:08:12 -0500 (Thu, 21 Feb 2008)
New Revision: 10057

Modified:
   docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescr=
iptors.xml
Log:
6.1.1. The JBoss Portlet DTD
minor revisions, spelling corrections, removing
doubled-up content. Mess almost fixed...


Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/x=
mldescriptors.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldesc=
riptors.xml	2008-02-21 04:18:31 UTC (rev 10056)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldesc=
riptors.xml	2008-02-21 05:08:12 UTC (rev 10057)
@@ -98,10 +98,10 @@
 		Additional configuration for the portlet. The <portle=
t-name> element defines the portlet name. It must match=
 a portlet defined in the WEB-INF/portlet.xml file for=
 that application.
 	
 	
-		Use the <remotable> element to co=
nfigure the default behavior of portlets with respect to WSRP exposure: if =
no value is given, the value is either the value globally defined at the po=
rtlet application level, or false. Accepte=
d values are true and fals=
e.
+		Use the <remotable> element to co=
nfigure the default behavior of portlets with respect to WSRP exposure: if =
no value is given, the value is either the value globally defined at the po=
rtlet application level, or false.
 	
 	
-		The <trans-attribute> element spe=
cifies the behavior of the portlet when it is invoked at runtime, with resp=
ect to the transactionnal context. Depending on how the portlet is
+		The <trans-attribute> element spe=
cifies the behavior of the portlet when it is invoked at runtime, with resp=
ect to the transactional context. Depending on how the portlet is
 		invoked, a transaction may or may not exist before the portlet is invoke=
d. The portal transaction is usually present in the local context. By defau=
lt, the value is NotSupported, which means=
 that the portal transaction will be suspended for the duration of the port=
let invocation. Accepted values are Required, Mandatory, Never, Supports, Not=
Supported, and RequiresNew.
 	
 	
@@ -157,7 +157,7 @@
 
 
 	
-		The <session-config> configures t=
he portlet session of the portlet. The <distributed><=
/computeroutput> element instructs the container to distribute the session =
attributes using the portal session replication. This only applies to local=
 portlets, not remote portlets. Accepted values are true and false. The default valu=
e is false.
+		The <session-config> configures t=
he portlet session of the portlet. The <distributed><=
/computeroutput> element instructs the container to distribute the session =
attributes using the portal session replication. This only applies to local=
 portlets, not remote portlets.
 	
 	
 		The following is an example of the <session-config>=
; and <distributed>=
 elements: =

@@ -175,7 +175,7 @@
 
 	
 	
-		The <distributed> element instruc=
ts the container to distribute the session attributes using the portal sess=
ion replication. This only applies to local portlets, not remote portlets. =
Accepted values are true and false. The default value is false.
+		Accepted values are true and false. The default value is false.
 	
 
 
@@ -184,7 +184,7 @@
 
 
 	
-		Define how the portlet behaves with the transactionnal context. The <trans-attribute> element specifies the =
behavior of the portlet when it is invoked at runtime, with respect to the =
transactionnal context. Depending on how the portlet is invoked, a transact=
ion may or may not exist before the portlet is invoked. The portal transact=
ion is usually present in the local context.
+		Define how the portlet behaves with the transactional context. The <trans-attribute> element specifies the b=
ehavior of the portlet when it is invoked at runtime, with respect to the t=
ransactional context. Depending on how the portlet is invoked, a transactio=
n may or may not exist before the portlet is invoked. The portal transactio=
n is usually present in the local context.
 	
 	
 		The following is an example of the <trans-attribute&g=
t; element:
@@ -202,7 +202,7 @@
 
 	
 	
-		The <trans-attribute> value defin=
es the transactionnal behavior. By default, the value is No=
tSupported, which means that the portal transaction will b=
e suspended for the duration of the portlet invocation. Accepted values are=
 Required, Mandatory, Never, Suppor=
ts, NotSupported, and RequiresNew.
+		The default value is NotSupported, whic=
h means that the portal transaction will be suspended for the duration of t=
he portlet invocation. Accepted values are Required, Mandatory, Neve=
r, Supports, NotSupported, and RequiresNew.
 	
 
 
@@ -219,7 +219,7 @@
 
 	
 	
-		No content is allowed inside an link element.
+		No content is allowed inside a link element.
 	
 	
 
 	
 	
-		The script header element can contain inline script definitions.
+		Use the <script> element for inli=
ne script definitions.
 	
 	
 
 	
 	
-		No content is allowed for meta element.
+		No content is allowed for the <meta> element.
 	
 
 
@@ -247,7 +247,7 @@
 		Declare a service that will be injected by the portlet container as an a=
ttribute of the portlet context.
 	
 	
-		For example:
+		The following is an example of the <service> element:
 	
 	
 ]]>
 
 	
-	In the portlet it is then possible to use it by doing a lookup on t=
he service name, for example in the init() lifecycle method :
+	
+		To use an injected service in a portlet, perform a lookup of the <service-name>, for example, using the init() lifecycle method:
 	
 	
 
 	
 	
-		The service name that will be used to bind the service as a portlet cont=
ext attribute.
+		The <service-name> element define=
s the name that binds the service as a portlet context attribute.
 	
 	
 
 	
 	
-		The full qualified name of the interface that the service implements.
+		The <service-class> element defin=
es the fully qualified name of the interface that the service implements.
 	
 	
 
 	
 	
-		The reference to the service. In the JMX Microkernel environment it cons=
ist of the JMX name of the service MBean. For an MBean reference if the dom=
ain is left out, then the current domain of the portal will be used.
+		The <service-ref> defines the ref=
erence to the service. In the JMX Microkernel environment, this consist of =
the JMX name of the service MBean. For an MBean reference, if the domain is=
 left out, then the current domain of the portal is used.
 	
 
 


--===============7538125737423496599==--

From portal-commits at lists.jboss.org Thu Feb 21 02:36:26 2008
Content-Type: multipart/mixed; boundary="===============5834272152879742519=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r10058 -
 docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
Date: Thu, 21 Feb 2008 02:36:26 -0500
Message-ID: 

--===============5834272152879742519==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mmcallis
Date: 2008-02-21 02:36:26 -0500 (Thu, 21 Feb 2008)
New Revision: 10058

Modified:
   docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescr=
iptors.xml
Log:
6.1.1. The JBoss Portlet DTD
minor revisions


Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/x=
mldescriptors.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldesc=
riptors.xml	2008-02-21 05:08:12 UTC (rev 10057)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldesc=
riptors.xml	2008-02-21 07:36:26 UTC (rev 10058)
@@ -101,11 +101,11 @@
 		Use the <remotable> element to co=
nfigure the default behavior of portlets with respect to WSRP exposure: if =
no value is given, the value is either the value globally defined at the po=
rtlet application level, or false.
 	
 	
-		The <trans-attribute> element spe=
cifies the behavior of the portlet when it is invoked at runtime, with resp=
ect to the transactional context. Depending on how the portlet is
-		invoked, a transaction may or may not exist before the portlet is invoke=
d. The portal transaction is usually present in the local context. By defau=
lt, the value is NotSupported, which means=
 that the portal transaction will be suspended for the duration of the port=
let invocation. Accepted values are Required, Mandatory, Never, Supports, Not=
Supported, and RequiresNew.
+		The <trans-attribute> element spe=
cifies the behavior of the portlet when it is invoked at runtime with respe=
ct to the transactional context. Depending on how the portlet is
+		invoked, a transaction may or may not exist before the portlet is invoke=
d. The portal transaction is usually present in the local context. The defa=
ult value is NotSupported, which means tha=
t the portal transaction will be suspended for the duration of the session.=
 Accepted values are Required, Mandatory, Never, Supports, NotSupported, and RequiresNew.
 	
 	
-		The following example uses the <portlet-name>, <remotable>, and <trans-attribute> elements:
+		The following is an example section from a WEB-INF/portlet.xml=
 file, which uses the <portlet-name>, <remotable>, and <trans-attribute> elements:
 	
 	
 
 
 	
-		Use the ajax element to configure the A=
synchronous JavaScript and XML (AJAX) capabilities of the portlet. If a por=
tlet uses the true value for the <partial-refresh> element, the portal uses pa=
rtial page refreshing and only renders that portlet. If the <partial-refresh> element uses a fa=
lse value, the portal uses a full-page refresh when the po=
rtlet is refreshed.
+		Use the ajax element to configure the A=
synchronous JavaScript and XML (AJAX) capabilities of the portlet.
 	
 	
 
 	
 	
-		If a portlet uses the true value for th=
e <partial-refresh> element, the por=
tal uses partial page refreshing and only renders that portlet. If the <partial-refresh> element uses a false value, the portal uses a full-page refresh =
when the portlet is refreshed.
+		If a portlet uses the true value for th=
e <partial-refresh> element, the por=
tal uses partial-page refreshing and only renders the portlet. If the <partial-refresh> element uses a false value, the portal uses a full-page refresh w=
hen the portlet is refreshed.
 	
 
 
@@ -157,7 +157,7 @@
 
 
 	
-		The <session-config> configures t=
he portlet session of the portlet. The <distributed><=
/computeroutput> element instructs the container to distribute the session =
attributes using the portal session replication. This only applies to local=
 portlets, not remote portlets.
+		The <session-config> element conf=
igures the portlet session of the portlet. The <distribu=
ted> element instructs the container to distribute the =
session attributes using portal session replication. This only applies to l=
ocal portlets, not remote portlets.
 	
 	
 		The following is an example of the <session-config>=
; and <distributed>=
 elements: =



--===============5834272152879742519==--

From portal-commits at lists.jboss.org Thu Feb 21 02:48:57 2008
Content-Type: multipart/mixed; boundary="===============3487777312608744127=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r10059 -
 docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
Date: Thu, 21 Feb 2008 02:48:57 -0500
Message-ID: 

--===============3487777312608744127==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mmcallis
Date: 2008-02-21 02:48:57 -0500 (Thu, 21 Feb 2008)
New Revision: 10059

Modified:
   docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/configur=
ation.xml
Log:
s/server/service on a port less than 1024


Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/c=
onfiguration.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/configu=
ration.xml	2008-02-21 07:36:26 UTC (rev 10058)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/configu=
ration.xml	2008-02-21 07:48:57 UTC (rev 10059)
@@ -40,7 +40,7 @@
 	      
 		      Root User Privileges
 		      
-			      Linux systems require root user privileges to run a server on a p=
ort less than 1024. Starting JBoss EAP or JBoss AS on port 80 as a non-priv=
ileged user will not work. Running JBoss EAP or JBoss AS as the root user c=
ould lead to security breaches.
+			      Linux systems require root user privileges to run a service on a =
port less than 1024. Starting JBoss EAP or JBoss AS on port 80 as a non-pri=
vileged user will not work. Running JBoss EAP or JBoss AS as the root user =
could lead to security breaches.
 		      
 	      
       


--===============3487777312608744127==--

From portal-commits at lists.jboss.org Thu Feb 21 07:10:56 2008
Content-Type: multipart/mixed; boundary="===============1976321161248116702=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN:  r10060 - branches.
Date: Thu, 21 Feb 2008 07:10:56 -0500
Message-ID: 

--===============1976321161248116702==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-21 07:10:56 -0500 (Thu, 21 Feb 2008)
New Revision: 10060

Added:
   branches/JBoss_Portal_Branch_2_7/
Log:
2.7

Copied: branches/JBoss_Portal_Branch_2_7 (from rev 10059, branches/JBoss_Po=
rtal_Branch_2_6)


--===============1976321161248116702==--

From portal-commits at lists.jboss.org Thu Feb 21 07:16:53 2008
Content-Type: multipart/mixed; boundary="===============5882868766149182400=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN:  r10061 - docs/branches.
Date: Thu, 21 Feb 2008 07:16:53 -0500
Message-ID: 

--===============5882868766149182400==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-21 07:16:53 -0500 (Thu, 21 Feb 2008)
New Revision: 10061

Added:
   docs/branches/JBoss_Portal_Branch_2_7/
Log:
branching 2.7 for docs

Copied: docs/branches/JBoss_Portal_Branch_2_7 (from rev 10060, docs/branche=
s/JBoss_Portal_Branch_2_6)


--===============5882868766149182400==--

From portal-commits at lists.jboss.org Thu Feb 21 07:20:46 2008
Content-Type: multipart/mixed; boundary="===============6414482982151028160=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN:  r10062 - trunk.
Date: Thu, 21 Feb 2008 07:20:46 -0500
Message-ID: 

--===============6414482982151028160==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-21 07:20:46 -0500 (Thu, 21 Feb 2008)
New Revision: 10062

Modified:
   trunk/
Log:
updating svn:externals to point to 2.7


Property changes on: trunk
___________________________________________________________________
Name: svn:externals
   - src	http://anonsvn.jboss.org/repos/portal/branches/JBoss_Portal_Branch=
_2_6

   + src	http://anonsvn.jboss.org/repos/portal/branches/JBoss_Portal_Branch=
_2_7



--===============6414482982151028160==--

From portal-commits at lists.jboss.org Thu Feb 21 07:41:09 2008
Content-Type: multipart/mixed; boundary="===============7535119001800926104=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN:  r10063 - docs/trunk.
Date: Thu, 21 Feb 2008 07:41:09 -0500
Message-ID: 

--===============7535119001800926104==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-21 07:41:08 -0500 (Thu, 21 Feb 2008)
New Revision: 10063

Modified:
   docs/trunk/
Log:
remove externals in doc trunk


Property changes on: docs/trunk
___________________________________________________________________
Name: svn:externals
   - docbook-support http://anonsvn.jboss.org/repos/portal/tools/docbook/su=
pport/
docbook-support/styles http://anonsvn.jboss.org/repos/portal/tools/docbook/=
styles/renaissance/

   + =




--===============7535119001800926104==--

From portal-commits at lists.jboss.org Thu Feb 21 07:42:52 2008
Content-Type: multipart/mixed; boundary="===============1654803419558805907=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN:  r10064 - docs.
Date: Thu, 21 Feb 2008 07:42:52 -0500
Message-ID: 

--===============1654803419558805907==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-21 07:42:52 -0500 (Thu, 21 Feb 2008)
New Revision: 10064

Removed:
   docs/trunk/
Modified:
   docs/
Log:
make trunk point to 2.7 branch for docs


Property changes on: docs
___________________________________________________________________
Name: svn:externals
   + trunk https://svn.jboss.org/repos/portal/docs/branches/JBoss_Portal_Br=
anch_2_7



--===============1654803419558805907==--

From portal-commits at lists.jboss.org Thu Feb 21 07:44:07 2008
Content-Type: multipart/mixed; boundary="===============6775011380644938822=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN:  r10065 - trunk.
Date: Thu, 21 Feb 2008 07:44:06 -0500
Message-ID: 

--===============6775011380644938822==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-21 07:44:06 -0500 (Thu, 21 Feb 2008)
New Revision: 10065

Modified:
   trunk/
Log:
update svn externals for trunk


Property changes on: trunk
___________________________________________________________________
Name: svn:externals
   - src	http://anonsvn.jboss.org/repos/portal/branches/JBoss_Portal_Branch=
_2_7

   + =




--===============6775011380644938822==--

From portal-commits at lists.jboss.org Thu Feb 21 07:45:10 2008
Content-Type: multipart/mixed; boundary="===============8253086331865467395=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN:  r10066 - /.
Date: Thu, 21 Feb 2008 07:45:09 -0500
Message-ID: 

--===============8253086331865467395==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-21 07:45:09 -0500 (Thu, 21 Feb 2008)
New Revision: 10066

Removed:
   trunk/
Modified:
   /
Log:
svn externals for trunk src to 2.7


Property changes on: =

___________________________________________________________________
Name: svn:externals
   + trunk http://anonsvn.jboss.org/repos/portal/branches/JBoss_Portal_Bran=
ch_2_7



--===============8253086331865467395==--

From portal-commits at lists.jboss.org Thu Feb 21 07:46:11 2008
Content-Type: multipart/mixed; boundary="===============4480967684331739692=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN:  r10067 - docs.
Date: Thu, 21 Feb 2008 07:46:11 -0500
Message-ID: 

--===============4480967684331739692==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-21 07:46:11 -0500 (Thu, 21 Feb 2008)
New Revision: 10067

Modified:
   docs/
Log:
svn externals for trunk docs to 2.7


Property changes on: docs
___________________________________________________________________
Name: svn:externals
   - trunk https://svn.jboss.org/repos/portal/docs/branches/JBoss_Portal_Br=
anch_2_7

   + trunk http://anonsvn.jboss.org/repos/portal/docs/branches/JBoss_Portal=
_Branch_2_7



--===============4480967684331739692==--

From portal-commits at lists.jboss.org Thu Feb 21 07:49:52 2008
Content-Type: multipart/mixed; boundary="===============5294572181840923137=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r10068 - docs and 1 other
 directory.
Date: Thu, 21 Feb 2008 07:49:52 -0500
Message-ID: 

--===============5294572181840923137==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-21 07:49:52 -0500 (Thu, 21 Feb 2008)
New Revision: 10068

Modified:
   /
   docs/
Log:
removing non usable svn externals


Property changes on: =

___________________________________________________________________
Name: svn:externals
   - trunk http://anonsvn.jboss.org/repos/portal/branches/JBoss_Portal_Bran=
ch_2_7

   + =




Property changes on: docs
___________________________________________________________________
Name: svn:externals
   - trunk http://anonsvn.jboss.org/repos/portal/docs/branches/JBoss_Portal=
_Branch_2_7

   + =




--===============5294572181840923137==--

From portal-commits at lists.jboss.org Thu Feb 21 17:21:39 2008
Content-Type: multipart/mixed; boundary="===============6806329659988029700=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r10069 - in modules/portlet/trunk:
 portlet/src/main/java/org/jboss/portal/portlet/container and 13 other
 directories.
Date: Thu, 21 Feb 2008 17:21:38 -0500
Message-ID: 

--===============6806329659988029700==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-21 17:21:37 -0500 (Thu, 21 Feb 2008)
New Revision: 10069

Added:
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/con=
tainer/PortletFilter.java
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/con=
tainer/PortletFilterContext.java
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/con=
tainer/managed/LifeCycleStatus.java
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/con=
tainer/managed/ManagedObjectAddedEvent.java
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/con=
tainer/managed/ManagedObjectEvent.java
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/con=
tainer/managed/ManagedObjectLifeCycleEvent.java
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/con=
tainer/managed/ManagedObjectRegistryEvent.java
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/con=
tainer/managed/ManagedObjectRegistryEventBroadcaster.java
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/con=
tainer/managed/ManagedObjectRegistryEventListener.java
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/con=
tainer/managed/ManagedObjectRemovedEvent.java
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/con=
tainer/managed/ManagedPortletFilter.java
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/con=
tainer/object/PortletFilterObject.java
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/imp=
l/container/DependencyNotResolvedException.java
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/imp=
l/container/LifeCycle.java
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/imp=
l/container/NullManagedObjectRegistryEventListener.java
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/imp=
l/container/PortletApplicationLifeCycle.java
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/imp=
l/container/PortletContainerLifeCycle.java
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/imp=
l/container/PortletFilterLifeCycle.java
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/imp=
l/jsr168/PortletFilterImpl.java
   modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/con=
tainer/
   modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/con=
tainer/LifeCycle1Test.java
   modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/con=
tainer/ManagedObjectRegistryEventList.java
   modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/con=
tainer/ObjectSupport.java
   modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/con=
tainer/PortletApplicationContextSupport.java
   modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/con=
tainer/PortletApplicationObjectSupport.java
   modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/con=
tainer/PortletContainerContextSupport.java
   modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/con=
tainer/PortletContainerObjectSupport.java
   modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/con=
tainer/PortletFilterContextSupport.java
   modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/con=
tainer/PortletFilterObjectSupport.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/portal=
/samples/basic/FailDuringInitPortlet.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/P=
ortletApplicationContextImpl.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/P=
ortletContainerContextImpl.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/P=
ortletFilterContextImpl.java
Removed:
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/con=
tainer/managed/ManagedObjectStatus.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/K=
ernelObject.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/K=
ernelPortletApplication.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/K=
ernelPortletContainer.java
Modified:
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/asp=
ects/portlet/ValveInterceptor.java
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/con=
tainer/PortletApplicationContext.java
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/con=
tainer/PortletContainerContext.java
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/con=
tainer/managed/ManagedObject.java
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/con=
tainer/managed/ManagedPortletApplication.java
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/con=
tainer/managed/PortletApplicationRegistry.java
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/con=
tainer/object/PortletApplicationObject.java
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/con=
tainer/object/PortletContainerObject.java
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/imp=
l/info/ContainerFilterInfo.java
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/imp=
l/jsr168/ClassInstanceLifeCycle.java
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/imp=
l/jsr168/PortletApplicationImpl.java
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/imp=
l/jsr168/PortletContainerImpl.java
   modules/portlet/trunk/portlet/src/test/resources/local-jboss-unit.xml
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/P=
ortletApplicationDeployer.java
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/P=
ortletApplicationDeployment.java
   modules/portlet/trunk/test/src/test/build.xml
   modules/portlet/trunk/test/src/test/resources/portlet-test-war/WEB-INF/j=
boss-beans.xml
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/=
jboss-beans.xml
Log:
refactor of the kernel integration layer to take in account filter dependen=
cies


Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/port=
let/aspects/portlet/ValveInterceptor.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/as=
pects/portlet/ValveInterceptor.java	2008-02-21 12:49:52 UTC (rev 10068)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/as=
pects/portlet/ValveInterceptor.java	2008-02-21 22:21:37 UTC (rev 10069)
@@ -60,7 +60,7 @@
          PortletContainerContext context =3D container.getContext();
 =

          // Invoke stop
-         context.invokeStop();
+//         context.invokeStop();
       }
 =

       //

Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/port=
let/container/PortletApplicationContext.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/co=
ntainer/PortletApplicationContext.java	2008-02-21 12:49:52 UTC (rev 10068)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/co=
ntainer/PortletApplicationContext.java	2008-02-21 22:21:37 UTC (rev 10069)
@@ -54,16 +54,4 @@
     * @return the classloader
     */
    ClassLoader getClassLoader();
-
-   /**
-    * Start the portlet application and its components.
-    *
-    * @throws Exception any exception
-    */
-   void invokeStart() throws Exception;
-
-   /**
-    * Stop the portlet application and its components.
-    */
-   void invokeStop();
 }

Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/port=
let/container/PortletContainerContext.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/co=
ntainer/PortletContainerContext.java	2008-02-21 12:49:52 UTC (rev 10068)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/co=
ntainer/PortletContainerContext.java	2008-02-21 22:21:37 UTC (rev 10069)
@@ -28,17 +28,4 @@
  */
 public interface PortletContainerContext
 {
-
-   /**
-    * Start the portlet container.
-    *
-    * @throws Exception any exception
-    */
-   void invokeStart() throws Exception;
-
-   /**
-    * Stop the portlet container.
-    */
-   void invokeStop();
-
 }

Added: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet=
/container/PortletFilter.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/co=
ntainer/PortletFilter.java	                        (rev 0)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/co=
ntainer/PortletFilter.java	2008-02-21 22:21:37 UTC (rev 10069)
@@ -0,0 +1,39 @@
+/*************************************************************************=
*****
+ * 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.container;
+
+/**
+ * @author Julien Viet
+ * @version $Revision: 630 $
+ */
+public interface PortletFilter
+{
+
+   /**
+    * Returns the id.
+    *
+    * @return the id
+    */
+   String getId();
+
+}

Added: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet=
/container/PortletFilterContext.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/co=
ntainer/PortletFilterContext.java	                        (rev 0)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/co=
ntainer/PortletFilterContext.java	2008-02-21 22:21:37 UTC (rev 10069)
@@ -0,0 +1,31 @@
+/*************************************************************************=
*****
+ * 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.container;
+
+/**
+ * @author Julien Viet
+ * @version $Revision: 630 $
+ */
+public interface PortletFilterContext
+{
+}

Copied: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portle=
t/container/managed/LifeCycleStatus.java (from rev 10034, modules/portlet/t=
runk/portlet/src/main/java/org/jboss/portal/portlet/container/managed/Manag=
edObjectStatus.java)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/co=
ntainer/managed/LifeCycleStatus.java	                        (rev 0)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/co=
ntainer/managed/LifeCycleStatus.java	2008-02-21 22:21:37 UTC (rev 10069)
@@ -0,0 +1,34 @@
+/*************************************************************************=
*****
+ * 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.container.managed;
+
+/**
+ * @author Julien Viet
+ * @version $Revision: 630 $
+ */
+public enum LifeCycleStatus
+{
+
+   STOPPED, STARTED, FAILED
+
+}

Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/port=
let/container/managed/ManagedObject.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/co=
ntainer/managed/ManagedObject.java	2008-02-21 12:49:52 UTC (rev 10068)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/co=
ntainer/managed/ManagedObject.java	2008-02-21 22:21:37 UTC (rev 10069)
@@ -29,9 +29,9 @@
 public interface ManagedObject
 {
 =

-   ManagedObjectStatus getStatus();
+   LifeCycleStatus getStatus();
 =

-   void managedStart() throws Exception;
+   void managedStart() throws IllegalStateException;
 =

    void managedStop();
    =


Added: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet=
/container/managed/ManagedObjectAddedEvent.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/co=
ntainer/managed/ManagedObjectAddedEvent.java	                        (rev 0)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/co=
ntainer/managed/ManagedObjectAddedEvent.java	2008-02-21 22:21:37 UTC (rev 1=
0069)
@@ -0,0 +1,35 @@
+/*************************************************************************=
*****
+ * 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.container.managed;
+
+/**
+ * @author Julien Viet
+ * @version $Revision: 630 $
+ */
+public class ManagedObjectAddedEvent extends ManagedObjectEvent
+{
+   public ManagedObjectAddedEvent(ManagedObject managedObject)
+   {
+      super(managedObject);
+   }
+}

Added: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet=
/container/managed/ManagedObjectEvent.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/co=
ntainer/managed/ManagedObjectEvent.java	                        (rev 0)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/co=
ntainer/managed/ManagedObjectEvent.java	2008-02-21 22:21:37 UTC (rev 10069)
@@ -0,0 +1,48 @@
+/*************************************************************************=
*****
+ * 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.container.managed;
+
+/**
+ * @author Julien Viet
+ * @version $Revision: 630 $
+ */
+public class ManagedObjectEvent extends ManagedObjectRegistryEvent
+{
+
+   /** . */
+   private final ManagedObject managedObject;
+
+   public ManagedObjectEvent(ManagedObject managedObject)
+   {
+      if (managedObject =3D=3D null)
+      {
+         throw new IllegalArgumentException();
+      }
+      this.managedObject =3D managedObject;
+   }
+
+   public ManagedObject getManagedObject()
+   {
+      return managedObject;
+   }
+}

Added: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet=
/container/managed/ManagedObjectLifeCycleEvent.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/co=
ntainer/managed/ManagedObjectLifeCycleEvent.java	                        (r=
ev 0)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/co=
ntainer/managed/ManagedObjectLifeCycleEvent.java	2008-02-21 22:21:37 UTC (r=
ev 10069)
@@ -0,0 +1,47 @@
+/*************************************************************************=
*****
+ * 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.container.managed;
+
+/**
+ * @author Julien Viet
+ * @version $Revision: 630 $
+ */
+public class ManagedObjectLifeCycleEvent extends ManagedObjectEvent
+{
+
+   /** . */
+   private final LifeCycleStatus status;
+
+   public ManagedObjectLifeCycleEvent(ManagedObject managedObject, LifeCyc=
leStatus status)
+   {
+      super(managedObject);
+
+      //
+      this.status =3D status;
+   }
+
+   public LifeCycleStatus getStatus()
+   {
+      return status;
+   }
+}

Added: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet=
/container/managed/ManagedObjectRegistryEvent.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/co=
ntainer/managed/ManagedObjectRegistryEvent.java	                        (re=
v 0)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/co=
ntainer/managed/ManagedObjectRegistryEvent.java	2008-02-21 22:21:37 UTC (re=
v 10069)
@@ -0,0 +1,31 @@
+/*************************************************************************=
*****
+ * 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.container.managed;
+
+/**
+ * @author Julien Viet
+ * @version $Revision: 630 $
+ */
+public class ManagedObjectRegistryEvent
+{
+}

Added: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet=
/container/managed/ManagedObjectRegistryEventBroadcaster.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/co=
ntainer/managed/ManagedObjectRegistryEventBroadcaster.java	                =
        (rev 0)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/co=
ntainer/managed/ManagedObjectRegistryEventBroadcaster.java	2008-02-21 22:21=
:37 UTC (rev 10069)
@@ -0,0 +1,85 @@
+/*************************************************************************=
*****
+ * 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.container.managed;
+
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+/**
+ * @author Julien Viet
+ * @version $Revision: 630 $
+ */
+public class ManagedObjectRegistryEventBroadcaster implements ManagedObjec=
tRegistryEventListener
+{
+
+   /** . */
+   private final List listeners;
+
+   public ManagedObjectRegistryEventBroadcaster()
+   {
+      listeners =3D new CopyOnWriteArrayList();
+   }
+
+   public void addListener(ManagedObjectRegistryEventListener listener)
+   {
+      if (listener =3D=3D null)
+      {
+         throw new IllegalArgumentException();
+      }
+
+      //
+      if (!listeners.contains(listener))
+      {
+         listeners.add(listener);
+      }
+   }
+
+   public void removeListener(ManagedObjectRegistryEventListener listener)
+   {
+      if (listener =3D=3D null)
+      {
+         throw new IllegalArgumentException();
+      }
+
+      //
+      if (listeners.contains(listener))
+      {
+         listeners.remove(listener);
+      }
+   }
+
+   public void onEvent(ManagedObjectRegistryEvent event)
+   {
+      for (ManagedObjectRegistryEventListener listener : listeners)
+      {
+         try
+         {
+            listener.onEvent(event);
+         }
+         catch (Exception e)
+         {
+            e.printStackTrace();
+         }
+      }
+   }
+}

Added: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet=
/container/managed/ManagedObjectRegistryEventListener.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/co=
ntainer/managed/ManagedObjectRegistryEventListener.java	                   =
     (rev 0)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/co=
ntainer/managed/ManagedObjectRegistryEventListener.java	2008-02-21 22:21:37=
 UTC (rev 10069)
@@ -0,0 +1,32 @@
+/*************************************************************************=
*****
+ * 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.container.managed;
+
+/**
+ * @author Julien Viet
+ * @version $Revision: 630 $
+ */
+public interface ManagedObjectRegistryEventListener
+{
+   void onEvent(ManagedObjectRegistryEvent event);
+}

Added: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet=
/container/managed/ManagedObjectRemovedEvent.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/co=
ntainer/managed/ManagedObjectRemovedEvent.java	                        (rev=
 0)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/co=
ntainer/managed/ManagedObjectRemovedEvent.java	2008-02-21 22:21:37 UTC (rev=
 10069)
@@ -0,0 +1,35 @@
+/*************************************************************************=
*****
+ * 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.container.managed;
+
+/**
+ * @author Julien Viet
+ * @version $Revision: 630 $
+ */
+public class ManagedObjectRemovedEvent extends ManagedObjectEvent
+{
+   public ManagedObjectRemovedEvent(ManagedObject managedObject)
+   {
+      super(managedObject);
+   }
+}

Deleted: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portl=
et/container/managed/ManagedObjectStatus.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/co=
ntainer/managed/ManagedObjectStatus.java	2008-02-21 12:49:52 UTC (rev 10068)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/co=
ntainer/managed/ManagedObjectStatus.java	2008-02-21 22:21:37 UTC (rev 10069)
@@ -1,34 +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.container.managed;
-
-/**
- * @author Julien Viet
- * @version $Revision: 630 $
- */
-public enum ManagedObjectStatus
-{
-
-   STOPPED, STARTED, FAILED
-
-}

Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/port=
let/container/managed/ManagedPortletApplication.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/co=
ntainer/managed/ManagedPortletApplication.java	2008-02-21 12:49:52 UTC (rev=
 10068)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/co=
ntainer/managed/ManagedPortletApplication.java	2008-02-21 22:21:37 UTC (rev=
 10069)
@@ -37,5 +37,8 @@
 =

    ManagedPortletContainer getManagedPortletContainer(String portletContai=
nerId);
    =

+   Collection getManagedPortletFilters();
 =

+   ManagedPortletFilter getManagedPortletFilter(String portletFilterId);
+
 }

Added: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet=
/container/managed/ManagedPortletFilter.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/co=
ntainer/managed/ManagedPortletFilter.java	                        (rev 0)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/co=
ntainer/managed/ManagedPortletFilter.java	2008-02-21 22:21:37 UTC (rev 1006=
9)
@@ -0,0 +1,36 @@
+/*************************************************************************=
*****
+ * 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.container.managed;
+
+/**
+ * @author Julien Viet
+ * @version $Revision: 630 $
+ */
+public interface ManagedPortletFilter extends ManagedObject
+{
+
+   String getId();
+
+   ManagedPortletApplication getManagedPortletApplication();
+
+}

Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/port=
let/container/managed/PortletApplicationRegistry.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/co=
ntainer/managed/PortletApplicationRegistry.java	2008-02-21 12:49:52 UTC (re=
v 10068)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/co=
ntainer/managed/PortletApplicationRegistry.java	2008-02-21 22:21:37 UTC (re=
v 10069)
@@ -47,4 +47,8 @@
     */
    ManagedPortletApplication getManagedPortletApplication(String id);
 =

+   void addListener(ManagedObjectRegistryEventListener listener);
+
+   void removeListener(ManagedObjectRegistryEventListener listener);
+
 }

Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/port=
let/container/object/PortletApplicationObject.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/co=
ntainer/object/PortletApplicationObject.java	2008-02-21 12:49:52 UTC (rev 1=
0068)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/co=
ntainer/object/PortletApplicationObject.java	2008-02-21 22:21:37 UTC (rev 1=
0069)
@@ -25,6 +25,7 @@
 import org.jboss.portal.portlet.container.PortletApplicationContext;
 import org.jboss.portal.portlet.container.PortletContainer;
 import org.jboss.portal.portlet.container.PortletApplication;
+import org.jboss.portal.portlet.container.PortletFilter;
 =

 /**
  * Contains life cycle and wiring details for the kernel environment.
@@ -50,20 +51,34 @@
    PortletApplicationContext getContext();
 =

    /**
-    * Wire a container.
+    * Add a container.
     *
     * @param container the container
     */
    void addContainer(PortletContainer container);
 =

    /**
-    * Unwire a container.
+    * Remove a container.
     *
     * @param container the container
     */
    void removeContainer(PortletContainer container);
 =

    /**
+    * Add a filter.
+    *
+    * @param filter the filter
+    */
+   void addFilter(PortletFilter filter);
+
+   /**
+    * Remove a filter.
+    *
+    * @param filter the filter
+    */
+   void removeFilter(PortletFilter filter);
+
+   /**
     * Starts the application only. It does not take care of starting its c=
omponents.
     *
     * @throws Exception any exception preventing the start

Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/port=
let/container/object/PortletContainerObject.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/co=
ntainer/object/PortletContainerObject.java	2008-02-21 12:49:52 UTC (rev 100=
68)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/co=
ntainer/object/PortletContainerObject.java	2008-02-21 22:21:37 UTC (rev 100=
69)
@@ -25,6 +25,7 @@
 import org.jboss.portal.portlet.container.PortletApplication;
 import org.jboss.portal.portlet.container.PortletContainerContext;
 import org.jboss.portal.portlet.container.PortletContainer;
+import org.jboss.portal.portlet.container.PortletFilter;
 =

 /**
  * Contains life cycle and wiring details for the kernel environment.
@@ -36,20 +37,34 @@
 {
 =

    /**
-    * Wire the application.
+    * Set/unset the application.
     *
     * @param application the related application
     */
    void setApplication(PortletApplication application);
 =

    /**
-    * Wire the portlet container context.
+    * Set/unset the portlet container context.
     *
     * @param context the context
     */
    void setContext(PortletContainerContext context);
 =

    /**
+    * Add a filter.
+    *
+    * @param filter the portlet filter
+    */
+   void addFilter(PortletFilter filter);
+
+   /**
+    * Remove a filter.
+    *
+    * @param filter the portlet filter
+    */
+   void removeFilter(PortletFilter filter);
+
+   /**
     * Starts the portlet container.
     *
     * @throws Exception any exception preventing the start

Added: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet=
/container/object/PortletFilterObject.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/co=
ntainer/object/PortletFilterObject.java	                        (rev 0)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/co=
ntainer/object/PortletFilterObject.java	2008-02-21 22:21:37 UTC (rev 10069)
@@ -0,0 +1,61 @@
+/*************************************************************************=
*****
+ * 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.container.object;
+
+import org.jboss.portal.portlet.container.PortletApplication;
+import org.jboss.portal.portlet.container.PortletFilter;
+import org.jboss.portal.portlet.container.PortletFilterContext;
+
+/**
+ * @author Julien Viet
+ * @version $Revision: 630 $
+ */
+public interface PortletFilterObject extends PortletFilter
+{
+
+   /**
+    * Set the application on the portlet filter.
+    * =

+    * @param application the application
+    */
+   void setApplication(PortletApplication application);
+
+   /**
+    * Set the context required by that filter.
+    *
+    * @param context the context
+    */
+   void setContext(PortletFilterContext context);
+
+   /**
+    * Starts the portlet container.
+    *
+    * @throws Exception any exception preventing the start
+    */
+   void start() throws Exception;
+
+   /**
+    * Stops the portlet container.
+    */
+   void stop();
+}

Added: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet=
/impl/container/DependencyNotResolvedException.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/container/DependencyNotResolvedException.java	                        (r=
ev 0)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/container/DependencyNotResolvedException.java	2008-02-21 22:21:37 UTC (r=
ev 10069)
@@ -0,0 +1,37 @@
+/*************************************************************************=
*****
+ * 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.impl.container;
+
+/**
+ * Internally used only.
+ *
+ * @author Julien Viet
+ * @version $Revision: 630 $
+ */
+class DependencyNotResolvedException extends Exception
+{
+   public DependencyNotResolvedException(String message)
+   {
+      super(message);
+   }
+}

Added: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet=
/impl/container/LifeCycle.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/container/LifeCycle.java	                        (rev 0)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/container/LifeCycle.java	2008-02-21 22:21:37 UTC (rev 10069)
@@ -0,0 +1,171 @@
+/*************************************************************************=
*****
+ * 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.impl.container;
+
+import org.jboss.portal.portlet.container.managed.ManagedObject;
+import org.jboss.portal.portlet.container.managed.LifeCycleStatus;
+import org.jboss.portal.portlet.container.managed.ManagedObjectRegistryEve=
ntListener;
+import org.jboss.portal.portlet.container.managed.ManagedObjectLifeCycleEv=
ent;
+import org.apache.log4j.Logger;
+
+import java.util.Set;
+import java.util.HashSet;
+
+/**
+ * @author Julien Viet
+ * @version $Revision: 630 $
+ */
+public abstract class LifeCycle implements ManagedObject
+{
+
+   /** . */
+   private Logger log =3D Logger.getLogger(LifeCycle.class);
+
+   /** . */
+   private LifeCycleStatus status =3D LifeCycleStatus.STOPPED;
+
+   public final LifeCycleStatus getStatus()
+   {
+      return status;
+   }
+
+   private static final ThreadLocal> faileds =3D new ThreadLoc=
al>();
+
+   public final void managedStart() throws IllegalStateException
+   {
+      boolean clearFaileds =3D false;
+
+      //
+      try
+      {
+         if (faileds.get() =3D=3D null)
+         {
+            clearFaileds =3D true;
+            faileds.set(new HashSet
       PortletSwap
+         PortletSwap
 =

             Po=
rtletswap.com is an open community sponsored
                by JBoss, Inc. to facilitate the exchange of portlets and l=
ayouts for use in JBoss Portal. Project Informatio=
n
+         Project Informa=
tion
 =

             Learn more about the JBoss=
 Portal project, on-going development, open
                issues, and our


--===============2509975241632012980==--

From portal-commits at lists.jboss.org Wed Feb 13 14:29:12 2008
Content-Type: multipart/mixed; boundary="===============0935472016399245835=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9955 - in modules/web/trunk:
 build and 1 other directories.
Date: Wed, 13 Feb 2008 14:29:12 -0500
Message-ID: 

--===============0935472016399245835==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: bdaw
Date: 2008-02-13 14:29:12 -0500 (Wed, 13 Feb 2008)
New Revision: 9955

Modified:
   modules/web/trunk/build/pom.xml
   modules/web/trunk/pom.xml
   modules/web/trunk/web/pom.xml
Log:
1.2.0-Beta1

Modified: modules/web/trunk/build/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/web/trunk/build/pom.xml	2008-02-13 17:34:08 UTC (rev 9954)
+++ modules/web/trunk/build/pom.xml	2008-02-13 19:29:12 UTC (rev 9955)
@@ -18,7 +18,7 @@
   4.0.0
   org.jboss.portal.web
   module-parent
-  1.2.0-SNAPSHOT
+  1.2.0-Beta1
   pom
   JBoss Portal Test Module
   http://www.jboss.com/products/jbossmc
@@ -37,7 +37,7 @@
       3.6-beta
       2.2.1.GA
       1.2.0-Beta1
-      1.2.0-SNAPSHOT
+      1.2.0-Beta1
       1.2.14
       1.1.1
       3.0.1

Modified: modules/web/trunk/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/web/trunk/pom.xml	2008-02-13 17:34:08 UTC (rev 9954)
+++ modules/web/trunk/pom.xml	2008-02-13 19:29:12 UTC (rev 9955)
@@ -5,7 +5,7 @@
    module-aggregator
    pom
    JBoss Portal Web Module
-   1.2.0-SNAPSHOT
+   1.2.0-Beta1
    http://labs.jboss.com/jbossportal
 =

    

Modified: modules/web/trunk/web/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/web/trunk/web/pom.xml	2008-02-13 17:34:08 UTC (rev 9954)
+++ modules/web/trunk/web/pom.xml	2008-02-13 19:29:12 UTC (rev 9955)
@@ -3,7 +3,7 @@
    
       org.jboss.portal.web
       module-parent
-      1.2.0-SNAPSHOT
+      1.2.0-Beta1
       ../build/pom.xml
    
    4.0.0


--===============0935472016399245835==--

From portal-commits at lists.jboss.org Wed Feb 13 14:32:00 2008
Content-Type: multipart/mixed; boundary="===============6989401260623107776=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN:  r9956 - modules/web/tags.
Date: Wed, 13 Feb 2008 14:32:00 -0500
Message-ID: 

--===============6989401260623107776==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: bdaw
Date: 2008-02-13 14:32:00 -0500 (Wed, 13 Feb 2008)
New Revision: 9956

Added:
   modules/web/tags/JBP_WEB_1_2_0_BETA1/
Log:
tag web 1.2.0-Beta1



Copied: modules/web/tags/JBP_WEB_1_2_0_BETA1 (from rev 9955, modules/web/tr=
unk)


--===============6989401260623107776==--

From portal-commits at lists.jboss.org Wed Feb 13 16:05:27 2008
Content-Type: multipart/mixed; boundary="===============6297138728793188123=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9957 - in modules/portlet/trunk:
 bridge and 7 other directories.
Date: Wed, 13 Feb 2008 16:05:27 -0500
Message-ID: 

--===============6297138728793188123==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: bdaw
Date: 2008-02-13 16:05:27 -0500 (Wed, 13 Feb 2008)
New Revision: 9957

Modified:
   modules/portlet/trunk/bridge/pom.xml
   modules/portlet/trunk/build/pom.xml
   modules/portlet/trunk/controller/pom.xml
   modules/portlet/trunk/federation/pom.xml
   modules/portlet/trunk/jsr168api/pom.xml
   modules/portlet/trunk/management/pom.xml
   modules/portlet/trunk/pom.xml
   modules/portlet/trunk/portlet/pom.xml
   modules/portlet/trunk/test/pom.xml
Log:
update version to 2.0-Beta1

Modified: modules/portlet/trunk/bridge/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/bridge/pom.xml	2008-02-13 19:32:00 UTC (rev 9956)
+++ modules/portlet/trunk/bridge/pom.xml	2008-02-13 21:05:27 UTC (rev 9957)
@@ -3,7 +3,7 @@
    
       org.jboss.portal.portlet
       module-parent
-      2.0-SNAPSHOT
+      2.0-Beta1
       ../build/pom.xml
    
    4.0.0

Modified: modules/portlet/trunk/build/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/build/pom.xml	2008-02-13 19:32:00 UTC (rev 9956)
+++ modules/portlet/trunk/build/pom.xml	2008-02-13 21:05:27 UTC (rev 9957)
@@ -18,10 +18,9 @@
    4.0.0
    org.jboss.portal.portlet
    module-parent
-   2.0-SNAPSHOT
+   2.0-Beta1
    pom
    JBoss Portal Portlet Module
-   http://www.jboss.com/products/jbossmc
    JBoss Portal Portlet Module
 =

    

Modified: modules/portlet/trunk/controller/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/controller/pom.xml	2008-02-13 19:32:00 UTC (rev 9=
956)
+++ modules/portlet/trunk/controller/pom.xml	2008-02-13 21:05:27 UTC (rev 9=
957)
@@ -3,7 +3,7 @@
    
       org.jboss.portal.portlet
       module-parent
-      2.0-SNAPSHOT
+      2.0-Beta1
       ../build/pom.xml
    
    4.0.0

Modified: modules/portlet/trunk/federation/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/federation/pom.xml	2008-02-13 19:32:00 UTC (rev 9=
956)
+++ modules/portlet/trunk/federation/pom.xml	2008-02-13 21:05:27 UTC (rev 9=
957)
@@ -3,7 +3,7 @@
    
       org.jboss.portal.portlet
       module-parent
-      2.0-SNAPSHOT
+      2.0-Beta1
       ../build/pom.xml
    
    4.0.0

Modified: modules/portlet/trunk/jsr168api/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/jsr168api/pom.xml	2008-02-13 19:32:00 UTC (rev 99=
56)
+++ modules/portlet/trunk/jsr168api/pom.xml	2008-02-13 21:05:27 UTC (rev 99=
57)
@@ -3,7 +3,7 @@
    
       org.jboss.portal.portlet
       module-parent
-      2.0-SNAPSHOT
+      2.0-Beta1
       ../build/pom.xml
    
    4.0.0

Modified: modules/portlet/trunk/management/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/management/pom.xml	2008-02-13 19:32:00 UTC (rev 9=
956)
+++ modules/portlet/trunk/management/pom.xml	2008-02-13 21:05:27 UTC (rev 9=
957)
@@ -3,7 +3,7 @@
    
       org.jboss.portal.portlet
       module-parent
-      2.0-SNAPSHOT
+      2.0-Beta1
       ../build/pom.xml
    
    4.0.0

Modified: modules/portlet/trunk/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/pom.xml	2008-02-13 19:32:00 UTC (rev 9956)
+++ modules/portlet/trunk/pom.xml	2008-02-13 21:05:27 UTC (rev 9957)
@@ -5,7 +5,7 @@
    module-aggregator
    pom
    JBoss Portal Portlet Module Aggregator
-   2.0-SNAPSHOT
+   2.0-Beta1
    http://labs.jboss.com/jbossportal
 =

    

Modified: modules/portlet/trunk/portlet/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/pom.xml	2008-02-13 19:32:00 UTC (rev 9956)
+++ modules/portlet/trunk/portlet/pom.xml	2008-02-13 21:05:27 UTC (rev 9957)
@@ -3,7 +3,7 @@
    
       org.jboss.portal.portlet
       module-parent
-      2.0-SNAPSHOT
+      2.0-Beta1
       ../build/pom.xml
    
    4.0.0
@@ -40,13 +40,13 @@
          jaxb-api
       
 =

-      
-         sun.jdk
-         tools
-         1.5.0
-         system
-         ${JAVA_HOME}/lib/tools.jar
-      
+      
+         
+         
+         
+         
+         
+      
 =

       
       

Modified: modules/portlet/trunk/test/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/pom.xml	2008-02-13 19:32:00 UTC (rev 9956)
+++ modules/portlet/trunk/test/pom.xml	2008-02-13 21:05:27 UTC (rev 9957)
@@ -3,7 +3,7 @@
    
       org.jboss.portal.portlet
       module-parent
-      2.0-SNAPSHOT
+      2.0-Beta1
       ../build/pom.xml
    
    4.0.0


--===============6297138728793188123==--

From portal-commits at lists.jboss.org Wed Feb 13 19:37:37 2008
Content-Type: multipart/mixed; boundary="===============6277455078322425427=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9958 - in
 modules/portlet/trunk/test/src: test/resources/simple-portal-war/css and 2
 other directories.
Date: Wed, 13 Feb 2008 19:37:37 -0500
Message-ID: 

--===============6277455078322425427==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: wesleyhales
Date: 2008-02-13 19:37:37 -0500 (Wed, 13 Feb 2008)
New Revision: 9958

Modified:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/portal=
/samples/basic/HeaderPortlet.java
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/css/mast=
er.css
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/dem=
o3.jsp
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/=
header.jsp
Log:
partial refresh portlet updates

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/portal/samples/basic/HeaderPortlet.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/porta=
l/samples/basic/HeaderPortlet.java	2008-02-13 21:05:27 UTC (rev 9957)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/porta=
l/samples/basic/HeaderPortlet.java	2008-02-14 00:37:37 UTC (rev 9958)
@@ -23,7 +23,10 @@
 package org.jboss.portal.portlet.portal.samples.basic;
 =

 import org.w3c.dom.Element;
+import org.jboss.portal.portlet.ActionURL;
+import org.jboss.portal.portlet.RenderURL;
 =

+
 import javax.portlet.GenericPortlet;
 import javax.portlet.RenderRequest;
 import javax.portlet.RenderResponse;
@@ -31,6 +34,14 @@
 import javax.portlet.ResourceRequest;
 import javax.portlet.ResourceResponse;
 import javax.portlet.ResourceURL;
+import javax.portlet.EventRequest;
+import javax.portlet.EventResponse;
+import javax.portlet.ActionRequest;
+import javax.portlet.ActionResponse;
+import javax.portlet.PortletSecurityException;
+import javax.portlet.PortletURL;
+import javax.portlet.PortletPreferences;
+import javax.portlet.PortletMode;
 import java.io.IOException;
 import java.io.PrintWriter;
 =

@@ -40,11 +51,29 @@
  */
 public class HeaderPortlet extends GenericPortlet
 {
+   public final static int TITANIUM =3D 0;
+   public final static int PLATINUM =3D 1;
+   public final static int GOLD     =3D 2;
+   public final static int SILVER   =3D 3;
+   public final static int TIN      =3D 4;
+
+   public void processAction(ActionRequest req, ActionResponse resp) throw=
s PortletException, PortletSecurityException, IOException
+   {
+
+      String repeatText =3D req.getParameter("repeat");
+      // set zip as render parameter
+      if (repeatText !=3D null){
+      resp.setRenderParameter("repeat", repeatText);
+      }
+      // request view
+      resp.setPortletMode(PortletMode.VIEW);
+
+   }
    public void render(RenderRequest req, RenderResponse resp) throws Portl=
etException, IOException
    {
       ResourceURL resourceURL =3D resp.createResourceURL();
-
-      //
+      PortletURL actionURL =3D resp.createActionURL();
+       //
 //      Element elt =3D resp.createElement("script");
 //      elt.setAttribute("type", "text/javascript");
 //      elt.setAttribute("src", resourceURL.toString());
@@ -52,44 +81,109 @@
 //      resp.addProperty("script", elt);
 =

       //
+
       resp.setContentType("text/html");
       PrintWriter writer =3D resp.getWriter();
       writer.print("" +
          "" +
-         "
");
+
+         "");
+
+            writer.print("" +
+               "" +
+               "Partial Refresh Repeater Demo");
+            writer.print("" +
+            " " +
+               "  \n" +
+            "      Repeat Demo:
\n=
" +
+            "      \n" +
+           "      \n" +
+            "   \n" +
+               "" +
+            "");
+            writer.print("");
 //         "" +
 //         "Cl=
ick me to trigger script" +
+         writer.print("

" +
+            "Partial Refresh Product Catalog" +
+            "" +
+                        "");
+         writer.print("");
          resourceURL.setParameter("prodId","1");
-         writer.print("Product 1
");
+         writer.print("Product 1
");
 =

          resourceURL.setParameter("prodId","2");
-         writer.print("Product 2
");
+         writer.print("Product 2
");
 =

          resourceURL.setParameter("prodId","3");
-         writer.print("Product 3
");
+         writer.print("Product 3
");
 =

-         writer.print("" +
-         "
" +
-         "Product Details");
+         writer.print("
");
+         writer.print("" +
+            "Product Details" +
+            "" +
+            "");
+         writer.print("
");
+         writer.print("
");
+         writer.print("
");
+
+
+
+        // writer.print("");
    }
 =

    public void serveResource(ResourceRequest req, ResourceResponse resp) t=
hrows PortletException, IOException
    {
+      String repeatText =3D req.getParameter("repeat");
+      String prodId =3D req.getParameter("prodId");
+
       String namespace =3Dresp.getNamespace();
       //resp.setContentType("application/json");
       resp.setContentType("text/html");
       PrintWriter writer =3D resp.getWriter();
+      if (repeatText !=3D null){
+         writer.print(""+ req.getPrivateParamete=
rMap().get("repeat")[0] +"");
+      }
+      if (prodId !=3D null){
+         if (prodId.equals("1")){
+            writer.print("Product ID: "+ prodId=
 +"" +
+            "
" +
+            " B BY BURTON ALPHA
" +
+            "Sale Price: $314.96 " +
+            "");
+         }
+         if (prodId.equals("2")){
+            writer.print("Product ID: "+ prodId=
 +"" +
+            "
" +
+               "FORUM DESTROYER LTD
" +
+               "$319.99 " +
+            "");
+         }
+         if (prodId.equals("3")){
+            writer.print("Product ID: "+ prodId=
 +"" +
+            "
" +
+            "\n" +
+               "SANTA CRUZ ALLSTAR
" +
+               "$256.00 " +
+            "");
+         }
 =

-      writer.print("" + req.getParameter("prodId") +"");
+      }
 =

+
+
+
       writer.close();
    }
 }

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/c=
ss/master.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/css/mas=
ter.css	2008-02-13 21:05:27 UTC (rev 9957)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/css/mas=
ter.css	2008-02-14 00:37:37 UTC (rev 9958)
@@ -1,4 +1,5 @@
-body {
+body,
+div.container {
    font: normal 12px Lucida Sans, Trebuchet, tahoma, sans-serif;
 }
 =

@@ -81,6 +82,12 @@
    border: 0;
 }
 =

+.zero {
+   margin: 0;
+   padding: 0;
+   border: 0;
+}
+
 body,
    div,
    form,

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/d=
emo/demo3.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/de=
mo3.jsp	2008-02-13 21:05:27 UTC (rev 9957)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/de=
mo3.jsp	2008-02-14 00:37:37 UTC (rev 9958)
@@ -8,6 +8,7 @@
                =

 
    
+ =

    
             
                

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/l=
ayouts/header.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts=
/header.jsp	2008-02-13 21:05:27 UTC (rev 9957)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts=
/header.jsp	2008-02-14 00:37:37 UTC (rev 9958)
@@ -3,7 +3,7 @@
 
-
+
 
    Portlet Container 2.0
    


--===============6277455078322425427==--

From portal-commits at lists.jboss.org Wed Feb 13 20:02:59 2008
Content-Type: multipart/mixed; boundary="===============8064611263779887427=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9959 -
 docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
Date: Wed, 13 Feb 2008 20:02:56 -0500
Message-ID: 

--===============8064611263779887427==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mmcallis
Date: 2008-02-13 20:02:56 -0500 (Wed, 13 Feb 2008)
New Revision: 9959

Modified:
   docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorial=
s.xml
Log:
5.2.1.5. Building your Portlet
5.2.1.6. Deploying your Portlet
revising and fixing up the spelling errors I
introduced


Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/t=
utorials.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutoria=
ls.xml	2008-02-14 00:37:37 UTC (rev 9958)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutoria=
ls.xml	2008-02-14 01:02:56 UTC (rev 9959)
@@ -142,7 +142,7 @@
             Introduction
             
 		    This section details deploying your first portlet in JBoss Portal. B=
efore proceeding, download the HelloWorldPorlet from JBoss PortletSwap.
+                  url=3D"http://anonsvn.jboss.org/repos/portletswap/portle=
ts/2_6/bundles/HelloWorldPortlet.zip">HelloWorldPortlet from JBoss PortletSwap.
 	    
          
          
@@ -521,7 +521,7 @@
          
             Building your Portlet
             
-		    A pre-compiled HelloWorldPortlet/helloworldportlet.war file is created after extracting the HelloWorldPorlet.zip=
 file. To manually build the helloworldportlet.war file:
+		    A pre-compiled HelloWorldPortlet/helloworldportlet.war file is created after extracting the HelloWorldPortlet.zi=
p file. To manually build the helloworldportlet.war file:
 	    
 	    
 		    
@@ -545,7 +545,7 @@
 		    
 	    
             
-		    Expanding the helloworldportlet.war allows you =
to deploy the portlet as an expanded directory, which makes development eas=
ier. As well, it gives you access to the XML descriptors, resource files, J=
SF, and JSP pages. To expand the helloworldportlet.war=
 file:
+		    Expanding the helloworldportlet.war file allows=
 you to deploy the portlet as an expanded directory, which makes developmen=
t easier. As well, it gives you access to the XML descriptors, resource fil=
es, JSF, and JSP pages. To expand the helloworldportlet.war file:
 	    
 	    
 		    
@@ -583,26 +583,49 @@
             
          
          
-            Deploying your portlet
+            Deploying your Portlet
             
-               Deploying a portlet is as simple as copying/moving helloworldportlet.war
-               to your server deploy directory. Doing t=
his on a running instance of JBoss Portal and
-               application server, will trigger a hot-deploy of your portlet:
-               =

-               Pointing your browser to http://localhost:8080/portal/,
-               should yield a view of our HelloWorldPortlet, added to the =
default page of Portal:
-	       =

-	       
+		  If you did not expand the helloworldportlet.war f=
ile, copy the HelloWorldPortlet/helloworldportlet.war =
file into the correct JBoss AS or JBoss EAP deploy/ di=
rectory. If you expanded the helloworldportlet.war fil=
e, copy the HelloWorldPortlet/output/lib/exploded/helloworldportl=
et.war/ directory into the correct JBoss AS or JBoss EAP deploy/ directory. For example, if you are using JBoss AS, co=
py the file or directory into the $JBOSS_HOME/server/default/depl=
oy/ directory.
+	    
+	    
+		    Performing this step on a running instance of JBoss AS or JBoss EAP,=
 and JBoss Portal, will trigger a hot-deploy of the portlet:
+	    
+	    
+
+
+	   
+	   
+		   To see the HelloWorldPortlet, navigate to http://localhost:8080/portal/, or, if the main JB=
oss Portal page is already open, refresh the page. The HelloWorldPortlet is=
 added to the default page of JBoss Portal:
+	   
+	   
                
                   
                      
                   
                
             
-         
+	    
+		    To re-deploy the portlet, for example, if you have made changes to a=
ny of the XML descriptors, touch the $JBOSS_HOME/server/configuration/deploy/helloworldportlet.war/WEB-INF/web.xm=
l file. On Linux, run the following command to re-deploy the Hel=
loWorldPortlet:
+	    
+	    
+
+touch $JBOSS_HOME/server/configuration/deploy/h=
elloworldportlet.war/WEB-INF/web.xml
+
+	   
+	   
+		   Re-deploying the HelloWorldPortlet will produce the following output =
on the JBoss AS or JBoss EAP console:
+	   
+	   
+
+
+
+
       
       
          A Simple JSP Portlet


--===============8064611263779887427==--

From portal-commits at lists.jboss.org Wed Feb 13 20:24:02 2008
Content-Type: multipart/mixed; boundary="===============5678491002320575496=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9960 -
 modules/portlet/trunk/test/src/test.
Date: Wed, 13 Feb 2008 20:24:02 -0500
Message-ID: 

--===============5678491002320575496==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: chris.laprun(a)jboss.com
Date: 2008-02-13 20:24:02 -0500 (Wed, 13 Feb 2008)
New Revision: 9960

Modified:
   modules/portlet/trunk/test/src/test/build.xml
Log:
- Now rename Tomcat lib directory to the more explicit copy-to-tomcat-lib. =

- Commented out AS 5 references for now.

Modified: modules/portlet/trunk/test/src/test/build.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/build.xml	2008-02-14 01:02:56 UTC (=
rev 9959)
+++ modules/portlet/trunk/test/src/test/build.xml	2008-02-14 01:24:02 UTC (=
rev 9960)
@@ -712,14 +712,14 @@
       
       
       
-      
+      
 =

 =

       
@@ -772,6 +772,9 @@
          
       
       
+      
+         
+      
 =

       
       


--===============5678491002320575496==--

From portal-commits at lists.jboss.org Wed Feb 13 20:26:47 2008
Content-Type: multipart/mixed; boundary="===============8983591464016881099=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9961 - in
 modules/portlet/trunk/docs: common and 4 other directories.
Date: Wed, 13 Feb 2008 20:26:46 -0500
Message-ID: 

--===============8983591464016881099==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: chris.laprun(a)jboss.com
Date: 2008-02-13 20:26:46 -0500 (Wed, 13 Feb 2008)
New Revision: 9961

Added:
   modules/portlet/trunk/docs/common/
   modules/portlet/trunk/docs/common/en/
   modules/portlet/trunk/docs/common/en/images/
   modules/portlet/trunk/docs/common/en/images/forward.png
   modules/portlet/trunk/docs/common/en/images/frontpage.png
   modules/portlet/trunk/docs/common/en/images/messagebox_info.png
   modules/portlet/trunk/docs/common/en/images/messagebox_warning.png
   modules/portlet/trunk/docs/common/en/images/previous.png
   modules/portlet/trunk/docs/common/en/images/renaissance/
   modules/portlet/trunk/docs/common/en/images/renaissance/actionIcon_Add.g=
if
   modules/portlet/trunk/docs/common/en/images/renaissance/actionIcon_Creat=
eInstance.gif
   modules/portlet/trunk/docs/common/en/images/renaissance/actionIcon_Delet=
e.gif
   modules/portlet/trunk/docs/common/en/images/renaissance/actionIcon_Detai=
ls.gif
   modules/portlet/trunk/docs/common/en/images/renaissance/actionIcon_IsDef=
ault.gif
   modules/portlet/trunk/docs/common/en/images/renaissance/actionIcon_Layou=
t.gif
   modules/portlet/trunk/docs/common/en/images/renaissance/actionIcon_MakeD=
efault.gif
   modules/portlet/trunk/docs/common/en/images/renaissance/actionIcon_MoveD=
own.gif
   modules/portlet/trunk/docs/common/en/images/renaissance/actionIcon_MoveU=
p.gif
   modules/portlet/trunk/docs/common/en/images/renaissance/actionIcon_Prope=
rties.gif
   modules/portlet/trunk/docs/common/en/images/renaissance/actionIcon_Renam=
e.gif
   modules/portlet/trunk/docs/common/en/images/renaissance/actionIcon_Secur=
ity.gif
   modules/portlet/trunk/docs/common/en/images/renaissance/actionIcon_Theme=
.gif
   modules/portlet/trunk/docs/common/en/images/renaissance/animated_favicon=
1.gif
   modules/portlet/trunk/docs/common/en/images/renaissance/favicon.ico
   modules/portlet/trunk/docs/common/en/images/renaissance/header_bg.gif
   modules/portlet/trunk/docs/common/en/images/renaissance/homeimg_cornerel=
ement.gif
   modules/portlet/trunk/docs/common/en/images/renaissance/ico_16_help.gif
   modules/portlet/trunk/docs/common/en/images/renaissance/ico_16_maximize.=
gif
   modules/portlet/trunk/docs/common/en/images/renaissance/ico_16_minimize.=
gif
   modules/portlet/trunk/docs/common/en/images/renaissance/ico_16_normal.gif
   modules/portlet/trunk/docs/common/en/images/renaissance/ico_16_reload.gif
   modules/portlet/trunk/docs/common/en/images/renaissance/ico_16_remove.gif
   modules/portlet/trunk/docs/common/en/images/renaissance/ico_16_swizzlecl=
osed.gif
   modules/portlet/trunk/docs/common/en/images/renaissance/ico_16_swizzleop=
en.gif
   modules/portlet/trunk/docs/common/en/images/renaissance/ico_addcontent.g=
if
   modules/portlet/trunk/docs/common/en/images/renaissance/ico_admin.gif
   modules/portlet/trunk/docs/common/en/images/renaissance/ico_arrow_blue_l=
eft.gif
   modules/portlet/trunk/docs/common/en/images/renaissance/ico_arrow_blue_r=
ight.gif
   modules/portlet/trunk/docs/common/en/images/renaissance/ico_arrow_grey_l=
eft.gif
   modules/portlet/trunk/docs/common/en/images/renaissance/ico_arrow_grey_r=
ight.gif
   modules/portlet/trunk/docs/common/en/images/renaissance/ico_cancel.gif
   modules/portlet/trunk/docs/common/en/images/renaissance/ico_edit.gif
   modules/portlet/trunk/docs/common/en/images/renaissance/ico_listelement.=
gif
   modules/portlet/trunk/docs/common/en/images/renaissance/logo.gif
   modules/portlet/trunk/docs/common/en/images/renaissance/msgIcon_Warning.=
gif
   modules/portlet/trunk/docs/common/en/images/renaissance/objectPath_Arrow=
.gif
   modules/portlet/trunk/docs/common/en/images/renaissance/pathBackground.p=
ng
   modules/portlet/trunk/docs/common/en/images/renaissance/pathSeparator.png
   modules/portlet/trunk/docs/common/en/images/renaissance/portlet-bottom-l=
eft.gif
   modules/portlet/trunk/docs/common/en/images/renaissance/portlet-bottom-m=
iddle.gif
   modules/portlet/trunk/docs/common/en/images/renaissance/portlet-bottom-r=
ight.gif
   modules/portlet/trunk/docs/common/en/images/renaissance/portlet-left-ver=
tical.gif
   modules/portlet/trunk/docs/common/en/images/renaissance/portlet-right-ve=
rtical.gif
   modules/portlet/trunk/docs/common/en/images/renaissance/portlet-top-left=
.gif
   modules/portlet/trunk/docs/common/en/images/renaissance/portlet-top-midd=
le.gif
   modules/portlet/trunk/docs/common/en/images/renaissance/portlet-top-righ=
t.gif
   modules/portlet/trunk/docs/common/en/images/renaissance/spacer.gif
   modules/portlet/trunk/docs/common/en/images/renaissance/tab_left.gif
   modules/portlet/trunk/docs/common/en/images/renaissance/tab_left_admin.g=
if
   modules/portlet/trunk/docs/common/en/images/renaissance/tab_left_current=
.gif
   modules/portlet/trunk/docs/common/en/images/renaissance/tab_left_hover2.=
gif
   modules/portlet/trunk/docs/common/en/images/renaissance/tab_right.gif
   modules/portlet/trunk/docs/common/en/images/renaissance/tab_right_admin.=
gif
   modules/portlet/trunk/docs/common/en/images/renaissance/tab_right_curren=
t.gif
   modules/portlet/trunk/docs/common/en/images/renaissance/tab_right_hover2=
.gif
   modules/portlet/trunk/docs/common/en/images/renaissance/tab_swizzle.gif
Modified:
   modules/portlet/trunk/docs/user-guide/build.xml
Log:
- Made doc build more specific.
- Added common directory for doc images.

Added: modules/portlet/trunk/docs/common/en/images/forward.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: modules/portlet/trunk/docs/common/en/images/forward.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: modules/portlet/trunk/docs/common/en/images/frontpage.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: modules/portlet/trunk/docs/common/en/images/frontpage.=
png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: modules/portlet/trunk/docs/common/en/images/messagebox_info.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: modules/portlet/trunk/docs/common/en/images/messagebox=
_info.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: modules/portlet/trunk/docs/common/en/images/messagebox_warning.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: modules/portlet/trunk/docs/common/en/images/messagebox=
_warning.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: modules/portlet/trunk/docs/common/en/images/previous.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: modules/portlet/trunk/docs/common/en/images/previous.p=
ng
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: modules/portlet/trunk/docs/common/en/images/renaissance/actionIcon_A=
dd.gif
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: modules/portlet/trunk/docs/common/en/images/renaissanc=
e/actionIcon_Add.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: modules/portlet/trunk/docs/common/en/images/renaissance/actionIcon_C=
reateInstance.gif
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: modules/portlet/trunk/docs/common/en/images/renaissanc=
e/actionIcon_CreateInstance.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: modules/portlet/trunk/docs/common/en/images/renaissance/actionIcon_D=
elete.gif
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: modules/portlet/trunk/docs/common/en/images/renaissanc=
e/actionIcon_Delete.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: modules/portlet/trunk/docs/common/en/images/renaissance/actionIcon_D=
etails.gif
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: modules/portlet/trunk/docs/common/en/images/renaissanc=
e/actionIcon_Details.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: modules/portlet/trunk/docs/common/en/images/renaissance/actionIcon_I=
sDefault.gif
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: modules/portlet/trunk/docs/common/en/images/renaissanc=
e/actionIcon_IsDefault.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: modules/portlet/trunk/docs/common/en/images/renaissance/actionIcon_L=
ayout.gif
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: modules/portlet/trunk/docs/common/en/images/renaissanc=
e/actionIcon_Layout.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: modules/portlet/trunk/docs/common/en/images/renaissance/actionIcon_M=
akeDefault.gif
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: modules/portlet/trunk/docs/common/en/images/renaissanc=
e/actionIcon_MakeDefault.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: modules/portlet/trunk/docs/common/en/images/renaissance/actionIcon_M=
oveDown.gif
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: modules/portlet/trunk/docs/common/en/images/renaissanc=
e/actionIcon_MoveDown.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: modules/portlet/trunk/docs/common/en/images/renaissance/actionIcon_M=
oveUp.gif
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: modules/portlet/trunk/docs/common/en/images/renaissanc=
e/actionIcon_MoveUp.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: modules/portlet/trunk/docs/common/en/images/renaissance/actionIcon_P=
roperties.gif
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: modules/portlet/trunk/docs/common/en/images/renaissanc=
e/actionIcon_Properties.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: modules/portlet/trunk/docs/common/en/images/renaissance/actionIcon_R=
ename.gif
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: modules/portlet/trunk/docs/common/en/images/renaissanc=
e/actionIcon_Rename.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: modules/portlet/trunk/docs/common/en/images/renaissance/actionIcon_S=
ecurity.gif
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: modules/portlet/trunk/docs/common/en/images/renaissanc=
e/actionIcon_Security.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: modules/portlet/trunk/docs/common/en/images/renaissance/actionIcon_T=
heme.gif
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: modules/portlet/trunk/docs/common/en/images/renaissanc=
e/actionIcon_Theme.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: modules/portlet/trunk/docs/common/en/images/renaissance/animated_fav=
icon1.gif
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: modules/portlet/trunk/docs/common/en/images/renaissanc=
e/animated_favicon1.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: modules/portlet/trunk/docs/common/en/images/renaissance/favicon.ico
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: modules/portlet/trunk/docs/common/en/images/renaissanc=
e/favicon.ico
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: modules/portlet/trunk/docs/common/en/images/renaissance/header_bg.gif
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: modules/portlet/trunk/docs/common/en/images/renaissanc=
e/header_bg.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: modules/portlet/trunk/docs/common/en/images/renaissance/homeimg_corn=
erelement.gif
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: modules/portlet/trunk/docs/common/en/images/renaissanc=
e/homeimg_cornerelement.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: modules/portlet/trunk/docs/common/en/images/renaissance/ico_16_help.=
gif
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: modules/portlet/trunk/docs/common/en/images/renaissanc=
e/ico_16_help.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: modules/portlet/trunk/docs/common/en/images/renaissance/ico_16_maxim=
ize.gif
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: modules/portlet/trunk/docs/common/en/images/renaissanc=
e/ico_16_maximize.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: modules/portlet/trunk/docs/common/en/images/renaissance/ico_16_minim=
ize.gif
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: modules/portlet/trunk/docs/common/en/images/renaissanc=
e/ico_16_minimize.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: modules/portlet/trunk/docs/common/en/images/renaissance/ico_16_norma=
l.gif
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: modules/portlet/trunk/docs/common/en/images/renaissanc=
e/ico_16_normal.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: modules/portlet/trunk/docs/common/en/images/renaissance/ico_16_reloa=
d.gif
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: modules/portlet/trunk/docs/common/en/images/renaissanc=
e/ico_16_reload.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: modules/portlet/trunk/docs/common/en/images/renaissance/ico_16_remov=
e.gif
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: modules/portlet/trunk/docs/common/en/images/renaissanc=
e/ico_16_remove.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: modules/portlet/trunk/docs/common/en/images/renaissance/ico_16_swizz=
leclosed.gif
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: modules/portlet/trunk/docs/common/en/images/renaissanc=
e/ico_16_swizzleclosed.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: modules/portlet/trunk/docs/common/en/images/renaissance/ico_16_swizz=
leopen.gif
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: modules/portlet/trunk/docs/common/en/images/renaissanc=
e/ico_16_swizzleopen.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: modules/portlet/trunk/docs/common/en/images/renaissance/ico_addconte=
nt.gif
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: modules/portlet/trunk/docs/common/en/images/renaissanc=
e/ico_addcontent.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: modules/portlet/trunk/docs/common/en/images/renaissance/ico_admin.gif
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: modules/portlet/trunk/docs/common/en/images/renaissanc=
e/ico_admin.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: modules/portlet/trunk/docs/common/en/images/renaissance/ico_arrow_bl=
ue_left.gif
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: modules/portlet/trunk/docs/common/en/images/renaissanc=
e/ico_arrow_blue_left.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: modules/portlet/trunk/docs/common/en/images/renaissance/ico_arrow_bl=
ue_right.gif
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: modules/portlet/trunk/docs/common/en/images/renaissanc=
e/ico_arrow_blue_right.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: modules/portlet/trunk/docs/common/en/images/renaissance/ico_arrow_gr=
ey_left.gif
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: modules/portlet/trunk/docs/common/en/images/renaissanc=
e/ico_arrow_grey_left.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: modules/portlet/trunk/docs/common/en/images/renaissance/ico_arrow_gr=
ey_right.gif
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: modules/portlet/trunk/docs/common/en/images/renaissanc=
e/ico_arrow_grey_right.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: modules/portlet/trunk/docs/common/en/images/renaissance/ico_cancel.g=
if
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: modules/portlet/trunk/docs/common/en/images/renaissanc=
e/ico_cancel.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: modules/portlet/trunk/docs/common/en/images/renaissance/ico_edit.gif
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: modules/portlet/trunk/docs/common/en/images/renaissanc=
e/ico_edit.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: modules/portlet/trunk/docs/common/en/images/renaissance/ico_listelem=
ent.gif
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: modules/portlet/trunk/docs/common/en/images/renaissanc=
e/ico_listelement.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: modules/portlet/trunk/docs/common/en/images/renaissance/logo.gif
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: modules/portlet/trunk/docs/common/en/images/renaissanc=
e/logo.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: modules/portlet/trunk/docs/common/en/images/renaissance/msgIcon_Warn=
ing.gif
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: modules/portlet/trunk/docs/common/en/images/renaissanc=
e/msgIcon_Warning.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: modules/portlet/trunk/docs/common/en/images/renaissance/objectPath_A=
rrow.gif
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: modules/portlet/trunk/docs/common/en/images/renaissanc=
e/objectPath_Arrow.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: modules/portlet/trunk/docs/common/en/images/renaissance/pathBackgrou=
nd.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: modules/portlet/trunk/docs/common/en/images/renaissanc=
e/pathBackground.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: modules/portlet/trunk/docs/common/en/images/renaissance/pathSeparato=
r.png
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: modules/portlet/trunk/docs/common/en/images/renaissanc=
e/pathSeparator.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: modules/portlet/trunk/docs/common/en/images/renaissance/portlet-bott=
om-left.gif
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: modules/portlet/trunk/docs/common/en/images/renaissanc=
e/portlet-bottom-left.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: modules/portlet/trunk/docs/common/en/images/renaissance/portlet-bott=
om-middle.gif
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: modules/portlet/trunk/docs/common/en/images/renaissanc=
e/portlet-bottom-middle.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: modules/portlet/trunk/docs/common/en/images/renaissance/portlet-bott=
om-right.gif
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: modules/portlet/trunk/docs/common/en/images/renaissanc=
e/portlet-bottom-right.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: modules/portlet/trunk/docs/common/en/images/renaissance/portlet-left=
-vertical.gif
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: modules/portlet/trunk/docs/common/en/images/renaissanc=
e/portlet-left-vertical.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: modules/portlet/trunk/docs/common/en/images/renaissance/portlet-righ=
t-vertical.gif
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: modules/portlet/trunk/docs/common/en/images/renaissanc=
e/portlet-right-vertical.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: modules/portlet/trunk/docs/common/en/images/renaissance/portlet-top-=
left.gif
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: modules/portlet/trunk/docs/common/en/images/renaissanc=
e/portlet-top-left.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: modules/portlet/trunk/docs/common/en/images/renaissance/portlet-top-=
middle.gif
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: modules/portlet/trunk/docs/common/en/images/renaissanc=
e/portlet-top-middle.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: modules/portlet/trunk/docs/common/en/images/renaissance/portlet-top-=
right.gif
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: modules/portlet/trunk/docs/common/en/images/renaissanc=
e/portlet-top-right.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: modules/portlet/trunk/docs/common/en/images/renaissance/spacer.gif
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: modules/portlet/trunk/docs/common/en/images/renaissanc=
e/spacer.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: modules/portlet/trunk/docs/common/en/images/renaissance/tab_left.gif
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: modules/portlet/trunk/docs/common/en/images/renaissanc=
e/tab_left.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: modules/portlet/trunk/docs/common/en/images/renaissance/tab_left_adm=
in.gif
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: modules/portlet/trunk/docs/common/en/images/renaissanc=
e/tab_left_admin.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: modules/portlet/trunk/docs/common/en/images/renaissance/tab_left_cur=
rent.gif
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: modules/portlet/trunk/docs/common/en/images/renaissanc=
e/tab_left_current.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: modules/portlet/trunk/docs/common/en/images/renaissance/tab_left_hov=
er2.gif
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: modules/portlet/trunk/docs/common/en/images/renaissanc=
e/tab_left_hover2.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: modules/portlet/trunk/docs/common/en/images/renaissance/tab_right.gif
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: modules/portlet/trunk/docs/common/en/images/renaissanc=
e/tab_right.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: modules/portlet/trunk/docs/common/en/images/renaissance/tab_right_ad=
min.gif
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: modules/portlet/trunk/docs/common/en/images/renaissanc=
e/tab_right_admin.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: modules/portlet/trunk/docs/common/en/images/renaissance/tab_right_cu=
rrent.gif
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: modules/portlet/trunk/docs/common/en/images/renaissanc=
e/tab_right_current.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: modules/portlet/trunk/docs/common/en/images/renaissance/tab_right_ho=
ver2.gif
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: modules/portlet/trunk/docs/common/en/images/renaissanc=
e/tab_right_hover2.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: modules/portlet/trunk/docs/common/en/images/renaissance/tab_swizzle.=
gif
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: modules/portlet/trunk/docs/common/en/images/renaissanc=
e/tab_swizzle.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: modules/portlet/trunk/docs/user-guide/build.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/docs/user-guide/build.xml	2008-02-14 01:24:02 UTC=
 (rev 9960)
+++ modules/portlet/trunk/docs/user-guide/build.xml	2008-02-14 01:26:46 UTC=
 (rev 9961)
@@ -1,26 +1,28 @@
-
+
 =

-    
-    
+   
+   
 =

-    
-    
+   
+   
 =

-    
-       
-          
-       
-    
+   
+      
+         
+      
+   
 =

-    
-        
-    
-        =

-    
+   
+      
+         
+      
+   
 =

+   
+
 


--===============8983591464016881099==--

From portal-commits at lists.jboss.org Wed Feb 13 20:28:19 2008
Content-Type: multipart/mixed; boundary="===============7232256687278022764=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9962 -
 modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo.
Date: Wed, 13 Feb 2008 20:28:19 -0500
Message-ID: 

--===============7232256687278022764==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: chris.laprun(a)jboss.com
Date: 2008-02-13 20:28:19 -0500 (Wed, 13 Feb 2008)
New Revision: 9962

Modified:
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/dem=
o1.jsp
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/hom=
e.jsp
Log:
- Added some content for home page.

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/d=
emo/demo1.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/de=
mo1.jsp	2008-02-14 01:26:46 UTC (rev 9961)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/de=
mo1.jsp	2008-02-14 01:28:19 UTC (rev 9962)
@@ -9,12 +9,12 @@
 
    
    
-            
-               
-            
-            
-               
-            
+      
+         
+      
+      
+         
+      
    
 
 =


Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/d=
emo/home.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/ho=
me.jsp	2008-02-14 01:26:46 UTC (rev 9961)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/ho=
me.jsp	2008-02-14 01:28:19 UTC (rev 9962)
@@ -1,20 +1,45 @@
 <%@ page contentType=3D"text/html" %>
-<%@ page language=3D"java" %>
-<%@ taglib prefix=3D"jbp" tagdir=3D"/WEB-INF/tags/portal" %>
-<%@ taglib uri=3D"/WEB-INF/portal.tld" prefix=3D"portal" %>
-<%@ page isELIgnored=3D"false" %>
+<%@ include file=3D"/layouts/header.jsp" %>
 =

-   <%@ include file=3D"/layouts/header.jsp" %>
 =

-      
-         
-            
+
+JBo=
ss Portlet Container is the next generation
+   portlet container on which future versions of JBoss Portal will be base=
d. It provides a standard-compliant
+   implementation of the JSR-286 Portlet 2.0 specification. It has been de=
veloped with reusability in mind so that
+   advanced users, who don't require a full-fledged portal, can leverage t=
he portlet management services it provides in
+   their own applications. JBoss Portlet Container is available through th=
e business-friendly LGPL open source license.
+
 =

-            
-            
+This simple portal is a demonstration of what can be achieved reasonabl=
y quickly by leveraging JBoss Portlet
+   Container.
 =

-            
-         
-      
+
+   
+      
+      
+      
+   
+Support Services
 =

-   <%@ include file=3D"/layouts/footer.jsp" %>
\ No newline at end of file
+         JBoss (a division of Red Hat Inc.) offers various support serv=
ices tailored to fit your needs.
+            E=
xplore support and service options for
+            JBoss Portal.
+      PortletSwap
+
+         Portle=
tswap.com is an open community sponsored
+            by JBoss to facilitate the exchange of portlets that can be us=
ed with JBoss Portlet Container and JBoss
+            Portal.
+      Project Information
+
+         Learn more about JBoss Portlet Container
+            community project, JBoss Portal,
+            JBoss Portal platform
+      
+
+Thank you for downloading and deploying JBoss Portlet Container. We hop=
e your enjoy working with it as much as we
+   enjoy developing it!
+
+Baci e abbracci,

+   The JBoss Portal Team.
+
+<%@ include file=3D"/layouts/footer.jsp" %>
\ No newline at end of file


--===============7232256687278022764==--

From portal-commits at lists.jboss.org Wed Feb 13 20:28:52 2008
Content-Type: multipart/mixed; boundary="===============4325423671310929528=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9963 - in
 modules/portlet/trunk/build: distrib and 1 other directory.
Date: Wed, 13 Feb 2008 20:28:51 -0500
Message-ID: 

--===============4325423671310929528==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: chris.laprun(a)jboss.com
Date: 2008-02-13 20:28:51 -0500 (Wed, 13 Feb 2008)
New Revision: 9963

Added:
   modules/portlet/trunk/build/distrib/
   modules/portlet/trunk/build/distrib/README.txt
   modules/portlet/trunk/build/distrib/distrib.xml
Log:
- Started distribution build.

Added: modules/portlet/trunk/build/distrib/README.txt
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/build/distrib/README.txt	                        =
(rev 0)
+++ modules/portlet/trunk/build/distrib/README.txt	2008-02-14 01:28:51 UTC =
(rev 9963)
@@ -0,0 +1,15 @@
+
+JBoss Portlet Container
+LGPL Licensed (See http://www.gnu.org/copyleft/lesser.html for details on =
the product usage)
+
+JBoss Portlet Container is the next generation portlet container on which =
future versions of JBoss
+Portal will be based. It provides a standard-compliant implementation of t=
he JSR-286 Portlet 2.0 =

+specification. It has been developed with reusability in mind so that adva=
nced users, who don't require
+a full-fledged portal, can leverage the portlet management services it pro=
vides in their own applications.
+JBoss Portlet Container is available through the business-friendly LGPL op=
en source license.
+
+This distribution also contains a simple portal built on top of JBoss Port=
let Container. This simple
+portal can be run on Tomcat 6.x and JBoss Application Server 4.2.x.
+
+INSTALLATION AND RUNNING:
+For installation, please refer to the user guide available in the 'docs' d=
irectory
\ No newline at end of file


Property changes on: modules/portlet/trunk/build/distrib/README.txt
___________________________________________________________________
Name: svn:eol-style
   + native

Added: modules/portlet/trunk/build/distrib/distrib.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/build/distrib/distrib.xml	                       =
 (rev 0)
+++ modules/portlet/trunk/build/distrib/distrib.xml	2008-02-14 01:28:51 UTC=
 (rev 9963)
@@ -0,0 +1,162 @@
+
+
+   
+   
+   
+
+   
+   
+   
+   
+   
+
+   
+   
+   
+   
+
+   
+
+   
+   
+      
+   
+
+   
+   
+
+   
+   
+      
+      
+      
+      
+         
+         
+      
+   
+
+   
+   
+
+   
+   
+      
+         
+      
+   
+
+   
+   
+
+      
+      
+
+      
+      
+      
+   
+
+   
+   
+         
+      
+      
+         
+      
+   
+
+   
+   
+      
+         
+      
+      
+         
+      
+   
+
+   
+   
+      
+         
+      
+      
+         
+      
+   
+
+   
+   
+      
+         
+      
+      
+         
+      
+      
+         
+      
+   
+
+   
+   
+      
+         
+      
+      
+      
+         
+      
+   
+
+   
+      
+      
+         
+      
+   
+
+   
+      
+         
+         
+         
+            
+         
+         
+         
+      
+   
+
+   
+      
+         
+      
+      
+   
+


Property changes on: modules/portlet/trunk/build/distrib/distrib.xml
___________________________________________________________________
Name: svn:executable
   + *


--===============4325423671310929528==--

From portal-commits at lists.jboss.org Wed Feb 13 21:01:33 2008
Content-Type: multipart/mixed; boundary="===============0829159592480603024=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9964 -
 modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/portal/samples.
Date: Wed, 13 Feb 2008 21:00:30 -0500
Message-ID: 

--===============0829159592480603024==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: chris.laprun(a)jboss.com
Date: 2008-02-13 21:00:29 -0500 (Wed, 13 Feb 2008)
New Revision: 9964

Modified:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/portal=
/samples/RemoteControlResourcePortlet.java
Log:
- Fixed remote control window that was still referencing /simple context.
- Use namespace for javascript functions.

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/portal/samples/RemoteControlResourcePortlet.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/porta=
l/samples/RemoteControlResourcePortlet.java	2008-02-14 01:28:51 UTC (rev 99=
63)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/porta=
l/samples/RemoteControlResourcePortlet.java	2008-02-14 02:00:29 UTC (rev 99=
64)
@@ -31,9 +31,11 @@
    {
       renderResponse.setContentType("text/html");
       PrintWriter printWriter =3D renderResponse.getWriter();
-      printWriter.print("");
-      printWriter.print("function " + nam=
espace
+         + "_openRemote(url){window.name=3D'" + namespace + "_parent';wind=
ow.open(url, '" + namespace
+         + "_remote', 'width=3D400,height=3D200,scrollable=3Dyes')}");
+      printWriter.print("
Open remote control!");
@@ -47,19 +49,20 @@
    {
       resourceResponse.setContentType("text/html");
       PrintWriter writer =3D resourceResponse.getWriter();
+      String namespace =3D resourceResponse.getNamespace();
 //      resourceRequest.getPreferences().setValue("color", COLORS[COLOR_IN=
DEX++ % 8]);
-      writer.print("" +
-         "");
+      writer.print("\n");
       PortletURL url =3D resourceResponse.createRenderURL();
       url.setWindowState(WindowState.MINIMIZED);
       writer.print(" minimize parent portlet");
+         "                        src=3D\"/simple-portal/images/icon-minim=
ize.gif\" alt=3D\"\"/> minimize parent portlet");
       url.setWindowState(WindowState.MAXIMIZED);
       writer.print(" maximize parent portlet");
+         "                        src=3D\"/simple-portal/images/icon-maxim=
ize.gif\" alt=3D\"\"/> maximize parent portlet");
       url.setWindowState(WindowState.NORMAL);
       writer.print(" make parent portlet normal");
+         "                        src=3D\"/simple-portal/images/icon-norma=
l.gif\" alt=3D\"\"/> make parent portlet normal");
       writer.print("
'zipcode' public render parameter =
value: " + resourceRequest.getParameter(ZIPCODE) + "
");
       writer.print("Set value of 'zipcode' public render parameter =
to:");
       url.setParameter(ZIPCODE, "80201");


--===============0829159592480603024==--

From portal-commits at lists.jboss.org Wed Feb 13 22:01:13 2008
Content-Type: multipart/mixed; boundary="===============6628991230708158424=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9965 -
 docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
Date: Wed, 13 Feb 2008 22:01:12 -0500
Message-ID: 

--===============6628991230708158424==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mmcallis
Date: 2008-02-13 22:01:12 -0500 (Wed, 13 Feb 2008)
New Revision: 9965

Modified:
   docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/configur=
ation.xml
   docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/installa=
tion.xml
   docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorial=
s.xml
Log:
5.2.1.6. Deploying your Portlet
revising section
updating previous pages with ulinks to
localhost:8080/portal


Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/c=
onfiguration.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/configu=
ration.xml	2008-02-14 02:00:29 UTC (rev 9964)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/configu=
ration.xml	2008-02-14 03:01:12 UTC (rev 9965)
@@ -38,7 +38,7 @@
 	
       	
 	      
-		      Root user Privileges
+		      Root User Privileges
 		      
 			      Linux systems require root user privileges to run a server on a p=
ort less than 1024. Starting JBoss EAP or JBoss AS on port 80 as a non-priv=
ileged user will not work. Running JBoss EAP or JBoss AS as the root user c=
ould lead to security breaches.
 		      

Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/i=
nstallation.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/install=
ation.xml	2008-02-14 02:00:29 UTC (rev 9964)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/install=
ation.xml	2008-02-14 03:01:12 UTC (rev 9965)
@@ -30,7 +30,7 @@
 	      
 	      
 		      
-			      Log in to JBoss Portal: using =
a Web browser, navigate to http://localhost:8080/portal to open the JBoss Portal homepage. Log in using one of the tw=
o default accounts: username user, password =
user, or username admin, password admin.
+			      Log in to JBoss Portal: using =
a Web browser, navigate to  to open the JBoss Portal homepage. Log in using one of the two default=
 accounts: username user, password user, or username admin, password admin.
 		      
 	      
       
@@ -166,7 +166,7 @@
 		
 		
 			
-				Log in to JBoss Portal: using a Web=
 browser, navigate to http://localhost:8080/portal to open the JBoss Portal homepage. Log in using one of the two def=
ault accounts: username user, password user<=
/emphasis>, or username admin, password admi=
n:
+				Log in to JBoss Portal: using a Web=
 browser, navigate to  =
to open the JBoss Portal homepage. Log in using one of the two default acco=
unts: username user, password user, or username admin, password admin:
 			
 			
 				
@@ -259,7 +259,7 @@
                
             
 	    
-		    If the source files were obtained from SVN, change into the trunk/src/ directory to see the directories from the above ima=
ge. As well, there will be an empty thirdparty directo=
ry. This directory will contain files after building the JBoss Portal sourc=
e code (). For more info=
rmation about the JBoss Portal SVN repository, and accessing different vers=
ions of the JBoss Portal codebase, please visit the JBoss Portal SVN Repo page on the JBoss Wiki.
+		    If the source files were obtained from SVN, change into the trunk/src/ directory to see the directories from the above ima=
ge. As well, there will be an empty thirdparty directo=
ry. This directory will contain files after building the JBoss Portal sourc=
e code (see ). For more =
information about the JBoss Portal SVN repository, and accessing different =
versions of the JBoss Portal codebase, please visit the JBoss Portal SVN Repo<=
/ulink> page on the JBoss Wiki.
 		    
 	    
       
@@ -482,7 +482,7 @@
 		       
 		       
 			       
-				       Log in to JBoss Portal: usin=
g a Web browser, navigate to http://localhost:8080/portal to open the JBoss Portal homepage. Log in using one of the =
two default accounts: username user, password user, or username admin, password admin:
+				       Log in to JBoss Portal: usin=
g a Web browser, navigate to  to open the JBoss Portal homepage. Log in using one of the two defau=
lt accounts: username user, password user, or username admin, password admin<=
/emphasis>:
 			       
 			       
 			       

Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/t=
utorials.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutoria=
ls.xml	2008-02-14 02:00:29 UTC (rev 9964)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutoria=
ls.xml	2008-02-14 03:01:12 UTC (rev 9965)
@@ -532,6 +532,11 @@
 			    
 			    
 				    
+					    If required, edit the HelloWorldPortlet/src/main/org/jb=
oss/portlet/hello/HelloWorldPortlet.java file, and the XML descr=
iptors in the HelloWorldPortlet/src/resources/helloworldportlet-w=
ar/WEB-INF/ directory.
+				    
+			    
+			    
+				    
 					    Run the ant deploy command:
 				    
 				    
@@ -585,7 +590,7 @@
          
             Deploying your Portlet
             
-		  If you did not expand the helloworldportlet.war f=
ile, copy the HelloWorldPortlet/helloworldportlet.war =
file into the correct JBoss AS or JBoss EAP deploy/ di=
rectory. If you expanded the helloworldportlet.war fil=
e, copy the HelloWorldPortlet/output/lib/exploded/helloworldportl=
et.war/ directory into the correct JBoss AS or JBoss EAP deploy/ directory. For example, if you are using JBoss AS, co=
py the file or directory into the $JBOSS_HOME/server/default/depl=
oy/ directory.
+		  If you did not expand the helloworldportlet.war f=
ile, copy the HelloWorldPortlet/helloworldportlet.war =
file into the correct JBoss AS or JBoss EAP deploy/ di=
rectory. If you expanded the helloworldportlet.war fil=
e, copy the HelloWorldPortlet/output/lib/exploded/helloworldportl=
et.war/ directory into the correct JBoss AS or JBoss EAP deploy/ directory. For example, if you are using JBoss AS, co=
py the war file or the expanded directory into the $JBOSS_HOME/se=
rver/default/deploy/ directory.
 	    
 	    
 		    Performing this step on a running instance of JBoss AS or JBoss EAP,=
 and JBoss Portal, will trigger a hot-deploy of the portlet:
@@ -593,11 +598,11 @@
 	    
 
+warUrl=3D.../tmp/deploy/tmp35219helloworldportlet-exp.war/]]>
 
 	   
 	   
-		   To see the HelloWorldPortlet, navigate to http://localhost:8080/portal/, or, if the main JB=
oss Portal page is already open, refresh the page. The HelloWorldPortlet is=
 added to the default page of JBoss Portal:
+		   To see the HelloWorldPortlet, navigate to http://localhost:8080/portal/, or, if the default=
 JBoss Portal page is already open, refresh the page. The HelloWorldPortlet=
 is added to the default JBoss Portal page:
 	   
 	   
                
@@ -615,7 +620,7 @@
 
 	   
 	   
-		   Re-deploying the HelloWorldPortlet will produce the following output =
on the JBoss AS or JBoss EAP console:
+		   Re-deploying the HelloWorldPortlet will produce output to the JBoss A=
S or JBoss EAP console, similar to the following:
 	   
 	   
 

--===============2434503316584890184==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mmcallis
Date: 2008-02-14 02:17:39 -0500 (Thu, 14 Feb 2008)
New Revision: 9966

Modified:
   docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorial=
s.xml
Log:
minor revisions for:
5.2.2. An Example JSP Portlet
5.2.2.1. Introduction
5.2.2.2. Package Content


Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/t=
utorials.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutoria=
ls.xml	2008-02-14 03:01:12 UTC (rev 9965)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutoria=
ls.xml	2008-02-14 07:17:39 UTC (rev 9966)
@@ -141,7 +141,7 @@
          
             Introduction
             
-		    This section details deploying your first portlet in JBoss Portal. B=
efore proceeding, download the HelloWorldPortlet from JBoss PortletSwap.
 	    
          
@@ -264,7 +264,7 @@
                
            
            
-		   The following is an example of the HelloWorldPortlet/WEB-IN=
F/portlet.xml file. Note: in order to create the WEB-I=
NF and META-INF directories, extract the helloworldportlet.war file:
+		   The following is an example of the HelloWorldPortlet/WEB-IN=
F/portlet.xml file:
 	   
 	   
 
 	
 	
-		This file must adhere to its definition in the JSR-168 Portlet Specifica=
tion. You may define more than one portlet application in this file.
+		In order to create the WEB-INF and META-I=
NF directories, extract the helloworldportlet.war file.This file must adhere to its definition in the JSR-168 Portlet =
Specification. You may define more than one portlet application in this fil=
e.
 	
 	
 		
@@ -597,12 +597,12 @@
 	    
 	    
 
 
 	   
 	   
-		   To see the HelloWorldPortlet, navigate to http://localhost:8080/portal/, or, if the default=
 JBoss Portal page is already open, refresh the page. The HelloWorldPortlet=
 is added to the default JBoss Portal page:
+		   To see the HelloWorldPortlet, navigate to http://localhost:8080/portal/, or, if the default=
 JBoss Portal page is already open, refresh the page. The HelloWorldPortlet=
 is added to the bottom of the default JBoss Portal page:
 	   
 	   
                
@@ -626,39 +626,34 @@
 
 
 
 
       
       
-         A Simple JSP Portlet
+         An Example JSP Portlet
          
             Introduction
-            This section will introduce the reader to deploying a si=
mple JSP portlet in JBoss Portal. It requires
-               you download the HelloWorldJSPPortlet from PortletSwap.com,=
 using this
-               
-                  link.
+	    
+		    This section describes how to deploy a JSP portlet in JBoss Portal. =
Before proceeding, download the HelloWorldJSPP=
ortlet from JBoss=
 PortletSwap. The HelloWorldJSPPortlet demonstrates how to use JSPs=
 for view rendering, and the portlet taglib for generating links.
             
-            
-               This portlet will introduce you to using JSPs for view rend=
ering and the portlet taglib for generating
-               links.
-            
          
          
-            Package content
+            Package Content
             
-               The application descriptors for this portlet are similar to=
 the ones we saw in
-               . See the  chapter on
-               descriptors for more details.
+		    The application descriptors for the HelloWorldJSPPortlet portlet are=
 similar to those from the HelloWorldPortlet (). See  for further =
details about application descriptors.
+	    
+	    
+		    The following is an example of the directory structure of the HelloW=
orldJSPPortlet portlet. The HelloWorldJSPPortlet portlet contains the tradi=
tional portlet and JBoss Portal specific application descriptors:
+	    
+	    
                
                   
                      
                   
                
-               As you can see in the figure above, the package content is =
what you'd expect from a traditional web
-               application augmented with the portlet- and JBoss Portal-sp=
ecific application descriptors.
             
          
          


--===============2434503316584890184==--

From portal-commits at lists.jboss.org Thu Feb 14 03:06:19 2008
Content-Type: multipart/mixed; boundary="===============3359256899643538263=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9967 -
 docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
Date: Thu, 14 Feb 2008 03:06:19 -0500
Message-ID: 

--===============3359256899643538263==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mmcallis
Date: 2008-02-14 03:06:18 -0500 (Thu, 14 Feb 2008)
New Revision: 9967

Modified:
   docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorial=
s.xml
Log:
revising 5.2.2.3. Portlet Class with variablelists.
Periodic backup. This will break the book until later
commits.


Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/t=
utorials.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutoria=
ls.xml	2008-02-14 07:17:39 UTC (rev 9966)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutoria=
ls.xml	2008-02-14 08:06:18 UTC (rev 9967)
@@ -659,12 +659,11 @@
          
             Portlet Class
             
-               Included in the 
-               download bundle you should have one java source fil=
e:
-               HelloWorldJSPPortlet\src\main\org\jboss\portlet\he=
llo\HelloWorldJSPPortlet.java,
-               containing the following:
-               HelloWorldJSPPortlet contai=
ns a HelloWorldJSPPortlet/src/main/org/jboss/portlet/hello/HelloW=
orldJSPPortlet.java file:
+	    
+	    
+
-               Now let's look at some of our methods:
-               
-                  
-                     
-                        
+
+
+
+	
+		
-                        Support for these Modes must be declared in the po=
rtlet.xml. They will be triggered when a user
-                        clicks on the respective icons in the portlet wind=
ow titlebar, or through generated links within
-                        the portlet.
-                     
-                  
-                  
-                     
-                        
+
+
+	
+		Support for these modes must be declared in the HelloWorldJSPP=
ortlet/WEB-INF/portlet.xml file. They will be triggered when a u=
ser clicks on the respective icons in the portlet window titlebar, or throu=
gh generated links within the portlet.
+       
+
+
+
+		
-                        This method will be triggered upon clicking on an =
ActionURL from our
-                        view.jsp. It will retrieve yourname from the HTML form,
+}]]>
+
+
+	
+		This method is triggered when a user clicks on an action=
URL, which is defined in the HelloWorldJSPPortle=
t/WEB-INF/jsp/view.jsp file. This retrieves your=
name from the HTML form, and passes it as a rende=
rParameter to the doView() method.
+	
+
+
+	=

+	It will retrieve yourname from the HTML form,
                         and pass it along as a renderParameter to the doView()
                         method.
                      


--===============3359256899643538263==--

From portal-commits at lists.jboss.org Thu Feb 14 03:46:35 2008
Content-Type: multipart/mixed; boundary="===============2404185924936327495=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9968 -
 docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
Date: Thu, 14 Feb 2008 03:46:35 -0500
Message-ID: 

--===============2404185924936327495==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mmcallis
Date: 2008-02-14 03:46:35 -0500 (Thu, 14 Feb 2008)
New Revision: 9968

Modified:
   docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorial=
s.xml
Log:
5.2.2.3. Portlet Class
revising, fixing my broken variablelist


Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/t=
utorials.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutoria=
ls.xml	2008-02-14 08:06:18 UTC (rev 9967)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutoria=
ls.xml	2008-02-14 08:46:35 UTC (rev 9968)
@@ -744,8 +744,7 @@
        
 
 
-
-		
 
 
-	=

-	It will retrieve yourname from the HTML form,
-                        and pass it along as a renderParameter to the doView()
-                        method.
-                     
-                  
-                  
-                     
-                        rResponse.setContentType("text/htm=
l");
-                        Just like in the servlet world, you must declare w=
hich kind of MIME type of the content the
-                        portlet will be generating.
-                     
-                  
-                  
-                     
-                        
-                        In this case, our doView implem=
entation is responsible for dispatching to
-                        the appropriate JSP view.jsp or=
 view2.jsp, depending on
-                        the existence of the yourname p=
arameter passed in from
-                        processAction.
-                     
-                  
-               
-            
+
+
+
+	
+		As in the servlet-world, you must declare what content-type the portlet =
will be responding in. Do this before starting to write content, or the por=
tlet will throw an exception.
+       
+
+
+
+
+
+	
+		The doView implementation is responsible for dispatch=
ing to the appropriate JSP, HelloWorldJSPPortlet/WEB-INF/jsp/view=
.jsp or HelloWorldJSPPortlet/WEB-INF/jsp/view2.jsp, depending on the existence of the yourname para=
meter passed in from processAction.
+	
+
+
+
+
          
          
             JSP files and the portlet taglib


--===============2404185924936327495==--

From portal-commits at lists.jboss.org Thu Feb 14 11:23:10 2008
Content-Type: multipart/mixed; boundary="===============7659533760003711457=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9969 -
 modules/portlet/trunk/build/distrib.
Date: Thu, 14 Feb 2008 11:23:07 -0500
Message-ID: 

--===============7659533760003711457==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: chris.laprun(a)jboss.com
Date: 2008-02-14 11:23:07 -0500 (Thu, 14 Feb 2008)
New Revision: 9969

Modified:
   modules/portlet/trunk/build/distrib/distrib.xml
Log:
- Added samples to binary distributions.

Modified: modules/portlet/trunk/build/distrib/distrib.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/build/distrib/distrib.xml	2008-02-14 08:46:35 UTC=
 (rev 9968)
+++ modules/portlet/trunk/build/distrib/distrib.xml	2008-02-14 16:23:07 UTC=
 (rev 9969)
@@ -130,6 +130,9 @@
       
          
       
+      
+         
+      
    
 =

    


--===============7659533760003711457==--

From portal-commits at lists.jboss.org Thu Feb 14 12:51:12 2008
Content-Type: multipart/mixed; boundary="===============3864306533276487840=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9970 - in
 modules/portlet/trunk/test/src/test/resources/simple-portal-war: demo and 1
 other directories.
Date: Thu, 14 Feb 2008 12:51:12 -0500
Message-ID: 

--===============3864306533276487840==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: wesleyhales
Date: 2008-02-14 12:51:12 -0500 (Thu, 14 Feb 2008)
New Revision: 9970

Added:
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/images/c=
ontent-box-bg.gif
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/images/c=
ontent-box-head-lt.gif
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/images/c=
ontent-box-head-rt.gif
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/images/p=
c20-picture.gif
Modified:
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/css/mast=
er.css
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/hom=
e.jsp
Log:
home page markup

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/c=
ss/master.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/css/mas=
ter.css	2008-02-14 16:23:07 UTC (rev 9969)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/css/mas=
ter.css	2008-02-14 17:51:12 UTC (rev 9970)
@@ -314,3 +314,48 @@
 div.remote-container ul li a {
    color: #332299
 }
+
+/*-------------------------------------Home page*/
+
+div#container div#content div.main-content {
+   padding: 5px;
+   width: 950px;
+   border-bottom: 1px solid #777777;
+}
+
+div#container div#content div.content-box {
+   background-image: url( /simple-portal/images/content-box-bg.gif );
+   background-repeat: repeat-x;
+   background-position: top right;
+   height: 200px ;
+   width: 300px;
+   margin: 0 13px 0 13px;
+}
+
+div#container div#content div.content-box div.box-header {
+   position: relative;
+   height: 28px;
+   width: 100%;
+}
+
+div#container div#content div.content-box div.box-header h3{
+   padding: 4px 0 0 10px;
+   font-size:1.2em;
+}
+
+
+div#container div#content div.content-box div.box-header img.left {
+   position: absolute;
+   top: 0;
+   left: 0;
+}
+
+div#container div#content div.content-box div.box-header img.right {
+   position: absolute;
+   top: 0;
+   right: 0;
+}
+
+div#container div#content div.content-box div.box-content {
+   padding: 5px;
+}
\ No newline at end of file

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/d=
emo/home.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/ho=
me.jsp	2008-02-14 16:23:07 UTC (rev 9969)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/ho=
me.jsp	2008-02-14 17:51:12 UTC (rev 9970)
@@ -1,9 +1,12 @@
 <%@ page contentType=3D"text/html" %>
 <%@ include file=3D"/layouts/header.jsp" %>
-
-
+
+
 
-JBo=
ss Portlet Container is the next generation
+

+   
+   
+   JBoss Portlet Container is the next generation
    portlet container on which future versions of JBoss Portal will be base=
d. It provides a standard-compliant
    implementation of the JSR-286 Portlet 2.0 specification. It has been de=
veloped with reusability in mind so that
    advanced users, who don't require a full-fledged portal, can leverage t=
he portlet management services it provides in
@@ -12,34 +15,55 @@
 =

 
This simple portal is a demonstration of what can be achieved reasonabl=
y quickly by leveraging JBoss Portlet
    Container.
+
+   

+
+   
+      
+      Support Services
+      
+   
+   
+      JBoss (a division of Red Hat Inc.) offers various support service=
s tailored to fit your needs.
+      Explore=
 support and service options for
+      JBoss Portal.
+   
+
 =

-
-   
-      
-      
-      
-   
-Support Services
-
-         JBoss (a division of Red Hat Inc.) offers various support serv=
ices tailored to fit your needs.
-            E=
xplore support and service options for
-            JBoss Portal.
-      PortletSwap
-
-         Portle=
tswap.com is an open community sponsored
+

+   
+      
+      PortletSwap
+      
+   
+   
+      Portletsw=
ap.com is an open community sponsored
             by JBoss to facilitate the exchange of portlets that can be us=
ed with JBoss Portlet Container and JBoss
             Portal.
-      Project Information
+   
+
 =

-         Learn more about JBoss Portlet Container
-            community project, JBoss Portal,
-            JBoss Portal platform
-      
-
-Thank you for downloading and deploying JBoss Portlet Container. We hop=
e your enjoy working with it as much as we
+

+   
+      
+      Project Information
+      
+   
+   
+      Learn more about JBoss Portlet Container
+      community project, JBoss Portal,
+      JBoss Portal platform
+   
+
+   

+
+   Thank you for downloading and deploying JBoss Portlet Container. We =
hope your enjoy working with it as much as we
    enjoy developing it!
 =

-Baci e abbracci,

-   The JBoss Portal Team.
+   Baci e abbracci,

+      The JBoss Portal Team.
+
 =

+
+
 <%@ include file=3D"/layouts/footer.jsp" %>
\ No newline at end of file

Added: modules/portlet/trunk/test/src/test/resources/simple-portal-war/imag=
es/content-box-bg.gif
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: modules/portlet/trunk/test/src/test/resources/simple-p=
ortal-war/images/content-box-bg.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: modules/portlet/trunk/test/src/test/resources/simple-portal-war/imag=
es/content-box-head-lt.gif
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: modules/portlet/trunk/test/src/test/resources/simple-p=
ortal-war/images/content-box-head-lt.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: modules/portlet/trunk/test/src/test/resources/simple-portal-war/imag=
es/content-box-head-rt.gif
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: modules/portlet/trunk/test/src/test/resources/simple-p=
ortal-war/images/content-box-head-rt.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: modules/portlet/trunk/test/src/test/resources/simple-portal-war/imag=
es/pc20-picture.gif
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: modules/portlet/trunk/test/src/test/resources/simple-p=
ortal-war/images/pc20-picture.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream


--===============3864306533276487840==--

From portal-commits at lists.jboss.org Thu Feb 14 12:54:26 2008
Content-Type: multipart/mixed; boundary="===============0579372189799049228=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9971 -
 modules/portlet/trunk/test/src/test/resources/simple-portal-war/css.
Date: Thu, 14 Feb 2008 12:54:26 -0500
Message-ID: 

--===============0579372189799049228==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: wesleyhales
Date: 2008-02-14 12:54:26 -0500 (Thu, 14 Feb 2008)
New Revision: 9971

Modified:
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/css/mast=
er.css
Log:
change link color

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/c=
ss/master.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/css/mas=
ter.css	2008-02-14 17:51:12 UTC (rev 9970)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/css/mas=
ter.css	2008-02-14 17:54:26 UTC (rev 9971)
@@ -129,7 +129,7 @@
 }
 =

 a {
-   color: #666666;
+   color: #990000;
 }
 =

 p {


--===============0579372189799049228==--

From portal-commits at lists.jboss.org Thu Feb 14 13:17:56 2008
Content-Type: multipart/mixed; boundary="===============6965426337220413382=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9972 - in
 modules/portlet/trunk/test/src/test/resources/simple-portal-war: images and 1
 other directory.
Date: Thu, 14 Feb 2008 13:16:16 -0500
Message-ID: 

--===============6965426337220413382==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: wesleyhales
Date: 2008-02-14 13:16:15 -0500 (Thu, 14 Feb 2008)
New Revision: 9972

Modified:
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/css/mast=
er.css
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/images/p=
c20-picture.gif
Log:
small change

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/c=
ss/master.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/css/mas=
ter.css	2008-02-14 17:54:26 UTC (rev 9971)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/css/mas=
ter.css	2008-02-14 18:16:15 UTC (rev 9972)
@@ -323,6 +323,10 @@
    border-bottom: 1px solid #777777;
 }
 =

+div#container div#content div.main-content p {
+   padding: 5px;
+}
+
 div#container div#content div.content-box {
    background-image: url( /simple-portal/images/content-box-bg.gif );
    background-repeat: repeat-x;

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/i=
mages/pc20-picture.gif
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


--===============6965426337220413382==--

From portal-commits at lists.jboss.org Thu Feb 14 14:05:59 2008
Content-Type: multipart/mixed; boundary="===============8090922884046854323=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9973 - in
 modules/portlet/trunk/test/src/test/resources/simple-portal-war: demo and 1
 other directory.
Date: Thu, 14 Feb 2008 14:05:59 -0500
Message-ID: 

--===============8090922884046854323==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: wesleyhales
Date: 2008-02-14 14:05:58 -0500 (Thu, 14 Feb 2008)
New Revision: 9973

Modified:
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/css/mast=
er.css
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/wik=
ipedia.jsp
Log:
wikipedia formatting

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/c=
ss/master.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/css/mas=
ter.css	2008-02-14 18:16:15 UTC (rev 9972)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/css/mas=
ter.css	2008-02-14 19:05:58 UTC (rev 9973)
@@ -362,4 +362,15 @@
 =

 div#container div#content div.content-box div.box-content {
    padding: 5px;
+}
+
+/*-------------------------------------Wiki page*/
+
+div#container div#content div.wiki-content {
+   padding: 5px;
+   border-bottom: 1px solid #777777;
+}
+
+div#container div#content div.wiki-content p {
+   padding: 5px;
 }
\ No newline at end of file

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/d=
emo/wikipedia.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/wi=
kipedia.jsp	2008-02-14 18:16:15 UTC (rev 9972)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/wi=
kipedia.jsp	2008-02-14 19:05:58 UTC (rev 9973)
@@ -8,7 +8,7 @@
 =

 
    
-   
+   
       
          
       


--===============8090922884046854323==--

From portal-commits at lists.jboss.org Thu Feb 14 14:59:49 2008
Content-Type: multipart/mixed; boundary="===============0656861386821472700=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9974 -
 modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/portal/samples/basic.
Date: Thu, 14 Feb 2008 14:59:48 -0500
Message-ID: 

--===============0656861386821472700==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: wesleyhales
Date: 2008-02-14 14:59:47 -0500 (Thu, 14 Feb 2008)
New Revision: 9974

Modified:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/portal=
/samples/basic/HeaderPortlet.java
Log:
formatting

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/portal/samples/basic/HeaderPortlet.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/porta=
l/samples/basic/HeaderPortlet.java	2008-02-14 19:05:58 UTC (rev 9973)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/porta=
l/samples/basic/HeaderPortlet.java	2008-02-14 19:59:47 UTC (rev 9974)
@@ -112,7 +112,7 @@
             "   \n" +
                "" +
             "");
-            writer.print("");
+            writer.print(""=
);
 //         "" +
 //         "Cl=
ick me to trigger script" +
          writer.print("

" +


--===============0656861386821472700==--

From portal-commits at lists.jboss.org Thu Feb 14 17:13:57 2008
Content-Type: multipart/mixed; boundary="===============1151803486081248594=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9975 -
 modules/portlet/trunk/build/distrib.
Date: Thu, 14 Feb 2008 17:13:57 -0500
Message-ID: 

--===============1151803486081248594==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: chris.laprun(a)jboss.com
Date: 2008-02-14 17:13:56 -0500 (Thu, 14 Feb 2008)
New Revision: 9975

Added:
   modules/portlet/trunk/build/distrib/JBossPC-README.txt
Modified:
   modules/portlet/trunk/build/distrib/distrib.xml
Log:
- Now create bundled distributions. Requires either (or both) TOMCAT_6_HOME=
 or JBOSS_4_2_HOME to be set.

Copied: modules/portlet/trunk/build/distrib/JBossPC-README.txt (from rev 99=
70, modules/portlet/trunk/build/distrib/README.txt)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/build/distrib/JBossPC-README.txt	                =
        (rev 0)
+++ modules/portlet/trunk/build/distrib/JBossPC-README.txt	2008-02-14 22:13=
:56 UTC (rev 9975)
@@ -0,0 +1,15 @@
+
+JBoss Portlet Container
+LGPL Licensed (See http://www.gnu.org/copyleft/lesser.html for details on =
the product usage)
+
+JBoss Portlet Container is the next generation portlet container on which =
future versions of JBoss
+Portal will be based. It provides a standard-compliant implementation of t=
he JSR-286 Portlet 2.0 =

+specification. It has been developed with reusability in mind so that adva=
nced users, who don't require
+a full-fledged portal, can leverage the portlet management services it pro=
vides in their own applications.
+JBoss Portlet Container is available through the business-friendly LGPL op=
en source license.
+
+This distribution also contains a simple portal built on top of JBoss Port=
let Container. This simple
+portal can be run on Tomcat 6.x and JBoss Application Server 4.2.x.
+
+INSTALLATION AND RUNNING:
+For installation, please refer to the user guide available in the 'jbosspc=
-docs' directory
\ No newline at end of file


Property changes on: modules/portlet/trunk/build/distrib/JBossPC-README.txt
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: modules/portlet/trunk/build/distrib/distrib.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/build/distrib/distrib.xml	2008-02-14 19:59:47 UTC=
 (rev 9974)
+++ modules/portlet/trunk/build/distrib/distrib.xml	2008-02-14 22:13:56 UTC=
 (rev 9975)
@@ -1,29 +1,30 @@
 
 =

    
-   
-   
+   
+   
+   
 =

    
-   
+   
+   
    
-   
-   
+   
+   
 =

    
    
-   
-   
+   
+   
 =

-   
-
    
    
       
    
 =

    
-   
+   
 =

    
    
@@ -38,11 +39,11 @@
          
                   =

       -->
-      
+      
       
-      
+      
          
          
       
@@ -54,7 +55,7 @@
    
    
       
-         
+         
       
    
 =

@@ -85,25 +86,42 @@
    
-   
+   
+      
+         
+      
       
          
+         
       
-      
+      
+      
+         
       
    
 =

    
-   
+   
+      
+         
+      
       
          
+         
       
-      
+      
+      
+         
       
+      
+         
+      
    
 =

    
@@ -112,10 +130,10 @@
          
       
       
-         
+         
       
       
-         
+         
       
    
 =

@@ -126,6 +144,12 @@
       
          
       
+      
+         
+      
+   
+
+   
       
       
          
@@ -135,10 +159,17 @@
       
    
 =

+   
+      
+         
+      
+   
+
    
       
+      
       
-         
+         
       
    
 =

@@ -147,9 +178,8 @@
          
          
          
-            
+            
          
-         
          
@@ -162,4 +192,30 @@
       
       
    
+
+   
+      
+
+      
+      
+         
+            
+            
+               
+            
+         
+      
+      
+         
+            
+            
+               
+            
+         
+      
+
+      
+      
+      
+   
 


--===============1151803486081248594==--

From portal-commits at lists.jboss.org Thu Feb 14 17:43:40 2008
Content-Type: multipart/mixed; boundary="===============0197514256400590434=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9976 -
 modules/portlet/trunk/build/distrib.
Date: Thu, 14 Feb 2008 17:43:38 -0500
Message-ID: 

--===============0197514256400590434==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: chris.laprun(a)jboss.com
Date: 2008-02-14 17:43:38 -0500 (Thu, 14 Feb 2008)
New Revision: 9976

Modified:
   modules/portlet/trunk/build/distrib/distrib.xml
Log:
- Compress each distrib individually.

Modified: modules/portlet/trunk/build/distrib/distrib.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/build/distrib/distrib.xml	2008-02-14 22:13:56 UTC=
 (rev 9975)
+++ modules/portlet/trunk/build/distrib/distrib.xml	2008-02-14 22:43:38 UTC=
 (rev 9976)
@@ -23,7 +23,7 @@
    
 =

    
-   
 =

    
@@ -81,6 +81,9 @@
          
       
+      
+         
+      
    
 =

    
-   
       
-         
-      
-      
-         
-      
-      
          
       
    
@@ -186,7 +182,7 @@
       
    
 =

-   
+   
       
          
       


--===============0197514256400590434==--

From portal-commits at lists.jboss.org Thu Feb 14 19:04:47 2008
Content-Type: multipart/mixed; boundary="===============0676648416089026618=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9977 -
 docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
Date: Thu, 14 Feb 2008 19:04:47 -0500
Message-ID: 

--===============0676648416089026618==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mmcallis
Date: 2008-02-14 19:04:46 -0500 (Thu, 14 Feb 2008)
New Revision: 9977

Modified:
   docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorial=
s.xml
Log:
5.2.2.3. Portlet Class
minor revisions, splitting first example for =

HelloWorldJSPPorlet.java into two screen elements


Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/t=
utorials.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutoria=
ls.xml	2008-02-14 22:43:38 UTC (rev 9976)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutoria=
ls.xml	2008-02-15 00:04:46 UTC (rev 9977)
@@ -141,7 +141,7 @@
          
             Introduction
             
-		    This section describes how to deploy a portlet in JBoss Portal. Befo=
re proceeding, download the HelloWorldPortlet from JBoss PortletSwap.
 	    
          
@@ -264,7 +264,7 @@
                
            
            
-		   The following is an example of the HelloWorldPortlet/WEB-IN=
F/portlet.xml file:
+		   The following is an example of the HelloWorldPortlet/WEB-IN=
F/portlet.xml file. In order to create the WEB-INF/ and META-INF/ directories, extract the helloworldportlet.war file.This file must adhere to its defi=
nition in the JSR-168 Portlet Specification. You may define more than one p=
ortlet application in this file:
 	   
 	   
 
 	
 	
-		In order to create the WEB-INF and META-I=
NF directories, extract the helloworldportlet.war file.This file must adhere to its definition in the JSR-168 Portlet =
Specification. You may define more than one portlet application in this fil=
e.
-	
-	
 		
 			HelloWorldPortlet]]>
@@ -633,20 +630,20 @@
 
       
       
-         An Example JSP Portlet
+         An example JSP Portlet
          
             Introduction
 	    
-		    This section describes how to deploy a JSP portlet in JBoss Portal. =
Before proceeding, download the HelloWorldJSPP=
ortlet from JBoss=
 PortletSwap. The HelloWorldJSPPortlet demonstrates how to use JSPs=
 for view rendering, and the portlet taglib for generating links.
+		    This section describes how to deploy a JSP portlet for JBoss Portal.=
 Before proceeding, download the HelloWorldJSP=
Portlet from JBos=
s PortletSwap. The HelloWorldJSPPortlet demonstrates how to use JSP=
s for view rendering, and the portlet taglib for generating links.
             
          
          
             Package Content
             
-		    The application descriptors for the HelloWorldJSPPortlet portlet are=
 similar to those from the HelloWorldPortlet (). See  for further =
details about application descriptors.
+		    The application descriptors for the HelloWorldJSPPortlet portlet are=
 similar to those from the HelloWorldPortlet (). See  for further =
information about application descriptors.
 	    
 	    
-		    The following is an example of the directory structure of the HelloW=
orldJSPPortlet portlet. The HelloWorldJSPPortlet portlet contains the tradi=
tional portlet and JBoss Portal specific application descriptors:
+		    The following is an example of the directory structure of the HelloW=
orldJSPPortlet portlet. The HelloWorldJSPPortlet portlet contains the tradi=
tional portlet and JBoss Portal specific application descriptors. In order =
to create the WEB-INF/ and META-INF/ directories, extract the helloworldjspportlet.war =
file.
 	    
 	    
                
@@ -659,7 +656,7 @@
          
             Portlet Class
             
-		    The HelloWorldJSPPortlet contai=
ns a HelloWorldJSPPortlet/src/main/org/jboss/portlet/hello/HelloW=
orldJSPPortlet.java file:
+		    The HelloWorldJSPPortlet contai=
ns the HelloWorldJSPPortlet/src/main/org/jboss/portlet/hello/Hell=
oWorldJSPPortlet.java file:
 	    
 	    
 
 	
 		
+protected void doHelp(RenderRequest rRequest, RenderResponse rResponse)
+                   throws PortletException, IOException, UnavailableExcept=
ion]]>
+
 
 
 	
@@ -776,7 +773,7 @@
 
 
 	
-		The doView implementation is responsible for dispatch=
ing to the appropriate JSP, HelloWorldJSPPortlet/WEB-INF/jsp/view=
.jsp or HelloWorldJSPPortlet/WEB-INF/jsp/view2.jsp, depending on the existence of the yourname para=
meter passed in from processAction.
+		The doView implementation is responsible for dispatch=
ing to the appropriate JSP, HelloWorldJSPPortlet/WEB-INF/jsp/view=
.jsp, or HelloWorldJSPPortlet/WEB-INF/jsp/view2.jsp, depending on the existence of the yourname par=
ameter passed in from processAction.
 	
 
 


--===============0676648416089026618==--

From portal-commits at lists.jboss.org Thu Feb 14 19:33:56 2008
Content-Type: multipart/mixed; boundary="===============8374153903901399293=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9978 - in modules/portlet/trunk:
 test/src/test and 1 other directories.
Date: Thu, 14 Feb 2008 19:33:56 -0500
Message-ID: 

--===============8374153903901399293==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: chris.laprun(a)jboss.com
Date: 2008-02-14 19:33:56 -0500 (Thu, 14 Feb 2008)
New Revision: 9978

Removed:
   modules/portlet/trunk/build/distrib/README.txt
Modified:
   modules/portlet/trunk/build/distrib/distrib.xml
   modules/portlet/trunk/test/src/test/build.xml
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/hom=
e.jsp
Log:
- Fixed issue with samples not being properly copied to tomcat distrib.
- Added option to not generate source distrib.
- Standardized distrib names.
- Added licenses to distrib.
- Added JBoss Logging to tomcat lib dir.
- Clean-ups.

Deleted: modules/portlet/trunk/build/distrib/README.txt
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/build/distrib/README.txt	2008-02-15 00:04:46 UTC =
(rev 9977)
+++ modules/portlet/trunk/build/distrib/README.txt	2008-02-15 00:33:56 UTC =
(rev 9978)
@@ -1,15 +0,0 @@
-
-JBoss Portlet Container
-LGPL Licensed (See http://www.gnu.org/copyleft/lesser.html for details on =
the product usage)
-
-JBoss Portlet Container is the next generation portlet container on which =
future versions of JBoss
-Portal will be based. It provides a standard-compliant implementation of t=
he JSR-286 Portlet 2.0 =

-specification. It has been developed with reusability in mind so that adva=
nced users, who don't require
-a full-fledged portal, can leverage the portlet management services it pro=
vides in their own applications.
-JBoss Portlet Container is available through the business-friendly LGPL op=
en source license.
-
-This distribution also contains a simple portal built on top of JBoss Port=
let Container. This simple
-portal can be run on Tomcat 6.x and JBoss Application Server 4.2.x.
-
-INSTALLATION AND RUNNING:
-For installation, please refer to the user guide available in the 'docs' d=
irectory
\ No newline at end of file

Modified: modules/portlet/trunk/build/distrib/distrib.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/build/distrib/distrib.xml	2008-02-15 00:04:46 UTC=
 (rev 9977)
+++ modules/portlet/trunk/build/distrib/distrib.xml	2008-02-15 00:33:56 UTC=
 (rev 9978)
@@ -3,11 +3,11 @@
    
    
    
-   
+   
 =

    
    
-   
+   
    
    
    
@@ -28,24 +28,9 @@
 =

    
    
-      
       
-      
       
-         
-         
+         
       
    
 =

@@ -73,7 +58,7 @@
    
-   
       
          
       
@@ -117,7 +102,7 @@
       
       
          
-         
+         
       
       
-
-   
-   
-   JBoss Portlet Container is the next generation
-   portlet container on which future versions of JBoss Portal will be base=
d. It provides a standard-compliant
-   implementation of the JSR-286 Portlet 2.0 specification. It has been de=
veloped with reusability in mind so that
-   advanced users, who don't require a full-fledged portal, can leverage t=
he portlet management services it provides in
-   their own applications. JBoss Portlet Container is available through th=
e business-friendly LGPL open source license.
-
+   
+      
+         
+         
+            JBoss Portlet Container is the next generation
+         portlet container on which future versions of JBoss Portal will b=
e based. It provides a standard-compliant
+         implementation of the JSR-286 Portlet 2.0 specification. It has b=
een developed with reusability in mind so that
+         advanced users, who don't require a full-fledged portal, can leve=
rage the portlet management services it
+         provides in
+         their own applications. JBoss Portlet Container is available thro=
ugh the business-friendly LGPL open source
+         license.
+      
 =

-This simple portal is a demonstration of what can be achieved reasonabl=
y quickly by leveraging JBoss Portlet
-   Container.
-
+      This simple portal is a demonstration of what can be achieved rea=
sonably quickly by leveraging JBoss Portlet
+         Container.
+   
    

-
-   
-      
-      Support Services
-      
+
+   
+      
+         
+
+         Support Services
+         
+      
+      
+         JBoss (a division of Red Hat Inc.) offers various support serv=
ices tailored to fit your needs.
+            E=
xplore support and service options for
+            JBoss Portal.
+      
    
-   
-      JBoss (a division of Red Hat Inc.) offers various support service=
s tailored to fit your needs.
-      Explore=
 support and service options for
-      JBoss Portal.
-   
-
 =

-
-   
-      
-      PortletSwap
-      
-   
-   
-      Portletsw=
ap.com is an open community sponsored
+   

+      
+         
+
+         PortletSwap
+         
+      
+      
+         Portle=
tswap.com is an open community sponsored
             by JBoss to facilitate the exchange of portlets that can be us=
ed with JBoss Portlet Container and JBoss
             Portal.
+      
    
-
 =

-
-   
-      
-      Project Information
-      
+   
+      
+         
+
+         Project Information
+         
+      
+      
+         Learn more about JBoss Portlet Container
+            community project, JBoss Portal,
+            JBoss Portal platform
+      
    
-   
-      Learn more about JBoss Portlet Container
-      community project, JBoss Portal,
-      JBoss Portal platform
-   
-
    

-
-   Thank you for downloading and deploying JBoss Portlet Container. We =
hope your enjoy working with it as much as we
-   enjoy developing it!
 =

-   Baci e abbracci,

-      The JBoss Portal Team.
-
+   
+      Thank you for downloading and deploying JBoss Portlet Container. =
We hope your enjoy working with it as much as
+         we
+         enjoy developing it!
 =

+      Baci e abbracci,

+         The JBoss Portal Team.
+   
+
 
 =

 <%@ include file=3D"/layouts/footer.jsp" %>
\ No newline at end of file


--===============8374153903901399293==--

From portal-commits at lists.jboss.org Thu Feb 14 19:54:09 2008
Content-Type: multipart/mixed; boundary="===============0427466042809539606=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9979 -
 modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/portal/samples.
Date: Thu, 14 Feb 2008 19:54:09 -0500
Message-ID: 

--===============0427466042809539606==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: chris.laprun(a)jboss.com
Date: 2008-02-14 19:54:09 -0500 (Thu, 14 Feb 2008)
New Revision: 9979

Modified:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/portal=
/samples/RemoteControlResourcePortlet.java
Log:
- Added state to SF and Denver for consistency.
- Removed commented code.

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet=
/portal/samples/RemoteControlResourcePortlet.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/porta=
l/samples/RemoteControlResourcePortlet.java	2008-02-15 00:33:56 UTC (rev 99=
78)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/porta=
l/samples/RemoteControlResourcePortlet.java	2008-02-15 00:54:09 UTC (rev 99=
79)
@@ -23,8 +23,6 @@
 public class RemoteControlResourcePortlet extends GenericPortlet
 {
    private static final String ZIPCODE =3D "zipcode";
-   private static int COLOR_INDEX =3D 0;
-   private static final String[] COLORS =3D {"000", "f00", "0f0", "00f", "=
ff0", "0ff", "f0f", "fff"};
 =

    @Override
    protected void doView(RenderRequest renderRequest, RenderResponse rende=
rResponse) throws PortletException, IOException
@@ -39,9 +37,6 @@
       ResourceURL resource =3D renderResponse.createResourceURL();
       printWriter.print(resource);
       printWriter.print("')\">Open remote control!");
-      /*String color =3D renderRequest.getPreferences().getValue("color", =
"000");
-      printWriter.print("Preferred color:  ");*/
    }
 =

    @Override
@@ -50,7 +45,6 @@
       resourceResponse.setContentType("text/html");
       PrintWriter writer =3D resourceResponse.getWriter();
       String namespace =3D resourceResponse.getNamespace();
-//      resourceRequest.getPreferences().setValue("color", COLORS[COLOR_IN=
DEX++ % 8]);
       writer.print("\n");
       PortletURL url =3D resourceResponse.createRenderURL();
@@ -66,9 +60,9 @@
       writer.print("
'zipcode' public render parameter =
value: " + resourceRequest.getParameter(ZIPCODE) + "
");
       writer.print("Set value of 'zipcode' public render parameter =
to:");
       url.setParameter(ZIPCODE, "80201");
-      writer.print("Denver");
+      writer.print("
Denver, CO");
       url.setParameter(ZIPCODE, "94102");
-      writer.print("
San Francisco");
+      writer.print("
San Francisco, CA");
       url.setParameter(ZIPCODE, "20001");
       writer.print("
Washington, DC");
       writer.print("");


--===============0427466042809539606==--

From portal-commits at lists.jboss.org Thu Feb 14 19:57:46 2008
Content-Type: multipart/mixed; boundary="===============4867591712141779387=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9980 -
 docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
Date: Thu, 14 Feb 2008 19:57:46 -0500
Message-ID: 

--===============4867591712141779387==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mmcallis
Date: 2008-02-14 19:57:45 -0500 (Thu, 14 Feb 2008)
New Revision: 9980

Modified:
   docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorial=
s.xml
Log:
5.2.2.4. JSP Files and the Portlet Taglib
minor revision, replacing itemizedlist with =

variablelist


Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/t=
utorials.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutoria=
ls.xml	2008-02-15 00:54:09 UTC (rev 9979)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutoria=
ls.xml	2008-02-15 00:57:45 UTC (rev 9980)
@@ -754,7 +754,7 @@
 
 
 	
-		This method is triggered when a user clicks on an action=
URL, which is defined in the HelloWorldJSPPortle=
t/WEB-INF/jsp/view.jsp file. This retrieves your=
name from the HTML form, and passes it as a rende=
rParameter to the doView() method.
+		This method is triggered when a user clicks on an action=
URL, which is defined in the HelloWorldJSPPortle=
t/WEB-INF/jsp/view.jsp file. This retrieves your=
name from the HTML form, and passes it as a aResponse.setRenderParameter to the doView() method.
 	
 
 
@@ -781,22 +781,23 @@
 
          
          
-            JSP files and the portlet taglib
+            JSP Files and the Portlet Taglib
             
-               Of importance in this tutorial are the two view JSPs. The f=
irst, view.jsp, allows the
-               user to input his name, which is then posted to the processAction method in our
-               portlet class, set as a renderParameter,=
 then the render method is
-               invoked (in our case, doView, which then=
 dispatches to our
-               view2.jsp).
+		    The HelloWorldJSPPortlet/WEB-INF/jsp/view.jsp a=
nd HelloWorldJSPPortlet/WEB-INF/jsp/view2.jsp JSP file=
s are included in the HelloWorldJSPPortlet portlet. The first, vi=
ew.jsp, allows a user to input their name. This is then posted t=
o the processAction method in the portlet =
class, which is set in the aResponse.setRenderParameter. The render method, doView=
, is invoked, which dispatches to the view2.jsp<=
/filename> JSP:
+	    
+	    
                
                   
                      
                   
                
-               Now let's have a look at our view.jsp:
             
+	    
+		    The following is an example of the HelloWorldJSPPortlet/WE=
B-INF/jsp/view.jsp file:
+            
             
-               
+
 =

 
 =

@@ -814,42 +815,57 @@
    You can also link to other pages, using a renderURL, like 
             ">this.
-]]>
-               
-                  
-                     
-                        ]]>
-                        Define the portlet taglib. You do NOT need to bundle the portlet taglib,
-                        JBoss Portal will handle that for you.
-                     
-                  
-                  
-                     
-                        ]=
]>
-                        Calling defineObjects makes ava=
ilable implicit objects, such as
-                        renderRequest, actionRequest, portletConf=
ig, in this JSP.
-                     
-                  
-                  
-                     
-                        
-      " method=3D"POST">]]>
-                        We create an HTML form, but generate the URL it wi=
ll post to using the portlet tag library. In
-                        this case, notice how we are creating an =
actionURL, which will activate our
-                        processAction method, passing i=
n any input parameters in the form.
-                     
-                  
-                  
-                     
-                        
-">]]>
-                        Likewise, we are able to create a link to our doView method, by simply
-                        creating it with a renderURL, t=
hat passes in our yourname
-                        parameter.
-                     
-                  
-               
-            
+]]>
+
+
+
+
+	]]>
+
+
+	
+		Define the portlet taglib. You do NOT need to bundl=
e the portlet taglib,
+		JBoss Portal will handle that for you.
+	
+
+
+]]>
+
+
+	
+		Calling defineObjects makes available implicit object=
s, such as
+		renderRequest, actionRequest, portletConfig, in this =
JSP.
+	
+
+
+
+      " method=3D"POST">]]>
+
+
+	
+		We create an HTML form, but generate the URL it will post to using the p=
ortlet tag library. In
+		this case, notice how we are creating an actionURL, w=
hich will activate our
+		processAction method, passing in any input parameters=
 in the form.
+	
+
+
+
+">]]>
+
+
+	
+		Likewise, we are able to create a link to our doView =
method, by simply
+		creating it with a renderURL, that passes in our yourname
+		parameter.
+	
+
+
+
+
          
          
             Building and deploying your portlet


--===============4867591712141779387==--

From portal-commits at lists.jboss.org Thu Feb 14 20:56:02 2008
Content-Type: multipart/mixed; boundary="===============0123714341754068374=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9981 -
 docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
Date: Thu, 14 Feb 2008 20:56:02 -0500
Message-ID: 

--===============0123714341754068374==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: mmcallis
Date: 2008-02-14 20:56:01 -0500 (Thu, 14 Feb 2008)
New Revision: 9981

Modified:
   docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorial=
s.xml
Log:
5.2.2.4. JSP Files and the Portlet Tag Library
minor revisions to text explaining the view.jsp file


Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/t=
utorials.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutoria=
ls.xml	2008-02-15 00:57:45 UTC (rev 9980)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutoria=
ls.xml	2008-02-15 01:56:01 UTC (rev 9981)
@@ -781,9 +781,9 @@
 
          
          
-            JSP Files and the Portlet Taglib
+            JSP Files and the Portlet Tag Library
             
-		    The HelloWorldJSPPortlet/WEB-INF/jsp/view.jsp a=
nd HelloWorldJSPPortlet/WEB-INF/jsp/view2.jsp JSP file=
s are included in the HelloWorldJSPPortlet portlet. The first, vi=
ew.jsp, allows a user to input their name. This is then posted t=
o the processAction method in the portlet =
class, which is set in the aResponse.setRenderParameter. The render method, doView=
, is invoked, which dispatches to the view2.jsp<=
/filename> JSP:
+		    The HelloWorldJSPPortlet/WEB-INF/jsp/view.jsp a=
nd HelloWorldJSPPortlet/WEB-INF/jsp/view2.jsp JSP file=
s are included in the HelloWorldJSPPortlet portlet. The view.jsp<=
/filename> file allows a user to input their name. This is then posted to t=
he processAction method in the portlet cla=
ss, which is set as a aResponse.setRenderParameter. The render method, doView, is invoked, which dispatches to the view2.jsp JSP:
 	    
 	    
                
@@ -825,8 +825,7 @@
 
 
 	
-		Define the portlet taglib. You do NOT need to bundl=
e the portlet taglib,
-		JBoss Portal will handle that for you.
+		Define the portlet tag library (taglib). You do not need to bundle the p=
ortlet taglib - JBoss Portal handles this for you.
 	
 
 
@@ -835,8 +834,8 @@
 
 
 	
-		Calling defineObjects makes available implicit object=
s, such as
-		renderRequest, actionRequest, portletConfig, in this =
JSP.
+		Calling defineObjects makes available implicit object=
s in the JSP, such as
+		renderRequest, actionRequest, portletConfig.
 	
 
 
@@ -846,9 +845,7 @@
 
 
 	
-		We create an HTML form, but generate the URL it will post to using the p=
ortlet tag library. In
-		this case, notice how we are creating an actionURL, w=
hich will activate our
-		processAction method, passing in any input parameters=
 in the form.
+		A HTML form is created. This form posts to the URL defined by the portle=
t taglib. In this example, an actionURL is=
 created, that activates the processAction method, which=
 passes the input parameters in the form.
 	
 
 
@@ -858,9 +855,7 @@
 
 
 	
-		Likewise, we are able to create a link to our doView =
method, by simply
-		creating it with a renderURL, that passes in our yourname
-		parameter.
+		You can create a link to the doView met=
hod by creating a renderURL, that passes t=
he yourname parameter.
 	
 
 


--===============0123714341754068374==--

From portal-commits at lists.jboss.org Thu Feb 14 20:58:37 2008
Content-Type: multipart/mixed; boundary="===============2618200536948200204=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9982 - in
 modules/portlet/trunk/docs/user-guide/en: modules and 1 other directory.
Date: Thu, 14 Feb 2008 20:58:37 -0500
Message-ID: 

--===============2618200536948200204==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: chris.laprun(a)jboss.com
Date: 2008-02-14 20:58:37 -0500 (Thu, 14 Feb 2008)
New Revision: 9982

Added:
   modules/portlet/trunk/docs/user-guide/en/modules/installation.xml
Modified:
   modules/portlet/trunk/docs/user-guide/en/master.xml
   modules/portlet/trunk/docs/user-guide/en/modules/introduction.xml
Log:
- Started documentation.

Modified: modules/portlet/trunk/docs/user-guide/en/master.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/docs/user-guide/en/master.xml	2008-02-15 01:56:01=
 UTC (rev 9981)
+++ modules/portlet/trunk/docs/user-guide/en/master.xml	2008-02-15 01:58:37=
 UTC (rev 9982)
@@ -1,8 +1,9 @@
 
 
-      ]>
+   "../../docbook-support/support/docbook-dtd/docbookx.dtd" [
+   
+   
+   ]>
 
    
       Simple Portlet Container
@@ -13,8 +14,14 @@
          Viet
          julien(a)jboss.org
       
+      
+         Chris
+         Laprun
+         chris.laprun(a)jboss.com
+      
    
    
     &introduction;
+    &installation;
 =

 

Added: modules/portlet/trunk/docs/user-guide/en/modules/installation.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/docs/user-guide/en/modules/installation.xml	     =
                   (rev 0)
+++ modules/portlet/trunk/docs/user-guide/en/modules/installation.xml	2008-=
02-15 01:58:37 UTC (rev 9982)
@@ -0,0 +1,129 @@
+
+
+   
+      
+         Julien
+         Viet
+         julien(a)jboss.org
+      
+      
+         Chris
+         Laprun
+         chris.laprun(a)jboss.com
+      
+   
+
+   Installation
+   
+      Downloading and installing
+      Two bundled versions are provided to showcase JBoss Portlet Co=
ntainer in action with minimum effort. Theses
+         bundles each include a servlet container configured with the Simp=
le Portal demonstration portal along with
+         some JSR-286 compliant portlets. You will need to have Java 5 con=
figured on your machine to run the
+         demonstration portal.
+         You can download Java 5 at
+         http://java.sun.com/javase/downloads/index_jdk5.jsp. Once=
 you have Java installed, you are ready to
+         download one of JBoss Portlet Container bundles. The following li=
nk has the list of downloads for JBoss Portlet
+         Container:
+         http://labs.jboss.com/portal/portletcontainer/download. T=
wo bundles are currently provided: one with
+         Tomcat 6.0.16 and one with JBoss Application Server 4.2.2.GA.
+      
+      
+         JBoss AS 4.2.x bundle
+         
+            Of note in the bundle are the following directories:
+            
+               
+                  bin
+                  - Contains the startup/shutdown commands for JBoss Appli=
cation Server
+               
+               
+                  docs
+                  - Contains documentation for JBoss Application Server
+               
+               
+                  jbosspc-docs
+                  - Contains documentation for JBoss Portlet Container (th=
is document included)
+               
+               
+                  server
+                  - Contains JBoss Application Server configuration and the
+                  simple-portal.war
+                  file along with several sample portlets in the
+                  deploy
+                  directory of the
+                  default
+                  configuration
+               
+            
+         
+         
+            To start the demonstration portal, go to the
+            bin
+            directory and execute either
+            run.sh
+            or
+            run.bat
+            (depending on your platform).
+         
+      
+      
+         Tomcat 6.0.x bundle
+         
+            Of note in the bundle are the following directories:
+            
+               
+                  bin
+                  - Contains the startup/shutdown commands for Tomcat
+               
+               
+                  logs
+                  - Contains the logs once the servlet container is starte=
d (the most interesting one being one with
+                  locahost
+                  in its name)
+               
+               
+                  jbosspc-docs
+                  - Contains documentation for JBoss Portlet Container (th=
is document included)
+               
+               
+                  lib
+                  - Contains Tomcat libraries to which several support lib=
raries for JBoss Portlet Container have been
+                  added
+               
+               
+                  webapps
+                  - Contains Tomcat default applications and the
+                  simple-portal.war
+                  file along with several sample portlets
+               
+            
+         
+         
+            To start the demonstration portal, go to the
+            bin
+            directory and execute either
+            startup.sh
+            or
+            startup.bat
+            (depending on your platform).
+         
+      
+   
+
+   
+      Testing Portal Container's demonstration portal
+      Once the servlet container is started, bring up your web brows=
er and go to the following URL:
+         http://localho=
st:8080/simple-portal.
+         You should see the default page for Portlet Container's demonstra=
tion portal:
+         
+            
+               
+            
+            

+               Default page for Portlet Container's demonstration po=
rtal.
+            
          
       
    
    
    
    
 
";
+      int begIndex =3D html.indexOf(beg);
+      if (begIndex !=3D -1)
+      {
+         // extract table containing specific first result
+         int endIndex =3D html.indexOf(end, begIndex);
+         html =3D html.substring(begIndex + beg.length(), endIndex + end.l=
ength());
+
+         html =3D postProcessHTML(html);
+
+         renderResponse.setContentType("text/html");
+         PrintWriter printWriter =3D renderResponse.getWriter();
+         printWriter.print(html);
+      }
+   }
+
+   protected String getZipCode(RenderRequest renderRequest)
+   {
+      String zip =3D renderRequest.getParameter(ZIP);
+      if (zip =3D=3D null)
+      {
+         zip =3D renderRequest.getPreferences().getValue(ZIP, SAN_FRAN);
+      }
+      return zip;
+   }
+
+   @Override
+   protected void doEdit(RenderRequest renderRequest, RenderResponse rende=
rResponse) throws PortletException, IOException
+   {
+      renderResponse.setContentType("text/html");
+      renderResponse.getWriter().print(
+         "\n" +
+            "   
\n" +
+            "   Change Location:\n" +
+            "\n" +
+            "   Zip Code:
\n" +
+            "      \n" +
+            "      
\n" +
+            "      \n" +
+            "   \n" +
+            "");
+   }
+
+   @Override
+   public void processAction(ActionRequest actionRequest, ActionResponse a=
ctionResponse) throws PortletException, IOException
+   {
+      String zip =3D actionRequest.getParameter(ZIP);
+
+      if (null !=3D zip)
+      {
+         PortletPreferences prefs =3D actionRequest.getPreferences();
+         prefs.setValue(ZIP, zip);
+         prefs.store();
+      }
+
+      // set zip as render parameter
+      actionResponse.setRenderParameter(ZIP, zip);
+
+      // request view
+      actionResponse.setPortletMode(PortletMode.VIEW);
+   }
+
+   protected String postProcessHTML(String html)
+   {
+      // links should open in new windows
+      html =3D html.replaceAll(A, A_TARGET_BLANK);
+
+      // src attributes should be absolute
+      html =3D html.replaceAll("src=3D/", "src=3Dhttp://google.com/");
+      html =3D html.replaceAll("src=3D\"/", "src=3D\"http://google.com/");
+
+      // forms should open in new windows and have an absolute action URL
+      html =3D html.replaceAll("action=3D\"/", "target=3D'_blank' action=
=3D\"http://google.com/");
+
+      return html;
+   }
+
+   protected String getQueryString(String zip)
+   {
+      return GOOGLE + zip;
+   }
+
+   private byte[] getBytes(InputStream in, int bufferSize) throws IOExcept=
ion, IllegalArgumentException
+   {
+      ByteArrayOutputStream out =3D new ByteArrayOutputStream();
+
+      byte[] buffer =3D new byte[bufferSize];
+      while (true)
+      {
+         int i =3D in.read(buffer);
+         if (i =3D=3D 0)
+         {
+            continue;
+         }
+         if (i =3D=3D -1)
+         {
+            break;
+         }
+         out.write(buffer, 0, i);
+      }
+      return out.toByteArray();
+   }
+
+}

Added: modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/=
portal/samples/GoogleWeatherClippingPortlet.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/por=
tal/samples/GoogleWeatherClippingPortlet.java	                        (rev =
0)
+++ modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/por=
tal/samples/GoogleWeatherClippingPortlet.java	2008-02-29 23:47:01 UTC (rev =
10161)
@@ -0,0 +1,55 @@
+/*************************************************************************=
*****
+ * 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.portal.samples;
+
+/**
+ * @author Chris Laprun
+ * @version $Revision: 9912 $
+ */
+public class GoogleWeatherClippingPortlet extends GoogleClippingPortlet
+{
+   private final static String WEATHER_URL =3D "http://www.google.com/sear=
ch?q=3Dweather+";
+   private static final String A_END =3D "";
+
+   protected String getQueryString(String zip)
+   {
+      return WEATHER_URL + zip;
+   }
+
+   protected String postProcessHTML(String html)
+   {
+      int begIndex;
+      int endIndex;
+
+      // remove add to iGoogle link
+      begIndex =3D html.indexOf(A);
+      if (begIndex !=3D -1)
+      {
+         endIndex =3D html.indexOf(A_END, begIndex);
+         html =3D html.substring(0, begIndex) + html.substring(endIndex + =
A_END.length());
+      }
+
+      return super.postProcessHTML(html);
+   }
+}

Added: modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/=
portal/samples/RemoteControlResourcePortlet.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/por=
tal/samples/RemoteControlResourcePortlet.java	                        (rev =
0)
+++ modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/por=
tal/samples/RemoteControlResourcePortlet.java	2008-02-29 23:47:01 UTC (rev =
10161)
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2008, Your Corporation. All Rights Reserved.
+ */
+
+package org.jboss.portal.portlet.portal.samples;
+
+import javax.portlet.GenericPortlet;
+import javax.portlet.PortletException;
+import javax.portlet.PortletURL;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+import javax.portlet.ResourceRequest;
+import javax.portlet.ResourceResponse;
+import javax.portlet.ResourceURL;
+import javax.portlet.WindowState;
+import java.io.IOException;
+import java.io.PrintWriter;
+
+/**
+ * @author Chris Laprun
+ * @version $Revision: 9979 $
+ */
+public class RemoteControlResourcePortlet extends GenericPortlet
+{
+   private static final String ZIPCODE =3D "zipcode";
+
+   @Override
+   protected void doView(RenderRequest renderRequest, RenderResponse rende=
rResponse) throws PortletException, IOException
+   {
+      renderResponse.setContentType("text/html");
+      PrintWriter printWriter =3D renderResponse.getWriter();
+      String namespace =3D renderResponse.getNamespace();
+      printWriter.print("\n");
+      PortletURL url =3D resourceResponse.createRenderURL();
+      url.setWindowState(WindowState.MINIMIZED);
+      writer.print(" minimize parent portlet");
+      url.setWindowState(WindowState.MAXIMIZED);
+      writer.print(" maximize parent portlet");
+      url.setWindowState(WindowState.NORMAL);
+      writer.print(" make parent portlet normal");
+      writer.print("
'zipcode' public render parameter =
value: " + resourceRequest.getParameter(ZIPCODE) + "
");
+      writer.print("Set value of 'zipcode' public render parameter =
to:");
+      url.setParameter(ZIPCODE, "80201");
+      writer.print("Denver, CO");
+      url.setParameter(ZIPCODE, "94102");
+      writer.print("
San Francisco, CA");
+      url.setParameter(ZIPCODE, "20001");
+      writer.print("
Washington, DC");
+      writer.print("");
+   }
+
+   private String createParentURL(PortletURL url)
+   {
+      return "openLinkInParent('" + url + "')";
+   }
+}

Added: modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/=
portal/samples/basic/ExceptionPortlet.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/por=
tal/samples/basic/ExceptionPortlet.java	                        (rev 0)
+++ modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/por=
tal/samples/basic/ExceptionPortlet.java	2008-02-29 23:47:01 UTC (rev 10161)
@@ -0,0 +1,113 @@
+/*************************************************************************=
*****
+ * 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.portal.samples.basic;
+
+import javax.portlet.GenericPortlet;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+import javax.portlet.PortletException;
+import javax.portlet.PortletURL;
+import javax.portlet.PortletRequest;
+import javax.portlet.ActionRequest;
+import javax.portlet.PortletSecurityException;
+import javax.portlet.ActionResponse;
+import java.io.IOException;
+import java.io.PrintWriter;
+
+/**
+ * @author Julien Viet
+ * @version $Revision: 630 $
+ */
+public class ExceptionPortlet extends GenericPortlet
+{
+
+   public void processAction(ActionRequest req, ActionResponse resp) throw=
s PortletException, PortletSecurityException, IOException
+   {
+      throwException(req);
+   }
+
+   protected void doView(RenderRequest req, RenderResponse resp) throws Po=
rtletException, PortletSecurityException, IOException
+   {
+      throwException(req);
+
+      //
+      resp.setContentType("text/html");
+      PrintWriter writer =3D resp.getWriter();
+      PortletURL renderURL =3D resp.createRenderURL();
+      PortletURL actionURL =3D resp.createActionURL();
+
+      //
+      writer.write("");
+      writer.write("
Throw :"=
);
+      writer.write("");
+      renderURL.setParameter("op", "portletexception");
+      writer.write("render PortletExc=
eption");
+      renderURL.setParameter("op", "portletsecurityexception");
+      writer.write("render PortletSec=
urityException");
+      renderURL.setParameter("op", "ioexception");
+      writer.write("render IOExceptio=
n");
+      renderURL.setParameter("op", "runtimeexception");
+      writer.write("render RuntimeExc=
eption");
+      actionURL.setParameter("op", "error");
+      writer.write("render Error<=
/div>");
+      actionURL.setParameter("op", "portletexception");
+      writer.write("action PortletExc=
eption");
+      actionURL.setParameter("op", "portletsecurityexception");
+      writer.write("action PortletSec=
urityException");
+      actionURL.setParameter("op", "ioexception");
+      writer.write("action IOExceptio=
n");
+      actionURL.setParameter("op", "runtimeexception");
+      writer.write("action RuntimeExc=
eption");
+      actionURL.setParameter("op", "error");
+      writer.write("action Error<=
/div>");
+      writer.write("");
+      writer.write("");
+   }
+
+   private void throwException(PortletRequest req) throws PortletException=
, IOException
+   {
+      String op =3D req.getParameter("op");
+
+      // Throw any required exception
+      if ("portletexception".equals(op))
+      {
+         throw new PortletException();
+      }
+      if ("portletsecurityexception".equals(op))
+      {
+         throw new PortletSecurityException("");
+      }
+      if ("ioexception".equals(op))
+      {
+         throw new IOException();
+      }
+      if ("runtimeexception".equals(op))
+      {
+         throw new RuntimeException();
+      }
+      if ("error".equals(op))
+      {
+         throw new Error();
+      }
+   }
+}

Added: modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/=
portal/samples/basic/FailDuringInitPortlet.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/por=
tal/samples/basic/FailDuringInitPortlet.java	                        (rev 0)
+++ modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/por=
tal/samples/basic/FailDuringInitPortlet.java	2008-02-29 23:47:01 UTC (rev 1=
0161)
@@ -0,0 +1,65 @@
+/*************************************************************************=
*****
+ * 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.portal.samples.basic;
+
+import javax.portlet.GenericPortlet;
+import javax.portlet.PortletException;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+import java.io.IOException;
+import java.io.PrintWriter;
+
+/**
+ * A portlet that will fail only one time during startup (so it is possibl=
e to restart it).
+ *
+ * @author Julien Viet
+ * @version $Revision: 630 $
+ */
+public class FailDuringInitPortlet extends GenericPortlet
+{
+
+   private static int initCount =3D 0;
+
+   public void init() throws PortletException
+   {
+      if (initCount =3D=3D 0)
+      {
+         initCount =3D 1;
+
+         //
+         throw new PortletException();
+      }
+      else
+      {
+         // Nothing
+      }
+   }
+
+   protected void doView(RenderRequest renderRequest, RenderResponse rende=
rResponse) throws PortletException, IOException
+   {
+      renderResponse.setContentType("text/html");
+      PrintWriter writer =3D renderResponse.getWriter();
+      writer.print("A portlet that may fail during init");
+      writer.close();
+   }
+}

Added: modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/=
portal/samples/basic/HeaderPortlet.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/por=
tal/samples/basic/HeaderPortlet.java	                        (rev 0)
+++ modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/por=
tal/samples/basic/HeaderPortlet.java	2008-02-29 23:47:01 UTC (rev 10161)
@@ -0,0 +1,189 @@
+/*************************************************************************=
*****
+ * 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.portal.samples.basic;
+
+import org.w3c.dom.Element;
+import org.jboss.portal.portlet.ActionURL;
+import org.jboss.portal.portlet.RenderURL;
+
+
+import javax.portlet.GenericPortlet;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+import javax.portlet.PortletException;
+import javax.portlet.ResourceRequest;
+import javax.portlet.ResourceResponse;
+import javax.portlet.ResourceURL;
+import javax.portlet.EventRequest;
+import javax.portlet.EventResponse;
+import javax.portlet.ActionRequest;
+import javax.portlet.ActionResponse;
+import javax.portlet.PortletSecurityException;
+import javax.portlet.PortletURL;
+import javax.portlet.PortletPreferences;
+import javax.portlet.PortletMode;
+import java.io.IOException;
+import java.io.PrintWriter;
+
+/**
+ * @author Julien Viet
+ * @version $Revision: 630 $
+ */
+public class HeaderPortlet extends GenericPortlet
+{
+   public final static int TITANIUM =3D 0;
+   public final static int PLATINUM =3D 1;
+   public final static int GOLD     =3D 2;
+   public final static int SILVER   =3D 3;
+   public final static int TIN      =3D 4;
+
+   public void processAction(ActionRequest req, ActionResponse resp) throw=
s PortletException, PortletSecurityException, IOException
+   {
+
+      String repeatText =3D req.getParameter("repeat");
+      // set zip as render parameter
+      if (repeatText !=3D null){
+      resp.setRenderParameter("repeat", repeatText);
+      }
+      // request view
+      resp.setPortletMode(PortletMode.VIEW);
+
+   }
+   public void render(RenderRequest req, RenderResponse resp) throws Portl=
etException, IOException
+   {
+      ResourceURL resourceURL =3D resp.createResourceURL();
+      PortletURL actionURL =3D resp.createActionURL();
+       //
+//      Element elt =3D resp.createElement("script");
+//      elt.setAttribute("type", "text/javascript");
+//      elt.setAttribute("src", resourceURL.toString());
+//      elt.appendChild(elt.getOwnerDocument().createTextNode(""));
+//      resp.addProperty("script", elt);
+
+      //
+
+      resp.setContentType("text/html");
+      PrintWriter writer =3D resp.getWriter();
+      writer.print("" +
+         "");
+
+            writer.print("" +
+               "" +
+               "Partial Refresh Repeater Demo");
+            writer.print("" +
+            " " +
+               "  \n" +
+            "      Repeat Demo:
\n=
" +
+            "      \n" +
+           "      \n" +
+            "   \n" +
+               "" +
+            "");
+            writer.print(""=
);
+//         "" +
+//         "Cl=
ick me to trigger script" +
+         writer.print("

" +
+            "Partial Refresh Product Catalog" +
+            "" +
+                        "");
+         writer.print("");
+         resourceURL.setParameter("prodId","1");
+         writer.print("Product 1
");
+
+         resourceURL.setParameter("prodId","2");
+         writer.print("Product 2
");
+
+         resourceURL.setParameter("prodId","3");
+         writer.print("Product 3
");
+
+         writer.print("
");
+         writer.print("" +
+            "Product Details" +
+            "" +
+            "");
+         writer.print("
");
+         writer.print("
");
+         writer.print("
");
+
+
+
+        // writer.print("");
+   }
+
+   public void serveResource(ResourceRequest req, ResourceResponse resp) t=
hrows PortletException, IOException
+   {
+      String repeatText =3D req.getParameter("repeat");
+      String prodId =3D req.getParameter("prodId");
+
+      String namespace =3Dresp.getNamespace();
+      //resp.setContentType("application/json");
+      resp.setContentType("text/html");
+      PrintWriter writer =3D resp.getWriter();
+      if (repeatText !=3D null){
+         writer.print(""+ req.getPrivateParamete=
rMap().get("repeat")[0] +"");
+      }
+      if (prodId !=3D null){
+         if (prodId.equals("1")){
+            writer.print("Product ID: "+ prodId=
 +"" +
+            "
" +
+            " B BY BURTON ALPHA
" +
+            "Sale Price: $314.96 " +
+            "");
+         }
+         if (prodId.equals("2")){
+            writer.print("Product ID: "+ prodId=
 +"" +
+            "
" +
+               "FORUM DESTROYER LTD
" +
+               "$319.99 " +
+            "");
+         }
+         if (prodId.equals("3")){
+            writer.print("Product ID: "+ prodId=
 +"" +
+            "
" +
+            "\n" +
+               "SANTA CRUZ ALLSTAR
" +
+               "$256.00 " +
+            "");
+         }
+
+      }
+
+
+
+
+      writer.close();
+   }
+}

Added: modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/=
portal/samples/basic/NullFilter.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/por=
tal/samples/basic/NullFilter.java	                        (rev 0)
+++ modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/por=
tal/samples/basic/NullFilter.java	2008-02-29 23:47:01 UTC (rev 10161)
@@ -0,0 +1,75 @@
+/*************************************************************************=
*****
+ * 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.portal.samples.basic;
+
+import javax.portlet.filter.RenderFilter;
+import javax.portlet.filter.ActionFilter;
+import javax.portlet.filter.EventFilter;
+import javax.portlet.filter.ResourceFilter;
+import javax.portlet.filter.FilterChain;
+import javax.portlet.filter.FilterConfig;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+import javax.portlet.PortletException;
+import javax.portlet.ActionRequest;
+import javax.portlet.ActionResponse;
+import javax.portlet.EventRequest;
+import javax.portlet.EventResponse;
+import javax.portlet.ResourceRequest;
+import javax.portlet.ResourceResponse;
+import java.io.IOException;
+
+/**
+ * @author Julien Viet
+ * @version $Revision: 630 $
+ */
+public class NullFilter implements RenderFilter, ActionFilter, EventFilter=
, ResourceFilter
+{
+   public void init(FilterConfig config) throws PortletException
+   {
+   }
+
+   public void doFilter(RenderRequest req, RenderResponse resp, FilterChai=
n chain) throws IOException, PortletException
+   {
+      chain.doFilter(req, resp);
+   }
+
+   public void doFilter(ActionRequest req, ActionResponse resp, FilterChai=
n chain) throws IOException, PortletException
+   {
+      chain.doFilter(req, resp);
+   }
+
+   public void doFilter(EventRequest req, EventResponse resp, FilterChain =
chain) throws IOException, PortletException
+   {
+      chain.doFilter(req, resp);
+   }
+
+   public void doFilter(ResourceRequest req, ResourceResponse resp, Filter=
Chain chain) throws IOException, PortletException
+   {
+      chain.doFilter(req, resp);
+   }
+
+   public void destroy()
+   {
+   }
+}

Added: modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/=
portal/samples/event/CartEvent.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/por=
tal/samples/event/CartEvent.java	                        (rev 0)
+++ modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/por=
tal/samples/event/CartEvent.java	2008-02-29 23:47:01 UTC (rev 10161)
@@ -0,0 +1,50 @@
+/*************************************************************************=
*****
+ * 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.portal.samples.event;
+
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.namespace.QName;
+import java.io.Serializable;
+
+/**
+ * @author Chris Laprun
+ * @version $Revision: 9912 $
+ */
+(a)XmlRootElement
+public class CartEvent implements Serializable
+{
+   private String id;
+
+   public static final QName QNAME =3D new QName("urn:jboss:portal:samples=
:event", "CartEvent");
+
+   public CartEvent(String id)
+   {
+      this.id =3D id;
+   }
+
+   public String getId()
+   {
+      return id;
+   }
+}

Added: modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/=
portal/samples/event/CartPortlet.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/por=
tal/samples/event/CartPortlet.java	                        (rev 0)
+++ modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/por=
tal/samples/event/CartPortlet.java	2008-02-29 23:47:01 UTC (rev 10161)
@@ -0,0 +1,83 @@
+/*************************************************************************=
*****
+ * 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.portal.samples.event;
+
+import javax.portlet.Event;
+import javax.portlet.EventRequest;
+import javax.portlet.EventResponse;
+import javax.portlet.GenericPortlet;
+import javax.portlet.PortletException;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+import java.io.IOException;
+import java.io.Writer;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author Chris Laprun
+ * @version $Revision: 9932 $
+ */
+public class CartPortlet extends GenericPortlet
+{
+   List items =3D new ArrayList(7);
+
+   @Override
+   protected void doView(RenderRequest renderRequest, RenderResponse rende=
rResponse) throws PortletException, IOException
+   {
+      renderResponse.setContentType("text/html");
+      Writer writer =3D renderResponse.getWriter();
+
+
+      if (!items.isEmpty())
+      {
+         writer.append("");
+         int total =3D 0;
+         for (CatalogItem item : items)
+         {
+            int price =3D item.getPrice();
+            total +=3D price;
+            writer.append("");
+         }
+         writer.append("Description Pric=
e
").append(item.getDescription()).append=
(" $").append("" + price)
+               .append("
Total: ")
+            .append("$" + total).append("");
+      }
+      else
+      {
+         writer.append("Cart is empty.");
+      }
+   }
+
+   @Override
+   public void processEvent(EventRequest eventRequest, EventResponse event=
Response) throws PortletException, IOException
+   {
+      Event event =3D eventRequest.getEvent();
+      if (event.getName().equals("CartEvent"))
+      {
+         CartEvent cartEvent =3D (CartEvent)event.getValue();
+         items.add(Catalog.get(cartEvent.getId()));
+      }
+   }
+}

Added: modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/=
portal/samples/event/Catalog.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/por=
tal/samples/event/Catalog.java	                        (rev 0)
+++ modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/por=
tal/samples/event/Catalog.java	2008-02-29 23:47:01 UTC (rev 10161)
@@ -0,0 +1,63 @@
+/*************************************************************************=
*****
+ * 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.portal.samples.event;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author Chris Laprun
+ * @version $Revision: 9912 $
+ */
+public class Catalog
+{
+   private static Map items;
+
+   static
+   {
+      items =3D new HashMap(7);
+      items.put("1", new CatalogItem("1", 800, "Bike"));
+      items.put("2", new CatalogItem("2", 450, "Snowboard"));
+      items.put("3", new CatalogItem("3", 225, "Tent"));
+      items.put("4", new CatalogItem("4", 75, "Backpack"));
+      items.put("5", new CatalogItem("5", 119, "Skateboard"));
+      items.put("6", new CatalogItem("6", 333, "Surfboard"));
+      items.put("7", new CatalogItem("7", 90, "Sneakers"));
+   }
+
+   private Catalog()
+   {
+   }
+
+   public static CatalogItem get(String id)
+   {
+      return items.get(id);
+   }
+
+   public static Collection getAll()
+   {
+      return items.values();
+   }
+}

Added: modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/=
portal/samples/event/CatalogItem.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/por=
tal/samples/event/CatalogItem.java	                        (rev 0)
+++ modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/por=
tal/samples/event/CatalogItem.java	2008-02-29 23:47:01 UTC (rev 10161)
@@ -0,0 +1,57 @@
+/*************************************************************************=
*****
+ * 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.portal.samples.event;
+
+/**
+ * @author Chris Laprun
+ * @version $Revision: 9912 $
+ */
+public class CatalogItem
+{
+   private String id;
+   private int price;
+   private String description;
+
+   public CatalogItem(String id, int price, String description)
+   {
+      this.id =3D id;
+      this.price =3D price;
+      this.description =3D description;
+   }
+
+   public String getId()
+   {
+      return id;
+   }
+
+   public int getPrice()
+   {
+      return price;
+   }
+
+   public String getDescription()
+   {
+      return description;
+   }
+}

Added: modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/=
portal/samples/event/CatalogPortlet.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/por=
tal/samples/event/CatalogPortlet.java	                        (rev 0)
+++ modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/por=
tal/samples/event/CatalogPortlet.java	2008-02-29 23:47:01 UTC (rev 10161)
@@ -0,0 +1,71 @@
+/*************************************************************************=
*****
+ * 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.portal.samples.event;
+
+import javax.portlet.ActionRequest;
+import javax.portlet.ActionResponse;
+import javax.portlet.GenericPortlet;
+import javax.portlet.PortletException;
+import javax.portlet.PortletURL;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+import java.io.IOException;
+import java.io.Writer;
+import java.util.Collection;
+
+/**
+ * @author Chris Laprun
+ * @version $Revision: 9932 $
+ */
+public class CatalogPortlet extends GenericPortlet
+{
+   @Override
+   protected void doView(RenderRequest renderRequest, RenderResponse rende=
rResponse) throws PortletException, IOException
+   {
+      renderResponse.setContentType("text/html");
+      Writer writer =3D renderResponse.getWriter();
+
+      writer.append("");
+
+      PortletURL addURL =3D renderResponse.createActionURL();
+      addURL.setParameter("op", "add");
+
+      Collection items =3D Catalog.getAll();
+      for (CatalogItem item : items)
+      {
+         addURL.setParameter("id", item.getId());
+         writer.append("");
+      }
+
+      writer.append("Description Price Actions
").append(item.getDescription()).append("<=
/td> $").append("" + item.getPrice())
+            .append(" Add to cart");
+   }
+
+   @Override
+   public void processAction(ActionRequest actionRequest, ActionResponse a=
ctionResponse) throws PortletException, IOException
+   {
+      String value =3D actionRequest.getParameter("id");
+      actionResponse.setEvent(CartEvent.QNAME, new CartEvent(value));
+   }
+}

Copied: modules/portlet/trunk/portal/src/main/resources/samples (from rev 1=
0138, modules/portlet/trunk/test/src/test/resources/portal/samples)

Copied: modules/portlet/trunk/portal/src/main/resources/samples/basic-war (=
from rev 10160, modules/portlet/trunk/test/src/test/resources/portal/sample=
s/basic-war)

Copied: modules/portlet/trunk/portal/src/main/resources/samples/cart-event-=
portlet-war (from rev 10160, modules/portlet/trunk/test/src/test/resources/=
portal/samples/cart-event-portlet-war)

Copied: modules/portlet/trunk/portal/src/main/resources/samples/google-map-=
portlet-war (from rev 10160, modules/portlet/trunk/test/src/test/resources/=
portal/samples/google-map-portlet-war)

Copied: modules/portlet/trunk/portal/src/main/resources/samples/google-weat=
her-portlet-war (from rev 10160, modules/portlet/trunk/test/src/test/resour=
ces/portal/samples/google-weather-portlet-war)

Copied: modules/portlet/trunk/portal/src/main/resources/samples/remotecontr=
ol-portlet-war (from rev 10160, modules/portlet/trunk/test/src/test/resourc=
es/portal/samples/remotecontrol-portlet-war)

Copied: modules/portlet/trunk/portal/src/main/resources/simple-portal-war (=
from rev 10138, modules/portlet/trunk/test/src/test/resources/simple-portal=
-war)

Copied: modules/portlet/trunk/portal/src/main/resources/simple-portal-war/M=
ETA-INF (from rev 10160, modules/portlet/trunk/test/src/test/resources/simp=
le-portal-war/META-INF)

Copied: modules/portlet/trunk/portal/src/main/resources/simple-portal-war/W=
EB-INF (from rev 10160, modules/portlet/trunk/test/src/test/resources/simpl=
e-portal-war/WEB-INF)

Modified: modules/portlet/trunk/portal/src/main/resources/simple-portal-war=
/WEB-INF/jboss-beans.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF=
/jboss-beans.xml	2008-02-29 17:41:05 UTC (rev 10160)
+++ modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-I=
NF/jboss-beans.xml	2008-02-29 23:47:01 UTC (rev 10161)
@@ -45,7 +45,7 @@
    
    
    
-   
+   
       
          
             
@@ -55,7 +55,7 @@
    
 =

    
-   
+   
       
       
    
@@ -70,7 +70,7 @@
    
    
    
-   
+   
       
          
             

Added: modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WE=
B-INF/jboss-web.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-I=
NF/jboss-web.xml	                        (rev 0)
+++ modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-I=
NF/jboss-web.xml	2008-02-29 23:47:01 UTC (rev 10161)
@@ -0,0 +1,31 @@
+
+
+
+
+   
+      test:loader=3Dportlet
+   
+
\ No newline at end of file

Modified: modules/portlet/trunk/portal/src/main/resources/simple-portal-war=
/WEB-INF/portal.tld
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF=
/portal.tld	2008-02-29 17:41:05 UTC (rev 10160)
+++ modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-I=
NF/portal.tld	2008-02-29 23:47:01 UTC (rev 10161)
@@ -10,13 +10,13 @@
 =

    
       page
-      org.jboss.portal.portlet.test.jsp.taglib.PageTag
+      org.jboss.portal.portlet.portal.jsp.taglib.PageTag
       JSP
    
 =

    
       portlet
-      org.jboss.portal.portlet.test.jsp.taglib.PortletTag
+      org.jboss.portal.portlet.portal.jsp.taglib.PortletTag
       JSP
       
          name
@@ -54,19 +54,19 @@
 =

    
       portletmarkup
-      org.jboss.portal.portlet.test.jsp.taglib.PortletMarkupTag=

+      org.jboss.portal.portlet.portal.jsp.taglib.PortletMarkupT=
ag
       empty
    
 =

    
       portlettitle
-      org.jboss.portal.portlet.test.jsp.taglib.PortletTitleTag<=
/tag-class>
+      org.jboss.portal.portlet.portal.jsp.taglib.PortletTitleTa=
g
       empty
    
 =

    
       portleturl
-      org.jboss.portal.portlet.test.jsp.taglib.PortletURLTag
+      org.jboss.portal.portlet.portal.jsp.taglib.PortletURLTag<=
/tag-class>
       JSP
       
          mode
@@ -82,7 +82,7 @@
 =

    
       param
-      org.jboss.portal.portlet.test.jsp.taglib.ParamTag
+      org.jboss.portal.portlet.portal.jsp.taglib.ParamTag
       empty
       
          name
@@ -100,7 +100,7 @@
 =

    
       pageparam
-      org.jboss.portal.portlet.test.jsp.taglib.PageParamTag
+      org.jboss.portal.portlet.portal.jsp.taglib.PageParamTag
       empty
       
          namespaceURI
@@ -129,7 +129,7 @@
 =

    
       headers
-      org.jboss.portal.portlet.test.jsp.taglib.HeadersTag
+      org.jboss.portal.portlet.portal.jsp.taglib.HeadersTag
       empty
    
 =


Modified: modules/portlet/trunk/portal/src/main/resources/simple-portal-war=
/WEB-INF/web.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF=
/web.xml	2008-02-29 17:41:05 UTC (rev 10160)
+++ modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-I=
NF/web.xml	2008-02-29 23:47:01 UTC (rev 10161)
@@ -28,7 +28,7 @@
          version=3D"2.5">
    
       ControllerFilter
-      org.jboss.portal.portlet.test.jsp.ControllerFilter
+      org.jboss.portal.portlet.portal.jsp.ControllerFilter
    
    
       ControllerFilter

Copied: modules/portlet/trunk/portal/src/main/resources/simple-portal-war/c=
ss (from rev 10160, modules/portlet/trunk/test/src/test/resources/simple-po=
rtal-war/css)

Copied: modules/portlet/trunk/portal/src/main/resources/simple-portal-war/d=
emo (from rev 10160, modules/portlet/trunk/test/src/test/resources/simple-p=
ortal-war/demo)

Copied: modules/portlet/trunk/portal/src/main/resources/simple-portal-war/i=
mages (from rev 10160, modules/portlet/trunk/test/src/test/resources/simple=
-portal-war/images)

Deleted: modules/portlet/trunk/portal/src/main/resources/simple-portal-war/=
index.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/index.j=
sp	2008-02-27 20:42:50 UTC (rev 10138)
+++ modules/portlet/trunk/portal/src/main/resources/simple-portal-war/index=
.jsp	2008-02-29 23:47:01 UTC (rev 10161)
@@ -1,8 +0,0 @@
-<%@ page language=3D"java" %>
-<%@ taglib uri=3D"/WEB-INF/portal.tld" prefix=3D"portal" %>
-<%@ page isELIgnored=3D"false" %>
-
-
-
-
-

Copied: modules/portlet/trunk/portal/src/main/resources/simple-portal-war/i=
ndex.jsp (from rev 10160, modules/portlet/trunk/test/src/test/resources/sim=
ple-portal-war/index.jsp)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portal/src/main/resources/simple-portal-war/index=
.jsp	                        (rev 0)
+++ modules/portlet/trunk/portal/src/main/resources/simple-portal-war/index=
.jsp	2008-02-29 23:47:01 UTC (rev 10161)
@@ -0,0 +1,8 @@
+<%@ page language=3D"java" %>
+<%@ taglib uri=3D"/WEB-INF/portal.tld" prefix=3D"portal" %>
+<%@ page isELIgnored=3D"false" %>
+
+
+
+
+

Copied: modules/portlet/trunk/portal/src/main/resources/simple-portal-war/j=
s (from rev 10160, modules/portlet/trunk/test/src/test/resources/simple-por=
tal-war/js)

Copied: modules/portlet/trunk/portal/src/main/resources/simple-portal-war/l=
ayouts (from rev 10160, modules/portlet/trunk/test/src/test/resources/simpl=
e-portal-war/layouts)

Modified: modules/portlet/trunk/test/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/pom.xml	2008-02-29 17:41:05 UTC (rev 10160)
+++ modules/portlet/trunk/test/pom.xml	2008-02-29 23:47:01 UTC (rev 10161)
@@ -367,7 +367,6 @@
 =

                         
                            
-                           
                            
                         
 =


Modified: modules/portlet/trunk/test/src/test/build.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/build.xml	2008-02-29 17:41:05 UTC (=
rev 10160)
+++ modules/portlet/trunk/test/src/test/build.xml	2008-02-29 23:47:01 UTC (=
rev 10161)
@@ -699,29 +699,6 @@
 =

    
 =

-
-   
-      
-      
-         
-            
-               
-               
-               
-               
-               
-               
-               
-               
-            
-         
-
-         
-            
-         
-      
-   
-
    
 =

       
@@ -871,83 +848,7 @@
 =

    
 =

-   
-      
-      
-      
-      
-
-
-      
-         
-      
-
-      
-         
-      
-
-      
-      
-
-         
-         
-
-
-         
-
-         
-         
-         
-         
-         
-         
-         
-         
-         
-         
-         
-         
-      
-
-      
-      
-
-      
-      
-      
-         
-            
-            
-            
-            
-            
-            
-            
-         
-      
-      
-         
-      
-      
-      
-         
-      
-
-      
-      
-
-      
-
-      
-   
-
+
 =

 
\ No newline at end of file


--===============0425153434645711631==--

From portal-commits at lists.jboss.org Fri Feb 29 18:49:38 2008
Content-Type: multipart/mixed; boundary="===============0434071961540793668=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r10162 -
 modules/portlet/trunk/test/src/test/resources.
Date: Fri, 29 Feb 2008 18:49:38 -0500
Message-ID: 

--===============0434071961540793668==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-29 18:49:38 -0500 (Fri, 29 Feb 2008)
New Revision: 10162

Removed:
   modules/portlet/trunk/test/src/test/resources/portal/
Log:
remove empty dir


--===============0434071961540793668==--

From portal-commits at lists.jboss.org Fri Feb 29 18:50:13 2008
Content-Type: multipart/mixed; boundary="===============0090688265482820792=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r10163 -
 modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet.
Date: Fri, 29 Feb 2008 18:50:13 -0500
Message-ID: 

--===============0090688265482820792==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: julien(a)jboss.com
Date: 2008-02-29 18:50:12 -0500 (Fri, 29 Feb 2008)
New Revision: 10163

Removed:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/portal/
Log:
remove empty dir


--===============0090688265482820792==--

Error

Error

<%=3D request.getAttribute("org.jboss.portal.portlet.po= rtal.error.portlet_name")%> +

Demo Page Title

Demo Page Title

Demo Page Title

Demo Page Title

Demo Page Title

Demo Page Title

<%=3D request.getAttribute("org.jboss.portal.portlet.po= rtal.error.portlet_name")%> +

+ ${requestScope['org.jboss.portal.portlet.portal.error.po= rtlet_name']} ${requestScope['org.jboss.portal.portlet.portal.error.status= '] =3D=3D 'not_found' ? ' not found' : ''}

Portlet was not rendered

Demo Page Title

Demo Page Title

St. Augustine, Florida

St. Augustine, Florida

St. Augustine, Florida

PortletSwap

PortletSwap

Project Informatio= n

Project Informa= tion

PortletSwap

PortletSwap

Project Informatio= n

Project Informa= tion

Partial Refresh Repeater Demo

Partial Refresh Product Catalog

Product Details

Support Services

PortletSwap

Project Information

Support Services

Support Services

PortletSwap

PortletSwap

Project Information

Project Information

Support Services

Support Services

PortletSwap

PortletSwap

Project Information

Project Information

Partial Refresh Repeater Demo

Partial Refresh Product Catalog

Product Details