portals-pluto-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From msnickl...@apache.org
Subject [11/11] portals-pluto git commit: Adapted several JSPs to use updated URIs for the tag libraries.
Date Wed, 03 Dec 2014 15:01:36 GMT
Adapted several JSPs to use updated URIs for the tag libraries.


Project: http://git-wip-us.apache.org/repos/asf/portals-pluto/repo
Commit: http://git-wip-us.apache.org/repos/asf/portals-pluto/commit/1c869b7c
Tree: http://git-wip-us.apache.org/repos/asf/portals-pluto/tree/1c869b7c
Diff: http://git-wip-us.apache.org/repos/asf/portals-pluto/diff/1c869b7c

Branch: refs/heads/PortletHub
Commit: 1c869b7cfcc10ce79ef036377db3ea81ef238009
Parents: f25b14a
Author: Scott Nicklous <msnicklous@apache.org>
Authored: Wed Dec 3 15:55:32 2014 +0100
Committer: Scott Nicklous <msnicklous@apache.org>
Committed: Wed Dec 3 15:55:32 2014 +0100

----------------------------------------------------------------------
 .../webapp/WEB-INF/fragments/about/view.jsp     |   1 +
 .../admin/page/TomcatDeploymentHelp.jsp         |   1 +
 .../WEB-INF/fragments/admin/page/help.jsp       |   1 +
 .../WEB-INF/fragments/admin/page/view.jsp       |   4 +-
 .../webapp/WEB-INF/fragments/admin/view.jsp     |   1 +
 .../main/webapp/WEB-INF/themes/navigation.jsp   |   1 +
 .../WEB-INF/themes/pluto-default-theme.jsp      |   1 +
 .../main/webapp/WEB-INF/themes/portlet-skin.jsp |   1 +
 pluto-portal/src/main/webapp/about.jsp          |   1 +
 pluto-portal/src/main/webapp/login.jsp          |   1 +
 .../jsp/ExternalAppScopedAttributeTest.jsp      |   1 +
 ...ExternalAppScopedAttributeTest_companion.jsp |   1 +
 .../src/main/webapp/jsp/SessionTimeoutTest.jsp  |   1 +
 .../main/webapp/jsp/TestCompanionPortlet.jsp    |   1 +
 pluto-testsuite/src/main/webapp/jsp/help.jsp    |  59 ++--
 .../src/main/webapp/jsp/introduction.jsp        |   1 +
 .../src/main/webapp/jsp/load_resource_test.jsp  |   1 +
 .../src/main/webapp/jsp/navigation.inc          | 161 +++++------
 .../src/main/webapp/jsp/portlet_mode_test.jsp   | 117 ++++----
 pluto-testsuite/src/main/webapp/jsp/test4.jsp   | 169 +++++------
 .../src/main/webapp/jsp/test_results.inc        | 277 ++++++++++---------
 .../src/main/webapp/jsp/test_results.jsp        |  53 ++--
 .../src/main/webapp/jsp/window_state_test.jsp   | 117 ++++----
 23 files changed, 498 insertions(+), 474 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/1c869b7c/pluto-portal/src/main/webapp/WEB-INF/fragments/about/view.jsp
----------------------------------------------------------------------
diff --git a/pluto-portal/src/main/webapp/WEB-INF/fragments/about/view.jsp b/pluto-portal/src/main/webapp/WEB-INF/fragments/about/view.jsp
index d4a1136..0dcc41c 100644
--- a/pluto-portal/src/main/webapp/WEB-INF/fragments/about/view.jsp
+++ b/pluto-portal/src/main/webapp/WEB-INF/fragments/about/view.jsp
@@ -1,3 +1,4 @@
+<%@ page isELIgnored="false" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 
 <%--

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/1c869b7c/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/page/TomcatDeploymentHelp.jsp
----------------------------------------------------------------------
diff --git a/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/page/TomcatDeploymentHelp.jsp b/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/page/TomcatDeploymentHelp.jsp
index 53e8644..20bf5fa 100644
--- a/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/page/TomcatDeploymentHelp.jsp
+++ b/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/page/TomcatDeploymentHelp.jsp
@@ -16,6 +16,7 @@ implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 --%>
+<%@ page isELIgnored="false" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/1c869b7c/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/page/help.jsp
----------------------------------------------------------------------
diff --git a/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/page/help.jsp b/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/page/help.jsp
index 0bb46a5..385fc8c 100644
--- a/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/page/help.jsp
+++ b/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/page/help.jsp
@@ -16,6 +16,7 @@ implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 --%>
+<%@ page isELIgnored="false" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/1c869b7c/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/page/view.jsp
----------------------------------------------------------------------
diff --git a/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/page/view.jsp b/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/page/view.jsp
index c06ebaf..481f245 100644
--- a/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/page/view.jsp
+++ b/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/page/view.jsp
@@ -16,6 +16,7 @@ implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 --%>
+<%@ page isELIgnored="false" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
@@ -150,9 +151,10 @@ limitations under the License.
 </fmt:bundle> 
 
 <portlet:renderURL portletMode="help" var="deployerhelpURL">
+   <%-- needed el taglib to be able to use fmt:message value above --%>
+   <%-- portlet-el:param name="helpPage" value="${deployerHelp}"/ --%>
 	<portlet:param name="helpPage" value="${deployerHelp}"/>
 </portlet:renderURL>
