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 dd...@apache.org on 2005/07/29 18:43:41 UTC

svn commit: r226395 [14/14] - in /portals/pluto/branches/pluto-1.1: ./ binding/ binding/src/java/org/apache/pluto/binding/ binding/src/java/org/apache/pluto/binding/impl/digester/ binding/src/java/org/apache/pluto/binding/util/ binding/src/resources/or...

Added: portals/pluto/branches/pluto-1.1/pluto-testsuite/src/main/webapp/jsp/ext_app_scoped_attr_test.jsp
URL: http://svn.apache.org/viewcvs/portals/pluto/branches/pluto-1.1/pluto-testsuite/src/main/webapp/jsp/ext_app_scoped_attr_test.jsp?rev=226395&view=auto
==============================================================================
--- portals/pluto/branches/pluto-1.1/pluto-testsuite/src/main/webapp/jsp/ext_app_scoped_attr_test.jsp (added)
+++ portals/pluto/branches/pluto-1.1/pluto-testsuite/src/main/webapp/jsp/ext_app_scoped_attr_test.jsp Fri Jul 29 09:40:51 2005
@@ -0,0 +1,52 @@
+<%--
+Copyright 2004 The Apache Software Foundation
+Licensed  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" prefix="portlet"%>
+
+<portlet:defineObjects/>
+
+<script name="JavaScript">
+function openCompanionWindow() {
+	w = 500;
+	h = 400;
+	x = (screen.width - w) / 2;
+	y = (screen.height - h) / 2;
+	window.open('<HTML><BODY><CENTER><FONT color=red>Testing Session Attributes</FONT></CENTER></BODY></HTML>', 'companionWindow', 'resizable=yes,scrollbars=yes,status=yes,width=' + w + ',height=' + h + ',screenX=' + x + ',screenY=' + y + ',left=' + x + ',top=' + y);
+}
+</script>
+
+<c:choose>
+<c:when test="${results.inQuestion}">
+<TABLE>
+<TR><TH colspan="2" style="background-color:blue;color:white;">MANUAL TEST</TH></TR>
+<TR><TH colspan="2">Application Scoped Session Attributes Test</TH></TR>
+<TR><TD>
+    <P>This test is to validate that application scoped attributes can be viewed
+    by resources outside of the portlet.  Additionally, it tests to make sure that
+    session attributes set by other resources may be viewed by the portlet as an
+    application scoped session attribute.</P>
+    This test requires manual intervention.  Click
+    <A href="<%=renderResponse.encodeURL(renderRequest.getContextPath() + "/test/extAppScopedTest?sessionId="+request.getSession().getId())%>" target="companionWindow" onclick="openCompanionWindow()">here</A>
+    </TD></TR>
+<TABLE>
+</c:when>
+<c:otherwise>
+<%@ include file="test_results.inc" %>
+</c:otherwise>
+</c:choose>
+
+<%@ include file="navigation.inc" %>
\ No newline at end of file

