geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jb...@apache.org
Subject svn commit: r559986 [7/7] - in /geronimo/sandbox/portals: pluto-portal/src/assemble/ pluto-portal/src/assemble/config/ pluto-portal/src/main/resources/ pluto-portal/src/main/webapp/ pluto-portal/src/main/webapp/WEB-INF/ pluto-portal/src/main/webapp/WEB...
Date Thu, 26 Jul 2007 21:22:14 GMT
Modified: geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/WEB-INF/portlet.xml?view=diff&rev=559986&r1=559985&r2=559986
==============================================================================
--- geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/WEB-INF/portlet.xml (original)
+++ geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/WEB-INF/portlet.xml Thu Jul 26 14:22:10 2007
@@ -1,144 +1,144 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
+<?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
-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.
--->
+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.
+-->
 <portlet-app version="1.0">
-  
-  <!-- Test Portlet #1 ===================================================== -->
-  
-  <portlet>
-    
-    <description>TestSuiteDescription</description>
-    <portlet-name>TestPortlet1</portlet-name>
-    <display-name>Test Portlet #1</display-name>
-    <portlet-class>org.apache.pluto.testsuite.TestPortlet</portlet-class>
-    
-    <init-param>
-      <name>config</name>
-      <value>/WEB-INF/testsuite-config.xml</value>
-    </init-param>
-    <init-param>
-      <name>dummyName</name>
-      <value>dummyValue</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>
-    
-    <supported-locale>en</supported-locale>        
-    <supported-locale>de</supported-locale>
-    
-    <portlet-info>
-      <title>Test Portlet #1</title>
-      <short-title>Test #1</short-title>
-      <keywords>Test,Testing</keywords>
-    </portlet-info>
-    
-    <portlet-preferences>
-      <preference>
-        <name>dummyName</name>
-        <value>dummyValue</value>
-        <read-only>false</read-only>
-      </preference>
-      <preference>
-        <name>dummyName2</name>
-        <value>dummyValue2</value>
-      </preference>
-      <preference>
-        <name>readonly</name>
-        <value>readonly</value>
-        <read-only>true</read-only>
-      </preference>
-      <preference>
-        <name>nameWithNoValue</name>
-      </preference>
-      <preferences-validator>org.apache.pluto.testsuite.validator.PreferencesValidatorImpl</preferences-validator>
-    </portlet-preferences>
-    
-    <security-role-ref>
-      <role-name>plutoTestRole</role-name>
-      <role-link>tomcat</role-link>
-    </security-role-ref>
-  
-  </portlet>
-  
-  
-  
-  <!-- Test Portlet #2 ===================================================== -->
-  
-	<portlet>
-    
-    <description>TestSuiteDescription</description>
-    <portlet-name>TestPortlet2</portlet-name>
-    <display-name>Test Portlet #2</display-name>
-    <portlet-class>org.apache.pluto.testsuite.TestPortlet</portlet-class>
-    
-    <init-param>
-      <name>config</name>
-      <value>/WEB-INF/testsuite-2-config.xml</value>
-    </init-param>
-    <init-param>
-      <name>dummyName</name>
-      <value>dummyValue</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>
-    
-    <supported-locale>en</supported-locale>
-    <supported-locale>de</supported-locale>
-    <resource-bundle>TestPortlet</resource-bundle>
-    
-    <portlet-preferences >
-      <preference>
-        <name>dummyName</name>
-        <value>dummyValue</value>
-        <read-only>false</read-only>
-      </preference>
-      <preference>
-        <name>dummyName2</name>
-        <value>dummyValue2</value>
-      </preference>
-      <preference>
-        <name>readonly</name>
-        <value>readonly</value>
-        <read-only>true</read-only>
-      </preference>
-      <preference>
-        <name>nameWithNoValue</name>
-      </preference>
-      <preferences-validator>org.apache.pluto.testsuite.validator.PreferencesValidatorImpl2</preferences-validator>
-    </portlet-preferences>
-    
-  </portlet>
-  
-</portlet-app>
-
-
+  
+  <!-- Test Portlet #1 ===================================================== -->
+  
+  <portlet>
+    
+    <description>TestSuiteDescription</description>
+    <portlet-name>TestPortlet1</portlet-name>
+    <display-name>Test Portlet #1</display-name>
+    <portlet-class>org.apache.pluto.testsuite.TestPortlet</portlet-class>
+    
+    <init-param>
+      <name>config</name>
+      <value>/WEB-INF/testsuite-config.xml</value>
+    </init-param>
+    <init-param>
+      <name>dummyName</name>
+      <value>dummyValue</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>
+    
+    <supported-locale>en</supported-locale>        
+    <supported-locale>de</supported-locale>
+    
+    <portlet-info>
+      <title>Test Portlet #1</title>
+      <short-title>Test #1</short-title>
+      <keywords>Test,Testing</keywords>
+    </portlet-info>
+    
+    <portlet-preferences>
+      <preference>
+        <name>dummyName</name>
+        <value>dummyValue</value>
+        <read-only>false</read-only>
+      </preference>
+      <preference>
+        <name>dummyName2</name>
+        <value>dummyValue2</value>
+      </preference>
+      <preference>
+        <name>readonly</name>
+        <value>readonly</value>
+        <read-only>true</read-only>
+      </preference>
+      <preference>
+        <name>nameWithNoValue</name>
+      </preference>
+      <preferences-validator>org.apache.pluto.testsuite.validator.PreferencesValidatorImpl</preferences-validator>
+    </portlet-preferences>
+    
+    <security-role-ref>
+      <role-name>plutoTestRole</role-name>
+      <role-link>tomcat</role-link>
+    </security-role-ref>
+  
+  </portlet>
+  
+  
+  
+  <!-- Test Portlet #2 ===================================================== -->
+  
+	<portlet>
+    
+    <description>TestSuiteDescription</description>
+    <portlet-name>TestPortlet2</portlet-name>
+    <display-name>Test Portlet #2</display-name>
+    <portlet-class>org.apache.pluto.testsuite.TestPortlet</portlet-class>
+    
+    <init-param>
+      <name>config</name>
+      <value>/WEB-INF/testsuite-2-config.xml</value>
+    </init-param>
+    <init-param>
+      <name>dummyName</name>
+      <value>dummyValue</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>
+    
+    <supported-locale>en</supported-locale>
+    <supported-locale>de</supported-locale>
+    <resource-bundle>TestPortlet</resource-bundle>
+    
+    <portlet-preferences >
+      <preference>
+        <name>dummyName</name>
+        <value>dummyValue</value>
+        <read-only>false</read-only>
+      </preference>
+      <preference>
+        <name>dummyName2</name>
+        <value>dummyValue2</value>
+      </preference>
+      <preference>
+        <name>readonly</name>
+        <value>readonly</value>
+        <read-only>true</read-only>
+      </preference>
+      <preference>
+        <name>nameWithNoValue</name>
+      </preference>
+      <preferences-validator>org.apache.pluto.testsuite.validator.PreferencesValidatorImpl2</preferences-validator>
+    </portlet-preferences>
+    
+  </portlet>
+  
+</portlet-app>
+
+