-
 <div>
 <a href='<c:out value="${deployerURL}"/>' target="_blank">Upload and deploy a new portlet war</a> 
 <a href='<c:out value="${deployerhelpURL}"/>'>Help</a>

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/1c869b7c/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/view.jsp
----------------------------------------------------------------------
diff --git a/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/view.jsp b/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/view.jsp
index 3a5e065..00f8858 100644
--- a/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/view.jsp
+++ b/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/view.jsp
@@ -16,6 +16,7 @@ implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 --%>
+<%@ page isELIgnored="false" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 
 <div>

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/1c869b7c/pluto-portal/src/main/webapp/WEB-INF/themes/navigation.jsp
----------------------------------------------------------------------
diff --git a/pluto-portal/src/main/webapp/WEB-INF/themes/navigation.jsp b/pluto-portal/src/main/webapp/WEB-INF/themes/navigation.jsp
index 5d12bae..b63d47e 100644
--- a/pluto-portal/src/main/webapp/WEB-INF/themes/navigation.jsp
+++ b/pluto-portal/src/main/webapp/WEB-INF/themes/navigation.jsp
@@ -16,6 +16,7 @@ implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 --%>
+<%@ page isELIgnored="false" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://portals.apache.org/pluto" prefix="pluto" %>
 

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/1c869b7c/pluto-portal/src/main/webapp/WEB-INF/themes/pluto-default-theme.jsp
----------------------------------------------------------------------
diff --git a/pluto-portal/src/main/webapp/WEB-INF/themes/pluto-default-theme.jsp b/pluto-portal/src/main/webapp/WEB-INF/themes/pluto-default-theme.jsp
index 4dc3503..0c53aba 100644
--- a/pluto-portal/src/main/webapp/WEB-INF/themes/pluto-default-theme.jsp
+++ b/pluto-portal/src/main/webapp/WEB-INF/themes/pluto-default-theme.jsp
@@ -16,6 +16,7 @@ implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 --%>
+<%@ page isELIgnored="false" %>
 <%@page import="org.apache.pluto.driver.core.PortalRequestContext"%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/1c869b7c/pluto-portal/src/main/webapp/WEB-INF/themes/portlet-skin.jsp
----------------------------------------------------------------------
diff --git a/pluto-portal/src/main/webapp/WEB-INF/themes/portlet-skin.jsp b/pluto-portal/src/main/webapp/WEB-INF/themes/portlet-skin.jsp
index d19dc57..9425702 100644
--- a/pluto-portal/src/main/webapp/WEB-INF/themes/portlet-skin.jsp
+++ b/pluto-portal/src/main/webapp/WEB-INF/themes/portlet-skin.jsp
@@ -16,6 +16,7 @@ implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 --%>
+<%@ page isELIgnored="false" %>
 <%@ taglib uri="http://portals.apache.org/pluto" prefix="pluto" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/1c869b7c/pluto-portal/src/main/webapp/about.jsp
----------------------------------------------------------------------
diff --git a/pluto-portal/src/main/webapp/about.jsp b/pluto-portal/src/main/webapp/about.jsp
index 558b9e2..472315d 100644
--- a/pluto-portal/src/main/webapp/about.jsp
+++ b/pluto-portal/src/main/webapp/about.jsp
@@ -16,6 +16,7 @@ implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 --%>
+<%@ page isELIgnored="false" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://portals.apache.org/pluto" prefix="pluto" %>
 

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/1c869b7c/pluto-portal/src/main/webapp/login.jsp
----------------------------------------------------------------------
diff --git a/pluto-portal/src/main/webapp/login.jsp b/pluto-portal/src/main/webapp/login.jsp
index cd568ea..6b9b532 100644
--- a/pluto-portal/src/main/webapp/login.jsp
+++ b/pluto-portal/src/main/webapp/login.jsp
@@ -14,6 +14,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 --%>
+<%@ page isELIgnored="false" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <% pageContext.setAttribute("now", new java.util.Date()); %>

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/1c869b7c/pluto-testsuite/src/main/webapp/jsp/ExternalAppScopedAttributeTest.jsp
----------------------------------------------------------------------
diff --git a/pluto-testsuite/src/main/webapp/jsp/ExternalAppScopedAttributeTest.jsp b/pluto-testsuite/src/main/webapp/jsp/ExternalAppScopedAttributeTest.jsp
index 87d6152..959157a 100644
--- a/pluto-testsuite/src/main/webapp/jsp/ExternalAppScopedAttributeTest.jsp
+++ b/pluto-testsuite/src/main/webapp/jsp/ExternalAppScopedAttributeTest.jsp
@@ -17,6 +17,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 --%>
 
+<%@ page isELIgnored="false" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet"%>
 

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/1c869b7c/pluto-testsuite/src/main/webapp/jsp/ExternalAppScopedAttributeTest_companion.jsp
----------------------------------------------------------------------
diff --git a/pluto-testsuite/src/main/webapp/jsp/ExternalAppScopedAttributeTest_companion.jsp b/pluto-testsuite/src/main/webapp/jsp/ExternalAppScopedAttributeTest_companion.jsp
index 8e3a250..82132ec 100644
--- a/pluto-testsuite/src/main/webapp/jsp/ExternalAppScopedAttributeTest_companion.jsp
+++ b/pluto-testsuite/src/main/webapp/jsp/ExternalAppScopedAttributeTest_companion.jsp
@@ -17,6 +17,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 --%>
 
+<%@ page isELIgnored="false" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 
 

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/1c869b7c/pluto-testsuite/src/main/webapp/jsp/SessionTimeoutTest.jsp
----------------------------------------------------------------------
diff --git a/pluto-testsuite/src/main/webapp/jsp/SessionTimeoutTest.jsp b/pluto-testsuite/src/main/webapp/jsp/SessionTimeoutTest.jsp
index 455ddc2..6319184 100644
--- a/pluto-testsuite/src/main/webapp/jsp/SessionTimeoutTest.jsp
+++ b/pluto-testsuite/src/main/webapp/jsp/SessionTimeoutTest.jsp
@@ -18,6 +18,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 --%>
 
+<%@ page isELIgnored="false" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet"%>
 

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/1c869b7c/pluto-testsuite/src/main/webapp/jsp/TestCompanionPortlet.jsp
----------------------------------------------------------------------
diff --git a/pluto-testsuite/src/main/webapp/jsp/TestCompanionPortlet.jsp b/pluto-testsuite/src/main/webapp/jsp/TestCompanionPortlet.jsp
index 0355328..616258d 100644
--- a/pluto-testsuite/src/main/webapp/jsp/TestCompanionPortlet.jsp
+++ b/pluto-testsuite/src/main/webapp/jsp/TestCompanionPortlet.jsp
@@ -17,6 +17,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 --%>
 