Added: portals/pluto/branches/pluto-1.1/pluto-testsuite/src/main/webapp/jsp/external_app_scoped_test_ext.jsp
URL: http://svn.apache.org/viewcvs/portals/pluto/branches/pluto-1.1/pluto-testsuite/src/main/webapp/jsp/external_app_scoped_test_ext.jsp?rev=226395&view=auto
==============================================================================
--- portals/pluto/branches/pluto-1.1/pluto-testsuite/src/main/webapp/jsp/external_app_scoped_test_ext.jsp (added)
+++ portals/pluto/branches/pluto-1.1/pluto-testsuite/src/main/webapp/jsp/external_app_scoped_test_ext.jsp Fri Jul 29 09:40:51 2005
@@ -0,0 +1,88 @@
+<%--
+Copyright 2004 The Apache Software Foundation
+Licensed  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" %>
+
+
+<HTML>
+<HEAD>
+<STYLE>
+BODY, P, TH, TD {
+    font-family: arial, helvetica, sans-serif;
+    text-align: left;
+}
+
+.BODY, .P, .TD {
+    font-size: 12px;
+}
+
+TABLE {
+    width: 100%;
+    padding: 2px 3px;
+    border-collapse:collapse;
+    border-spacing: 3px 3px;
+}
+
+
+.banner, .banner TD, .banner A:link, .banner A:visited, .banner A:hover {
+    background-color: #DDDDDD;
+    color: #36a;
+}
+
+.nav, .nav TD, .nav A:link, .nav A:visited, .nav A:hover {
+    background-color: #DDDDDD;
+    color: #36a;
+}
+
+.small {
+    font-size: -1;
+}
+
+</STYLE>
+</HEAD>
+<TABLE style="font-size: -1" border="1">
+<c:choose>
+<c:when test="${passed}">
+<TR><TH colspan="2" style="background-color:green;color:white">PASSED</FONT>
+</c:when>
+<c:otherwise>
+<TR><TH colspan="2" style="background-color:red;color:white">FAILED</TH></TR>
+</c:otherwise>
+</c:choose>
+
+<TR><TD colspan="2">
+    <p>This resource has been requested outside of the portal framework.  It is
+    intended to test application scope attribute functions of the PortletSession.
+    If the PortletSession is functioning as designed the key set in the PortletSession
+    should be readable.  If it were, this test would have passed. This resource has
+    also added a key to it's HttpSession which should be viewable through the PortletSession
+    attribute.</p>
+
+    <p>Note that this test is not expected to pass on Tomcat 4.x or 5.0.x. On Tomcat 5.5.x
+    it requires <i>emptySessionPath="true"</i> to be added to the connector configuration
+    in server.xml. See
+    <a href="http://portals.apache.org/pluto/faq.html#tomcat5_5" target="_blank">the FAQ</a>
+    for details.</p>
+</TD></TR>
+<TR><TH colspan="2">Session Id Comparison</TH></TR>
+<TR><TD>This HttpSession Id</TD>
+    <TD><c:out value="${pageContext.request.session.id}"/></TD></TR>
+<TR><TD>Requesting Portlet's Session Id</TD>
+    <TD><%=request.getParameter("sessionId")%></TD></TR>
+    </TABLE>
+</BODY>
+</HTML>
+

Added: portals/pluto/branches/pluto-1.1/pluto-testsuite/src/main/webapp/jsp/help.jsp
URL: http://svn.apache.org/viewcvs/portals/pluto/branches/pluto-1.1/pluto-testsuite/src/main/webapp/jsp/help.jsp?rev=226395&view=auto
==============================================================================
--- portals/pluto/branches/pluto-1.1/pluto-testsuite/src/main/webapp/jsp/help.jsp (added)
+++ portals/pluto/branches/pluto-1.1/pluto-testsuite/src/main/webapp/jsp/help.jsp Fri Jul 29 09:40:51 2005
@@ -0,0 +1,28 @@
+<%--
+Copyright 2004 The Apache Software Foundation
+Licensed  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>
+</TABLE>
\ No newline at end of file

Added: portals/pluto/branches/pluto-1.1/pluto-testsuite/src/main/webapp/jsp/introduction.jsp
URL: http://svn.apache.org/viewcvs/portals/pluto/branches/pluto-1.1/pluto-testsuite/src/main/webapp/jsp/introduction.jsp?rev=226395&view=auto
==============================================================================
--- portals/pluto/branches/pluto-1.1/pluto-testsuite/src/main/webapp/jsp/introduction.jsp (added)
+++ portals/pluto/branches/pluto-1.1/pluto-testsuite/src/main/webapp/jsp/introduction.jsp Fri Jul 29 09:40:51 2005
@@ -0,0 +1,51 @@
+<%@ page import="java.util.Map"%>
+ <%--
+Copyright 2004 The Apache Software Foundation
+Licensed  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" prefix="portlet"%>
+
+<portlet:defineObjects/>
+
+<TABLE>
+<TR><TD>
+    <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="test" items="${tests}" varStatus="status">
+    <TR><TD><c:out value="${test.name}"/></TD>
+        <portlet:actionURL secure='<%=renderRequest.isSecure()?"True":"False"%>' var="url">
+    	<portlet:param name="testId" value='<%=((javax.servlet.jsp.jstl.core.LoopTagStatus)pageContext.getAttribute("status")).getIndex()+""%>'/>
+        <c:forEach var="param" items="${test.actionParameters}">
+        <%
+            Map.Entry parm = ((Map.Entry)pageContext.findAttribute("param"));
+        %>
+          <portlet:param name="<%=parm.getKey().toString()%>" value="<%=parm.getValue().toString()%>"/>
+        </c:forEach>
+        </portlet:actionURL>
+        <TD><A href="<c:out value="${url}"/>">Test</A></TD>
+    </c:forEach>
+    </TABLE>
+    </P>
+    </TD></TR>
+</TABLE>
\ No newline at end of file

