Author: chris.laprun(a)jboss.com Date: 2010-10-13 15:58:55 -0400 (Wed, 13 Oct 2010) New Revision: 4662 Modified: components/pc/trunk/api/src/main/java/org/gatein/pc/api/StateString.java components/pc/trunk/docs/user-guide/en/modules/introduction.xml components/pc/trunk/docs/user-guide/en/modules/simpleportal.xml components/pc/trunk/jsr168api/build.xml components/pc/trunk/portal/src/main/resources/simple-portal-war/demo/home.jsp components/pc/trunk/samples/src/main/artifacts/google-portlet-war/WEB-INF/portlet.xml components/pc/trunk/test/src/test/java/org/gatein/pc/test/portlet/jsr168/tck/portletinterface/ExceptionsDuringRequestHandlingTestCase.java components/pc/trunk/test/src/test/java/org/gatein/pc/test/portlet/jsr168/tck/portletinterface/PortletInterfaceTestSuite.java Log: - GTNPC-34: removed references to JBoss Portal. Modified: components/pc/trunk/api/src/main/java/org/gatein/pc/api/StateString.java =================================================================== --- components/pc/trunk/api/src/main/java/org/gatein/pc/api/StateString.java 2010-10-13 19:50:57 UTC (rev 4661) +++ components/pc/trunk/api/src/main/java/org/gatein/pc/api/StateString.java 2010-10-13 19:58:55 UTC (rev 4662) @@ -118,7 +118,7 @@ if (!opaqueValue.startsWith(JBPNS_PREFIX)) { throw new IllegalArgumentException("Bad format: [" + opaqueValue - + "] was not encoded by JBoss Portal and thus cannot be decoded."); + + "] was not encoded by the JBoss portlet container and thus cannot be decoded."); } // Modified: components/pc/trunk/docs/user-guide/en/modules/introduction.xml =================================================================== --- components/pc/trunk/docs/user-guide/en/modules/introduction.xml 2010-10-13 19:50:57 UTC (rev 4661) +++ components/pc/trunk/docs/user-guide/en/modules/introduction.xml 2010-10-13 19:58:55 UTC (rev 4662) @@ -15,8 +15,9 @@ <title>Introduction</title> <sect1> <title>Motivation</title> - <para>JBoss Portlet Container is the next generation portlet container on which future versions of JBoss Portal, - and the JBoss Portal platform will be based. It provides a standard-compliant implementation of the JSR-286 + <para>JBoss Portlet Container is the next generation portlet container on which future versions of GateIn, + and the JBoss Enterprise Portal Platform will be based. It provides a standard-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 management services it provides in their own applications. JBoss Portlet Container is available through the business-friendly LGPL open source license. Modified: components/pc/trunk/docs/user-guide/en/modules/simpleportal.xml =================================================================== --- components/pc/trunk/docs/user-guide/en/modules/simpleportal.xml 2010-10-13 19:50:57 UTC (rev 4661) +++ components/pc/trunk/docs/user-guide/en/modules/simpleportal.xml 2010-10-13 19:58:55 UTC (rev 4662) @@ -58,7 +58,7 @@ <sect2> <title>Portlet deployment</title> <para>Simple Portal integrates with a few web containers in order to provide handling of portlet deployment and - runtime. This feature leverages JBoss Portal's Web Service Provider Interface (SPI). In particular, JBoss + runtime. This feature leverages GateIn's Web Service Provider Interface (SPI). In particular, JBoss Portlet Container uses the Web SPI in order to transparently react to the life cycle of WAR files that contains portlet components as they are deployed or undeployed on the target servlet container. The SPI defines two levels of integrations. @@ -96,7 +96,7 @@ </listitem> </itemizedlist> <page>If you need more advanced page creation capabilities, you should consider using a more advanced portal - product such as JBoss Portal. + product such as GateIn. </page> <sect3> <title>Page creation</title> @@ -480,8 +480,8 @@ examine an extension provided to allow the display of portlets pretty much as they are rendered in classic portals, that is with decorations. This extension is built on top of Simple Portal's tag library and uses the JSP 2.0 tag library extension feature. A pretty good overview of this feature can be found at<ulink - url="http://www.onjava.com/pub/a/onjava/2004/05/12/jsp2part4.html&qu... - http://www.onjava.com/pub/a/onjava/2004/05/12/jsp2part4.html</ulink>;. + url="http://www.onjava.com/pub/a/onjava/2004/05/12/jsp2part4.html&qu... + http://www.onjava.com/pub/a/onjava/2004/05/12/jsp2part4.html</ulink>;. </para> <sect3> <title>The extended portlet tag</title> @@ -511,10 +511,12 @@ <title>Portlet debugging</title> <para>The Portlet 2.0 specification provides a new eventing feature for coordinating several portlets. This long awaited feature is very powerful but can sometime lead to complex scenarios when multiple - events are consumed and fired by multiple portlets on the same page.</para> + events are consumed and fired by multiple portlets on the same page. + </para> <para>The simple portal provides a visual debugger that can be used to understand what happens during the - event phase orchestrated by the portal. It comes as a portlet that you can place on any page and it shows - a tree of events that were produced and consumed during the event phase.</para> + event phase orchestrated by the portal. It comes as a portlet that you can place on any page and it shows + a tree of events that were produced and consumed during the event phase. + </para> <mediaobject> <imageobject> <imagedata align="center" fileref="images/debugger1.png" format="PNG" @@ -528,7 +530,8 @@ tree don't represent events, they rather represent event routings from a source portlet to a destination portlet. By default it shows the name of the portlet that published the event, the event name and the destination of the event that was chosen by the simple portal during - the event distribution phase. Hovering the mouse on a node shows more information.</para> + the event distribution phase. Hovering the mouse on a node shows more information. + </para> <mediaobject> <imageobject> <imagedata align="center" fileref="images/debugger2.png" format="PNG" @@ -539,9 +542,12 @@ </caption> </mediaobject> <para>When hovering the mouse on a node you can see the optional event payload represented by - the string returned when invoked its <code>toString()</code> method and the state of the portlet - after the event phase. The state of the portlet consist in its portlet mode, its window state and the - set of its render parameters. Adding the event debugger to a page is easy.</para> + the string returned when invoked its + <code>toString()</code> + method and the state of the portlet + after the event phase. The state of the portlet consist in its portlet mode, its window state and the + set of its render parameters. Adding the event debugger to a page is easy. + </para> <example> <title>Adding the event debugger to a portal page</title> <programlisting><![CDATA[ @@ -553,12 +559,14 @@ <sect2> <title>Admin portlet</title> <para>The admin portlet shows the list of portlet applications deployed in the simple portal. For each - portlet application it is possible to unfold the appliation to display the portlet contained in the - unfolded application as well as the portlet filters.</para> + portlet application it is possible to unfold the appliation to display the portlet contained in the + unfolded application as well as the portlet filters. + </para> <sect3> <title>Portlet application administration</title> <para>By default the admin portlet displays the list of portlet applications. It shows the status - of each application and provides the capability to stop or start an application.</para> + of each application and provides the capability to stop or start an application. + </para> <mediaobject> <imageobject> <imagedata align="center" fileref="images/admin1.png" format="PNG" @@ -569,14 +577,21 @@ </caption> </mediaobject> <para>On the example we can see that all the applications are in started mode except the - <emphasis>samples-basic-portlet</emphasis> application. It is possible to manage the - life cycle of each application by clicking on the <emphasis>start</emphasis> link when it - is stopped or clicking on the <emphasis>stop</emphasis> link when it is started.</para> + <emphasis>samples-basic-portlet</emphasis> + application. It is possible to manage the + life cycle of each application by clicking on the + <emphasis>start</emphasis> + link when it + is stopped or clicking on the + <emphasis>stop</emphasis> + link when it is started. + </para> </sect3> <sect3> <title>Portlet container and filter administration</title> <para>Selecting a particular portlet application unfolds it and shows the list of portlet containers - that the application contains as well as the filters it contains.</para> + that the application contains as well as the filters it contains. + </para> <mediaobject> <imageobject> <imagedata align="center" fileref="images/admin2.png" format="PNG" @@ -587,7 +602,8 @@ </caption> </mediaobject> <para>Again here it displays the name of the container and filters, the status of the life cycle and - a link to start or stop the corresponding item.</para> + a link to start or stop the corresponding item. + </para> </sect3> </sect2> <sect2> Modified: components/pc/trunk/jsr168api/build.xml =================================================================== --- components/pc/trunk/jsr168api/build.xml 2010-10-13 19:50:57 UTC (rev 4661) +++ components/pc/trunk/jsr168api/build.xml 2010-10-13 19:58:55 UTC (rev 4662) @@ -43,7 +43,7 @@ <!--| Buildmagic extentions. |--> <!--+======================================================================+--> -<project default="main" name="JBoss Portal"> +<project default="main" name="GateIn Portlet Container"> <!--+====================================================================+--> <!--| Setup |--> Modified: components/pc/trunk/portal/src/main/resources/simple-portal-war/demo/home.jsp =================================================================== --- components/pc/trunk/portal/src/main/resources/simple-portal-war/demo/home.jsp 2010-10-13 19:50:57 UTC (rev 4661) +++ components/pc/trunk/portal/src/main/resources/simple-portal-war/demo/home.jsp 2010-10-13 19:58:55 UTC (rev 4662) @@ -6,7 +6,7 @@ <img src="${pageContext.request.contextPath}/images/pc20-picture.gif" alt="" align="right"/> <a href="http://labs.jboss.com/portletcontainer" target="jboss"> JBoss Portlet Container</a> is the next generation - portlet container on which future versions of JBoss Portal will be based. It provides a standard-compliant + portlet container on which future versions of GateIn will be based. It provides a standard-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 management services it provides in @@ -29,7 +29,8 @@ <div class="box-content"> <p>JBoss (a division of Red Hat Inc.) offers various support services tailored to fit your needs. <a target="jboss" href="http://jboss.com/services/index">Explore</a> support and service options for - <a href="http://jboss.com/products/platforms/portals" target="jboss">JBoss Portal</a>.</p> + <a href="http://jboss.com/products/platforms/portals" target="jboss">JBoss Enterprise Portal Platform</a>. + </p> </div> </div> @@ -56,8 +57,9 @@ </div> <div class="box-content"> <p>Learn more about <a href="http://labs.jboss.com/portletcontainer" target="jboss">JBoss Portlet Container</a> - community project, <a href="http://labs.jboss.com/jbossportal" target="jboss">JBoss Portal</a>, - <a href="http://jboss.com/products/platforms/portals" target="jboss">JBoss Portal platform</a></p> + community project, <a href="http://gatein.org" target="jboss">GateIn</a>, + <a href="http://jboss.com/products/platforms/portals" target="jboss">JBoss Enterprise Portal platform</a> + </p> </div> </div> <br/> @@ -68,7 +70,7 @@ enjoy developing it!</p> <p>Baci e abbracci,<br/> - The JBoss Portal Team.</p> + The GateIn Team.</p> </div> </div> Modified: components/pc/trunk/samples/src/main/artifacts/google-portlet-war/WEB-INF/portlet.xml =================================================================== --- components/pc/trunk/samples/src/main/artifacts/google-portlet-war/WEB-INF/portlet.xml 2010-10-13 19:50:57 UTC (rev 4661) +++ components/pc/trunk/samples/src/main/artifacts/google-portlet-war/WEB-INF/portlet.xml 2010-10-13 19:58:55 UTC (rev 4662) @@ -107,6 +107,9 @@ <read-only>false</read-only> </preference> </portlet-preferences> + <supported-publishing-event> + <qname xmlns:jbp='urn:jboss:portal:samples:event'>jbp:ZipEvent</qname> + </supported-publishing-event> <supported-public-render-parameter>zipcode</supported-public-render-parameter> </portlet> Modified: components/pc/trunk/test/src/test/java/org/gatein/pc/test/portlet/jsr168/tck/portletinterface/ExceptionsDuringRequestHandlingTestCase.java =================================================================== --- components/pc/trunk/test/src/test/java/org/gatein/pc/test/portlet/jsr168/tck/portletinterface/ExceptionsDuringRequestHandlingTestCase.java 2010-10-13 19:50:57 UTC (rev 4661) +++ components/pc/trunk/test/src/test/java/org/gatein/pc/test/portlet/jsr168/tck/portletinterface/ExceptionsDuringRequestHandlingTestCase.java 2010-10-13 19:58:55 UTC (rev 4662) @@ -22,23 +22,19 @@ ******************************************************************************/ package org.gatein.pc.test.portlet.jsr168.tck.portletinterface; +import org.gatein.pc.test.unit.Assertion; import org.gatein.pc.test.unit.PortletTestCase; import org.gatein.pc.test.unit.annotations.TestCase; -import org.gatein.pc.test.unit.Assertion; /** - * This case is based on: - * - ExceptionsDuringRequestHandlingControllerPortlet - * - PortletExceptionDuringRequestHandlingPortlet - * - RuntimeExceptionDuringRequestHandlingPortlet - * - UnavailableExceptionDuringProcessActionPortlet - * - UnavailableExceptionDuringRenderPortlet + * This case is based on: - ExceptionsDuringRequestHandlingControllerPortlet - PortletExceptionDuringRequestHandlingPortlet + * - RuntimeExceptionDuringRequestHandlingPortlet - UnavailableExceptionDuringProcessActionPortlet - + * UnavailableExceptionDuringRenderPortlet + * <p/> + * This test is disabled. Specification doesn't defined strictly portal behaviour when one of the portlets throws + * PortletException. Currently in GateIn if one portlet throws an PortletException than the rest of portlet of the page + * is not rendered - code 500 is returned. Tests are based on different behaviour where rest of portlets are rendered. * - * This test is disabled. Specification doesn't defined strictly portal behaviour when - * one of the portlets throws PortletException. Currently in JBoss Portal if one portlet - * throws an PortletException than the rest of portlet of the page is not rendered - code 500 - * is returned. Tests are based on different behaviour where rest of portlets are rendered. - * * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 1.1 $ */ Modified: components/pc/trunk/test/src/test/java/org/gatein/pc/test/portlet/jsr168/tck/portletinterface/PortletInterfaceTestSuite.java =================================================================== --- components/pc/trunk/test/src/test/java/org/gatein/pc/test/portlet/jsr168/tck/portletinterface/PortletInterfaceTestSuite.java 2010-10-13 19:50:57 UTC (rev 4661) +++ components/pc/trunk/test/src/test/java/org/gatein/pc/test/portlet/jsr168/tck/portletinterface/PortletInterfaceTestSuite.java 2010-10-13 19:58:55 UTC (rev 4662) @@ -97,7 +97,7 @@ // * - UnavailableExceptionDuringRenderPortlet // * // * This test is disabled. Specification doesn't defined strictly portal behaviour when -// * one of the portlets throws PortletException. Currently in JBoss Portal if one portlet +// * one of the portlets throws PortletException. Currently in GateIn if one portlet // * throws an PortletException than the rest of portlet of the page is not rendered - code 500 // * is returned. Tests are based on different behaviour where rest of portlets are rendered. // */