+<%@ page isELIgnored="false" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet"%>
 

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/1c869b7c/pluto-testsuite/src/main/webapp/jsp/help.jsp
----------------------------------------------------------------------
diff --git a/pluto-testsuite/src/main/webapp/jsp/help.jsp b/pluto-testsuite/src/main/webapp/jsp/help.jsp
index 0111e53..0762ad6 100644
--- a/pluto-testsuite/src/main/webapp/jsp/help.jsp
+++ b/pluto-testsuite/src/main/webapp/jsp/help.jsp
@@ -1,30 +1,31 @@
-<%--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements.  See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed  under the  License is distributed on an "AS IS" BASIS,
-WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
-implied.
-
-See the License for the specific language governing permissions and
-limitations under the License.
---%>
-<TABLE style="border-colapse: false;padding: 4px 4px;border-spacing: 3px 4px;">
-<TR><TH colspan="2">Test Portlet Help Page</TH></TR>
-<TR><TD colspan="2">Color Code Key</TH></TR>
-<TR><TD width="20" style="background-color:green;">&nbsp;</TD>
-    <TD style="font-size: 12px">Test has passed!</TH></TR>
-<TR><TD width="20" style="background-color:blue;">&nbsp;</TD>
-    <TD style="font-size: 12px">Manual Judgment Required!</TH></TR>
-<TR><TD width="20" style="background-color:yellow;">&nbsp;</TD>
-    <TD style="font-size: 12px">Warning! Could not determine pass or fail due to an fixable condition.</TH></TR>
-<TR><TD width="20" style="background-color:red;">&nbsp;</TD>
-    <TD style="font-size: 12px">Test has failed!</TH></TR>
+<%--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed  under the  License is distributed on an "AS IS" BASIS,
+WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
+implied.
+
+See the License for the specific language governing permissions and
+limitations under the License.
+--%>
+<%@ page isELIgnored="false" %>
+<TABLE style="border-colapse: false;padding: 4px 4px;border-spacing: 3px 4px;">
+<TR><TH colspan="2">Test Portlet Help Page</TH></TR>
+<TR><TD colspan="2">Color Code Key</TH></TR>
+<TR><TD width="20" style="background-color:green;">&nbsp;</TD>
+    <TD style="font-size: 12px">Test has passed!</TH></TR>
+<TR><TD width="20" style="background-color:blue;">&nbsp;</TD>
+    <TD style="font-size: 12px">Manual Judgment Required!</TH></TR>
+<TR><TD width="20" style="background-color:yellow;">&nbsp;</TD>
+    <TD style="font-size: 12px">Warning! Could not determine pass or fail due to an fixable condition.</TH></TR>
+<TR><TD width="20" style="background-color:red;">&nbsp;</TD>
+    <TD style="font-size: 12px">Test has failed!</TH></TR>
 </TABLE>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/1c869b7c/pluto-testsuite/src/main/webapp/jsp/introduction.jsp
----------------------------------------------------------------------
diff --git a/pluto-testsuite/src/main/webapp/jsp/introduction.jsp b/pluto-testsuite/src/main/webapp/jsp/introduction.jsp
index b5874f2..879d835 100644
--- a/pluto-testsuite/src/main/webapp/jsp/introduction.jsp
+++ b/pluto-testsuite/src/main/webapp/jsp/introduction.jsp
@@ -17,6 +17,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 --%>
 
