You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pluto-scm@portals.apache.org by ms...@apache.org on 2014/12/03 16:01:32 UTC
[07/11] portals-pluto git commit: updated taglib URIs from
...sun.com/jstl... to ...sun.com/jsp/jstl... to make them work with servlet 3
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/bd96a224/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 f8cdae4..455ddc2 100644
--- a/pluto-testsuite/src/main/webapp/jsp/SessionTimeoutTest.jsp
+++ b/pluto-testsuite/src/main/webapp/jsp/SessionTimeoutTest.jsp
@@ -1,73 +1,73 @@
-<%@ page import="javax.portlet.WindowState" %>
-<%--
-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/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet"%>
-
-<portlet:defineObjects/>
-
-<c:choose>
- <c:when test="${results.inQuestion}">
-
- <%-- Generate portlet render URL: Start =============================== --%>
- <portlet:renderURL windowState="<%=WindowState.MAXIMIZED.toString()%>" secure='<%= renderRequest.isSecure() ? "True" : "False" %>'
- var="url">
- <portlet:param name="maxInactiveIntervalSet" value="<%= Boolean.TRUE.toString() %>"/>
- <portlet:param name="testId" value='<%= renderRequest.getParameter("testId") %>'/>
- </portlet:renderURL>
- <%-- Generate portlet action URL: End ================================= --%>
-
-
-
- <table>
- <tr>
- <th colspan="2" style="background-color:blue;color:white;">MANUAL TEST</th>
- </tr>
- <tr>
- <th colspan="2">Session Timeout Test</th>
- </tr>
- <tr>
- <td>
- <p>
- This test is to validate that portlet session will expire and be
- invalidated by the portlet container after its max inactive interval
- is passed.
- </p>
- <p>
- This test requires manual intervention. Please wait for at least
- 5 seconds and click <a href="<c:out value="${url}"/>">here</a>.
- </p>
- <p>
- NOTE: Clicking the url above will maximize this portlet. This is required
- to ensure that no other portlets on the current page recreate the session we
- are trying to invalidate.
- </p>
- </td>
- </tr>
- </table>
- </c:when>
- <c:otherwise>
- <%@ include file="test_results.inc" %>
- </c:otherwise>
-</c:choose>
-
-<%@ include file="navigation.inc" %>
-
-
+<%@ page import="javax.portlet.WindowState" %>
+<%--
+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/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet"%>
+
+<portlet:defineObjects/>
+
+<c:choose>
+ <c:when test="${results.inQuestion}">
+
+ <%-- Generate portlet render URL: Start =============================== --%>
+ <portlet:renderURL windowState="<%=WindowState.MAXIMIZED.toString()%>" secure='<%= renderRequest.isSecure() ? "True" : "False" %>'
+ var="url">
+ <portlet:param name="maxInactiveIntervalSet" value="<%= Boolean.TRUE.toString() %>"/>
+ <portlet:param name="testId" value='<%= renderRequest.getParameter("testId") %>'/>
+ </portlet:renderURL>
+ <%-- Generate portlet action URL: End ================================= --%>
+
+
+
+ <table>
+ <tr>
+ <th colspan="2" style="background-color:blue;color:white;">MANUAL TEST</th>
+ </tr>
+ <tr>
+ <th colspan="2">Session Timeout Test</th>
+ </tr>
+ <tr>
+ <td>
+ <p>
+ This test is to validate that portlet session will expire and be
+ invalidated by the portlet container after its max inactive interval
+ is passed.
+ </p>
+ <p>
+ This test requires manual intervention. Please wait for at least
+ 5 seconds and click <a href="<c:out value="${url}"/>">here</a>.
+ </p>
+ <p>
+ NOTE: Clicking the url above will maximize this portlet. This is required
+ to ensure that no other portlets on the current page recreate the session we
+ are trying to invalidate.
+ </p>
+ </td>
+ </tr>
+ </table>
+ </c:when>
+ <c:otherwise>
+ <%@ include file="test_results.inc" %>
+ </c:otherwise>
+</c:choose>
+
+<%@ include file="navigation.inc" %>
+
+
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/bd96a224/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 10a46c2..0355328 100644
--- a/pluto-testsuite/src/main/webapp/jsp/TestCompanionPortlet.jsp
+++ b/pluto-testsuite/src/main/webapp/jsp/TestCompanionPortlet.jsp
@@ -1,47 +1,47 @@
-<%--
-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/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet"%>
-
-<portlet:defineObjects/>
-
-<div class="portlet-section-body">
-<p>
- This portlet is a companion portlet to the 286 Test Portlet.
- It is designed to test interportlet coordination features of version 2.0 of the
- Java Portlet API (JSR-286) which include public render parameters and eventing.
-</p>
-
-<c:if test="${not empty param['public-render-param1']}">
- <p>
- <h4>Public Render Parameter Test Results:</h4>
- <p>
- checkPublicRenderParameter test: <b><c:out value="${param['public-render-param1']}"/></b>
- </p>
- </p>
-</c:if>
-
-<c:if test="${not empty eventInfo}">
- <p>
- <h4>Information from last event:</h4>
- <p><c:out value="${eventInfo}" /></p>
- </p>
-</c:if>
+<%--
+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/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet"%>
+
+<portlet:defineObjects/>
+
+<div class="portlet-section-body">
+<p>
+ This portlet is a companion portlet to the 286 Test Portlet.
+ It is designed to test interportlet coordination features of version 2.0 of the
+ Java Portlet API (JSR-286) which include public render parameters and eventing.
+</p>
+
+<c:if test="${not empty param['public-render-param1']}">
+ <p>
+ <h4>Public Render Parameter Test Results:</h4>
+ <p>
+ checkPublicRenderParameter test: <b><c:out value="${param['public-render-param1']}"/></b>
+ </p>
+ </p>
+</c:if>
+
+<c:if test="${not empty eventInfo}">
+ <p>
+ <h4>Information from last event:</h4>
+ <p><c:out value="${eventInfo}" /></p>
+ </p>
+</c:if>
</div>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/bd96a224/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 0389e89..b5874f2 100644
--- a/pluto-testsuite/src/main/webapp/jsp/introduction.jsp
+++ b/pluto-testsuite/src/main/webapp/jsp/introduction.jsp
@@ -1,76 +1,76 @@
-<%--
-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="javax.servlet.jsp.jstl.core.LoopTagStatus" %>
-<%@ 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/>
-
-<p>
- This portlet is a portlet specification compatibility test portlet.
- It provides several tests of verying complexities which will assist in
- evaluating compliance with the portlet specification. It was originally
- developed for testing Apache Pluto, however, it does not utilize any
- proprietary APIs and should work with all compliant portlet containers.
-</p>
-
-<p>
- Please select one of the following tests:
- <table>
- <c:forEach var="testConfig" items="${testConfigs}" varStatus="status">
- <tr>
- <td>
- # <c:out value="${status.index}"/>.
- </td>
- <td>
- <c:out value="${testConfig.name}"/>
- </td>
-
- <%-- Generate portlet action URL: Start =========================== --%>
- <portlet:actionURL secure='<%= renderRequest.isSecure() ? "True" : "False" %>' escapeXml="true"
- var="url">
- <portlet:param name="testId"
- value='<%= ((LoopTagStatus) pageContext.getAttribute("status")).getIndex() + "" %>'/>
- <c:forEach var="param" items="${testConfig.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>
- <%-- Generate portlet action URL: End ============================= --%>
-
- <td>
- <a href="<c:out value="${url}" escapeXml="false"/>">Test</a>
- </td>
- </tr>
- </c:forEach>
- </table>
-</p>
-
-
-
+<%--
+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="javax.servlet.jsp.jstl.core.LoopTagStatus" %>
+<%@ 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/>
+
+<p>
+ This portlet is a portlet specification compatibility test portlet.
+ It provides several tests of verying complexities which will assist in
+ evaluating compliance with the portlet specification. It was originally
+ developed for testing Apache Pluto, however, it does not utilize any
+ proprietary APIs and should work with all compliant portlet containers.
+</p>
+
+<p>
+ Please select one of the following tests:
+ <table>
+ <c:forEach var="testConfig" items="${testConfigs}" varStatus="status">
+ <tr>
+ <td>
+ # <c:out value="${status.index}"/>.
+ </td>
+ <td>
+ <c:out value="${testConfig.name}"/>
+ </td>
+
+ <%-- Generate portlet action URL: Start =========================== --%>
+ <portlet:actionURL secure='<%= renderRequest.isSecure() ? "True" : "False" %>' escapeXml="true"
+ var="url">
+ <portlet:param name="testId"
+ value='<%= ((LoopTagStatus) pageContext.getAttribute("status")).getIndex() + "" %>'/>
+ <c:forEach var="param" items="${testConfig.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>
+ <%-- Generate portlet action URL: End ============================= --%>
+
+ <td>
+ <a href="<c:out value="${url}" escapeXml="false"/>">Test</a>
+ </td>
+ </tr>
+ </c:forEach>
+ </table>
+</p>
+
+
+
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/bd96a224/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 d8788d1..c262ee1 100644
--- a/pluto-testsuite/src/main/webapp/jsp/load_resource_test.jsp
+++ b/pluto-testsuite/src/main/webapp/jsp/load_resource_test.jsp
@@ -1,84 +1,84 @@
-<%--
-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 prefix="portlet" uri="http://java.sun.com/portlet_2_0" %>
-<%@taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
-<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><c:out value="${test.config.name}" /></TH></TR>
-<TR><TD colspan="2">
- Output from this test will be loaded in a separate window using the
- generated ResourceURL. If the window does not open automatically,
- <a id="<portlet:namespace />windowlink"
- href="<portlet:resourceURL>
- <portlet:param name='testId' value='<%= ((Integer) renderRequest.getAttribute("testId")).toString() %>' /><portlet:param name='nocache' value='<%= Long.toString(System.currentTimeMillis()) %>' />
- </portlet:resourceURL>" target="_blank">
- Click here to open the new window.
- </a>
- </TD>
-</TR>
-</TABLE>
- <script type="text/javascript">
- <!--
- (function() {
- var $ = function(something) {
- return document.getElementById(something);
- }
- var link = $('<portlet:namespace />windowlink');
- var resourceURL = link.href;
- link.onclick = function() {
- window.open(resourceURL, '_blank', 'scrollbars=yes,resizable=yes,width=400,height=300');
- return false;
- }
- link.onclick();
-<%--
- Originally, I was going to use Ajax to load the resource URL, but I found that
- window.open is a little cleaner; keeping this around just in case though
-
-
-
- var getXHR = function() {
- try { return new XMLHttpRequest(); } catch (e) {}
- try{ return new ActiveXObject("MSXML3.XMLHTTP") }catch(e){}
- try{ return new ActiveXObject("MSXML2.XMLHTTP.3.0") }catch(e){}
- try{ return new ActiveXObject("Msxml2.XMLHTTP") }catch(e){}
- try{ return new ActiveXObject("Microsoft.XMLHTTP") }catch(e){}
- throw new Error("Could not find an XMLHttpRequest alternative.")
- }
-
- var xhr = getXHR();
- xhr.onreadystatechange = function() {
- if (xhr.readyState == 4 && xhr.status == 200) {
- $('<portlet:namespace />contentArea').innerHTML = xhr.responseText;
- } else if (xhr.readyState == 4) {
- var win = window.open('', '_blank', 'scrollbars=yes,resizable=yes,width=400,height=300');
- win.document.write(xhr.responseText);
- win.document.close();
- }
- };
-
- xhr.open("get", resourceURL, true);
- xhr.send();
- --%>
- })();
- //-->
- </script>
-
+<%--
+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 prefix="portlet" uri="http://java.sun.com/portlet_2_0" %>
+<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<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><c:out value="${test.config.name}" /></TH></TR>
+<TR><TD colspan="2">
+ Output from this test will be loaded in a separate window using the
+ generated ResourceURL. If the window does not open automatically,
+ <a id="<portlet:namespace />windowlink"
+ href="<portlet:resourceURL>
+ <portlet:param name='testId' value='<%= ((Integer) renderRequest.getAttribute("testId")).toString() %>' /><portlet:param name='nocache' value='<%= Long.toString(System.currentTimeMillis()) %>' />
+ </portlet:resourceURL>" target="_blank">
+ Click here to open the new window.
+ </a>
+ </TD>
+</TR>
+</TABLE>
+ <script type="text/javascript">
+ <!--
+ (function() {
+ var $ = function(something) {
+ return document.getElementById(something);
+ }
+ var link = $('<portlet:namespace />windowlink');
+ var resourceURL = link.href;
+ link.onclick = function() {
+ window.open(resourceURL, '_blank', 'scrollbars=yes,resizable=yes,width=400,height=300');
+ return false;
+ }
+ link.onclick();
+<%--
+ Originally, I was going to use Ajax to load the resource URL, but I found that
+ window.open is a little cleaner; keeping this around just in case though
+
+
+
+ var getXHR = function() {
+ try { return new XMLHttpRequest(); } catch (e) {}
+ try{ return new ActiveXObject("MSXML3.XMLHTTP") }catch(e){}
+ try{ return new ActiveXObject("MSXML2.XMLHTTP.3.0") }catch(e){}
+ try{ return new ActiveXObject("Msxml2.XMLHTTP") }catch(e){}
+ try{ return new ActiveXObject("Microsoft.XMLHTTP") }catch(e){}
+ throw new Error("Could not find an XMLHttpRequest alternative.")
+ }
+
+ var xhr = getXHR();
+ xhr.onreadystatechange = function() {
+ if (xhr.readyState == 4 && xhr.status == 200) {
+ $('<portlet:namespace />contentArea').innerHTML = xhr.responseText;
+ } else if (xhr.readyState == 4) {
+ var win = window.open('', '_blank', 'scrollbars=yes,resizable=yes,width=400,height=300');
+ win.document.write(xhr.responseText);
+ win.document.close();
+ }
+ };
+
+ xhr.open("get", resourceURL, true);
+ xhr.send();
+ --%>
+ })();
+ //-->
+ </script>
+
<%@ include file="navigation.inc" %>
\ No newline at end of file