portals-pluto-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cdore...@apache.org
Subject svn commit: r604408 - in /portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/webapp: WEB-INF/portlet.xml jsp/ExternalAppScopedAttributeTest.jsp jsp/TestCompanionPortlet.jsp
Date Sat, 15 Dec 2007 09:11:33 GMT
Author: cdoremus
Date: Sat Dec 15 01:11:31 2007
New Revision: 604408

URL: http://svn.apache.org/viewvc?rev=604408&view=rev
Log:
Missed these in rev 604407. Part of pluto-testsuite.afewfiltertests.patch in PLUTO-442.

Added:
    portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/webapp/jsp/TestCompanionPortlet.jsp
Modified:
    portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/webapp/WEB-INF/portlet.xml
    portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/webapp/jsp/ExternalAppScopedAttributeTest.jsp

Modified: portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/webapp/WEB-INF/portlet.xml?rev=604408&r1=604407&r2=604408&view=diff
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/webapp/WEB-INF/portlet.xml
(original)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/webapp/WEB-INF/portlet.xml
Sat Dec 15 01:11:31 2007
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- 
-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
+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
@@ -17,12 +17,12 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
+<!-- FIXME: schema location points to temp location of portlet spec -->
 <portlet-app
     xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd"
-    version="1.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd
-                        http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd">
+    version="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd
+                        http://hnsp.inf-bb.uni-jena.de/spec/JSR%202.0%20API/portlet-app_2_0.xsd">
   
   <!-- Test Portlet #1 ===================================================== -->
   
@@ -148,7 +148,126 @@
     </security-role-ref>
     
   </portlet>
+
+  <!-- JSR 286 Compatibility Test Portlet -->
+  
+  <portlet>
+    
+    <description>JSR 286 Compatibility Tests</description>
+    <portlet-name>286TestPortlet</portlet-name>
+    <display-name>JSR 286 Test Portlet</display-name>
+    <portlet-class>org.apache.pluto.testsuite.TestPortlet</portlet-class>
+    
+    <init-param>
+      <name>config</name>
+      <value>/WEB-INF/testsuite-286-config.xml</value>
+    </init-param>
+    
+    <expiration-cache>-1</expiration-cache>
+    
+    <supports>
+      <mime-type>text/html</mime-type>
+      <portlet-mode>VIEW</portlet-mode>
+      <portlet-mode>EDIT</portlet-mode>
+      <portlet-mode>HELP</portlet-mode>
+    </supports>
+        
+    <portlet-info>
+      <title>286 Test Portlet</title>
+      <short-title>286 Tests</short-title>
+      <keywords>JSR 286,Tests</keywords>
+    </portlet-info>
+    
+    <supported-processing-event>
+      <name>trigger-event-phase</name>
+    </supported-processing-event>
+    
+    <supported-publishing-event>
+      <name>trigger-event-phase</name>
+    </supported-publishing-event>
+    
+  </portlet>
+
+  <portlet>
+    
+    <description>JSR 286 Test Portlet Companion</description>
+    <portlet-name>286TestCompanionPortlet</portlet-name>
+    <portlet-class>
+        org.apache.pluto.testsuite.test.jsr286.TestCompanionPortlet
+    </portlet-class>
+    
+    <supports>
+      <mime-type>text/html</mime-type>
+      <portlet-mode>VIEW</portlet-mode>
+    </supports>
+    
+    <portlet-info>
+      <title>286 Test Portlet Companion</title>
+      <short-title>286 Test Companion</short-title>
+      <keywords>JSR 286,Tests</keywords>
+    </portlet-info>
+    
+  </portlet>
+
+  <filter>
+  
+    <description>
+        This filter should be applied both the JSR 286
+        test portlet as well as its helper portlet.
+    </description>
+    
+    <display-name>Wildcard Mapped Filter</display-name>
+      
+    <filter-name>WildcardMappedFilter</filter-name>
+    <filter-class>
+        org.apache.pluto.testsuite.jsr286.filter.WildcardMappedFilter
+    </filter-class>
+    
+    <lifecycle>ACTION_PHASE</lifecycle>
+    <lifecycle>RENDER_PHASE</lifecycle>
+    <lifecycle>EVENT_PHASE</lifecycle>
+    <lifecycle>RESOURCE_PHASE</lifecycle>
   
