JBoss Portal SVN: r9962 - modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo.
by portal-commits@lists.jboss.org
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/demo1.jsp
modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/home.jsp
Log:
- Added some content for home page.
Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/demo1.jsp
===================================================================
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/demo1.jsp 2008-02-14 01:26:46 UTC (rev 9961)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/demo1.jsp 2008-02-14 01:28:19 UTC (rev 9962)
@@ -9,12 +9,12 @@
<portal:page>
<portal:pageparam namespaceURI="urn:jboss:portal:simple:google" localName="zipcode" value="80201"/>
<jbp:layout1>
- <jsp:attribute name="leftcol">
- <jbp:portlet name="Cart" applicationName="samples-cart-event-portlet" id="cart-portlet"/>
- </jsp:attribute>
- <jsp:attribute name="rightcol">
- <jbp:portlet name="Catalog" applicationName="samples-cart-event-portlet" />
- </jsp:attribute>
+ <jsp:attribute name="leftcol">
+ <jbp:portlet name="Cart" applicationName="samples-cart-event-portlet" id="cart-portlet"/>
+ </jsp:attribute>
+ <jsp:attribute name="rightcol">
+ <jbp:portlet name="Catalog" applicationName="samples-cart-event-portlet"/>
+ </jsp:attribute>
</jbp:layout1>
</portal:page>
Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/home.jsp
===================================================================
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/home.jsp 2008-02-14 01:26:46 UTC (rev 9961)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/home.jsp 2008-02-14 01:28:19 UTC (rev 9962)
@@ -1,20 +1,45 @@
<%@ page contentType="text/html" %>
-<%@ page language="java" %>
-<%@ taglib prefix="jbp" tagdir="/WEB-INF/tags/portal" %>
-<%@ taglib uri="/WEB-INF/portal.tld" prefix="portal" %>
-<%@ page isELIgnored="false" %>
+<%@ include file="/layouts/header.jsp" %>
- <%@ include file="/layouts/header.jsp" %>
- <portal:page>
- <jbp:layout1>
- <jsp:attribute name="leftcol">
+<!-- Logo floated to the left of text would be good! :) -->
+<p><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
+ 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.
+</p>
- </jsp:attribute>
- <jsp:attribute name="rightcol">
+<p>This simple portal is a demonstration of what can be achieved reasonably quickly by leveraging JBoss Portlet
+ Container.</p>
- </jsp:attribute>
- </jbp:layout1>
- </portal:page>
+<table width="100%">
+ <tr>
+ <td valign="top"><h3>Support Services</h3>
- <%@ include file="/layouts/footer.jsp" %>
\ No newline at end of file
+ <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>
+ </td>
+ <td valign="top"><h3>PortletSwap</h3>
+
+ <p><a href="http://www.portletswap.com" target="jboss">Portletswap.com</a> is an open community sponsored
+ by JBoss to facilitate the exchange of portlets that can be used with JBoss Portlet Container and JBoss
+ Portal.</p>
+ </td>
+ <td valign="top"><h3>Project Information</h3>
+
+ <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>
+ </td>
+ </tr>
+</table>
+
+<p>Thank you for downloading and deploying JBoss Portlet Container. We hope your enjoy working with it as much as we
+ enjoy developing it!</p>
+
+<p>Baci e abbracci,<br/>
+ The JBoss Portal Team.</p>
+
+<%@ include file="/layouts/footer.jsp" %>
\ No newline at end of file
16 years, 7 months
JBoss Portal SVN: r9961 - in modules/portlet/trunk/docs: common and 4 other directories.
by portal-commits@lists.jboss.org
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.gif
modules/portlet/trunk/docs/common/en/images/renaissance/actionIcon_CreateInstance.gif
modules/portlet/trunk/docs/common/en/images/renaissance/actionIcon_Delete.gif
modules/portlet/trunk/docs/common/en/images/renaissance/actionIcon_Details.gif
modules/portlet/trunk/docs/common/en/images/renaissance/actionIcon_IsDefault.gif
modules/portlet/trunk/docs/common/en/images/renaissance/actionIcon_Layout.gif
modules/portlet/trunk/docs/common/en/images/renaissance/actionIcon_MakeDefault.gif
modules/portlet/trunk/docs/common/en/images/renaissance/actionIcon_MoveDown.gif
modules/portlet/trunk/docs/common/en/images/renaissance/actionIcon_MoveUp.gif
modules/portlet/trunk/docs/common/en/images/renaissance/actionIcon_Properties.gif
modules/portlet/trunk/docs/common/en/images/renaissance/actionIcon_Rename.gif
modules/portlet/trunk/docs/common/en/images/renaissance/actionIcon_Security.gif
modules/portlet/trunk/docs/common/en/images/renaissance/actionIcon_Theme.gif
modules/portlet/trunk/docs/common/en/images/renaissance/animated_favicon1.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_cornerelement.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_swizzleclosed.gif
modules/portlet/trunk/docs/common/en/images/renaissance/ico_16_swizzleopen.gif
modules/portlet/trunk/docs/common/en/images/renaissance/ico_addcontent.gif
modules/portlet/trunk/docs/common/en/images/renaissance/ico_admin.gif
modules/portlet/trunk/docs/common/en/images/renaissance/ico_arrow_blue_left.gif
modules/portlet/trunk/docs/common/en/images/renaissance/ico_arrow_blue_right.gif
modules/portlet/trunk/docs/common/en/images/renaissance/ico_arrow_grey_left.gif
modules/portlet/trunk/docs/common/en/images/renaissance/ico_arrow_grey_right.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.png
modules/portlet/trunk/docs/common/en/images/renaissance/pathSeparator.png
modules/portlet/trunk/docs/common/en/images/renaissance/portlet-bottom-left.gif
modules/portlet/trunk/docs/common/en/images/renaissance/portlet-bottom-middle.gif
modules/portlet/trunk/docs/common/en/images/renaissance/portlet-bottom-right.gif
modules/portlet/trunk/docs/common/en/images/renaissance/portlet-left-vertical.gif
modules/portlet/trunk/docs/common/en/images/renaissance/portlet-right-vertical.gif
modules/portlet/trunk/docs/common/en/images/renaissance/portlet-top-left.gif
modules/portlet/trunk/docs/common/en/images/renaissance/portlet-top-middle.gif
modules/portlet/trunk/docs/common/en/images/renaissance/portlet-top-right.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.gif
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_current.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
===================================================================
(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
===================================================================
(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
===================================================================
(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
===================================================================
(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
===================================================================
(Binary files differ)
Property changes on: modules/portlet/trunk/docs/common/en/images/previous.png
___________________________________________________________________
Name: svn:mime-type
+ image/png
Added: modules/portlet/trunk/docs/common/en/images/renaissance/actionIcon_Add.gif
===================================================================
(Binary files differ)
Property changes on: modules/portlet/trunk/docs/common/en/images/renaissance/actionIcon_Add.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: modules/portlet/trunk/docs/common/en/images/renaissance/actionIcon_CreateInstance.gif
===================================================================
(Binary files differ)
Property changes on: modules/portlet/trunk/docs/common/en/images/renaissance/actionIcon_CreateInstance.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: modules/portlet/trunk/docs/common/en/images/renaissance/actionIcon_Delete.gif
===================================================================
(Binary files differ)
Property changes on: modules/portlet/trunk/docs/common/en/images/renaissance/actionIcon_Delete.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: modules/portlet/trunk/docs/common/en/images/renaissance/actionIcon_Details.gif
===================================================================
(Binary files differ)
Property changes on: modules/portlet/trunk/docs/common/en/images/renaissance/actionIcon_Details.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: modules/portlet/trunk/docs/common/en/images/renaissance/actionIcon_IsDefault.gif
===================================================================
(Binary files differ)
Property changes on: modules/portlet/trunk/docs/common/en/images/renaissance/actionIcon_IsDefault.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: modules/portlet/trunk/docs/common/en/images/renaissance/actionIcon_Layout.gif
===================================================================
(Binary files differ)
Property changes on: modules/portlet/trunk/docs/common/en/images/renaissance/actionIcon_Layout.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: modules/portlet/trunk/docs/common/en/images/renaissance/actionIcon_MakeDefault.gif
===================================================================
(Binary files differ)
Property changes on: modules/portlet/trunk/docs/common/en/images/renaissance/actionIcon_MakeDefault.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: modules/portlet/trunk/docs/common/en/images/renaissance/actionIcon_MoveDown.gif
===================================================================
(Binary files differ)
Property changes on: modules/portlet/trunk/docs/common/en/images/renaissance/actionIcon_MoveDown.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: modules/portlet/trunk/docs/common/en/images/renaissance/actionIcon_MoveUp.gif
===================================================================
(Binary files differ)
Property changes on: modules/portlet/trunk/docs/common/en/images/renaissance/actionIcon_MoveUp.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: modules/portlet/trunk/docs/common/en/images/renaissance/actionIcon_Properties.gif
===================================================================
(Binary files differ)
Property changes on: modules/portlet/trunk/docs/common/en/images/renaissance/actionIcon_Properties.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: modules/portlet/trunk/docs/common/en/images/renaissance/actionIcon_Rename.gif
===================================================================
(Binary files differ)
Property changes on: modules/portlet/trunk/docs/common/en/images/renaissance/actionIcon_Rename.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: modules/portlet/trunk/docs/common/en/images/renaissance/actionIcon_Security.gif
===================================================================
(Binary files differ)
Property changes on: modules/portlet/trunk/docs/common/en/images/renaissance/actionIcon_Security.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: modules/portlet/trunk/docs/common/en/images/renaissance/actionIcon_Theme.gif
===================================================================
(Binary files differ)
Property changes on: modules/portlet/trunk/docs/common/en/images/renaissance/actionIcon_Theme.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: modules/portlet/trunk/docs/common/en/images/renaissance/animated_favicon1.gif
===================================================================
(Binary files differ)
Property changes on: modules/portlet/trunk/docs/common/en/images/renaissance/animated_favicon1.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: modules/portlet/trunk/docs/common/en/images/renaissance/favicon.ico
===================================================================
(Binary files differ)
Property changes on: modules/portlet/trunk/docs/common/en/images/renaissance/favicon.ico
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: modules/portlet/trunk/docs/common/en/images/renaissance/header_bg.gif
===================================================================
(Binary files differ)
Property changes on: modules/portlet/trunk/docs/common/en/images/renaissance/header_bg.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: modules/portlet/trunk/docs/common/en/images/renaissance/homeimg_cornerelement.gif
===================================================================
(Binary files differ)
Property changes on: modules/portlet/trunk/docs/common/en/images/renaissance/homeimg_cornerelement.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: modules/portlet/trunk/docs/common/en/images/renaissance/ico_16_help.gif
===================================================================
(Binary files differ)
Property changes on: modules/portlet/trunk/docs/common/en/images/renaissance/ico_16_help.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: modules/portlet/trunk/docs/common/en/images/renaissance/ico_16_maximize.gif
===================================================================
(Binary files differ)
Property changes on: modules/portlet/trunk/docs/common/en/images/renaissance/ico_16_maximize.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: modules/portlet/trunk/docs/common/en/images/renaissance/ico_16_minimize.gif
===================================================================
(Binary files differ)
Property changes on: modules/portlet/trunk/docs/common/en/images/renaissance/ico_16_minimize.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: modules/portlet/trunk/docs/common/en/images/renaissance/ico_16_normal.gif
===================================================================
(Binary files differ)
Property changes on: modules/portlet/trunk/docs/common/en/images/renaissance/ico_16_normal.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: modules/portlet/trunk/docs/common/en/images/renaissance/ico_16_reload.gif
===================================================================
(Binary files differ)
Property changes on: modules/portlet/trunk/docs/common/en/images/renaissance/ico_16_reload.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: modules/portlet/trunk/docs/common/en/images/renaissance/ico_16_remove.gif
===================================================================
(Binary files differ)
Property changes on: modules/portlet/trunk/docs/common/en/images/renaissance/ico_16_remove.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: modules/portlet/trunk/docs/common/en/images/renaissance/ico_16_swizzleclosed.gif
===================================================================
(Binary files differ)
Property changes on: modules/portlet/trunk/docs/common/en/images/renaissance/ico_16_swizzleclosed.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: modules/portlet/trunk/docs/common/en/images/renaissance/ico_16_swizzleopen.gif
===================================================================
(Binary files differ)
Property changes on: modules/portlet/trunk/docs/common/en/images/renaissance/ico_16_swizzleopen.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: modules/portlet/trunk/docs/common/en/images/renaissance/ico_addcontent.gif
===================================================================
(Binary files differ)
Property changes on: modules/portlet/trunk/docs/common/en/images/renaissance/ico_addcontent.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: modules/portlet/trunk/docs/common/en/images/renaissance/ico_admin.gif
===================================================================
(Binary files differ)
Property changes on: modules/portlet/trunk/docs/common/en/images/renaissance/ico_admin.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: modules/portlet/trunk/docs/common/en/images/renaissance/ico_arrow_blue_left.gif
===================================================================
(Binary files differ)
Property changes on: modules/portlet/trunk/docs/common/en/images/renaissance/ico_arrow_blue_left.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: modules/portlet/trunk/docs/common/en/images/renaissance/ico_arrow_blue_right.gif
===================================================================
(Binary files differ)
Property changes on: modules/portlet/trunk/docs/common/en/images/renaissance/ico_arrow_blue_right.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: modules/portlet/trunk/docs/common/en/images/renaissance/ico_arrow_grey_left.gif
===================================================================
(Binary files differ)
Property changes on: modules/portlet/trunk/docs/common/en/images/renaissance/ico_arrow_grey_left.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: modules/portlet/trunk/docs/common/en/images/renaissance/ico_arrow_grey_right.gif
===================================================================
(Binary files differ)
Property changes on: modules/portlet/trunk/docs/common/en/images/renaissance/ico_arrow_grey_right.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: modules/portlet/trunk/docs/common/en/images/renaissance/ico_cancel.gif
===================================================================
(Binary files differ)
Property changes on: modules/portlet/trunk/docs/common/en/images/renaissance/ico_cancel.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: modules/portlet/trunk/docs/common/en/images/renaissance/ico_edit.gif
===================================================================
(Binary files differ)
Property changes on: modules/portlet/trunk/docs/common/en/images/renaissance/ico_edit.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: modules/portlet/trunk/docs/common/en/images/renaissance/ico_listelement.gif
===================================================================
(Binary files differ)
Property changes on: modules/portlet/trunk/docs/common/en/images/renaissance/ico_listelement.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: modules/portlet/trunk/docs/common/en/images/renaissance/logo.gif
===================================================================
(Binary files differ)
Property changes on: modules/portlet/trunk/docs/common/en/images/renaissance/logo.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: modules/portlet/trunk/docs/common/en/images/renaissance/msgIcon_Warning.gif
===================================================================
(Binary files differ)
Property changes on: modules/portlet/trunk/docs/common/en/images/renaissance/msgIcon_Warning.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: modules/portlet/trunk/docs/common/en/images/renaissance/objectPath_Arrow.gif
===================================================================
(Binary files differ)
Property changes on: modules/portlet/trunk/docs/common/en/images/renaissance/objectPath_Arrow.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: modules/portlet/trunk/docs/common/en/images/renaissance/pathBackground.png
===================================================================
(Binary files differ)
Property changes on: modules/portlet/trunk/docs/common/en/images/renaissance/pathBackground.png
___________________________________________________________________
Name: svn:mime-type
+ image/png
Added: modules/portlet/trunk/docs/common/en/images/renaissance/pathSeparator.png
===================================================================
(Binary files differ)
Property changes on: modules/portlet/trunk/docs/common/en/images/renaissance/pathSeparator.png
___________________________________________________________________
Name: svn:mime-type
+ image/png
Added: modules/portlet/trunk/docs/common/en/images/renaissance/portlet-bottom-left.gif
===================================================================
(Binary files differ)
Property changes on: modules/portlet/trunk/docs/common/en/images/renaissance/portlet-bottom-left.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: modules/portlet/trunk/docs/common/en/images/renaissance/portlet-bottom-middle.gif
===================================================================
(Binary files differ)
Property changes on: modules/portlet/trunk/docs/common/en/images/renaissance/portlet-bottom-middle.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: modules/portlet/trunk/docs/common/en/images/renaissance/portlet-bottom-right.gif
===================================================================
(Binary files differ)
Property changes on: modules/portlet/trunk/docs/common/en/images/renaissance/portlet-bottom-right.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: modules/portlet/trunk/docs/common/en/images/renaissance/portlet-left-vertical.gif
===================================================================
(Binary files differ)
Property changes on: modules/portlet/trunk/docs/common/en/images/renaissance/portlet-left-vertical.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: modules/portlet/trunk/docs/common/en/images/renaissance/portlet-right-vertical.gif
===================================================================
(Binary files differ)
Property changes on: modules/portlet/trunk/docs/common/en/images/renaissance/portlet-right-vertical.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: modules/portlet/trunk/docs/common/en/images/renaissance/portlet-top-left.gif
===================================================================
(Binary files differ)
Property changes on: modules/portlet/trunk/docs/common/en/images/renaissance/portlet-top-left.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: modules/portlet/trunk/docs/common/en/images/renaissance/portlet-top-middle.gif
===================================================================
(Binary files differ)
Property changes on: modules/portlet/trunk/docs/common/en/images/renaissance/portlet-top-middle.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: modules/portlet/trunk/docs/common/en/images/renaissance/portlet-top-right.gif
===================================================================
(Binary files differ)
Property changes on: modules/portlet/trunk/docs/common/en/images/renaissance/portlet-top-right.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: modules/portlet/trunk/docs/common/en/images/renaissance/spacer.gif
===================================================================
(Binary files differ)
Property changes on: modules/portlet/trunk/docs/common/en/images/renaissance/spacer.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: modules/portlet/trunk/docs/common/en/images/renaissance/tab_left.gif
===================================================================
(Binary files differ)
Property changes on: modules/portlet/trunk/docs/common/en/images/renaissance/tab_left.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: modules/portlet/trunk/docs/common/en/images/renaissance/tab_left_admin.gif
===================================================================
(Binary files differ)
Property changes on: modules/portlet/trunk/docs/common/en/images/renaissance/tab_left_admin.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: modules/portlet/trunk/docs/common/en/images/renaissance/tab_left_current.gif
===================================================================
(Binary files differ)
Property changes on: modules/portlet/trunk/docs/common/en/images/renaissance/tab_left_current.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: modules/portlet/trunk/docs/common/en/images/renaissance/tab_left_hover2.gif
===================================================================
(Binary files differ)
Property changes on: modules/portlet/trunk/docs/common/en/images/renaissance/tab_left_hover2.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: modules/portlet/trunk/docs/common/en/images/renaissance/tab_right.gif
===================================================================
(Binary files differ)
Property changes on: modules/portlet/trunk/docs/common/en/images/renaissance/tab_right.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: modules/portlet/trunk/docs/common/en/images/renaissance/tab_right_admin.gif
===================================================================
(Binary files differ)
Property changes on: modules/portlet/trunk/docs/common/en/images/renaissance/tab_right_admin.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: modules/portlet/trunk/docs/common/en/images/renaissance/tab_right_current.gif
===================================================================
(Binary files differ)
Property changes on: modules/portlet/trunk/docs/common/en/images/renaissance/tab_right_current.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: modules/portlet/trunk/docs/common/en/images/renaissance/tab_right_hover2.gif
===================================================================
(Binary files differ)
Property changes on: modules/portlet/trunk/docs/common/en/images/renaissance/tab_right_hover2.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: modules/portlet/trunk/docs/common/en/images/renaissance/tab_swizzle.gif
===================================================================
(Binary files differ)
Property changes on: modules/portlet/trunk/docs/common/en/images/renaissance/tab_swizzle.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: modules/portlet/trunk/docs/user-guide/build.xml
===================================================================
--- 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 @@
-<project name="CHANGE ME IN BUILD.XML" default="all.doc" basedir=".">
+<project name="JBoss Portlet Container Documentation" default="all.doc" basedir=".">
- <!-- Set the following property to generate the doco in the output folder -->
- <!--property name="build.dir" value="${basedir}/../../output/docs/guide"/-->
+ <!-- Set the following property to generate the doco in the output folder -->
+ <!--property name="build.dir" value="${basedir}/../../output/docs/guide"/-->
- <property name="pdf.name" value="ChangeMeInBuildXML.pdf" />
- <import file="../docbook-support/support.xml" />
+ <property name="pdf.name" value="jboss-portlet-container-user-guide.pdf"/>
+ <import file="../docbook-support/support.xml"/>
- <target name="en">
- <antcall target="lang.dochtml">
- <param name="lang" value="en"/>
- </antcall>
- </target>
+ <target name="en">
+ <antcall target="lang.dochtml">
+ <param name="lang" value="en"/>
+ </antcall>
+ </target>
- <target name="all.doc" depends="clean">
- <antcall target="lang.all"><param name="lang" value="en"/></antcall>
- </target>
-
- <!-- Use this alternate target to enable uptodate checking, i.e.
- don't generate docs if nothing has changed
- <target name="all.doc">
- <antcall target="lang.all.run"><param name="lang" value="en"/></antcall>
- </target>
- -->
+ <target name="all.doc" depends="clean">
+ <antcall target="lang.all">
+ <param name="lang" value="en"/>
+ </antcall>
+ </target>
+ <!-- Use this alternate target to enable uptodate checking, i.e.
+ don't generate docs if nothing has changed
+ <target name="all.doc">
+ <antcall target="lang.all.run"><param name="lang" value="en"/></antcall>
+ </target>
+ -->
+
</project>
16 years, 7 months
JBoss Portal SVN: r9960 - modules/portlet/trunk/test/src/test.
by portal-commits@lists.jboss.org
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
===================================================================
--- 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 @@
<property name="portal.dir" value="${target}/portal"/>
<property name="simple.tomcat.dir" value="${portal.dir}/tomcat"/>
<property name="simple.as42.dir" value="${portal.dir}/as42"/>
- <property name="simple.as5.dir" value="${portal.dir}/as5"/>
+ <!--<property name="simple.as5.dir" value="${portal.dir}/as5"/>-->
<delete dir="${portal.dir}"/>
<mkdir dir="${portal.dir}"/>
<mkdir dir="${simple.tomcat.dir}"/>
<mkdir dir="${simple.as42.dir}"/>
- <mkdir dir="${simple.as5.dir}"/>
+ <!--<mkdir dir="${simple.as5.dir}"/>-->
<jar jarfile="${target}/portlet-test-lib.jar">
@@ -772,6 +772,9 @@
<fileset dir="${simple.tomcat.dir}/simple-portal/simple-portal.war"/>
</jar>
<delete dir="${simple.tomcat.dir}/simple-portal/simple-portal.war"/>
+ <move todir="${simple.tomcat.dir}/copy-to-tomcat-lib">
+ <fileset dir="${simple.tomcat.dir}/simple-portal/"/>
+ </move>
<!-- AS 5 -->
<!--<generic-package-simple-portal server="${simple.as5.dir}"/>-->
16 years, 7 months
JBoss Portal SVN: r9959 - docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
by portal-commits@lists.jboss.org
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/tutorials.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/tutorials.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml 2008-02-14 00:37:37 UTC (rev 9958)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml 2008-02-14 01:02:56 UTC (rev 9959)
@@ -142,7 +142,7 @@
<title>Introduction</title>
<para>
This section details deploying your first portlet in JBoss Portal. Before proceeding, download the <ulink
- url="http://anonsvn.jboss.org/repos/portletswap/portlets/2_6/bundles/HelloWorl...">HelloWorldPorlet</ulink> from <ulink url="http://labs.jboss.com/portletswap/">JBoss PortletSwap</ulink>.
+ url="http://anonsvn.jboss.org/repos/portletswap/portlets/2_6/bundles/HelloWorl...">HelloWorldPortlet</ulink> from <ulink url="http://labs.jboss.com/portletswap/">JBoss PortletSwap</ulink>.
</para>
</sect3>
<sect3>
@@ -521,7 +521,7 @@
<sect3 id="first_portlet_build">
<title>Building your Portlet</title>
<para>
- A pre-compiled <filename>HelloWorldPortlet/helloworldportlet.war</filename> file is created after extracting the <filename>HelloWorldPorlet.zip</filename> file. To manually build the <filename>helloworldportlet.war</filename> file:
+ A pre-compiled <filename>HelloWorldPortlet/helloworldportlet.war</filename> file is created after extracting the <filename>HelloWorldPortlet.zip</filename> file. To manually build the <filename>helloworldportlet.war</filename> file:
</para>
<para>
<orderedlist>
@@ -545,7 +545,7 @@
</orderedlist>
</para>
<para>
- Expanding the <filename>helloworldportlet.war</filename> allows you to deploy the portlet as an expanded directory, which makes development easier. As well, it gives you access to the XML descriptors, resource files, JSF, and JSP pages. To expand the <filename>helloworldportlet.war</filename> file:
+ Expanding the <filename>helloworldportlet.war</filename> file allows you to deploy the portlet as an expanded directory, which makes development easier. As well, it gives you access to the XML descriptors, resource files, JSF, and JSP pages. To expand the <filename>helloworldportlet.war</filename> file:
</para>
<para>
<orderedlist>
@@ -583,26 +583,49 @@
</para>
</sect3>
<sect3>
- <title>Deploying your portlet</title>
+ <title>Deploying your Portlet</title>
<para>
- Deploying a portlet is as simple as copying/moving <literal>helloworldportlet.war</literal>
- to your server <literal>deploy</literal> directory. Doing this on a running instance of JBoss Portal and
- application server, will trigger a <emphasis>hot-deploy</emphasis> of your portlet:
- <programlisting><![CDATA[18:25:56,366 INFO [Server] JBoss (MX MicroKernel) [4.2.2.GA (build:
- CVSTag=JBoss_4_0_5_GA date=2006000000)] Started in 1m:3s:688ms
-18:26:21,147 INFO [TomcatDeployer] deploy, ctxPath=/helloworldportlet,
- warUrl=.../tmp/deploy/tmp35219helloworldportlet-exp.war/]]></programlisting>
- Pointing your browser to <ulink url="http://localhost:8080/portal/">http://localhost:8080/portal/</ulink>,
- should yield a view of our HelloWorldPortlet, added to the default page of Portal:
-
- <!-- Touching the <filename>web.xml</filename> file will let any live JBoss AS instance know that it needs to hot re-deploy the web application. -->
+ If you did not expand the <filename>helloworldportlet.war</filename> file, copy the <filename>HelloWorldPortlet/helloworldportlet.war</filename> file into the correct JBoss AS or JBoss EAP <filename>deploy/</filename> directory. If you expanded the <filename>helloworldportlet.war</filename> file, copy the <filename>HelloWorldPortlet/output/lib/exploded/helloworldportlet.war/</filename> directory into the correct JBoss AS or JBoss EAP <filename>deploy/</filename> directory. For example, if you are using JBoss AS, copy the file or directory into the <filename>$JBOSS_HOME/server/default/deploy/</filename> directory.
+ </para>
+ <para>
+ Performing this step on a running instance of JBoss AS or JBoss EAP, and JBoss Portal, will trigger a hot-deploy of the portlet:
+ </para>
+ <para>
+<screen><![CDATA[
+INFO [TomcatDeployer] deploy, ctxPath=/helloworldportlet,
+ warUrl=.../tmp/deploy/tmp35219helloworldportlet-exp.war/]]>
+</screen>
+ </para>
+ <para>
+ To see the HelloWorldPortlet, navigate to <ulink url="http://localhost:8080/portal/">http://localhost:8080/portal/</ulink>, or, if the main JBoss Portal page is already open, refresh the page. The HelloWorldPortlet is added to the default page of JBoss Portal:
+ </para>
+ <para>
<mediaobject>
<imageobject>
<imagedata align="center" fileref="images/tutorials/first_portlet/output.png" valign="middle"/>
</imageobject>
</mediaobject>
</para>
- </sect3>
+ <para>
+ To re-deploy the portlet, for example, if you have made changes to any of the XML descriptors, touch the <filename>$JBOSS_HOME/server/<replaceable>configuration</replaceable>/deploy/helloworldportlet.war/WEB-INF/web.xml</filename> file. On Linux, run the following command to re-deploy the HelloWorldPortlet:
+ </para>
+ <para>
+<screen>
+touch $JBOSS_HOME/server/<replaceable>configuration</replaceable>/deploy/helloworldportlet.war/WEB-INF/web.xml
+</screen>
+ </para>
+ <para>
+ Re-deploying the HelloWorldPortlet will produce the following output on the JBoss AS or JBoss EAP console:
+ </para>
+ <para>
+<screen><![CDATA[
+INFO [TomcatDeployer] undeploy, ctxPath=/helloworldportlet,
+warUrl=.../deploy/helloworldportlet.war/
+INFO [TomcatDeployer] deploy, ctxPath=/helloworldportlet,
+warUrl=.../deploy/helloworldportlet.war/]]>
+</screen>
+</para>
+</sect3>
</sect2>
<sect2>
<title>A Simple JSP Portlet</title>
16 years, 7 months
JBoss Portal SVN: r9958 - in modules/portlet/trunk/test/src: test/resources/simple-portal-war/css and 2 other directories.
by portal-commits@lists.jboss.org
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/master.css
modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/demo3.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
===================================================================
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/portal/samples/basic/HeaderPortlet.java 2008-02-13 21:05:27 UTC (rev 9957)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/portal/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 = 0;
+ public final static int PLATINUM = 1;
+ public final static int GOLD = 2;
+ public final static int SILVER = 3;
+ public final static int TIN = 4;
+
+ public void processAction(ActionRequest req, ActionResponse resp) throws PortletException, PortletSecurityException, IOException
+ {
+
+ String repeatText = req.getParameter("repeat");
+ // set zip as render parameter
+ if (repeatText != null){
+ resp.setRenderParameter("repeat", repeatText);
+ }
+ // request view
+ resp.setPortletMode(PortletMode.VIEW);
+
+ }
public void render(RenderRequest req, RenderResponse resp) throws PortletException, IOException
{
ResourceURL resourceURL = resp.createResourceURL();
-
- //
+ PortletURL actionURL = resp.createActionURL();
+ //
// Element elt = 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 = resp.getWriter();
writer.print("" +
"<script type=\"text/javascript\">" +
+ "" +
+ // "function init(){\n" +
+ //" Event.observe('repeat', 'keyup', repeat(), false);\n" +
+ // "}" +
+ "" +
"function browse(id) {" +
"var url = id;\n" +
- "alert(url);\n" +
"var pars = 'foo=bar';\n" +
"var target = 'output-div';\n" +
"var myAjax = new Ajax.Updater(target, url, {method: 'GET', parameters: pars});" +
"}" +
- "</script>" +
- "<div style=\"height:100px;width:100%;text-align:center;padding-top:50px;\">");
+
+ "</script>");
+
+ writer.print("" +
+ "<div class='full-width' style='padding:5px'>" +
+ "<h4>Partial Refresh Repeater Demo</h4>");
+ writer.print("" +
+ " <div class='half-width float-left'>" +
+ " <form method='post' id=\"testrepeatform\" name=\"testrepeatform\" action=\"" + actionURL + "\" onsubmit=\"new Ajax.Updater('repeat-div', '" + resourceURL + "', {asynchronous:true, parameters:Form.serialize(this)}); return false;\">\n" +
+ " <font class='portlet-font'>Repeat Demo:</font><br/>\n" +
+ " <input class='portlet-form-input-field' type='text' value='' size='12' name=\"repeat\" id=\"repeat\" onkeyup=\"this.form.submit2.click();new Effect.Highlight(document.getElementById('repeat-div'));\"/>\n" +
+ " <input class='portlet-form-input-field hidden' type='submit' name='submit2' value='submit' style=\"display:hidden;\">\n" +
+ " </form>\n" +
+ "</div>" +
+ "");
+ writer.print("<div id=\"repeat-div\" class='half-width float-left'></div>");
// "<input type=\"text\" id=\"hidden-input\" value=\"" + resourceURL.toString() + "\" />" +
// "<a href='javascript:" + resp.getNamespace() + "_handle()'>Click me to trigger script</a>" +
+ writer.print("<br class='clear'/><br class='clear'/><hr/>" +
+ "<h4>Partial Refresh Product Catalog</h4>" +
+ "<div class='full-width'>" +
+ "");
+ writer.print("<div class='float-left third-width'>");
resourceURL.setParameter("prodId","1");
- writer.print("<a href=\"javascript: browse(\'" + resourceURL + "\')\">Product 1</a><br/>");
+ writer.print("<a href=\"javascript: browse(\'" + resourceURL + "\');\">Product 1</a><br/>");
resourceURL.setParameter("prodId","2");
- writer.print("<a href=\"javascript: browse(\'" + resourceURL + "\')\">Product 2</a><br/>");
+ writer.print("<a href=\"javascript: browse(\'" + resourceURL + "\');\">Product 2</a><br/>");
resourceURL.setParameter("prodId","3");
- writer.print("<a href=\"javascript: browse(\'" + resourceURL + "\')\">Product 3</a><br/>");
+ writer.print("<a href=\"javascript: browse(\'" + resourceURL + "\');\">Product 3</a><br/>");
- writer.print("</div>" +
- "<br/>" +
- "<div id=\"output-div\">Product Details</div>");
+ writer.print("<br class='clear'/></div>");
+ writer.print("<div class='float-left two-third-width'>" +
+ "<h4 class='zero'>Product Details</h4>" +
+ "<div id=\"output-div\"></div>" +
+ "");
+ writer.print("<br class='clear'/></div>");
+ writer.print("<br class='clear'/></div>");
+ writer.print("<br class='clear'/></div>");
+
+
+
+ // writer.print("</div>");
}
public void serveResource(ResourceRequest req, ResourceResponse resp) throws PortletException, IOException
{
+ String repeatText = req.getParameter("repeat");
+ String prodId = req.getParameter("prodId");
+
String namespace =resp.getNamespace();
//resp.setContentType("application/json");
resp.setContentType("text/html");
PrintWriter writer = resp.getWriter();
+ if (repeatText != null){
+ writer.print("<div id=\"repeat-text\">"+ req.getPrivateParameterMap().get("repeat")[0] +"</div>");
+ }
+ if (prodId != null){
+ if (prodId.equals("1")){
+ writer.print("<div id=\"product-text\">Product ID: "+ prodId +"" +
+ "<br/>" +
+ " B BY BURTON ALPHA<br/>" +
+ "Sale Price: $314.96 " +
+ "</div>");
+ }
+ if (prodId.equals("2")){
+ writer.print("<div id=\"product-text\">Product ID: "+ prodId +"" +
+ "<br/>" +
+ "FORUM DESTROYER LTD<br/>" +
+ "$319.99 " +
+ "</div>");
+ }
+ if (prodId.equals("3")){
+ writer.print("<div id=\"product-text\">Product ID: "+ prodId +"" +
+ "<br/>" +
+ "\n" +
+ "SANTA CRUZ ALLSTAR<br/>" +
+ "$256.00 " +
+ "</div>");
+ }
- writer.print("<div>" + req.getParameter("prodId") +"</div>");
+ }
+
+
+
writer.close();
}
}
Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/css/master.css
===================================================================
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/css/master.css 2008-02-13 21:05:27 UTC (rev 9957)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/css/master.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/demo/demo3.jsp
===================================================================
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/demo3.jsp 2008-02-13 21:05:27 UTC (rev 9957)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/demo/demo3.jsp 2008-02-14 00:37:37 UTC (rev 9958)
@@ -8,6 +8,7 @@
<portal:page>
<portal:pageparam namespaceURI="urn:jboss:portal:simple:google" localName="zipcode" value="80201"/>
+
<jbp:layout1>
<jsp:attribute name="leftcol">
<jbp:portlet name="Foo" applicationName="bar"/>
Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/layouts/header.jsp
===================================================================
--- 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 @@
<!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" id="testreplace">
<head>
<title>Portlet Container 2.0</title>
<link rel="stylesheet" href="${pageContext.request.contextPath}/css/master.css" type="text/css"/>
16 years, 7 months
JBoss Portal SVN: r9957 - in modules/portlet/trunk: bridge and 7 other directories.
by portal-commits@lists.jboss.org
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
===================================================================
--- 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 @@
<parent>
<groupId>org.jboss.portal.portlet</groupId>
<artifactId>module-parent</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-Beta1</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: modules/portlet/trunk/build/pom.xml
===================================================================
--- 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 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.portal.portlet</groupId>
<artifactId>module-parent</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-Beta1</version>
<packaging>pom</packaging>
<name>JBoss Portal Portlet Module</name>
- <url>http://www.jboss.com/products/jbossmc</url>
<description>JBoss Portal Portlet Module</description>
<properties>
Modified: modules/portlet/trunk/controller/pom.xml
===================================================================
--- modules/portlet/trunk/controller/pom.xml 2008-02-13 19:32:00 UTC (rev 9956)
+++ modules/portlet/trunk/controller/pom.xml 2008-02-13 21:05:27 UTC (rev 9957)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.portal.portlet</groupId>
<artifactId>module-parent</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-Beta1</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: modules/portlet/trunk/federation/pom.xml
===================================================================
--- modules/portlet/trunk/federation/pom.xml 2008-02-13 19:32:00 UTC (rev 9956)
+++ modules/portlet/trunk/federation/pom.xml 2008-02-13 21:05:27 UTC (rev 9957)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.portal.portlet</groupId>
<artifactId>module-parent</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-Beta1</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: modules/portlet/trunk/jsr168api/pom.xml
===================================================================
--- modules/portlet/trunk/jsr168api/pom.xml 2008-02-13 19:32:00 UTC (rev 9956)
+++ modules/portlet/trunk/jsr168api/pom.xml 2008-02-13 21:05:27 UTC (rev 9957)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.portal.portlet</groupId>
<artifactId>module-parent</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-Beta1</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: modules/portlet/trunk/management/pom.xml
===================================================================
--- modules/portlet/trunk/management/pom.xml 2008-02-13 19:32:00 UTC (rev 9956)
+++ modules/portlet/trunk/management/pom.xml 2008-02-13 21:05:27 UTC (rev 9957)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.portal.portlet</groupId>
<artifactId>module-parent</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-Beta1</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: modules/portlet/trunk/pom.xml
===================================================================
--- 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 @@
<artifactId>module-aggregator</artifactId>
<packaging>pom</packaging>
<name>JBoss Portal Portlet Module Aggregator</name>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-Beta1</version>
<url>http://labs.jboss.com/jbossportal</url>
<dependencies/>
Modified: modules/portlet/trunk/portlet/pom.xml
===================================================================
--- 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 @@
<parent>
<groupId>org.jboss.portal.portlet</groupId>
<artifactId>module-parent</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-Beta1</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -40,13 +40,13 @@
<artifactId>jaxb-api</artifactId>
</dependency>
- <dependency>
- <groupId>sun.jdk</groupId>
- <artifactId>tools</artifactId>
- <version>1.5.0</version>
- <scope>system</scope>
- <systemPath>${JAVA_HOME}/lib/tools.jar</systemPath>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>sun.jdk</groupId>-->
+ <!--<artifactId>tools</artifactId>-->
+ <!--<version>1.5.0</version>-->
+ <!--<scope>system</scope>-->
+ <!--<systemPath>${JAVA_HOME}/lib/tools.jar</systemPath>-->
+ <!--</dependency>-->
<!--TEST SCOPE-->
<dependency>
Modified: modules/portlet/trunk/test/pom.xml
===================================================================
--- 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 @@
<parent>
<groupId>org.jboss.portal.portlet</groupId>
<artifactId>module-parent</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-Beta1</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
16 years, 7 months
JBoss Portal SVN: r9956 - modules/web/tags.
by portal-commits@lists.jboss.org
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/trunk)
16 years, 7 months
JBoss Portal SVN: r9955 - in modules/web/trunk: build and 1 other directories.
by portal-commits@lists.jboss.org
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
===================================================================
--- 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 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.portal.web</groupId>
<artifactId>module-parent</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.0-Beta1</version>
<packaging>pom</packaging>
<name>JBoss Portal Test Module</name>
<url>http://www.jboss.com/products/jbossmc</url>
@@ -37,7 +37,7 @@
<version.javassist>3.6-beta</version.javassist>
<version.jboss-remoting>2.2.1.GA</version.jboss-remoting>
<version.jboss.portal.common>1.2.0-Beta1</version.jboss.portal.common>
- <version.jboss.unit>1.2.0-SNAPSHOT</version.jboss.unit>
+ <version.jboss.unit>1.2.0-Beta1</version.jboss.unit>
<version.log4j>1.2.14</version.log4j>
<version.apache.commons-logging>1.1.1</version.apache.commons-logging>
<version.apache.commons-httpclient>3.0.1</version.apache.commons-httpclient>
Modified: modules/web/trunk/pom.xml
===================================================================
--- 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 @@
<artifactId>module-aggregator</artifactId>
<packaging>pom</packaging>
<name>JBoss Portal Web Module</name>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.0-Beta1</version>
<url>http://labs.jboss.com/jbossportal</url>
<dependencies/>
Modified: modules/web/trunk/web/pom.xml
===================================================================
--- 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 @@
<parent>
<groupId>org.jboss.portal.web</groupId>
<artifactId>module-parent</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.0-Beta1</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
16 years, 7 months
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.
by portal-commits@lists.jboss.org
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/default-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 be 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
===================================================================
--- branches/JBoss_Portal_Branch_2_6/cms/src/resources/portal-cms-sar/default-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/default-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 @@
<table width="100%" border="0" cellpadding="0" cellspacing="0">
<tr>
- <td width="560"><img src="default/images/homeimg_main.jpg" width="560" height="160"/></td>
+ <td width="560"><img src="default/images/homeimg_main.jpg" width="560" height="160"
+ alt="JBoss Portal 2.6: Unbound opportunity..."/></td>
<td align="right" valign="top" bgcolor="#7AB5E0"><img src="default/images/homeimg_cornerelement.gif" width="2"
height="2"/></td>
</tr>
</table>
-<div id="welcomelogo"><img src="default/images/homeimg_jbosslogo.gif" width="143" height="64"/></div>
+<div id="welcomelogo"><img src="default/images/homeimg_jbosslogo.gif" width="143" height="64"
+ alt="JBoss, a division of Red Hat"/></div>
<p id="welcometext">JBoss Portal provides an open source platform for hosting and serving a portal Web interface,
publishing and managing its content, and customizing its experience. While 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 @@
<p>JBoss Inc. offers various support services tailored to fit your needs. <a href="default/support.html">Explore</a>
support and service options for JBoss Portal.</p></td>
- <td valign="top" id="welcomegreyboxTD"><h3>PortletSwap</h3>
+ <td valign="top" class="welcomegreyboxTD"><h3>PortletSwap</h3>
<p><a href="http://www.portletswap.com" target="_blank">Portletswap.com</a> is an open community sponsored
by JBoss, Inc. to facilitate the exchange of portlets and layouts for use in JBoss Portal.</p></td>
- <td valign="top" id="welcomegreyboxTD"><h3>Project Information</h3>
+ <td valign="top" class="welcomegreyboxTD"><h3>Project Information</h3>
<p>Learn more about the <a href="default/project.html">JBoss Portal project</a>, on-going development, open
issues, and our
@@ -61,42 +63,4 @@
<p>Thank you for downloading and deploying JBoss Portal. We hope your enjoy working with it as much as we enjoy
developing it!</p>
<p>Baci e abbracci,<br/>
- The JBoss Portal Team.</p>
-
-<!--
-<table width="100%" border="0" cellpadding="2">
-<tr>
-<td valign="top" align="left" class="portlet-section-body"><font class="portlet-font">JBoss Portal provides an open source platform for hosting and serving a portal's Web interface, publishing and managing its content, and customizing its experience. While 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 underlying platform.</font></td>
-<td valign="top" align="right"><img src="default/images/jboss_logo.gif"></td>
-<tr>
-<td colspan="2"><table width="100%" border="0">
-<tr>
-<td align="left" valign="top" width="64" class="portlet-section-alternate"><a href="default/support.html"><img src="default/images/support.gif" border="0"></a></td>
-<td align="left" valign="top" class="portlet-section-alternate"><font class="portlet-font"><b>Support Services</b><br/>
-JBoss Inc. offers various support services tailored to fit your needs. <a href="default/support.html">Click here</a> to explore support and service options related to JBoss Portal.
-</font></td>
-</tr>
-<tr>
-<td align="left" valign="top" width="64" class="portlet-section-alternate"><a href="http://www.portletswap.com" target="_blank"><img src="default/images/plugin.gif" border="0"></a></td>
-<td align="left" valign="top" class="portlet-section-alternate"><font class="portlet-font"><b>PortletSwap</b><br/>
-<a href="http://www.portletswap.com" target="_blank">PortletSwap.com</a> is a open community sponsored by JBoss, Inc. to facilitate the exchange of portlets and layouts for use in JBoss Portal. <a href="http://www.portletswap.com" target="_blank">Click here</a> to visit PortletSwap.com.
-</font></td>
-</tr>
-<tr>
-<td align="left" valign="top" width="64" class="portlet-section-alternate"><a href="default/project.html"><img src="default/images/project.gif" border="0"></a></td>
-<td align="left" valign="top" class="portlet-section-alternate"><font class="portlet-font"><b>Project Information</b><br/>
-<a href="default/project.html">Click here</a> to learn more about the JBoss Portal project, on-going development, open issues, and our vibrant user and developer communities.
-</font></td>
-</tr>
-</table>
-</tr>
-<tr>
-<td colspan="2" align="left" class="portlet-section-body"><font class="portlet-font">
-Thank you for downloading and deploying JBoss Portal. We hope you enjoy working with it as much as we enjoy developing it!
-<br/><br/>
-Bacci e Abracci,<br/>
-The JBoss Portal Team.
-</font></td>
-</tr>
-</table>
--->
+ The JBoss Portal Team.</p>
\ 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
===================================================================
--- 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 9953)
+++ 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 9954)
@@ -12,7 +12,7 @@
margin-bottom: 30px;
}
- #welcomegreyboxTD {
+ .welcomegreyboxTD {
}
#welcomegreybox h3 {
@@ -22,15 +22,16 @@
</style>
<div>
- <img src="default/images/homeimg_main.png" width="560" height="160"/>
+ <img src="default/images/homeimg_main.png" width="560" height="160" alt="JBoss Portal 2.6: Unbound opportunity..."/>
</div>
-<div id="welcomelogo"><img src="default/images/homeimg_jbosslogo.png" width="143" height="64"/></div>
+<div id="welcomelogo"><img src="default/images/homeimg_jbosslogo.png" alt="JBoss, a division of Red Hat" width="143"
+ height="64"/></div>
<p id="welcometext">JBoss Portal provides an open source platform for hosting and serving a portal Web interface,
publishing and managing its content, and customizing its experience. While 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.</p>
-<br />
+<br/>
<div id="welcomegreybox">
<table width="100%">
<tr>
@@ -38,11 +39,11 @@
<p>JBoss Inc. offers various support services tailored to fit your needs. <a href="default/support.html">Explore</a>
support and service options for JBoss Portal.</p></td>
- <td valign="top" id="welcomegreyboxTD"><h3>PortletSwap</h3>
+ <td valign="top" class="welcomegreyboxTD"><h3>PortletSwap</h3>
<p><a href="http://www.portletswap.com" target="_blank">Portletswap.com</a> is an open community sponsored
by JBoss, Inc. to facilitate the exchange of portlets and layouts for use in JBoss Portal.</p></td>
- <td valign="top" id="welcomegreyboxTD"><h3>Project Information</h3>
+ <td valign="top" class="welcomegreyboxTD"><h3>Project Information</h3>
<p>Learn more about the <a href="default/project.html">JBoss Portal project</a>, on-going development, open
issues, and our
16 years, 7 months
JBoss Portal SVN: r9953 - in modules/web/trunk/web/src/main/java/org/jboss/portal/web: impl/tomcat and 1 other directory.
by portal-commits@lists.jboss.org
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/ServletContainer.java
modules/web/trunk/web/src/main/java/org/jboss/portal/web/impl/tomcat/TC6ServletContainerContext.java
Log:
- Replaced output to sysout by logging.
Modified: modules/web/trunk/web/src/main/java/org/jboss/portal/web/ServletContainer.java
===================================================================
--- modules/web/trunk/web/src/main/java/org/jboss/portal/web/ServletContainer.java 2008-02-13 14:45:12 UTC (rev 9952)
+++ modules/web/trunk/web/src/main/java/org/jboss/portal/web/ServletContainer.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 = Logger.getLogger(ServletContainer.class);
/** . */
private final Object lock = 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 == null)
{
@@ -87,7 +89,7 @@
public boolean addWebAppListener(WebAppListener listener)
{
- synchronized(lock)
+ synchronized (lock)
{
if (listener == null)
{
@@ -110,7 +112,7 @@
public boolean removeWebAppListener(WebAppListener listener)
{
- synchronized(lock)
+ synchronized (lock)
{
if (listener == null)
{
@@ -147,7 +149,7 @@
private void fireEvent(WebAppEvent event)
{
- for (Iterator i = listeners.iterator();i.hasNext();)
+ for (Iterator i = listeners.iterator(); i.hasNext();)
{
safeFireEvent((WebAppListener)i.next(), event);
}
@@ -157,10 +159,10 @@
* Generic detyped request dispatch to a servlet context using the include 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 servlet context
+ * @param callback the callback to perform after the dispatch 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 == 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 registered");
return false;
}
else
{
try
{
- System.out.println("Web application " + key + " registration");
+ log.debug("Web application " + key + " registration");
webAppContext.start();
WebAppImpl webApp = 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 context "+ 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 == null)
{
@@ -261,14 +263,14 @@
WebAppImpl webApp = (WebAppImpl)container.webAppMap.remove(webAppId);
if (webApp != null)
{
- System.out.println("Web application " + webAppId + " cleanup");
+ log.debug("Web application " + webAppId + " cleanup");
container.fireEvent(new WebAppLifeCycleEvent(webApp, WebAppLifeCycleEvent.REMOVED));
webApp.context.stop();
return true;
}
else
{
- System.out.println("Web application " + webAppId + " was not registered");
+ log.debug("Web application " + webAppId + " was not registered");
return false;
}
}
@@ -280,7 +282,7 @@
{
throw new IllegalStateException("Disposed registration");
}
- synchronized(container.lock)
+ synchronized (container.lock)
{
// Unregister all web apps
for (Iterator i = container.webAppMap.values().iterator(); i.hasNext();)
@@ -311,9 +313,7 @@
}
}
- /**
- * Implementation of the <code>WebApp</code> interface.
- */
+ /** Implementation of the <code>WebApp</code> interface. */
private static class WebAppImpl implements WebApp
{
Modified: modules/web/trunk/web/src/main/java/org/jboss/portal/web/impl/tomcat/TC6ServletContainerContext.java
===================================================================
--- modules/web/trunk/web/src/main/java/org/jboss/portal/web/impl/tomcat/TC6ServletContainerContext.java 2008-02-13 14:45:12 UTC (rev 9952)
+++ modules/web/trunk/web/src/main/java/org/jboss/portal/web/impl/tomcat/TC6ServletContainerContext.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 <code>ServletContainerContext</code> for Tomcat.
@@ -52,6 +53,7 @@
*/
public class TC6ServletContainerContext implements ServletContainerContext, ContainerListener, LifecycleListener
{
+ private final static Logger log = Logger.getLogger(TC6ServletContainerContext.class);
/** . */
private final CommandDispatcher dispatcher = new CommandDispatcher();
@@ -185,9 +187,8 @@
}
/**
- * Register an host for registration which means that we fire events for 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 for all the contexts it contains and we
+ * subscribe for its life cycle events. If the host is already monitored 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 = new TC6WebAppContext(context);
//
16 years, 7 months