Added: portals/pluto/branches/pluto-1.1/pluto-testsuite/src/main/webapp/jsp/navigation.inc
URL: http://svn.apache.org/viewcvs/portals/pluto/branches/pluto-1.1/pluto-testsuite/src/main/webapp/jsp/navigation.inc?rev=226395&view=auto
==============================================================================
--- portals/pluto/branches/pluto-1.1/pluto-testsuite/src/main/webapp/jsp/navigation.inc (added)
+++ portals/pluto/branches/pluto-1.1/pluto-testsuite/src/main/webapp/jsp/navigation.inc Fri Jul 29 09:40:51 2005
@@ -0,0 +1,58 @@
+<%@ page import="java.util.Map,
+                 org.apache.pluto.portalImpl.portlet.TestConfig"%>
+ <%--
+Copyright 2004 The Apache Software Foundation
+Licensed  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" prefix="portlet"%>
+
+<portlet:defineObjects/>
+
+<CENTER>
+<TABLE>
+<TR><TD align="center" nowrap="true">
+<portlet:actionURL secure="<%=renderRequest.isSecure()?"True":"False"%>" var="url">
+	<portlet:param name="nextTestId" value="<%=renderRequest.getParameter("testId") %>"/>
+      <c:forEach var="param" items="${prevTest.actionParameters}">
+        <% Map.Entry parm = ((Map.Entry)pageContext.findAttribute("param")); %>
+        <portlet:param name="<%=parm.getKey().toString()%>" value="<%=parm.getValue().toString()%>"/>
+      </c:forEach>
+</portlet:actionURL>
+
+<A href="<%=url%>"><IMG SRC="<%=renderResponse.encodeURL(renderRequest.getContextPath() + "/images/previous.png")%>" border="0"></A>
+
+<portlet:actionURL secure="<%=renderRequest.isSecure()?"True":"False"%>" var="url">
+	<portlet:param name="testId" value="<%=null%>"/>
+</portlet:actionURL>
+
+<A href="<%=url%>"><IMG SRC="<%=renderResponse.encodeURL(renderRequest.getContextPath() + "/images/return_index.png")%>" border="0"></A>
+
+<portlet:actionURL secure="<%=renderRequest.isSecure()?"True":"False"%>" var="url">
+	<portlet:param name="previousTestId" value="<%=renderRequest.getParameter("testId")%>"/>
+      <% TestConfig test = (TestConfig)pageContext.findAttribute("nextTest"); %>
+      <c:forEach var="param" items="${nextTest.actionParameters}">
+        <% Map.Entry parm = ((Map.Entry)pageContext.findAttribute("param")); %>
+        <portlet:param name="<%=parm.getKey().toString()%>" value="<%=parm.getValue().toString()%>"/>
+      </c:forEach>
+</portlet:actionURL>
+
+<A href="<%=url%>"><IMG SRC="<%=renderResponse.encodeURL(renderRequest.getContextPath() + "/images/next.png")%>" border="0"></A>
+</TD></TR>
+</TABLE>
+</CENTER>
+
+
+