-</portlet-app>
+  </filter>
 
+  <filter>
+    
+    <description>
+        This filter implements portlet filter methods for all four
+        lifecycle phases and is used in the various portlet filter tests.
+    </description>
+    
+    <display-name>Test Portlet Filter</display-name>
+    
+    <filter-name>TestFilter</filter-name>
+    <filter-class>
+        org.apache.pluto.testsuite.jsr286.filter.TestFilter
+    </filter-class>
+  
+    <lifecycle>ACTION_PHASE</lifecycle>
+    <lifecycle>RENDER_PHASE</lifecycle>
+    <lifecycle>EVENT_PHASE</lifecycle>
+    <lifecycle>RESOURCE_PHASE</lifecycle>
+    
+  </filter>
+
+  <filter-mapping>
+    <filter-name>WildcardMappedFilter</filter-name>
+    <portlet-name>286*</portlet-name>
+  </filter-mapping>
+
+  <filter-mapping>
+    <filter-name>TestFilter</filter-name>
+    <portlet-name>286TestPortlet</portlet-name>
+  </filter-mapping>
+
+  <!-- JSR 286 Portlet Coordination Definitions -->
+
+  <default-namespace>http://portals.apache.org/pluto/testsuite</default-namespace>
+  
+  <event-definition>
+  	<name>trigger-event-phase</name>
+  	<value-type>java.lang.String</value-type>
+  </event-definition>
 
+</portlet-app>
\ No newline at end of file

Modified: portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/webapp/jsp/ExternalAppScopedAttributeTest.jsp
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/webapp/jsp/ExternalAppScopedAttributeTest.jsp?rev=604408&r1=604407&r2=604408&view=diff
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/webapp/jsp/ExternalAppScopedAttributeTest.jsp
(original)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/webapp/jsp/ExternalAppScopedAttributeTest.jsp
Sat Dec 15 01:11:31 2007
@@ -1,9 +1,9 @@
 <%--
-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
+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
@@ -22,13 +22,13 @@
 
 <portlet:defineObjects/>
 
-<script name="JavaScript">
+<script type="text/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);
+	window.open('about:blank', 'companionWindow', 'resizable=yes,scrollbars=yes,status=yes,width='
+ w + ',height=' + h + ',screenX=' + x + ',screenY=' + y + ',left=' + x + ',top=' + y);
 }
 </script>
 
@@ -65,6 +65,4 @@
   </c:otherwise>
 </c:choose>
 
-<%@ include file="navigation.inc" %>
-
-
+<%@ include file="navigation.inc" %>
\ No newline at end of file

Added: portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/webapp/jsp/TestCompanionPortlet.jsp
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/webapp/jsp/TestCompanionPortlet.jsp?rev=604408&view=auto
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/webapp/jsp/TestCompanionPortlet.jsp
(added)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/webapp/jsp/TestCompanionPortlet.jsp
Sat Dec 15 01:11:31 2007
@@ -0,0 +1,60 @@
+<%--
+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" prefix="portlet"%>
+
+<portlet:defineObjects/>
+
+<div>
+
+    <table border="1">    
+        <thead>
+            <tr>
+                <th colspan="2">Public Render Parameters</th>
+            </tr>
+            <tr>
+                <th>Name</th>
+                <th>Value(s)</th>
+            </tr>
+        </thead>
+        <tbody>
+            <c:choose>
+                <c:when test="${empty renderRequest.publicParameterMap}">
+                    <tr>
+                        <td>No public render parameters set.</td>
+                    </tr>
+                </c:when>
+                <c:otherwise>
+                    <c:forEach items="${renderRequest.publicParameterMap}" var="param">
+                        <tr>
+                            <td><c:out value="${param.key}" /></td>
+                            <td>
+                                <c:forEach items="${param.value}" var="val">
+                                    <div><c:out value="${val}" /></div>
+                                </c:forEach>
+                            </td>
+                        </tr>                    
+                    </c:forEach>
+                </c:otherwise>
+            </c:choose>
+        </tbody>
+    </table>
+
+</div>
\ No newline at end of file



Mime
View raw message