From portal-commits at lists.jboss.org Fri Feb  8 18:45:47 2008
Content-Type: multipart/mixed; boundary="===============6110070005888723491=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9878 - in
 modules/portlet/trunk/test/src: test/resources/simple-portal-war/WEB-INF/jsp
 and 1 other directories.
Date: Fri, 08 Feb 2008 18:45:46 -0500
Message-ID: <E1JNcug-0002xx-BS@committer01.frg.pub.inap.atl.jboss.com>

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

Author: chris.laprun(a)jboss.com
Date: 2008-02-08 18:45:46 -0500 (Fri, 08 Feb 2008)
New Revision: 9878

Modified:
   modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/samples=
/RemoteControlResourcePortlet.java
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/=
jsp/error.jsp
   modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/=
tags/portal/portlet.tag
Log:
- Minor improvements.

Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/=
samples/RemoteControlResourcePortlet.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/sample=
s/RemoteControlResourcePortlet.java	2008-02-08 23:32:02 UTC (rev 9877)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/simple/sample=
s/RemoteControlResourcePortlet.java	2008-02-08 23:45:46 UTC (rev 9878)
@@ -45,20 +45,20 @@
       writer.print("<script type=3D'text/javascript'>function openLinkInPa=
rent(url){window.open(url,'jbp_parent');}</script>");
       PortletURL url =3D resourceResponse.createRenderURL();
       url.setWindowState(WindowState.MINIMIZED);
-      writer.print("<ul><li><a href=3D'#' onclick=3D\"" + createParentURL(=
url) + "\">minimize</a></li>");
+      writer.print("<ul><li><a href=3D'#' onclick=3D\"" + createParentURL(=
url) + "\">minimize parent portlet</a></li>");
       url.setWindowState(WindowState.MAXIMIZED);
-      writer.print("<li><a href=3D'#' onclick=3D\"" + createParentURL(url)=
 + "\">maximize</a></li>");
+      writer.print("<li><a href=3D'#' onclick=3D\"" + createParentURL(url)=
 + "\">maximize parent portlet</a></li>");
       url.setWindowState(WindowState.NORMAL);
-      writer.print("<li><a href=3D'#' onclick=3D\"" + createParentURL(url)=
 + "\">normal</a></li></ul>");
+      writer.print("<li><a href=3D'#' onclick=3D\"" + createParentURL(url)=
 + "\">make parent portlet normal</a></li></ul>");
       writer.print("<p><b>'zipcode'</b> public render parameter value: " +=
 resourceRequest.getParameter(ZIPCODE) + "<br/>");
-      writer.print("<p>Set value of <b>'zipcode'</b> public render paramet=
er to:");
+      writer.print("Set value of <b>'zipcode'</b> public render parameter =
to:</p>");
       url.setParameter(ZIPCODE, "80201");
-      writer.print("<li><a href=3D'#' onclick=3D\"" + createParentURL(url)=
 + "\">Denver</a>");
+      writer.print("<ul><li><a href=3D'#' onclick=3D\"" + createParentURL(=
url) + "\">Denver</a>");
       url.setParameter(ZIPCODE, "94102");
       writer.print("<li><a href=3D'#' onclick=3D\"" + createParentURL(url)=
 + "\">San Francisco</a>");
       url.setParameter(ZIPCODE, "20001");
       writer.print("<li><a href=3D'#' onclick=3D\"" + createParentURL(url)=
 + "\">Washington, DC</a>");
-      writer.print("</ul></p>");
+      writer.print("</ul>");
    }
 =

    private String createParentURL(PortletURL url)

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/W=
EB-INF/jsp/error.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF=
/jsp/error.jsp	2008-02-08 23:32:02 UTC (rev 9877)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF=
/jsp/error.jsp	2008-02-08 23:45:46 UTC (rev 9878)
@@ -2,18 +2,20 @@
 =

 <div class=3D"portlet">
    <div class=3D"portlet-frame">
-   <div class=3D"header full-width">
-      <div class=3D"header-layer full-width">
-         <div class=3D"title two-third-width float-left"><h2>Error</h2></d=
iv>
-         <div class=3D"controls third-width float-right">
+      <div class=3D"header full-width">
+         <div class=3D"header-layer full-width">
+            <div class=3D"title two-third-width float-left">
+               <h2><%=3D request.getAttribute("org.jboss.portal.portlet.po=
rtal.error.portlet_name")%>
+               </h2>
+            </div>
          </div>
       </div>
+      <p style=3D"font-weight: bold;">Portlet was not rendered</p>
+      <b>Error status:</b> <%=3D request.getAttribute("org.jboss.portal.po=
rtlet.portal.error.status")%><br/>
+      <b>Portlet name:</b> <%=3D request.getAttribute("org.jboss.portal.po=
rtlet.portal.error.portlet_name")%><br/>
+      <b>Portlet application
+         name:</b> <%=3D request.getAttribute("org.jboss.portal.portlet.po=
rtal.error.application_name")%><br/>
+      <b>Exception:</b> <%=3D request.getAttribute("org.jboss.portal.portl=
et.portal.error.exception")%><br/>
+      <b>Window id:</b> <%=3D request.getAttribute("org.jboss.portal.portl=
et.portal.error.window_id")%><br/>
    </div>
-<%=3D request.getAttribute("org.jboss.portal.portlet.portal.error.status")=
%><br/>
-<%=3D request.getAttribute("org.jboss.portal.portlet.portal.error.portlet_=
name")%><br/>
-<%=3D request.getAttribute("org.jboss.portal.portlet.portal.error.applicat=
ion_name")%><br/>
-<%=3D request.getAttribute("org.jboss.portal.portlet.portal.error.cause")%=
><br/>
-<%=3D request.getAttribute("org.jboss.portal.portlet.portal.error.message"=
)%><br/>
-<%=3D request.getAttribute("org.jboss.portal.portlet.portal.error.window_i=
d")%><br/>
 </div>
-</div>

Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/W=
EB-INF/tags/portal/portlet.tag
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF=
/tags/portal/portlet.tag	2008-02-08 23:32:02 UTC (rev 9877)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF=
/tags/portal/portlet.tag	2008-02-08 23:45:46 UTC (rev 9878)
@@ -1,38 +1,36 @@
 <%@ tag body-content=3D"scriptless" %>
 <%@ attribute name=3D"name" rtexprvalue=3D"true" required=3D"true" %>
 <%@ attribute name=3D"applicationName" rtexprvalue=3D"true" required=3D"tr=
ue" %>
-<%@ attribute name=3D"content" fragment=3D"true" required=3D"false" %> =

+<%@ attribute name=3D"content" fragment=3D"true" required=3D"false" %>
 <%@ taglib uri=3D"/WEB-INF/portal.tld" prefix=3D"portal" %>
 =

-<portal:portlet
-         name=3D"${name}"
-         applicationName=3D"${applicationName}"
-         errorPage=3D"/WEB-INF/jsp/error.jsp">
-<div class=3D"portlet">
-   <div class=3D"portlet-frame">
-   <div class=3D"header full-width">
-      <div class=3D"header-layer full-width">
-         <div class=3D"title two-third-width float-left"><h2><portal:portl=
ettitle/></h2></div>
-         <div class=3D"controls third-width float-right">
-            <span class=3D"mode-button">
-            <a href=3D"<portal:portleturl windowState=3D'maximized'/>"><im=
g src=3D"${pageContext.request.contextPath}/images/icon-maximize.gif" alt=
=3D""/></a>
-            </span>
-            <span class=3D"mode-button">
-            <a href=3D"<portal:portleturl windowState=3D'normal'/>"><img s=
rc=3D"${pageContext.request.contextPath}/images/icon-normal.gif" alt=3D""/>=
</a>
-            </span>
-            <span class=3D"mode-button">
-            <a href=3D"<portal:portleturl windowState=3D'minimized'/>"><im=
g src=3D"${pageContext.request.contextPath}/images/icon-minimize.gif" alt=
=3D""/></a>
-            </span>
-            <span class=3D"mode-button">
-               <a title=3D"Edit" href=3D"<portal:portleturl mode=3D'edit'/=
>">Edit</a>
-            </span>
+<portal:portlet name=3D"${name}" applicationName=3D"${applicationName}" er=
rorPage=3D"/WEB-INF/jsp/error.jsp">
+   <div class=3D"portlet">
+      <div class=3D"portlet-frame">
+         <div class=3D"header full-width">
+            <div class=3D"header-layer full-width">
+               <div class=3D"title two-third-width float-left"><h2><portal=
:portlettitle/></h2></div>
+               <div class=3D"controls third-width float-right">
+                  <span class=3D"mode-button">
+                     <a href=3D"<portal:portleturl windowState=3D'maximize=
d'/>"><img
+                        src=3D"${pageContext.request.contextPath}/images/i=
con-maximize.gif" alt=3D""/></a>
+                  </span>
+                  <span class=3D"mode-button">
+                     <a href=3D"<portal:portleturl windowState=3D'normal'/=
>"><img
+                        src=3D"${pageContext.request.contextPath}/images/i=
con-normal.gif" alt=3D""/></a>
+                  </span>
+                  <span class=3D"mode-button">
+                     <a href=3D"<portal:portleturl windowState=3D'minimize=
d'/>"><img
+                        src=3D"${pageContext.request.contextPath}/images/i=
con-minimize.gif" alt=3D""/></a>
+                  </span>
+                  <span class=3D"mode-button">
+                     <a title=3D"Edit" href=3D"<portal:portleturl mode=3D'=
edit'/>">Edit</a>
+                  </span>
+               </div>
+            </div>
          </div>
+         <portal:portletmarkup/>
+         <jsp:doBody/>
       </div>
    </div>
-   <portal:portletmarkup/>
-
-   <jsp:doBody/>
-
-</div>
-</div>
 </portal:portlet>


--===============6110070005888723491==--