Added: portals/pluto/branches/pluto-1.1/pluto-testsuite/src/main/webapp/jsp/portlet_mode_test.jsp
URL: http://svn.apache.org/viewcvs/portals/pluto/branches/pluto-1.1/pluto-testsuite/src/main/webapp/jsp/portlet_mode_test.jsp?rev=226395&view=auto
==============================================================================
--- portals/pluto/branches/pluto-1.1/pluto-testsuite/src/main/webapp/jsp/portlet_mode_test.jsp (added)
+++ portals/pluto/branches/pluto-1.1/pluto-testsuite/src/main/webapp/jsp/portlet_mode_test.jsp Fri Jul 29 09:40:51 2005
@@ -0,0 +1,56 @@
+<%--
+Copyright 2004 The Apache Software Foundation
+Licensed  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' 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" %>
\ No newline at end of file

Added: portals/pluto/branches/pluto-1.1/pluto-testsuite/src/main/webapp/jsp/test4.jsp
URL: http://svn.apache.org/viewcvs/portals/pluto/branches/pluto-1.1/pluto-testsuite/src/main/webapp/jsp/test4.jsp?rev=226395&view=auto
==============================================================================
--- portals/pluto/branches/pluto-1.1/pluto-testsuite/src/main/webapp/jsp/test4.jsp (added)
+++ portals/pluto/branches/pluto-1.1/pluto-testsuite/src/main/webapp/jsp/test4.jsp Fri Jul 29 09:40:51 2005
@@ -0,0 +1,82 @@
+<!-- 
+Copyright 2004 The Apache Software Foundation
+Licensed  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' 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>
+

Added: portals/pluto/branches/pluto-1.1/pluto-testsuite/src/main/webapp/jsp/test_results.inc
URL: http://svn.apache.org/viewcvs/portals/pluto/branches/pluto-1.1/pluto-testsuite/src/main/webapp/jsp/test_results.inc?rev=226395&view=auto
==============================================================================
--- portals/pluto/branches/pluto-1.1/pluto-testsuite/src/main/webapp/jsp/test_results.inc (added)
+++ portals/pluto/branches/pluto-1.1/pluto-testsuite/src/main/webapp/jsp/test_results.inc Fri Jul 29 09:40:51 2005
@@ -0,0 +1,66 @@
+<%--
+Copyright 2004 The Apache Software Foundation
+Licensed  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" prefix="portlet"%>
+
+<%
+    pageContext.setAttribute("passed", "Passed");
+    pageContext.setAttribute("failed", "Failed");
+    pageContext.setAttribute("warning", "Warning");
+%>
+
+<portlet:defineObjects/>
+
+<TABLE style="font-size: -1">
+<c:choose>
+<c:when test="${results.failed}">
+<TR><TH colspan="2" style="background-color:red;color:white">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">PASSED</FONT></c:otherwise>
+</c:choose>
+
+<TR><TH></TH>
+    <TH><c:out value="${results.name}"/></TH>
+<c:forEach var="result" varStatus="status" items="${results.collection}">
+<TR><TD valign="top">
+    <c:choose>
+    <c:when test="${result.returnCode==passed}">
+    <IMG src="<%=renderResponse.encodeURL(renderRequest.getContextPath() + "/images/yes.gif")%>" border="0">
+    </c:when>
+    <c:when test="${result.returnCode==failed}">
+    <IMG src="<%=renderResponse.encodeURL(renderRequest.getContextPath() + "/images/no.gif")%>" border="0">
+    </c:when>
+    <c:otherwise>
+    <IMG src="<%=renderResponse.encodeURL(renderRequest.getContextPath() + "/images/question.gif")%>" border="0">
+    </c:otherwise>
+    </c:choose>
+    </TD>
+    <TD style="font-size:12px;" nowrap="true"><c:out value="${result.name}"/></TD></TR>
+    <c:choose>
+    <c:when test="${result.returnCode==passed}">
+    <TR><TD></TD><TD style="font-size:10px;"><c:out value="${result.desc}"/></TD></TR>
+    </c:when>
+    <c:otherwise>
+    <TR><TD></TD><TD style="font-size:10px;"><c:out value="${result.results}"/></TD></TR>
+    </c:otherwise>
+    </c:choose>
+</c:forEach>
+</TABLE>
\ No newline at end of file