Propchange: geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/WEB-INF/portlet.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/WEB-INF/testsuite-2-config.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/WEB-INF/testsuite-2-config.xml?view=diff&rev=559986&r1=559985&r2=559986
==============================================================================
--- geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/WEB-INF/testsuite-2-config.xml (original)
+++ geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/WEB-INF/testsuite-2-config.xml Thu Jul 26 14:22:10 2007
@@ -1,167 +1,167 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
+<?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
-  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.
--->
-<testportlet-config>
-  
-  <testsuite-config>
-    <name>Render Parameter Test</name>
-    <class>org.apache.pluto.testsuite.test.RenderParameterTest</class>
-    <display-uri>/jsp/test_results.jsp</display-uri>
-    <action-param>
-      <name>org.apache.pluto.testsuite.PARAM_ACTION_KEY</name>
-      <value>org.apache.pluto.testsuite.ACTION_VALUE</value>
-    </action-param>
-  </testsuite-config>
-
-  <testsuite-config>
-    <name>Action Parameter Test</name>
-    <class>org.apache.pluto.testsuite.test.ActionParameterTest</class>
-    <display-uri>/jsp/test_results.jsp</display-uri>
-    <action-param>
-      <name>org.apache.pluto.testsuite.PARAM_ACTION_KEY</name>
-      <value>org.apache.pluto.testsuite.ACTION_VALUE</value>
-    </action-param>
-  </testsuite-config>
-    
-  <testsuite-config>
-    <name>Dispatcher Render Parameter Test</name>
-    <class>org.apache.pluto.testsuite.test.DispatcherRenderParameterTest</class>
-    <display-uri>/jsp/test_results.jsp</display-uri>
-  </testsuite-config>
-  
-  <testsuite-config>
-    <name>Dispatcher Request Test</name>
-    <class>org.apache.pluto.testsuite.test.DispatcherRequestTest</class>
-    <display-uri>/jsp/test_results.jsp</display-uri>
-  </testsuite-config>
-
-  <testsuite-config>
-    <name>Simple Attribute Test</name>
-    <class>org.apache.pluto.testsuite.test.SimpleAttributeTest</class>
-    <display-uri>/jsp/test_results.jsp</display-uri>
-  </testsuite-config>
-    
-  <testsuite-config>
-    <name>Application Scoped Session Attribute Test</name>
-    <class>org.apache.pluto.testsuite.test.AppScopedSessionAttributeTest</class>
-    <display-uri>/jsp/test_results.jsp</display-uri>
-  </testsuite-config>
-    
-  <testsuite-config>
-    <name>External Application Scoped Attribute Test</name>
-    <class>org.apache.pluto.testsuite.test.ExternalAppScopedAttributeTest</class>
-    <display-uri>/jsp/ExternalAppScopedAttributeTest.jsp</display-uri>
-  </testsuite-config>
-
-  <testsuite-config>
-    <name>Context Init Parameter Test</name>
-    <class>org.apache.pluto.testsuite.test.ContextInitParameterTest</class>
-    <display-uri>/jsp/test_results.jsp</display-uri>
-  </testsuite-config>
-
-  <testsuite-config>
-    <name>Preference In Action Test</name>
-    <class>org.apache.pluto.testsuite.test.PreferenceInActionTest</class>
-    <display-uri>/jsp/test_results.jsp</display-uri>
-  </testsuite-config>
-
-  <testsuite-config>
-    <name>Preference In Render Test</name>
-    <class>org.apache.pluto.testsuite.test.PreferenceInRenderTest</class>
-    <display-uri>/jsp/test_results.jsp</display-uri>
-  </testsuite-config>
-
-  <testsuite-config>
-    <name>Session Timeout Test</name>
-    <class>org.apache.pluto.testsuite.test.SessionTimeoutTest</class>
-    <display-uri>/jsp/SessionTimeoutTest.jsp</display-uri>
-  </testsuite-config>
-
-  <!--testsuite-config>
-    <name>Render Response No Content Type Test</name>
-    <class>org.apache.pluto.testsuite.test.RenderResponseNoContentTypeTest</class>
-    <display-uri>/jsp/test_results.jsp</display-uri>
-  </testsuite-config-->
-
-  <testsuite-config>
-    <name>Portlet Mode Test</name>
-    <display-uri>/jsp/portlet_mode_test.jsp</display-uri>
-  </testsuite-config>
-
-  <testsuite-config>
-    <name>Window State Test</name>
-    <display-uri>/jsp/window_state_test.jsp</display-uri>
-  </testsuite-config>
-
-  <testsuite-config>
-    <name>Misc Test</name>
-    <class>org.apache.pluto.testsuite.test.MiscTest</class>
-    <display-uri>/jsp/test_results.jsp</display-uri>
-  </testsuite-config>
-
-  <testsuite-config>
-    <name>Security Mapping Test</name>
-    <class>org.apache.pluto.testsuite.test.SecurityMappingTest</class>
-    <display-uri>/jsp/test_results.jsp</display-uri>
-  </testsuite-config>
-
-  <testsuite-config>
-    <name>Resource Bundle Test</name>
-    <class>org.apache.pluto.testsuite.test.ResourceBundleTest</class>
-    <display-uri>/jsp/test_results.jsp</display-uri>
-    <init-param>
-      <name>resource-bundle</name>
-      <value>true</value>
-    </init-param>
-    <init-param>
-      <name>title_en</name>
-      <value>Test Portlet 2 (en)</value>
-    </init-param>
-    <init-param>
-      <name>short-title_en</name>
-      <value>Test 2 (en)</value>
-    </init-param>
-    <init-param>
-      <name>keywords_en</name>
-      <value>Test,Testing</value>
-    </init-param>
-    <init-param>
-      <name>title_de</name>
-      <value>Test Portlet 2 (de)</value>
-    </init-param>
-    <init-param>
-      <name>short-title_de</name>
-      <value>Test 2 (de)</value>
-    </init-param>
-    <init-param>
-        <name>keywords_de</name>
-        <value>Test,Testen</value>
-    </init-param>
-    <init-param>
-      <name>title_dflt</name>
-      <value>Test Portlet 2 (dflt)</value>
-    </init-param>
-    <init-param>
-      <name>short-title_dflt</name>
-      <value>Test 2 (dflt)</value>
-    </init-param>
-    <init-param>
-      <name>keywords_dflt</name>
-      <value>Test,Testing</value>
-    </init-param>
-  </testsuite-config>
-</testportlet-config>
+  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.
+-->
+<testportlet-config>
+  
+  <testsuite-config>
+    <name>Render Parameter Test</name>
+    <class>org.apache.pluto.testsuite.test.RenderParameterTest</class>
+    <display-uri>/jsp/test_results.jsp</display-uri>
+    <action-param>
+      <name>org.apache.pluto.testsuite.PARAM_ACTION_KEY</name>
+      <value>org.apache.pluto.testsuite.ACTION_VALUE</value>
+    </action-param>
+  </testsuite-config>
+
+  <testsuite-config>
+    <name>Action Parameter Test</name>
+    <class>org.apache.pluto.testsuite.test.ActionParameterTest</class>
+    <display-uri>/jsp/test_results.jsp</display-uri>
+    <action-param>
+      <name>org.apache.pluto.testsuite.PARAM_ACTION_KEY</name>
+      <value>org.apache.pluto.testsuite.ACTION_VALUE</value>
+    </action-param>
+  </testsuite-config>
+    
+  <testsuite-config>
+    <name>Dispatcher Render Parameter Test</name>
+    <class>org.apache.pluto.testsuite.test.DispatcherRenderParameterTest</class>
+    <display-uri>/jsp/test_results.jsp</display-uri>
+  </testsuite-config>
+  
+  <testsuite-config>
+    <name>Dispatcher Request Test</name>
+    <class>org.apache.pluto.testsuite.test.DispatcherRequestTest</class>
+    <display-uri>/jsp/test_results.jsp</display-uri>
+  </testsuite-config>
+
+  <testsuite-config>
+    <name>Simple Attribute Test</name>
+    <class>org.apache.pluto.testsuite.test.SimpleAttributeTest</class>
+    <display-uri>/jsp/test_results.jsp</display-uri>
+  </testsuite-config>
+    
+  <testsuite-config>
+    <name>Application Scoped Session Attribute Test</name>
+    <class>org.apache.pluto.testsuite.test.AppScopedSessionAttributeTest</class>
+    <display-uri>/jsp/test_results.jsp</display-uri>
+  </testsuite-config>
+    
+  <testsuite-config>
+    <name>External Application Scoped Attribute Test</name>
+    <class>org.apache.pluto.testsuite.test.ExternalAppScopedAttributeTest</class>
+    <display-uri>/jsp/ExternalAppScopedAttributeTest.jsp</display-uri>
+  </testsuite-config>
+
+  <testsuite-config>
+    <name>Context Init Parameter Test</name>
+    <class>org.apache.pluto.testsuite.test.ContextInitParameterTest</class>
+    <display-uri>/jsp/test_results.jsp</display-uri>
+  </testsuite-config>
+
+  <testsuite-config>
+    <name>Preference In Action Test</name>
+    <class>org.apache.pluto.testsuite.test.PreferenceInActionTest</class>
+    <display-uri>/jsp/test_results.jsp</display-uri>
+  </testsuite-config>
+
+  <testsuite-config>
+    <name>Preference In Render Test</name>
+    <class>org.apache.pluto.testsuite.test.PreferenceInRenderTest</class>
+    <display-uri>/jsp/test_results.jsp</display-uri>
+  </testsuite-config>
+
+  <testsuite-config>
+    <name>Session Timeout Test</name>
+    <class>org.apache.pluto.testsuite.test.SessionTimeoutTest</class>
+    <display-uri>/jsp/SessionTimeoutTest.jsp</display-uri>
+  </testsuite-config>
+
+  <!--testsuite-config>
+    <name>Render Response No Content Type Test</name>
+    <class>org.apache.pluto.testsuite.test.RenderResponseNoContentTypeTest</class>
+    <display-uri>/jsp/test_results.jsp</display-uri>
+  </testsuite-config-->
+
+  <testsuite-config>
+    <name>Portlet Mode Test</name>
+    <display-uri>/jsp/portlet_mode_test.jsp</display-uri>
+  </testsuite-config>
+
+  <testsuite-config>
+    <name>Window State Test</name>
+    <display-uri>/jsp/window_state_test.jsp</display-uri>
+  </testsuite-config>
+
+  <testsuite-config>
+    <name>Misc Test</name>
+    <class>org.apache.pluto.testsuite.test.MiscTest</class>
+    <display-uri>/jsp/test_results.jsp</display-uri>
+  </testsuite-config>
+
+  <testsuite-config>
+    <name>Security Mapping Test</name>
+    <class>org.apache.pluto.testsuite.test.SecurityMappingTest</class>
+    <display-uri>/jsp/test_results.jsp</display-uri>
+  </testsuite-config>
+
+  <testsuite-config>
+    <name>Resource Bundle Test</name>
+    <class>org.apache.pluto.testsuite.test.ResourceBundleTest</class>
+    <display-uri>/jsp/test_results.jsp</display-uri>
+    <init-param>
+      <name>resource-bundle</name>
+      <value>true</value>
+    </init-param>
+    <init-param>
+      <name>title_en</name>
+      <value>Test Portlet 2 (en)</value>
+    </init-param>
+    <init-param>
+      <name>short-title_en</name>
+      <value>Test 2 (en)</value>
+    </init-param>
+    <init-param>
+      <name>keywords_en</name>
+      <value>Test,Testing</value>
+    </init-param>
+    <init-param>
+      <name>title_de</name>
+      <value>Test Portlet 2 (de)</value>
+    </init-param>
+    <init-param>
+      <name>short-title_de</name>
+      <value>Test 2 (de)</value>
+    </init-param>
+    <init-param>
+        <name>keywords_de</name>
+        <value>Test,Testen</value>
+    </init-param>
+    <init-param>
+      <name>title_dflt</name>
+      <value>Test Portlet 2 (dflt)</value>
+    </init-param>
+    <init-param>
+      <name>short-title_dflt</name>
+      <value>Test 2 (dflt)</value>
+    </init-param>
+    <init-param>
+      <name>keywords_dflt</name>
+      <value>Test,Testing</value>
+    </init-param>
+  </testsuite-config>
+</testportlet-config>