+<%@ page isELIgnored="false" %>
 <%@ page import="java.util.Map" %>
 <%@ page import="javax.servlet.jsp.jstl.core.LoopTagStatus" %>
 <%@ page import="org.apache.pluto.testsuite.TestConfig" %>

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/1c869b7c/pluto-testsuite/src/main/webapp/jsp/load_resource_test.jsp
----------------------------------------------------------------------
diff --git a/pluto-testsuite/src/main/webapp/jsp/load_resource_test.jsp b/pluto-testsuite/src/main/webapp/jsp/load_resource_test.jsp
index c262ee1..241afcc 100644
--- a/pluto-testsuite/src/main/webapp/jsp/load_resource_test.jsp
+++ b/pluto-testsuite/src/main/webapp/jsp/load_resource_test.jsp
@@ -16,6 +16,7 @@ implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 --%>
+<%@ page isELIgnored="false" %>
 <%@taglib prefix="portlet" uri="http://java.sun.com/portlet_2_0" %>
 <%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <portlet:defineObjects />

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/1c869b7c/pluto-testsuite/src/main/webapp/jsp/navigation.inc
----------------------------------------------------------------------
diff --git a/pluto-testsuite/src/main/webapp/jsp/navigation.inc b/pluto-testsuite/src/main/webapp/jsp/navigation.inc
index 8c4b000..51c76ae 100644
--- a/pluto-testsuite/src/main/webapp/jsp/navigation.inc
+++ b/pluto-testsuite/src/main/webapp/jsp/navigation.inc
@@ -1,80 +1,81 @@
-<%--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements.  See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed  under the  License is distributed on an "AS IS" BASIS,
-WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
-implied.
-
-See the License for the specific language governing permissions and
-limitations under the License.
---%>
-
-<%@ page import="java.util.Map"%>
-<%@ page import="org.apache.pluto.testsuite.TestConfig"%>
-
-<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet"%>
-
-<portlet:defineObjects/>
-
-<% if (request instanceof javax.portlet.RenderRequest) {%>
-<center>
-  <table>
-    <tr>
-      <td align="center" nowrap="true">
-        
-        <%-- Run Previous Test ============================================ --%>
-        <portlet:actionURL secure='<%= request.isSecure() ? "True" : "False" %>' var="url">
-          <portlet:param name="nextTestId" value='<%= request.getParameter("testId") %>'/>
-          <c:forEach var="param" items="${prevTest.actionParameters}">
-            <%
-                TestConfig.Parameter parameter = (TestConfig.Parameter) pageContext.findAttribute("param");
-                String paramName = parameter.getName();
-                String paramValue = parameter.getValue();
-            %>
-            <portlet:param name="<%= paramName %>" value="<%= paramValue %>"/>
-          </c:forEach>
-        </portlet:actionURL>
-        <a href="<%= url %>">
-          <img src='<%= response.encodeURL(request.getContextPath() + "/images/previous.png") %>' border="0">
-        </a>
-        
-        <%-- Return to Introduction ======================================= --%>
-        <portlet:actionURL secure='<%= request.isSecure() ? "True" : "False" %>' var="url">
-          <portlet:param name="testId" value="<%= null %>"/>
-        </portlet:actionURL>
-        <a href="<%= url %>">
-          <img src='<%= response.encodeURL(request.getContextPath() + "/images/return_index.png") %>' border="0">
-        </a>
-        
-        <%-- Run Next Test ================================================ --%>
-        <portlet:actionURL secure='<%= request.isSecure() ? "True" : "False" %>' var="url">
-          <portlet:param name="previousTestId" value='<%= request.getParameter("testId") %>'/>
-          <c:forEach var="param" items="${nextTest.actionParameters}">
-            <%
-                TestConfig.Parameter parameter = (TestConfig.Parameter) pageContext.findAttribute("param");
-                String paramName = parameter.getName();
-                String paramValue = parameter.getValue();
-            %>
-            <portlet:param name="<%= paramName %>" value="<%= paramValue %>"/>
-          </c:forEach>
-        </portlet:actionURL>
-        <a href="<%= url %>">
-          <img src='<%= response.encodeURL(request.getContextPath() + "/images/next.png") %>' border="0">
-        </a>
-        
-      </td>
-    </tr>
-  </table>
-</center>
-
-<% } %>
-
+<%--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed  under the  License is distributed on an "AS IS" BASIS,
+WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
+implied.
+
+See the License for the specific language governing permissions and
+limitations under the License.
+--%>
+
+<%@ page isELIgnored="false" %>
+<%@ page import="java.util.Map"%>
+<%@ page import="org.apache.pluto.testsuite.TestConfig"%>
+
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet"%>
+
+<portlet:defineObjects/>
+
+<% if (request instanceof javax.portlet.RenderRequest) {%>
+<center>
+  <table>
+    <tr>
+      <td align="center" nowrap="true">
+        
+        <%-- Run Previous Test ============================================ --%>
+        <portlet:actionURL secure='<%= request.isSecure() ? "True" : "False" %>' var="url">
+          <portlet:param name="nextTestId" value='<%= request.getParameter("testId") %>'/>
+          <c:forEach var="param" items="${prevTest.actionParameters}">
+            <%
+                TestConfig.Parameter parameter = (TestConfig.Parameter) pageContext.findAttribute("param");
+                String paramName = parameter.getName();
+                String paramValue = parameter.getValue();
+            %>
+            <portlet:param name="<%= paramName %>" value="<%= paramValue %>"/>
+          </c:forEach>
+        </portlet:actionURL>
+        <a href="<%= url %>">
+          <img src='<%= response.encodeURL(request.getContextPath() + "/images/previous.png") %>' border="0">
+        </a>
+        
+        <%-- Return to Introduction ======================================= --%>
+        <portlet:actionURL secure='<%= request.isSecure() ? "True" : "False" %>' var="url">
+          <portlet:param name="testId" value="<%= null %>"/>
+        </portlet:actionURL>
+        <a href="<%= url %>">
+          <img src='<%= response.encodeURL(request.getContextPath() + "/images/return_index.png") %>' border="0">
+        </a>
+        
+        <%-- Run Next Test ================================================ --%>
+        <portlet:actionURL secure='<%= request.isSecure() ? "True" : "False" %>' var="url">
+          <portlet:param name="previousTestId" value='<%= request.getParameter("testId") %>'/>
+          <c:forEach var="param" items="${nextTest.actionParameters}">
+            <%
+                TestConfig.Parameter parameter = (TestConfig.Parameter) pageContext.findAttribute("param");
+                String paramName = parameter.getName();
+                String paramValue = parameter.getValue();
+            %>
+            <portlet:param name="<%= paramName %>" value="<%= paramValue %>"/>
+          </c:forEach>
+        </portlet:actionURL>
+        <a href="<%= url %>">
+          <img src='<%= response.encodeURL(request.getContextPath() + "/images/next.png") %>' border="0">
+        </a>
+        
+      </td>
+    </tr>
+  </table>
+</center>
+
+<% } %>
+

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/1c869b7c/pluto-testsuite/src/main/webapp/jsp/portlet_mode_test.jsp
----------------------------------------------------------------------
diff --git a/pluto-testsuite/src/main/webapp/jsp/portlet_mode_test.jsp b/pluto-testsuite/src/main/webapp/jsp/portlet_mode_test.jsp
index 8327485..43f88fa 100644
--- a/pluto-testsuite/src/main/webapp/jsp/portlet_mode_test.jsp
+++ b/pluto-testsuite/src/main/webapp/jsp/portlet_mode_test.jsp
@@ -1,58 +1,59 @@
-<%--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements.  See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed  under the  License is distributed on an "AS IS" BASIS,
-WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
-implied.
-
-See the License for the specific language governing permissions and
-limitations under the License.
---%>
-<%@ page import="javax.portlet.PortletMode"%>
-<%@ taglib uri='http://java.sun.com/portlet_2_0' prefix='portlet'%>
-
-<portlet:defineObjects/>
-
-<TABLE style="font-size: -1">
-<TR><TH colspan="2" style="background-color:blue;color:white;">MANUAL TEST</TH></TR>
-<TR><TH></TH>
-    <TH>Portlet Mode Test</TH></TR>
-<TR><TD colspan="2">This test requires manual intervention
-        to ensure that it passes.  Click on the links below
-        and make sure that the specified mode is displayed.</TD></TR>
-
-<portlet:actionURL portletMode="<%=PortletMode.HELP.toString()%>" secure='<%=renderRequest.isSecure()?"True":"False"%>' var="url">
-	<portlet:param name="testId" value='<%=renderRequest.getParameter("testId")%>'/>
-</portlet:actionURL>
-
-<TR><TD style="font-size: 12px" valign="top"><A href="<%=url%>">Help</A></TD>
-    <TD style="font-size: 10px;">The help mode provides help info.  Click to ensure that help info is
-        displayed.</TD></TR>
-
-<portlet:actionURL portletMode="<%=PortletMode.EDIT.toString()%>" secure='<%=renderRequest.isSecure()?"True":"False"%>' var="url">
-	<portlet:param name="testId" value='<%=renderRequest.getParameter("testId")%>'/>
-</portlet:actionURL>
-
-<TR><TD style="font-size: 12px" valign="top"><A href="<%=url%>">Edit</A></TD>
-    <TD style="font-size: 10px;">The edit mode allows you to edit preferences. Click to view all preferences
-    currently stored in this portlet.</TD></TR>
-
-<portlet:actionURL portletMode="<%=PortletMode.VIEW.toString()%>" secure='<%=renderRequest.isSecure()?"True":"False"%>' var="url">
-	<portlet:param name="testId" value='<%=renderRequest.getParameter("testId")%>'/>
-</portlet:actionURL>
-
-<TR><TD style="font-size: 12px"><A href="<%=url%>">View</A></TD>
-    <TD style="font-size: 10px;" valign="top">You are currently looking at the view.  Verify that clicking on this link
-    simply refreshes this page.</TD></TR>
-
-</TABLE>
-
-<%@ include file="navigation.inc" %>
+<%--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed  under the  License is distributed on an "AS IS" BASIS,
+WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
+implied.
+
+See the License for the specific language governing permissions and
+limitations under the License.
+--%>
+<%@ page isELIgnored="false" %>
+<%@ page import="javax.portlet.PortletMode"%>
+<%@ taglib uri='http://java.sun.com/portlet_2_0' prefix='portlet'%>
+
+<portlet:defineObjects/>
+
+<TABLE style="font-size: -1">
+<TR><TH colspan="2" style="background-color:blue;color:white;">MANUAL TEST</TH></TR>
+<TR><TH></TH>
+    <TH>Portlet Mode Test</TH></TR>
+<TR><TD colspan="2">This test requires manual intervention
+        to ensure that it passes.  Click on the links below
+        and make sure that the specified mode is displayed.</TD></TR>
+
+<portlet:actionURL portletMode="<%=PortletMode.HELP.toString()%>" secure='<%=renderRequest.isSecure()?"True":"False"%>' var="url">
+	<portlet:param name="testId" value='<%=renderRequest.getParameter("testId")%>'/>
+</portlet:actionURL>
+
+<TR><TD style="font-size: 12px" valign="top"><A href="<%=url%>">Help</A></TD>
+    <TD style="font-size: 10px;">The help mode provides help info.  Click to ensure that help info is
+        displayed.</TD></TR>
+
+<portlet:actionURL portletMode="<%=PortletMode.EDIT.toString()%>" secure='<%=renderRequest.isSecure()?"True":"False"%>' var="url">
+	<portlet:param name="testId" value='<%=renderRequest.getParameter("testId")%>'/>
+</portlet:actionURL>
+
+<TR><TD style="font-size: 12px" valign="top"><A href="<%=url%>">Edit</A></TD>
+    <TD style="font-size: 10px;">The edit mode allows you to edit preferences. Click to view all preferences
+    currently stored in this portlet.</TD></TR>
+
+<portlet:actionURL portletMode="<%=PortletMode.VIEW.toString()%>" secure='<%=renderRequest.isSecure()?"True":"False"%>' var="url">
+	<portlet:param name="testId" value='<%=renderRequest.getParameter("testId")%>'/>
+</portlet:actionURL>
+
+<TR><TD style="font-size: 12px"><A href="<%=url%>">View</A></TD>
+    <TD style="font-size: 10px;" valign="top">You are currently looking at the view.  Verify that clicking on this link
+    simply refreshes this page.</TD></TR>
+
+</TABLE>
+
+<%@ include file="navigation.inc" %>

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/1c869b7c/pluto-testsuite/src/main/webapp/jsp/test4.jsp
----------------------------------------------------------------------
diff --git a/pluto-testsuite/src/main/webapp/jsp/test4.jsp b/pluto-testsuite/src/main/webapp/jsp/test4.jsp
index 5d9f913..77e65bb 100644
--- a/pluto-testsuite/src/main/webapp/jsp/test4.jsp
+++ b/pluto-testsuite/src/main/webapp/jsp/test4.jsp
@@ -1,84 +1,85 @@
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements.  See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License.  You may obtain a copy of the License at 
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed  under the  License is distributed on an "AS IS" BASIS,
-WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
-implied.
-
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<%@ page session="false" %>
-<%@ taglib uri='http://java.sun.com/portlet_2_0' prefix='portlet'%>
-<%@ page import="javax.portlet.*"%>
-<%@ page import="java.util.*"%>
-<portlet:defineObjects/>
-<%
-String baseNS = renderResponse.getNamespace();
-PortletSession ps = renderRequest.getPortletSession();
-%>
-
-<I>This portlet is testing basic functions...</I>
-<P>
-<FONT SIZE="-1">
-<B>Testing Portlet Actions...</B><BR>
-<%
-PortletURL url = renderResponse.createActionURL();
-url.setParameter("checkAction","action1");
-url.setSecure(renderRequest.isSecure());
-%>
-click <A HREF="<%=url.toString()%>">here</A> to invoke the first portlet action.<BR>
-<%
-if ("action1".equals(ps.getAttribute("checkAction", PortletSession.PORTLET_SCOPE)))
-{
-    out.print("Result: ");
-    out.print("<b>passed</b>");
-}
-%>
-<P>
-<B>Testing RenderParameters with Portlet Actions...</B><BR>
-<%
-PortletURL url1 = renderResponse.createActionURL();
-url1.setParameter("checkActionRender","step1");
-url1.setParameter("jspNameTransfer","test4.jsp");
-url.setSecure(renderRequest.isSecure());
-%>
-click <A HREF="<%=url1.toString()%>">here</A> for step 1.<BR>
-<%
-if ("step2".equals(renderRequest.getParameter("checkActionRender2")))
-{
-    PortletURL url2 = renderResponse.createRenderURL();
-    url2.setParameter("checkActionRender2","step2");
-    url2.setParameter("checkActionRender3","step3");
-    url2.setParameter("jspName","test4.jsp");
-    url2.setSecure(renderRequest.isSecure());
-%>
-click <A HREF="<%=url2.toString()%>">here</A> for step 2.<BR>
-<%
-}
-if (("step3".equals(renderRequest.getParameter("checkActionRender3"))) &&
-    ("step2".equals(renderRequest.getParameter("checkActionRender2"))))
-{
-    out.print("Result: ");
-    out.print("<b>passed</b>");
-}
-%>
-
-<%
-url = renderResponse.createRenderURL();
-url.setParameter("jspName","test5.jsp");
-url.setSecure(renderRequest.isSecure());
-%>
-<FORM METHOD="POST" ACTION="<%=url.toString()%>">
-<INPUT value="Next >>" TYPE="submit">
-</FORM>
-</FONT>
-
+<!-- 
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at 
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed  under the  License is distributed on an "AS IS" BASIS,
+WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
+implied.
+
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<%@ page isELIgnored="false" %>
+<%@ page session="false" %>
+<%@ taglib uri='http://java.sun.com/portlet_2_0' prefix='portlet'%>
+<%@ page import="javax.portlet.*"%>
+<%@ page import="java.util.*"%>
+<portlet:defineObjects/>
+<%
+String baseNS = renderResponse.getNamespace();
+PortletSession ps = renderRequest.getPortletSession();
+%>
+
+<I>This portlet is testing basic functions...</I>
+<P>
+<FONT SIZE="-1">
+<B>Testing Portlet Actions...</B><BR>
+<%
+PortletURL url = renderResponse.createActionURL();
+url.setParameter("checkAction","action1");
+url.setSecure(renderRequest.isSecure());
+%>
+click <A HREF="<%=url.toString()%>">here</A> to invoke the first portlet action.<BR>
+<%
+if ("action1".equals(ps.getAttribute("checkAction", PortletSession.PORTLET_SCOPE)))
+{
+    out.print("Result: ");
+    out.print("<b>passed</b>");
+}
+%>
+<P>
+<B>Testing RenderParameters with Portlet Actions...</B><BR>
+<%
+PortletURL url1 = renderResponse.createActionURL();
+url1.setParameter("checkActionRender","step1");
+url1.setParameter("jspNameTransfer","test4.jsp");
+url.setSecure(renderRequest.isSecure());
+%>
+click <A HREF="<%=url1.toString()%>">here</A> for step 1.<BR>
+<%
+if ("step2".equals(renderRequest.getParameter("checkActionRender2")))
+{
+    PortletURL url2 = renderResponse.createRenderURL();
+    url2.setParameter("checkActionRender2","step2");
+    url2.setParameter("checkActionRender3","step3");
+    url2.setParameter("jspName","test4.jsp");
+    url2.setSecure(renderRequest.isSecure());
+%>
+click <A HREF="<%=url2.toString()%>">here</A> for step 2.<BR>
+<%
+}
+if (("step3".equals(renderRequest.getParameter("checkActionRender3"))) &&
+    ("step2".equals(renderRequest.getParameter("checkActionRender2"))))
+{
+    out.print("Result: ");
+    out.print("<b>passed</b>");
+}
+%>
+
+<%
+url = renderResponse.createRenderURL();
+url.setParameter("jspName","test5.jsp");
+url.setSecure(renderRequest.isSecure());
+%>
+<FORM METHOD="POST" ACTION="<%=url.toString()%>">
+<INPUT value="Next >>" TYPE="submit">
+</FORM>
+</FONT>
+

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/1c869b7c/pluto-testsuite/src/main/webapp/jsp/test_results.inc
----------------------------------------------------------------------
diff --git a/pluto-testsuite/src/main/webapp/jsp/test_results.inc b/pluto-testsuite/src/main/webapp/jsp/test_results.inc
index cf697c0..ee32982 100644
--- a/pluto-testsuite/src/main/webapp/jsp/test_results.inc
+++ b/pluto-testsuite/src/main/webapp/jsp/test_results.inc
@@ -1,138 +1,139 @@
-<%--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements.  See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed  under the  License is distributed on an "AS IS" BASIS,
-WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
-implied.
-
-See the License for the specific language governing permissions and
-limitations under the License.
---%>
-
-<%@ page import="org.apache.pluto.testsuite.TestResult" %>
-
-<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
-
-<%
-    pageContext.setAttribute("PASSED_CODE", new Integer(TestResult.PASSED));
-    pageContext.setAttribute("FAILED_CODE", new Integer(TestResult.FAILED));
-    pageContext.setAttribute("WARNING_CODE", new Integer(TestResult.WARNING));
-%>
-
-<portlet:defineObjects/>
-
-<table>
-  <c:choose>
-    <c:when test="${results == null}">
-      <tr>
-        <th colspan="2" style="background-color:red; color:white;">
-          TEST RESULT NOT FOUND
-        </th>
-      </tr>
-      <tr>
-        <td valign="top">
-          <img src="<%= response.encodeURL(request.getContextPath() + "/images/question.gif") %>"
-               border="0" />
-        </td>
-        <td>
-          <p>
-            The test results could not be found in the request scope. If this
-            is an ActionTest (test logic resides in the processAction() method),
-            one possible reason may be that the original portlet session where
-            the test results reside was invalidated by another portlet.
-          </p>
-          <p>
-            Please return to the introduction page and retry.
-          </p>
-        </td>
-      </tr>
-    </c:when>
-    <c:when test="${results.failed}">
-      <tr>
-        <th colspan="2" style="background-color:red; color:white;">
-          TEST FAILED
-        </th>
-      </tr>
-    </c:when>
-    <c:when test="${results.inQuestion}">
-      <tr>
-        <th colspan="2" style="background-color:yellow;">
-          WARNING
-        </th>
-      </tr>
-    </c:when>
-    <c:otherwise>
-      <tr>
-        <th colspan="2" style="background-color:green; color:white;">
-          TEST PASSED
-        </th>
-      </tr>
-    </c:otherwise>
-  </c:choose>
-  
-  <tr>
-    <th />
-    <th><c:out value="${results.name}"/></th>
-  </tr>
-  
-  <c:forEach var="result" varStatus="status" items="${results.collection}">
-    <tr>
-      
-      <!-- Result Icon ===================================================== -->
-      <td valign="top">
-        <c:choose>
-          <c:when test="${result.returnCode == PASSED_CODE}">
-            <img src="<%= response.encodeURL(request.getContextPath() + "/images/yes.gif") %>"
-                 border="0" />
-          </c:when>
-          <c:when test="${result.returnCode == FAILED_CODE}">
-            <img src="<%= response.encodeURL(request.getContextPath() + "/images/no.gif") %>"
-                 border="0" />
-          </c:when>
-          <c:otherwise>
-            <img src="<%= response.encodeURL(request.getContextPath() + "/images/question.gif") %>"
-                 border="0" />
-          </c:otherwise>
-        </c:choose>
-      </td>
-      
-      <td style="white-space:nowrap;">
-        PLT <c:out value="${result.specPLT}"/> - <c:out value="${result.name}"/>
-      </td>
-    </tr>
-    
-    <c:choose>
-      <c:when test="${result.returnCode == PASSED_CODE}">
-        <tr>
-          <td />
-          <td style="font-size:smaller;">
-            <c:out value="${result.description}"/>
-          </td>
-        </tr>
-      </c:when>
-      <c:otherwise>
-        <tr>
-          <td />
-          <td style="font-size:smaller;">
-            <c:out value="${result.description}"/>
-            <br/>
-            <span style="color:#FF0000;">
-              <c:out value="${result.resultMessage}"/>
-            </span>
-          </td>
-        </tr>
-      </c:otherwise>
-    </c:choose>
-  </c:forEach>
-  
-</table>
-
+<%--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed  under the  License is distributed on an "AS IS" BASIS,
+WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
+implied.
+
+See the License for the specific language governing permissions and
+limitations under the License.
+--%>
+
+<%@ page isELIgnored="false" %>
+<%@ page import="org.apache.pluto.testsuite.TestResult" %>
+
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
+
+<%
+    pageContext.setAttribute("PASSED_CODE", new Integer(TestResult.PASSED));
+    pageContext.setAttribute("FAILED_CODE", new Integer(TestResult.FAILED));
+    pageContext.setAttribute("WARNING_CODE", new Integer(TestResult.WARNING));
+%>
+
+<portlet:defineObjects/>
+
+<table>
+  <c:choose>
+    <c:when test="${results == null}">
+      <tr>
+        <th colspan="2" style="background-color:red; color:white;">
+          TEST RESULT NOT FOUND
+        </th>
+      </tr>
+      <tr>
+        <td valign="top">
+          <img src="<%= response.encodeURL(request.getContextPath() + "/images/question.gif") %>"
+               border="0" />
+        </td>
+        <td>
+          <p>
+            The test results could not be found in the request scope. If this
+            is an ActionTest (test logic resides in the processAction() method),
+            one possible reason may be that the original portlet session where
+            the test results reside was invalidated by another portlet.
+          </p>
+          <p>
+            Please return to the introduction page and retry.
+          </p>
+        </td>
+      </tr>
+    </c:when>
+    <c:when test="${results.failed}">
+      <tr>
+        <th colspan="2" style="background-color:red; color:white;">
+          TEST FAILED
+        </th>
+      </tr>
+    </c:when>
+    <c:when test="${results.inQuestion}">
+      <tr>
+        <th colspan="2" style="background-color:yellow;">
+          WARNING
+        </th>
+      </tr>
+    </c:when>
+    <c:otherwise>
+      <tr>
+        <th colspan="2" style="background-color:green; color:white;">
+          TEST PASSED
+        </th>
+      </tr>
+    </c:otherwise>
+  </c:choose>
+  
+  <tr>
+    <th />
+    <th><c:out value="${results.name}"/></th>
+  </tr>
+  
+  <c:forEach var="result" varStatus="status" items="${results.collection}">
+    <tr>
+      
+      <!-- Result Icon ===================================================== -->
+      <td valign="top">
+        <c:choose>
+          <c:when test="${result.returnCode == PASSED_CODE}">
+            <img src="<%= response.encodeURL(request.getContextPath() + "/images/yes.gif") %>"
+                 border="0" />
+          </c:when>
+          <c:when test="${result.returnCode == FAILED_CODE}">
+            <img src="<%= response.encodeURL(request.getContextPath() + "/images/no.gif") %>"
+                 border="0" />
+          </c:when>
+          <c:otherwise>
+            <img src="<%= response.encodeURL(request.getContextPath() + "/images/question.gif") %>"
+                 border="0" />
+          </c:otherwise>
+        </c:choose>
+      </td>
+      
+      <td style="white-space:nowrap;">
+        PLT <c:out value="${result.specPLT}"/> - <c:out value="${result.name}"/>
+      </td>
+    </tr>
+    
+    <c:choose>
+      <c:when test="${result.returnCode == PASSED_CODE}">
+        <tr>
+          <td />
+          <td style="font-size:smaller;">
+            <c:out value="${result.description}"/>
+          </td>
+        </tr>
+      </c:when>
+      <c:otherwise>
+        <tr>
+          <td />
+          <td style="font-size:smaller;">
+            <c:out value="${result.description}"/>
+            <br/>
+            <span style="color:#FF0000;">
+              <c:out value="${result.resultMessage}"/>
+            </span>
+          </td>
+        </tr>
+      </c:otherwise>
+    </c:choose>
+  </c:forEach>
+  
+</table>
+

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/1c869b7c/pluto-testsuite/src/main/webapp/jsp/test_results.jsp
----------------------------------------------------------------------
diff --git a/pluto-testsuite/src/main/webapp/jsp/test_results.jsp b/pluto-testsuite/src/main/webapp/jsp/test_results.jsp
index c3ed1eb..26add41 100644
--- a/pluto-testsuite/src/main/webapp/jsp/test_results.jsp
+++ b/pluto-testsuite/src/main/webapp/jsp/test_results.jsp
@@ -1,26 +1,27 @@
-<%--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements.  See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed  under the  License is distributed on an "AS IS" BASIS,
-WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
-implied.
-
-See the License for the specific language governing permissions and
-limitations under the License.
---%>
-
-<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet"%>
-
-<portlet:defineObjects/>
-
-<%@ include file="test_results.inc" %>
-<%@ include file="navigation.inc" %>
-
+<%--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed  under the  License is distributed on an "AS IS" BASIS,
+WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
+implied.
+
+See the License for the specific language governing permissions and
+limitations under the License.
+--%>
+
+<%@ page isELIgnored="false" %>
+<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet"%>
+
+<portlet:defineObjects/>
+
+<%@ include file="test_results.inc" %>
+<%@ include file="navigation.inc" %>
+

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/1c869b7c/pluto-testsuite/src/main/webapp/jsp/window_state_test.jsp
----------------------------------------------------------------------
diff --git a/pluto-testsuite/src/main/webapp/jsp/window_state_test.jsp b/pluto-testsuite/src/main/webapp/jsp/window_state_test.jsp
index 9761993..b68a118 100644
--- a/pluto-testsuite/src/main/webapp/jsp/window_state_test.jsp
+++ b/pluto-testsuite/src/main/webapp/jsp/window_state_test.jsp
@@ -1,58 +1,59 @@
-<%--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements.  See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed  under the  License is distributed on an "AS IS" BASIS,
-WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
-implied.
-
-See the License for the specific language governing permissions and
-limitations under the License.
---%>
-<%@ page import="javax.portlet.WindowState"%>
-<%@ taglib uri='http://java.sun.com/portlet_2_0' prefix='portlet'%>
-
-<portlet:defineObjects/>
-
-<TABLE style="font-size: -1">
-<TR><TH colspan="2" style="background-color:blue;color:white;">MANUAL TEST</TH></TR>
-<TR><TH></TH>
-    <TH>Window State Test</TH></TR>
-<TR><TD colspan="2">This test requires manual intervention
-        to ensure that it passes.  Click on the links below
-        and make sure that the specified state is displayed.</TD></TR>
-
-<portlet:actionURL windowState="<%=WindowState.MAXIMIZED.toString()%>" secure='<%=renderRequest.isSecure()?"True":"False"%>' var="url">
-	<portlet:param name="testId" value='<%=renderRequest.getParameter("testId")%>'/>
-</portlet:actionURL>
-
-<TR><TD style="font-size: 12px" valign="top"><A href="<%=url%>">Max</A></TD>
-    <TD style="font-size: 10px;">The help mode provides help info.  Click to ensure that help info is
-        displayed.</TD></TR>
-
-<portlet:actionURL windowState="<%=WindowState.MINIMIZED.toString()%>" secure='<%=renderRequest.isSecure()?"True":"False"%>' var="url">
-	<portlet:param name="testId" value='<%=renderRequest.getParameter("testId")%>'/>
-</portlet:actionURL>
-
-<TR><TD style="font-size: 12px" valign="top"><A href="<%=url%>">Min</A></TD>
-    <TD style="font-size: 10px;">The edit mode allows you to edit preferences. Click to view all preferences
-    currently stored in this portlet.</TD></TR>
-
-<portlet:actionURL windowState="<%=WindowState.NORMAL.toString()%>" secure='<%=renderRequest.isSecure()?"True":"False"%>' var="url">
-	<portlet:param name="testId" value='<%=renderRequest.getParameter("testId")%>'/>
-</portlet:actionURL>
-
-<TR><TD style="font-size: 12px" valign="top"><A href="<%=url%>">Nor</A></TD>
-    <TD style="font-size: 10px;">You are currently looking at the view.  Verify that clicking on this link
-    simply refreshes this page.</TD></TR>
-
-</TABLE>
-
-<%@ include file="navigation.inc" %>
+<%--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed  under the  License is distributed on an "AS IS" BASIS,
+WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
+implied.
+
+See the License for the specific language governing permissions and
+limitations under the License.
+--%>
+<%@ page isELIgnored="false" %>
+<%@ page import="javax.portlet.WindowState"%>
+<%@ taglib uri='http://java.sun.com/portlet_2_0' prefix='portlet'%>
+
+<portlet:defineObjects/>
+
+<TABLE style="font-size: -1">
+<TR><TH colspan="2" style="background-color:blue;color:white;">MANUAL TEST</TH></TR>
+<TR><TH></TH>
+    <TH>Window State Test</TH></TR>
+<TR><TD colspan="2">This test requires manual intervention
+        to ensure that it passes.  Click on the links below
+        and make sure that the specified state is displayed.</TD></TR>
+
+<portlet:actionURL windowState="<%=WindowState.MAXIMIZED.toString()%>" secure='<%=renderRequest.isSecure()?"True":"False"%>' var="url">
+	<portlet:param name="testId" value='<%=renderRequest.getParameter("testId")%>'/>
+</portlet:actionURL>
+
+<TR><TD style="font-size: 12px" valign="top"><A href="<%=url%>">Max</A></TD>
+    <TD style="font-size: 10px;">The help mode provides help info.  Click to ensure that help info is
+        displayed.</TD></TR>
+
+<portlet:actionURL windowState="<%=WindowState.MINIMIZED.toString()%>" secure='<%=renderRequest.isSecure()?"True":"False"%>' var="url">
+	<portlet:param name="testId" value='<%=renderRequest.getParameter("testId")%>'/>
+</portlet:actionURL>
+
+<TR><TD style="font-size: 12px" valign="top"><A href="<%=url%>">Min</A></TD>
+    <TD style="font-size: 10px;">The edit mode allows you to edit preferences. Click to view all preferences
+    currently stored in this portlet.</TD></TR>
+
+<portlet:actionURL windowState="<%=WindowState.NORMAL.toString()%>" secure='<%=renderRequest.isSecure()?"True":"False"%>' var="url">
+	<portlet:param name="testId" value='<%=renderRequest.getParameter("testId")%>'/>
+</portlet:actionURL>
+
+<TR><TD style="font-size: 12px" valign="top"><A href="<%=url%>">Nor</A></TD>
+    <TD style="font-size: 10px;">You are currently looking at the view.  Verify that clicking on this link
+    simply refreshes this page.</TD></TR>
+
+</TABLE>
+
+<%@ include file="navigation.inc" %>


Mime
View raw message