Added: portals/pluto/branches/pluto-1.1/pluto-testsuite/src/main/webapp/jsp/test_results.jsp
URL: http://svn.apache.org/viewcvs/portals/pluto/branches/pluto-1.1/pluto-testsuite/src/main/webapp/jsp/test_results.jsp?rev=226395&view=auto
==============================================================================
--- portals/pluto/branches/pluto-1.1/pluto-testsuite/src/main/webapp/jsp/test_results.jsp (added)
+++ portals/pluto/branches/pluto-1.1/pluto-testsuite/src/main/webapp/jsp/test_results.jsp Fri Jul 29 09:40:51 2005
@@ -0,0 +1,22 @@
+<%--
+Copyright 2004 The Apache Software Foundation
+Licensed  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" prefix="portlet"%>
+
+<portlet:defineObjects/>
+<%@ include file="test_results.inc" %>
+<%@ include file="navigation.inc" %>
+

Added: portals/pluto/branches/pluto-1.1/pluto-testsuite/src/main/webapp/jsp/window_state_test.jsp
URL: http://svn.apache.org/viewcvs/portals/pluto/branches/pluto-1.1/pluto-testsuite/src/main/webapp/jsp/window_state_test.jsp?rev=226395&view=auto
==============================================================================
--- portals/pluto/branches/pluto-1.1/pluto-testsuite/src/main/webapp/jsp/window_state_test.jsp (added)
+++ portals/pluto/branches/pluto-1.1/pluto-testsuite/src/main/webapp/jsp/window_state_test.jsp Fri Jul 29 09:40:51 2005
@@ -0,0 +1,56 @@
+<%--
+Copyright 2004 The Apache Software Foundation
+Licensed  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' 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" %>