Propchange: geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/WEB-INF/testsuite-2-config.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/WEB-INF/testsuite-config.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/WEB-INF/testsuite-config.xml?view=diff&rev=559986&r1=559985&r2=559986
==============================================================================
--- geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/WEB-INF/testsuite-config.xml (original)
+++ geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/WEB-INF/testsuite-config.xml Thu Jul 26 14:22:10 2007
@@ -1,144 +1,144 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
+<?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
-  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.
--->
-<testportlet-config>
-  
-  <testsuite-config>
-    <name>Render Parameter Test</name>
-    <class>org.apache.pluto.testsuite.test.RenderParameterTest</class>
-    <display-uri>/jsp/test_results.jsp</display-uri>
-    <action-param>
-      <name>org.apache.pluto.testsuite.PARAM_ACTION_KEY</name>
-      <value>org.apache.pluto.testsuite.ACTION_VALUE</value>
-    </action-param>
-  </testsuite-config>
-
-  <testsuite-config>
-    <name>Action Parameter Test</name>
-    <class>org.apache.pluto.testsuite.test.ActionParameterTest</class>
-    <display-uri>/jsp/test_results.jsp</display-uri>
-    <action-param>
-      <name>org.apache.pluto.testsuite.PARAM_ACTION_KEY</name>
-      <value>org.apache.pluto.testsuite.ACTION_VALUE</value>
-    </action-param>
-  </testsuite-config>
-
-  <testsuite-config>
-    <name>Dispatcher Render Parameter Test</name>
-    <class>org.apache.pluto.testsuite.test.DispatcherRenderParameterTest</class>
-    <display-uri>/jsp/test_results.jsp</display-uri>
-  </testsuite-config>
-
-  <testsuite-config>
-    <name>Dispatcher Request Test</name>
-    <class>org.apache.pluto.testsuite.test.DispatcherRequestTest</class>
-    <display-uri>/jsp/test_results.jsp</display-uri>
-  </testsuite-config>
-
-  <testsuite-config>
-    <name>Simple Attribute Test</name>
-    <class>org.apache.pluto.testsuite.test.SimpleAttributeTest</class>
-    <display-uri>/jsp/test_results.jsp</display-uri>
-  </testsuite-config>
-    
-  <testsuite-config>
-    <name>Application Scoped Session Attribute Test</name>
-    <class>org.apache.pluto.testsuite.test.AppScopedSessionAttributeTest</class>
-    <display-uri>/jsp/test_results.jsp</display-uri>
-  </testsuite-config>
-    
-  <testsuite-config>
-    <name>External Application Scoped Attribute Test</name>
-    <class>org.apache.pluto.testsuite.test.ExternalAppScopedAttributeTest</class>
-    <display-uri>/jsp/ExternalAppScopedAttributeTest.jsp</display-uri>
-  </testsuite-config>
-
-  <testsuite-config>
-    <name>Context Init Parameter Test</name>
-    <class>org.apache.pluto.testsuite.test.ContextInitParameterTest</class>
-    <display-uri>/jsp/test_results.jsp</display-uri>
-  </testsuite-config>
-
-  <testsuite-config>
-    <name>Preference In Action Test</name>
-    <class>org.apache.pluto.testsuite.test.PreferenceInActionTest</class>
-    <display-uri>/jsp/test_results.jsp</display-uri>
-  </testsuite-config>
-
-  <testsuite-config>
-    <name>Preference In Render Test</name>
-    <class>org.apache.pluto.testsuite.test.PreferenceInRenderTest</class>
-    <display-uri>/jsp/test_results.jsp</display-uri>
-  </testsuite-config>
-
-  <testsuite-config>
-    <name>Session Timeout Test</name>
-    <class>org.apache.pluto.testsuite.test.SessionTimeoutTest</class>
-    <display-uri>/jsp/SessionTimeoutTest.jsp</display-uri>
-  </testsuite-config>
-  
-  <!--testsuite-config>
-    <name>Render Response No Content Type Test</name>
-    <class>org.apache.pluto.testsuite.test.RenderResponseNoContentTypeTest</class>
-    <display-uri>/jsp/test_results.jsp</display-uri>
-  </testsuite-config-->
-  
-  <testsuite-config>
-    <name>Portlet Mode Test</name>
-    <display-uri>/jsp/portlet_mode_test.jsp</display-uri>
-  </testsuite-config>
-
-  <testsuite-config>
-    <name>Window State Test</name>
-    <display-uri>/jsp/window_state_test.jsp</display-uri>
-  </testsuite-config>
-
-  <testsuite-config>
-    <name>Misc Test</name>
-    <class>org.apache.pluto.testsuite.test.MiscTest</class>
-    <display-uri>/jsp/test_results.jsp</display-uri>
-  </testsuite-config>
-
-  <testsuite-config>
-    <name>Security Mapping Test</name>
-    <class>org.apache.pluto.testsuite.test.SecurityMappingTest</class>
-    <display-uri>/jsp/test_results.jsp</display-uri>
-  </testsuite-config>
-
-  <testsuite-config>
-    <name>Resource Bundle Test</name>
-    <class>org.apache.pluto.testsuite.test.ResourceBundleTest</class>
-    <display-uri>/jsp/test_results.jsp</display-uri>
-    <init-param>
-        <name>resource-bundle</name>
-        <value>false</value>
-    </init-param>
-    <init-param>
-      <name>title</name>
-      <value>Test Portlet #1</value>
-    </init-param>
-    <init-param>
-      <name>short-title</name>
-      <value>Test #1</value>
-    </init-param>
-    <init-param>
-      <name>keywords</name>
-      <value>Test,Testing</value>
-    </init-param>
-  </testsuite-config>
-
-</testportlet-config>
+  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.
+-->
+<testportlet-config>
+  
+  <testsuite-config>
+    <name>Render Parameter Test</name>
+    <class>org.apache.pluto.testsuite.test.RenderParameterTest</class>
+    <display-uri>/jsp/test_results.jsp</display-uri>
+    <action-param>
+      <name>org.apache.pluto.testsuite.PARAM_ACTION_KEY</name>
+      <value>org.apache.pluto.testsuite.ACTION_VALUE</value>
+    </action-param>
+  </testsuite-config>
+
+  <testsuite-config>
+    <name>Action Parameter Test</name>
+    <class>org.apache.pluto.testsuite.test.ActionParameterTest</class>
+    <display-uri>/jsp/test_results.jsp</display-uri>
+    <action-param>
+      <name>org.apache.pluto.testsuite.PARAM_ACTION_KEY</name>
+      <value>org.apache.pluto.testsuite.ACTION_VALUE</value>
+    </action-param>
+  </testsuite-config>
+
+  <testsuite-config>
+    <name>Dispatcher Render Parameter Test</name>
+    <class>org.apache.pluto.testsuite.test.DispatcherRenderParameterTest</class>
+    <display-uri>/jsp/test_results.jsp</display-uri>
+  </testsuite-config>
+
+  <testsuite-config>
+    <name>Dispatcher Request Test</name>
+    <class>org.apache.pluto.testsuite.test.DispatcherRequestTest</class>
+    <display-uri>/jsp/test_results.jsp</display-uri>
+  </testsuite-config>
+
+  <testsuite-config>
+    <name>Simple Attribute Test</name>
+    <class>org.apache.pluto.testsuite.test.SimpleAttributeTest</class>
+    <display-uri>/jsp/test_results.jsp</display-uri>
+  </testsuite-config>
+    
+  <testsuite-config>
+    <name>Application Scoped Session Attribute Test</name>
+    <class>org.apache.pluto.testsuite.test.AppScopedSessionAttributeTest</class>
+    <display-uri>/jsp/test_results.jsp</display-uri>
+  </testsuite-config>
+    
+  <testsuite-config>
+    <name>External Application Scoped Attribute Test</name>
+    <class>org.apache.pluto.testsuite.test.ExternalAppScopedAttributeTest</class>
+    <display-uri>/jsp/ExternalAppScopedAttributeTest.jsp</display-uri>
+  </testsuite-config>
+
+  <testsuite-config>
+    <name>Context Init Parameter Test</name>
+    <class>org.apache.pluto.testsuite.test.ContextInitParameterTest</class>
+    <display-uri>/jsp/test_results.jsp</display-uri>
+  </testsuite-config>
+
+  <testsuite-config>
+    <name>Preference In Action Test</name>
+    <class>org.apache.pluto.testsuite.test.PreferenceInActionTest</class>
+    <display-uri>/jsp/test_results.jsp</display-uri>
+  </testsuite-config>
+
+  <testsuite-config>
+    <name>Preference In Render Test</name>
+    <class>org.apache.pluto.testsuite.test.PreferenceInRenderTest</class>
+    <display-uri>/jsp/test_results.jsp</display-uri>
+  </testsuite-config>
+
+  <testsuite-config>
+    <name>Session Timeout Test</name>
+    <class>org.apache.pluto.testsuite.test.SessionTimeoutTest</class>
+    <display-uri>/jsp/SessionTimeoutTest.jsp</display-uri>
+  </testsuite-config>
+  
+  <!--testsuite-config>
+    <name>Render Response No Content Type Test</name>
+    <class>org.apache.pluto.testsuite.test.RenderResponseNoContentTypeTest</class>
+    <display-uri>/jsp/test_results.jsp</display-uri>
+  </testsuite-config-->
+  
+  <testsuite-config>
+    <name>Portlet Mode Test</name>
+    <display-uri>/jsp/portlet_mode_test.jsp</display-uri>
+  </testsuite-config>
+
+  <testsuite-config>
+    <name>Window State Test</name>
+    <display-uri>/jsp/window_state_test.jsp</display-uri>
+  </testsuite-config>
+
+  <testsuite-config>
+    <name>Misc Test</name>
+    <class>org.apache.pluto.testsuite.test.MiscTest</class>
+    <display-uri>/jsp/test_results.jsp</display-uri>
+  </testsuite-config>
+
+  <testsuite-config>
+    <name>Security Mapping Test</name>
+    <class>org.apache.pluto.testsuite.test.SecurityMappingTest</class>
+    <display-uri>/jsp/test_results.jsp</display-uri>
+  </testsuite-config>
+
+  <testsuite-config>
+    <name>Resource Bundle Test</name>
+    <class>org.apache.pluto.testsuite.test.ResourceBundleTest</class>
+    <display-uri>/jsp/test_results.jsp</display-uri>
+    <init-param>
+        <name>resource-bundle</name>
+        <value>false</value>
+    </init-param>
+    <init-param>
+      <name>title</name>
+      <value>Test Portlet #1</value>
+    </init-param>
+    <init-param>
+      <name>short-title</name>
+      <value>Test #1</value>
+    </init-param>
+    <init-param>
+      <name>keywords</name>
+      <value>Test,Testing</value>
+    </init-param>
+  </testsuite-config>
+
+</testportlet-config>