Added: portals/pluto/branches/pluto-1.1/pluto.nsi
URL: http://svn.apache.org/viewcvs/portals/pluto/branches/pluto-1.1/pluto.nsi?rev=226395&view=auto
==============================================================================
--- portals/pluto/branches/pluto-1.1/pluto.nsi (added)
+++ portals/pluto/branches/pluto-1.1/pluto.nsi Fri Jul 29 09:40:51 2005
@@ -0,0 +1,107 @@
+; Pluto script for Nullsoft Installer
+; $Id: pluto.nsi,v 1 2005/07/28 14:17:51 ddewolf Exp $
+
+  ;Compression options
+  CRCCheck on
+  SetCompress force
+  SetCompressor lzma
+  SetDatablockOptimize on
+
+  Name "Apache Pluto"
+  OutFile "portals-pluto.exe"   ; The name of the unistaller file to write
+
+  ;Product information
+  VIAddVersionKey ProductName "Apache Pluto"
+  VIAddVersionKey CompanyName "Apache Software Foundation"
+  VIAddVersionKey LegalCopyright "Copyright (c) 1999-2005 The Apache Software Foundation"
+  VIAddVersionKey FileDescription "Apache Pluto Installer"
+  VIAddVersionKey FileVersion "2.0"
+  VIAddVersionKey ProductVersion "1.1.0"
+  VIAddVersionKey Comments "portals.apache.org/pluto"
+  VIAddVersionKey InternalName "portals-pluto-1.1.0.exe"
+  VIProductVersion 1.1.0.0
+
+!include "MUI.nsh"
+
+;---------------------------------
+;Installer Look and Feel Config
+;  !define MUI_HEADERIMAGE
+;  !define MUI_HEADERIMAGE_RIGHT
+;  !define MUI_HEADERIMAGE_BITMAP header.bmp
+;  !define MUI_WELCOMEFINISHPAGE_BITMAP side_left.bmp 
+;  !define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\README"
+;  !define MUI_FINISHPAGE_RUN $INSTDIR\bin\startup.bat
+;
+;  !define MUI_ABORTWARNING
+;
+;  ;Install Page order
+;  !insertmacro MUI_PAGE_WELCOME
+;  !insertmacro MUI_PAGE_LICENSE README
+;  !insertmacro MUI_PAGE_COMPONENTS
+;  !insertmacro MUI_PAGE_DIRECTORY
+;  !insertmacro MUI_PAGE_INSTFILES
+;  !insertmacro MUI_PAGE_FINISH
+;
+;  LicenseData README
+ 
+; Set prompt text for select components window and select directory window
+ComponentText "Select Pluto components to install."
+DirText       "Select the Tomcat installation directory."
+ 
+; --------- Install the Portlet Container
+Section "Pluto Portlet Container (required)"
+ 
+  SetOutPath $INSTDIR\shared\lib ; Tomcat Shared Libaries
+  File pluto-descriptor-api\target\pluto-descriptor-api-1.1-SNAPSHOT.jar
+  File pluto-descriptor-impl\target\pluto-descriptor-impl-1.1-SNAPSHOT.jar
+  File pluto-container\target\pluto-container-1.1-SNAPSHOT.jar
+  ;File castor-0.9.6.jar
+  ;File portlet-api-1.0.jar
+
+  SetOutPath $INSTDIR\common\endorsed 
+  ;File xercesImpl-2.6.2.jar
+  ;File xml-apis-1.0.b2.jar
+  ;File xmlParserAPIs-2.6.2.jar
+ 
+SectionEnd
+
+; --------- Install the Portal ----------
+Section "Pluto Portal Driver"
+ 
+  SetOutPath $INSTDIR\webapps 
+  File "pluto-portal\target\pluto-portal.war" 
+  ;File "\oname=pluto-portal.war" "pluto-portal\target\pluto-portal.war" 
+
+  SetOutPath $INSTDIR\conf\Catalina\localhost 
+  File "pluto-portal\src\main\resources\pluto.xml"
+ 
+SectionEnd
+
+; --------- Install the Deployer ----------
+Section "Pluto Portal Driver"
+ 
+    ; Execute the Deployer Installer!
+ 
+SectionEnd
+
+; --------- Install the TestSuite ----------
+Section "Pluto TestSuite"
+ 
+  SetOutPath $INSTDIR\webapps 
+  File "pluto-testsuite\target\pluto-testsuite.war" 
+
+  SetOutPath $INSTDIR\conf\Catalina\localhost 
+  File "pluto-testsuite\src\main\resources\testsuite.xml"
+
+SectionEnd
+
+; ---------- Functions ---------
+  Function .onVerifyInstDir
+    IfFileExists $INSTDIR\bin\tomcat5.exe PathGood
+      Abort ; if $INSTDIR is not a winamp directory, don't let us install there
+    PathGood:
+  FunctionEnd
+ 
+; eof 
+ 
+

Added: portals/pluto/branches/pluto-1.1/pom.xml
URL: http://svn.apache.org/viewcvs/portals/pluto/branches/pluto-1.1/pom.xml?rev=226395&view=auto
==============================================================================
--- portals/pluto/branches/pluto-1.1/pom.xml (added)
+++ portals/pluto/branches/pluto-1.1/pom.xml Fri Jul 29 09:40:51 2005
@@ -0,0 +1,23 @@
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.pluto</groupId>
+  <artifactId>pluto</artifactId>
+  <packaging>pom</packaging>
+  <version>1.1-SNAPSHOT</version>
+  <name>Apache Pluto</name>
+  <url>http://portals.apache.org/pluto</url>
+  <modules>
+	<module>pluto-descriptor-api</module>
+	<module>pluto-descriptor-impl</module>
+	<module>pluto-deploy</module>
+    <module>pluto-container</module>
+	<module>pluto-portal</module>
+	<module>pluto-testsuite</module>
+  </modules>
+  <plugins>
+    <plugin>
+      <groupId>org.apache.maven.plugins</groupId>
+      <artifactId>maven-checkstyle-plugin</artifactId>
+    </plugin>
+  </plugins>
+</project>