Propchange: geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/WEB-INF/testsuite-config.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/WEB-INF/web.xml?view=diff&rev=559986&r1=559985&r2=559986
==============================================================================
--- geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/WEB-INF/web.xml (original)
+++ geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/WEB-INF/web.xml Thu Jul 26 14:22:10 2007
@@ -1,80 +1,80 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<!DOCTYPE web-app PUBLIC
-    "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-    "http://java.sun.com/dtd/web-app_2_3.dtd">
-<!--
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!DOCTYPE web-app PUBLIC
+    "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+    "http://java.sun.com/dtd/web-app_2_3.dtd">
+<!--
 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.
--->
-<web-app>
-  
-  <display-name>Pluto Testsuite</display-name>
-  
-  <context-param>
-    <param-name>test-parameter-name</param-name>
-    <param-value>test-parameter-val</param-value>
-  </context-param>
-  
-  <context-param>
-    <param-name>parameter-name</param-name>
-    <param-value>parameter-value</param-value>
-  </context-param>
-  
-  <!-- Companion Servlet Definitions ======================================= -->
-  
-  <servlet>
-    <servlet-name>ExternalAppScopedAttributeTest_Servlet</servlet-name>
-    <servlet-class>org.apache.pluto.testsuite.test.ExternalAppScopedAttributeTest$CompanionServlet</servlet-class>
-  </servlet>
-  
-  <servlet>
-    <servlet-name>DispatcherRenderParameterTest_Servlet</servlet-name>
-    <servlet-class>org.apache.pluto.testsuite.test.DispatcherRenderParameterTest$CompanionServlet</servlet-class>
-  </servlet>
-  
-  <servlet>
-    <servlet-name>DispatcherRequestTest_Servlet</servlet-name>
-    <servlet-class>org.apache.pluto.testsuite.test.DispatcherRequestTest$CompanionServlet</servlet-class>
-  </servlet>
-  
-  
-  <!-- Companion Servlet Mappings ========================================== -->
-  
-  <servlet-mapping>
-    <servlet-name>ExternalAppScopedAttributeTest_Servlet</servlet-name>
-    <url-pattern>/test/ExternalAppScopedAttributeTest_Servlet</url-pattern>
-  </servlet-mapping>
-  
-  <servlet-mapping>
-    <servlet-name>DispatcherRenderParameterTest_Servlet</servlet-name>
-    <url-pattern>/test/DispatcherRenderParameterTest_Servlet</url-pattern>
-  </servlet-mapping>
-  
-  <servlet-mapping>
-    <servlet-name>DispatcherRequestTest_Servlet</servlet-name>
-    <url-pattern>/test/DispatcherRequestTest_Servlet/*</url-pattern>
-  </servlet-mapping>
-  
+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.
+-->
+<web-app>
+  
+  <display-name>Pluto Testsuite</display-name>
+  
+  <context-param>
+    <param-name>test-parameter-name</param-name>
+    <param-value>test-parameter-val</param-value>
+  </context-param>
+  
+  <context-param>
+    <param-name>parameter-name</param-name>
+    <param-value>parameter-value</param-value>
+  </context-param>
+  
+  <!-- Companion Servlet Definitions ======================================= -->
+  
+  <servlet>
+    <servlet-name>ExternalAppScopedAttributeTest_Servlet</servlet-name>
+    <servlet-class>org.apache.pluto.testsuite.test.ExternalAppScopedAttributeTest$CompanionServlet</servlet-class>
+  </servlet>
+  
+  <servlet>
+    <servlet-name>DispatcherRenderParameterTest_Servlet</servlet-name>
+    <servlet-class>org.apache.pluto.testsuite.test.DispatcherRenderParameterTest$CompanionServlet</servlet-class>
+  </servlet>
+  
+  <servlet>
+    <servlet-name>DispatcherRequestTest_Servlet</servlet-name>
+    <servlet-class>org.apache.pluto.testsuite.test.DispatcherRequestTest$CompanionServlet</servlet-class>
+  </servlet>
+  
+  
+  <!-- Companion Servlet Mappings ========================================== -->
+  
+  <servlet-mapping>
+    <servlet-name>ExternalAppScopedAttributeTest_Servlet</servlet-name>
+    <url-pattern>/test/ExternalAppScopedAttributeTest_Servlet</url-pattern>
+  </servlet-mapping>
+  
+  <servlet-mapping>
+    <servlet-name>DispatcherRenderParameterTest_Servlet</servlet-name>
+    <url-pattern>/test/DispatcherRenderParameterTest_Servlet</url-pattern>
+  </servlet-mapping>
+  
+  <servlet-mapping>
+    <servlet-name>DispatcherRequestTest_Servlet</servlet-name>
+    <url-pattern>/test/DispatcherRequestTest_Servlet/*</url-pattern>
+  </servlet-mapping>
+  
 <!--
-  <security-role>
-    <role-name>tomcat</role-name>
-  </security-role>
+  <security-role>
+    <role-name>tomcat</role-name>
+  </security-role>
 -->
-  
-</web-app>
-
+  
+</web-app>
+

Propchange: geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/index.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/index.jsp?view=diff&rev=559986&r1=559985&r2=559986
==============================================================================
--- geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/index.jsp (original)
+++ geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/index.jsp Thu Jul 26 14:22:10 2007
@@ -1,21 +1,21 @@
-<%-- 
+<%-- 
 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.
---%>
+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.
+--%>
 <html>
 <body>
 <h2>Hello World!</h2>

Propchange: geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/index.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/jsp/ExternalAppScopedAttributeTest.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/jsp/ExternalAppScopedAttributeTest.jsp?view=diff&rev=559986&r1=559985&r2=559986
==============================================================================
--- geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/jsp/ExternalAppScopedAttributeTest.jsp (original)
+++ geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/jsp/ExternalAppScopedAttributeTest.jsp Thu Jul 26 14:22:10 2007
@@ -1,70 +1,70 @@
-<%--
+<%--
 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/>
-
-<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>
-          <p>
-            This test requires manual intervention. Click
-            <a href="<%= renderResponse.encodeURL(renderRequest.getContextPath() + "/test/ExternalAppScopedAttributeTest_Servlet?sessionId=" + request.getSession().getId()) %>"
-               target="companionWindow" onclick="openCompanionWindow()">
-              here
-            </a>
-          </p>
-        </td>
-      </tr>
-    </table>
-  </c:when>
-  <c:otherwise>
-    <%@ include file="test_results.inc" %>
-  </c:otherwise>
-</c:choose>
-
-<%@ include file="navigation.inc" %>
-
-
+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>
+          <p>
+            This test requires manual intervention. Click
+            <a href="<%= renderResponse.encodeURL(renderRequest.getContextPath() + "/test/ExternalAppScopedAttributeTest_Servlet?sessionId=" + request.getSession().getId()) %>"
+               target="companionWindow" onclick="openCompanionWindow()">
+              here
+            </a>
+          </p>
+        </td>
+      </tr>
+    </table>
+  </c:when>
+  <c:otherwise>
+    <%@ include file="test_results.inc" %>
+  </c:otherwise>
+</c:choose>
+
+<%@ include file="navigation.inc" %>
+
+

Propchange: geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/jsp/ExternalAppScopedAttributeTest.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/jsp/ExternalAppScopedAttributeTest_companion.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/jsp/ExternalAppScopedAttributeTest_companion.jsp?view=diff&rev=559986&r1=559985&r2=559986
==============================================================================
--- geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/jsp/ExternalAppScopedAttributeTest_companion.jsp (original)
+++ geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/jsp/ExternalAppScopedAttributeTest_companion.jsp Thu Jul 26 14:22:10 2007
@@ -1,91 +1,91 @@
-<%--
+<%--
 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" %>
-
-
-<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>
-
+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>
+

Propchange: geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/jsp/ExternalAppScopedAttributeTest_companion.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/jsp/edit.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/jsp/edit.jsp?view=diff&rev=559986&r1=559985&r2=559986
==============================================================================
--- geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/jsp/edit.jsp (original)
+++ geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/jsp/edit.jsp Thu Jul 26 14:22:10 2007
@@ -1,19 +1,19 @@
-<%--
+<%--
 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.
---%>
+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.
+--%>
 THIS IS THE EDIT PAGE

Propchange: geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/jsp/edit.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/jsp/help.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/jsp/help.jsp?view=diff&rev=559986&r1=559985&r2=559986
==============================================================================
--- geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/jsp/help.jsp (original)
+++ geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/jsp/help.jsp Thu Jul 26 14:22:10 2007
@@ -1,30 +1,30 @@
-<%--
+<%--
 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>
+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>

Propchange: geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/jsp/help.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/jsp/introduction.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/jsp/introduction.jsp?view=diff&rev=559986&r1=559985&r2=559986
==============================================================================
--- geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/jsp/introduction.jsp (original)
+++ geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/jsp/introduction.jsp Thu Jul 26 14:22:10 2007
@@ -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" 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="${tests}" 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" %>'
-                           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}"/>">Test</a>
-        </td>
-      </tr>
-    </c:forEach>
-  </table>
-</p>
-
-
-
+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" 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="${tests}" 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" %>'
+                           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}"/>">Test</a>
+        </td>
+      </tr>
+    </c:forEach>
+  </table>
+</p>
+
+
+

Propchange: geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/jsp/introduction.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/jsp/portlet_mode_test.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/jsp/portlet_mode_test.jsp?view=diff&rev=559986&r1=559985&r2=559986
==============================================================================
--- geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/jsp/portlet_mode_test.jsp (original)
+++ geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/jsp/portlet_mode_test.jsp Thu Jul 26 14:22:10 2007
@@ -1,58 +1,58 @@
-<%--
+<%--
 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' 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>
-
+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" %>

Propchange: geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/jsp/portlet_mode_test.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/jsp/test4.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/jsp/test4.jsp?view=diff&rev=559986&r1=559985&r2=559986
==============================================================================
--- geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/jsp/test4.jsp (original)
+++ geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/jsp/test4.jsp Thu Jul 26 14:22:10 2007
@@ -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.
--->
-<%@ 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>
-
+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>
+

Propchange: geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/jsp/test4.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/jsp/test_results.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/jsp/test_results.jsp?view=diff&rev=559986&r1=559985&r2=559986
==============================================================================
--- geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/jsp/test_results.jsp (original)
+++ geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/jsp/test_results.jsp Thu Jul 26 14:22:10 2007
@@ -1,26 +1,26 @@
-<%--
+<%--
 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" prefix="portlet"%>
-
-<portlet:defineObjects/>
-
-<%@ include file="test_results.inc" %>
-<%@ include file="navigation.inc" %>
-
+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" %>
+

Propchange: geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/jsp/test_results.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/jsp/window_state_test.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/jsp/window_state_test.jsp?view=diff&rev=559986&r1=559985&r2=559986
==============================================================================
--- geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/jsp/window_state_test.jsp (original)
+++ geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/jsp/window_state_test.jsp Thu Jul 26 14:22:10 2007
@@ -1,58 +1,58 @@
-<%--
+<%--
 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' 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" %>
+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" %>

Propchange: geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/jsp/window_state_test.jsp
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message