portals-pluto-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From msnickl...@apache.org
Subject [08/11] portals-pluto git commit: updated taglib URIs from ...sun.com/jstl... to ...sun.com/jsp/jstl... to make them work with servlet 3
Date Wed, 03 Dec 2014 15:01:33 GMT
updated taglib URIs from ...sun.com/jstl... to ...sun.com/jsp/jstl... to make them work with servlet 3


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

Branch: refs/heads/PortletHub
Commit: bd96a224b88bc5f55d5af01487c30baa7c580a2e
Parents: 43ae1d0
Author: Scott Nicklous <msnicklous@apache.org>
Authored: Wed Dec 3 02:31:34 2014 +0100
Committer: Scott Nicklous <msnicklous@apache.org>
Committed: Wed Dec 3 02:31:34 2014 +0100

----------------------------------------------------------------------
 .../webapp/WEB-INF/fragments/about/view.jsp     | 140 ++++----
 .../admin/page/TomcatDeploymentHelp.jsp         | 154 ++++-----
 .../WEB-INF/fragments/admin/page/help.jsp       | 276 ++++++++--------
 .../WEB-INF/fragments/admin/page/view.jsp       | 319 +++++++++----------
 .../webapp/WEB-INF/fragments/admin/view.jsp     | 106 +++---
 .../main/webapp/WEB-INF/themes/navigation.jsp   |  78 ++---
 .../WEB-INF/themes/pluto-default-theme.jsp      |   4 +-
 .../main/webapp/WEB-INF/themes/portlet-skin.jsp | 100 +++---
 pluto-portal/src/main/webapp/about.jsp          | 188 +++++------
 pluto-portal/src/main/webapp/login.jsp          | 148 ++++-----
 .../jsp/ExternalAppScopedAttributeTest.jsp      | 134 ++++----
 ...ExternalAppScopedAttributeTest_companion.jsp | 182 +++++------
 .../src/main/webapp/jsp/SessionTimeoutTest.jsp  | 146 ++++-----
 .../main/webapp/jsp/TestCompanionPortlet.jsp    |  92 +++---
 .../src/main/webapp/jsp/introduction.jsp        | 152 ++++-----
 .../src/main/webapp/jsp/load_resource_test.jsp  | 166 +++++-----
 16 files changed, 1192 insertions(+), 1193 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/bd96a224/pluto-portal/src/main/webapp/WEB-INF/fragments/about/view.jsp
----------------------------------------------------------------------
diff --git a/pluto-portal/src/main/webapp/WEB-INF/fragments/about/view.jsp b/pluto-portal/src/main/webapp/WEB-INF/fragments/about/view.jsp
index 88df2d8..d4a1136 100644
--- a/pluto-portal/src/main/webapp/WEB-INF/fragments/about/view.jsp
+++ b/pluto-portal/src/main/webapp/WEB-INF/fragments/about/view.jsp
@@ -1,70 +1,70 @@
-<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
-
-<%--
-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.
---%>
-
-<!-- Pluto about portlet fragment (displayed in VIEW mode). -->
-
-<table>
-  
-  <tr>
-    <td colspan="2"><h2>About Pluto Portal Driver</h2></td>
-  </tr>
-  
-  <tr>
-    <td>Portal Name:</td>
-    <td><c:out value="${driverConfig.portalName}"/></td>
-  </tr>
-  <tr>
-    <td>Portal Version:</td>
-    <td><c:out value="${driverConfig.portalVersion}"/></td>
-  </tr>
-  <tr>
-    <td>Servlet Container:</td>
-    <td><%= config.getServletContext().getServerInfo() %></td>
-  </tr>
-  <tr>
-    <td>Java Version:</td>
-    <td><%= System.getProperty("java.version") %>  (<%= System.getProperty("java.vm.vendor") %> - <%= System.getProperty("java.vm.name") %> build <%= System.getProperty("java.vm.version") %>)</td>
-  </tr>
-  <tr>
-    <td>Operating System:</td>
-    <td><%= System.getProperty("os.name") %>  (<%= System.getProperty("os.arch") %> version <%= System.getProperty("os.version") %>)</td>
-  </tr>
-  <tr>
-    <td>Pluto Website:</td>
-    <td>
-      <a href="http://portals.apache.org/pluto/" target="_blank">
-        http://portals.apache.org/pluto/
-      </a>
-    </td>
-  </tr>
-  
-  <tr>
-    <td colspan="2">
-      <i>Please use the <a href="http://issues.apache.org/jira/secure/BrowseProject.jspa?id=10560" target="_blank">
-      Jira issue tracking site</a> to record any problems you are having with
-      the Pluto portal driver. When you report an issue, please include the data (version, os, etc.) collected in 
-      this portlet in addition to any relevant stack traces or log records and detailed steps on what you were doing when 
-      the problem arose.</i>
-    </td>
-  </tr>
-  
-</table>
-
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+
+<%--
+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.
+--%>
+
+<!-- Pluto about portlet fragment (displayed in VIEW mode). -->
+
+<table>
+  
+  <tr>
+    <td colspan="2"><h2>About Pluto Portal Driver</h2></td>
+  </tr>
+  
+  <tr>
+    <td>Portal Name:</td>
+    <td><c:out value="${driverConfig.portalName}"/></td>
+  </tr>
+  <tr>
+    <td>Portal Version:</td>
+    <td><c:out value="${driverConfig.portalVersion}"/></td>
+  </tr>
+  <tr>
+    <td>Servlet Container:</td>
+    <td><%= config.getServletContext().getServerInfo() %></td>
+  </tr>
+  <tr>
+    <td>Java Version:</td>
+    <td><%= System.getProperty("java.version") %>  (<%= System.getProperty("java.vm.vendor") %> - <%= System.getProperty("java.vm.name") %> build <%= System.getProperty("java.vm.version") %>)</td>
+  </tr>
+  <tr>
+    <td>Operating System:</td>
+    <td><%= System.getProperty("os.name") %>  (<%= System.getProperty("os.arch") %> version <%= System.getProperty("os.version") %>)</td>
+  </tr>
+  <tr>
+    <td>Pluto Website:</td>
+    <td>
+      <a href="http://portals.apache.org/pluto/" target="_blank">
+        http://portals.apache.org/pluto/
+      </a>
+    </td>
+  </tr>
+  
+  <tr>
+    <td colspan="2">
+      <i>Please use the <a href="http://issues.apache.org/jira/secure/BrowseProject.jspa?id=10560" target="_blank">
+      Jira issue tracking site</a> to record any problems you are having with
+      the Pluto portal driver. When you report an issue, please include the data (version, os, etc.) collected in 
+      this portlet in addition to any relevant stack traces or log records and detailed steps on what you were doing when 
+      the problem arose.</i>
+    </td>
+  </tr>
+  
+</table>
+

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/bd96a224/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/page/TomcatDeploymentHelp.jsp
----------------------------------------------------------------------
diff --git a/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/page/TomcatDeploymentHelp.jsp b/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/page/TomcatDeploymentHelp.jsp
index c25fb26..53e8644 100644
--- a/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/page/TomcatDeploymentHelp.jsp
+++ b/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/page/TomcatDeploymentHelp.jsp
@@ -1,77 +1,77 @@
-<%--
-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/jstl/fmt" prefix="fmt" %>
-<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
-
-<div class="portlet-section-header">Deploying Portlet Applications in Tomcat</div>
-
-<div class="portlet-section-subheader">Adding New Portlets to a Portal Page</div>
-
-<p class="portlet-font">
-The Page Administrator Portlet works with deployed portlet applications. This deployment can be done via the Pluto 
-Maven plugin or Ant task. Alternately, you can deploy the war using the 'Upload and deploy portlet war' 
-link on the bottom of the Page Administrator Portlet that points to the app server's war deployer application. 
-Clicking on that link opens up a new browser window, so you should disable any popup blockers for this page.
-</p>
-
-<div class="portlet-section-subheader">Uploading and deploying using Tomcat's Manager Application</div>
-<p class="portlet-font">
-The binary distribution of Pluto is built on Tomcat. Tomcat'�s deployer application is the manager application. 
-Use that application to upload and deploy the war. A properly deployed portlet on Tomcat requires that the war 
-have a context.xml file in META-INF containing a Context element and the crossContext attribute set to true 
-like this:<br/>
-&lt;Context path="HelloWorldPortlet" docBase="HelloWorldPortlet" crossContext="true"&gt;
-</p>
-
-<p class="portlet-font">
-The logged in user also needs to have a manager role also, 
-which is configured in conf/tomcat-users.xml. In the binary distribution, the tomcat and pluto users have the manager 
-role already set.  
-</p>
-<p class="portlet-font">
-When the portlet application has been deployed, restart Pluto and use the Page Administrator Portlet to add the new portlet to a page. 
-If you want to put the portlet on a new page, you must do so by manually adding a page element as a child of the 
-render-config element in pluto-portal-driver-config.xml before you restart Pluto. See the Help mode for more details
-on doing this process.
-</p>
-
-<div class="portlet-section-subheader">Deployment in Another Application Server</div>
-<p class="portlet-font">
-	The 'Upload and deploy portlet war' link can be changed to an appropriate administrative page when Pluto
-	is deployed inside another (non-Tomcat) app server. This is done by changing the appserver.deployer.url property
-	inside AdminPortlet.properties located in the WEB-INF/classes directory to point to the URL of an appropriate administrative
-	page. The 'Help' link can also be changed to another help page using the appserver.deployer.help.page property. 
-	That help file needs to reside in this directory (WEB-INF/fragments/admin/page).
-</p>
-
-
-<fmt:bundle basename="AdminPortlet">
-	<fmt:message key="appserver.deployer.url" var="deployerURL"/>
-</fmt:bundle> 
-
-<p class="portlet-font">
-<a href='<c:out value="${deployerURL}"/>' target="_blank">Upload and deploy a new portlet war</a> 
-</p>
-<p class="portlet-font">
-<a href='<portlet:renderURL portletMode="view"/>'>Page Administrator Portlet</a> 
-</p>
-<p class="portlet-font">
-<a href='<portlet:renderURL portletMode="help"/>'>Page Administrator Portlet Help</a> 
-</p>
+<%--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed  under the  License is distributed on an "AS IS" BASIS,
+WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
+implied.
+
+See the License for the specific language governing permissions and
+limitations under the License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
+
+<div class="portlet-section-header">Deploying Portlet Applications in Tomcat</div>
+
+<div class="portlet-section-subheader">Adding New Portlets to a Portal Page</div>
+
+<p class="portlet-font">
+The Page Administrator Portlet works with deployed portlet applications. This deployment can be done via the Pluto 
+Maven plugin or Ant task. Alternately, you can deploy the war using the 'Upload and deploy portlet war' 
+link on the bottom of the Page Administrator Portlet that points to the app server's war deployer application. 
+Clicking on that link opens up a new browser window, so you should disable any popup blockers for this page.
+</p>
+
+<div class="portlet-section-subheader">Uploading and deploying using Tomcat's Manager Application</div>
+<p class="portlet-font">
+The binary distribution of Pluto is built on Tomcat. Tomcat'�s deployer application is the manager application. 
+Use that application to upload and deploy the war. A properly deployed portlet on Tomcat requires that the war 
+have a context.xml file in META-INF containing a Context element and the crossContext attribute set to true 
+like this:<br/>
+&lt;Context path="HelloWorldPortlet" docBase="HelloWorldPortlet" crossContext="true"&gt;
+</p>
+
+<p class="portlet-font">
+The logged in user also needs to have a manager role also, 
+which is configured in conf/tomcat-users.xml. In the binary distribution, the tomcat and pluto users have the manager 
+role already set.  
+</p>
+<p class="portlet-font">
+When the portlet application has been deployed, restart Pluto and use the Page Administrator Portlet to add the new portlet to a page. 
+If you want to put the portlet on a new page, you must do so by manually adding a page element as a child of the 
+render-config element in pluto-portal-driver-config.xml before you restart Pluto. See the Help mode for more details
+on doing this process.
+</p>
+
+<div class="portlet-section-subheader">Deployment in Another Application Server</div>
+<p class="portlet-font">
+	The 'Upload and deploy portlet war' link can be changed to an appropriate administrative page when Pluto
+	is deployed inside another (non-Tomcat) app server. This is done by changing the appserver.deployer.url property
+	inside AdminPortlet.properties located in the WEB-INF/classes directory to point to the URL of an appropriate administrative
+	page. The 'Help' link can also be changed to another help page using the appserver.deployer.help.page property. 
+	That help file needs to reside in this directory (WEB-INF/fragments/admin/page).
+</p>
+
+
+<fmt:bundle basename="AdminPortlet">
+	<fmt:message key="appserver.deployer.url" var="deployerURL"/>
+</fmt:bundle> 
+
+<p class="portlet-font">
+<a href='<c:out value="${deployerURL}"/>' target="_blank">Upload and deploy a new portlet war</a> 
+</p>
+<p class="portlet-font">
+<a href='<portlet:renderURL portletMode="view"/>'>Page Administrator Portlet</a> 
+</p>
+<p class="portlet-font">
+<a href='<portlet:renderURL portletMode="help"/>'>Page Administrator Portlet Help</a> 
+</p>

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/bd96a224/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/page/help.jsp
----------------------------------------------------------------------
diff --git a/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/page/help.jsp b/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/page/help.jsp
index b42d4b0..0bb46a5 100644
--- a/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/page/help.jsp
+++ b/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/page/help.jsp
@@ -1,138 +1,138 @@
-<%--
-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/jstl/fmt" prefix="fmt" %>
-<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
-
-<div class="portlet-section-header">Page Adminstrator Portlet Help</div>
-
-<p class="portlet-font">
-The Page Administrator Portlet is used to add and remove pages and portlets from portal pages. The portlet
-also persist these changes to pluto-portal-driver-config.xml in pluto's WEB-INF directory.
-</p>
-
-<div class="portlet-section-subheader"><a name="ConfiguringPortletApp">Configuring a Portlet Application</a></div>
-<p class="portlet-font">
-The portlet application needs to be bundled in a war file as per the Java Portlet Specification. 
-The war also needs to include proper PortletServlet servlet and servlet-mapping records in WEB-INF/web.xml.
-An assembly process has been developed to add these records to web.xml using Maven 2 (the
-pluto:assemble goal in maven-pluto-plugin) or Ant (AssembleTask). 
-See the testsuite web.xml file for an example how the servlet and servlet-mapping
-records should look like after assembly (other items the developer adds to web.xml should be 
-carried forward into the updated file). 
-</p>
-
-<p class="portlet-font">
-A custom portlet war deployed into the bundled distribution of Pluto also needs a Tomcat context descriptor 
-with the same name as the portlet app war name (a.k.a. context name). This context file needs to be 
-in the META-INF directory of the war file. Here's an example of one for a portlet bundled for a 
-HelloWorldPortlet context (file name is HelloWorldPortlet.xml): 
-<pre>
-&lt;Context path="/HelloWorldPortlet" 
-	docBase="HelloWorldPortlet" crossContext="true"/&gt; 
-</pre>  
-The crossContext attribute allows Pluto, which is deployed in its own Tomcat context, to work with this custom portlet. 
-</p>
-
-<div class="portlet-section-subheader">Deploying a Portlet Application</div>
-<p class="portlet-font">
-	The way to deploy a portlet application depends on the app server Pluto is running in. In the bundled distribution
-	Pluto is deployed in Tomcat. In this case, you can use the Tomcat manager app to deploy the portlet
-	war. There is a 'Upload and deploy portlet war' link at the bottom of the Page Administrator portlet that points to 
-	the manager app	in the bundled distribution (this link can be changed for other app servers -- see the 
-	adjacent Help link). Use of the manager application requires you to be logged into Pluto in a manager role (pluto or
-	tomcat user). 
-</p>
-	
-<p class="portlet-font">
-	In the bundled distribution of Pluto, you can also deploy a properly configured portlet application by simply dropping
-	the war file into the webapp directory (see <a href="#ConfiguringPortletApp">Configuring a Portlet Application</a> above).
-	You will need to restart Pluto in order for the Page Administrator Portlet to see the newly deployed portlet so it
-	can be added to a portal page.
-</p>
-
-<div class="portlet-section-subheader">Adding Portal Pages</div>
-<p class="portlet-font">
-Adding a new portal page using the Pluto Page Administrator portlet involves inputing the page name into the text box adjacent 
-to the Add Page button and clicking on the button. The new page is created with the default 'theme', which lays out the 
-portlets in two columns (see /WEB-INF/themes/pluto-default-theme.jsp in the pluto webapp for details). Once a page
-has been added, portlets will need to be added to the page (see <a href="#AddingPortlets">Adding Portlets to a Portal Page</a>).
-</p>
-
-<p class="portlet-font">
-Please note that adding a new Page with the name of an existing page will replace the existing page with the
-new page. This is equivalent to removing the page and adding it again with the same name.
-</p>
-
-<div class="portlet-section-subheader">Removing Portal Pages</div>
-<p class="portlet-font">
-Removing a portal page using the Pluto Page Administrator portlet involves selecting a page in the drop down above 
-the Remove Page button and clicking on the button. You are not allowed to remove the default page 
-(default attribute of the render-config element in pluto-portal-driver-config.xml) and the Pluto Admin page.
-</p>
-
-<div class="portlet-section-subheader"><a name="AddingPortlets">Adding Portlets to a Portal Page</a></div>
-<p class="portlet-font">
-Adding portlets to a portal page using the Pluto Page Administrator portlet involves first selecting a portal 
-page in the Portal Pages drop-down (above the Remove Page button) and then selecting a portlet application 
-using the Portlet Applications drop-down and finally a portlet in the adjacent drop down. When this is done, 
-click the Add Portlet button.
-</p>
-
-<div class="portlet-section-subheader">Removing Portlets from a Portal Page</div>
-<p class="portlet-font">
-Removing portlets from a portal page involves selecting a portal page on the Portal Pages drop-down 
-(above the Remove Page button), selecting the portlet in the adjacent list and then clicking on the 
-Remove Portlet button.
-</p>
-
-
-<div class="portlet-section-subheader">Manually Updating the Configuration File</div>
-<p class="portlet-font">
-The pluto-portal-driver-config.xml file holds changes made by the Page Administrator Portlet. You can manually 
-update this file to add pages or portlets. If this is done, please be careful of the structure of the 
-render-config child elements. 
-</p>
-
-<p class="portlet-font">
-You can also change the theme of portlets and the default page -- the portal's 
-home page after login -- in this config file. The theme will require a proper URI to a file containing
-the new theme. Use the default theme (/WEB-INF/themes/pluto-default-theme.jsp in the pluto webapp) for 
-an example theme elements.
-
-Again, be careful to not modify the XML structure of the 
-config file if you choose to change the theme or default 
-</p>
-
-
-<%-- Properties for link to app server deployer and help mode file --%>
-<fmt:bundle basename="AdminPortlet">
-	<fmt:message key="appserver.deployer.help.page" var="deployerHelp"/>
-</fmt:bundle> 
-<portlet:renderURL portletMode="help" var="deployerhelpURL">
-	<portlet-el:param name="helpPage" value="${deployerHelp}"/>
-</portlet:renderURL>
-
-<p class="portlet-font">
-<a href='<c:out value="${deployerhelpURL}"/>'>Upload and Deployment in App Server Help</a>
-</p>
-
-<p class="portlet-font">
-<a href='<portlet:renderURL portletMode="view"/>'>Page Administrator Portlet</a> 
-</p>
+<%--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed  under the  License is distributed on an "AS IS" BASIS,
+WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
+implied.
+
+See the License for the specific language governing permissions and
+limitations under the License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
+
+<div class="portlet-section-header">Page Adminstrator Portlet Help</div>
+
+<p class="portlet-font">
+The Page Administrator Portlet is used to add and remove pages and portlets from portal pages. The portlet
+also persist these changes to pluto-portal-driver-config.xml in pluto's WEB-INF directory.
+</p>
+
+<div class="portlet-section-subheader"><a name="ConfiguringPortletApp">Configuring a Portlet Application</a></div>
+<p class="portlet-font">
+The portlet application needs to be bundled in a war file as per the Java Portlet Specification. 
+The war also needs to include proper PortletServlet servlet and servlet-mapping records in WEB-INF/web.xml.
+An assembly process has been developed to add these records to web.xml using Maven 2 (the
+pluto:assemble goal in maven-pluto-plugin) or Ant (AssembleTask). 
+See the testsuite web.xml file for an example how the servlet and servlet-mapping
+records should look like after assembly (other items the developer adds to web.xml should be 
+carried forward into the updated file). 
+</p>
+
+<p class="portlet-font">
+A custom portlet war deployed into the bundled distribution of Pluto also needs a Tomcat context descriptor 
+with the same name as the portlet app war name (a.k.a. context name). This context file needs to be 
+in the META-INF directory of the war file. Here's an example of one for a portlet bundled for a 
+HelloWorldPortlet context (file name is HelloWorldPortlet.xml): 
+<pre>
+&lt;Context path="/HelloWorldPortlet" 
+	docBase="HelloWorldPortlet" crossContext="true"/&gt; 
+</pre>  
+The crossContext attribute allows Pluto, which is deployed in its own Tomcat context, to work with this custom portlet. 
+</p>
+
+<div class="portlet-section-subheader">Deploying a Portlet Application</div>
+<p class="portlet-font">
+	The way to deploy a portlet application depends on the app server Pluto is running in. In the bundled distribution
+	Pluto is deployed in Tomcat. In this case, you can use the Tomcat manager app to deploy the portlet
+	war. There is a 'Upload and deploy portlet war' link at the bottom of the Page Administrator portlet that points to 
+	the manager app	in the bundled distribution (this link can be changed for other app servers -- see the 
+	adjacent Help link). Use of the manager application requires you to be logged into Pluto in a manager role (pluto or
+	tomcat user). 
+</p>
+	
+<p class="portlet-font">
+	In the bundled distribution of Pluto, you can also deploy a properly configured portlet application by simply dropping
+	the war file into the webapp directory (see <a href="#ConfiguringPortletApp">Configuring a Portlet Application</a> above).
+	You will need to restart Pluto in order for the Page Administrator Portlet to see the newly deployed portlet so it
+	can be added to a portal page.
+</p>
+
+<div class="portlet-section-subheader">Adding Portal Pages</div>
+<p class="portlet-font">
+Adding a new portal page using the Pluto Page Administrator portlet involves inputing the page name into the text box adjacent 
+to the Add Page button and clicking on the button. The new page is created with the default 'theme', which lays out the 
+portlets in two columns (see /WEB-INF/themes/pluto-default-theme.jsp in the pluto webapp for details). Once a page
+has been added, portlets will need to be added to the page (see <a href="#AddingPortlets">Adding Portlets to a Portal Page</a>).
+</p>
+
+<p class="portlet-font">
+Please note that adding a new Page with the name of an existing page will replace the existing page with the
+new page. This is equivalent to removing the page and adding it again with the same name.
+</p>
+
+<div class="portlet-section-subheader">Removing Portal Pages</div>
+<p class="portlet-font">
+Removing a portal page using the Pluto Page Administrator portlet involves selecting a page in the drop down above 
+the Remove Page button and clicking on the button. You are not allowed to remove the default page 
+(default attribute of the render-config element in pluto-portal-driver-config.xml) and the Pluto Admin page.
+</p>
+
+<div class="portlet-section-subheader"><a name="AddingPortlets">Adding Portlets to a Portal Page</a></div>
+<p class="portlet-font">
+Adding portlets to a portal page using the Pluto Page Administrator portlet involves first selecting a portal 
+page in the Portal Pages drop-down (above the Remove Page button) and then selecting a portlet application 
+using the Portlet Applications drop-down and finally a portlet in the adjacent drop down. When this is done, 
+click the Add Portlet button.
+</p>
+
+<div class="portlet-section-subheader">Removing Portlets from a Portal Page</div>
+<p class="portlet-font">
+Removing portlets from a portal page involves selecting a portal page on the Portal Pages drop-down 
+(above the Remove Page button), selecting the portlet in the adjacent list and then clicking on the 
+Remove Portlet button.
+</p>
+
+
+<div class="portlet-section-subheader">Manually Updating the Configuration File</div>
+<p class="portlet-font">
+The pluto-portal-driver-config.xml file holds changes made by the Page Administrator Portlet. You can manually 
+update this file to add pages or portlets. If this is done, please be careful of the structure of the 
+render-config child elements. 
+</p>
+
+<p class="portlet-font">
+You can also change the theme of portlets and the default page -- the portal's 
+home page after login -- in this config file. The theme will require a proper URI to a file containing
+the new theme. Use the default theme (/WEB-INF/themes/pluto-default-theme.jsp in the pluto webapp) for 
+an example theme elements.
+
+Again, be careful to not modify the XML structure of the 
+config file if you choose to change the theme or default 
+</p>
+
+
+<%-- Properties for link to app server deployer and help mode file --%>
+<fmt:bundle basename="AdminPortlet">
+	<fmt:message key="appserver.deployer.help.page" var="deployerHelp"/>
+</fmt:bundle> 
+<portlet:renderURL portletMode="help" var="deployerhelpURL">
+	<portlet-el:param name="helpPage" value="${deployerHelp}"/>
+</portlet:renderURL>
+
+<p class="portlet-font">
+<a href='<c:out value="${deployerhelpURL}"/>'>Upload and Deployment in App Server Help</a>
+</p>
+
+<p class="portlet-font">
+<a href='<portlet:renderURL portletMode="view"/>'>Page Administrator Portlet</a> 
+</p>

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/bd96a224/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/page/view.jsp
----------------------------------------------------------------------
diff --git a/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/page/view.jsp b/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/page/view.jsp
index 1c1ffbe..c06ebaf 100644
--- a/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/page/view.jsp
+++ b/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/page/view.jsp
@@ -1,160 +1,159 @@
-<%--
-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/jstl/fmt" prefix="fmt" %>
-<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
-<%@ taglib uri="http://portals.apache.org/pluto/portlet-el" prefix="portlet-el" %>
-
-<portlet:defineObjects/>
-
-<portlet:actionURL var="formActionUrl"/>
-<form name="adminForm" action="<c:out value="${formActionUrl}"/>" method="POST">
-<script type="text/javascript">
-
-
-</script>
-
-<div>
-  <h2>Portal Pages</h2>
-  <p>
-      <script type="text/javascript">
-          var <portlet:namespace/>placedPortlets = new Array();
-          <c:forEach items="${availablePages}" var="page">
-              <portlet:namespace/>placedPortlets['<c:out value="${page.id}"/>'] = new Array();
-              <c:forEach items="${page.portlets}" var="portlet" varStatus="loopStatus">
-              	<portlet:namespace/>placedPortlets['<c:out value="${page.id}"/>'][<c:out value="${loopStatus.index}"/>] = new Array();
-              	<portlet:namespace/>placedPortlets['<c:out value="${page.id}"/>'][<c:out value="${loopStatus.index}"/>][0] = '<c:out value="${portlet.id}"/>';
-              	<portlet:namespace/>placedPortlets['<c:out value="${page.id}"/>'][<c:out value="${loopStatus.index}"/>][1] = '<c:out value="${portlet.portletName}"/>';
-              </c:forEach>
-          </c:forEach>
-
-          function <portlet:namespace/>doSwitchPage(select) {
-              var placePortletsSelect = document.forms['adminForm'].elements['placedPortlets'];
-              while (placePortletsSelect.options.length > 0) {
-                  placePortletsSelect.options[0] = null;
-              }
-
-              var disabled = select.value == 'Select. . .'
-        	  //disable 'Remove Page' button
-              document.forms['adminForm'].elements['command'][1].disabled = disabled;
-        	  //disable 'Remove Portlet' button
-              document.forms['adminForm'].elements['command'][2].disabled = disabled;
-
-              if(disabled) {
-                  return;
-              }
-
-              for(var i=0; i < <portlet:namespace/>placedPortlets[select.value].length;i++) {
-                  placePortletsSelect[i] = new Option(<portlet:namespace/>placedPortlets[select.value][i][1], <portlet:namespace/>placedPortlets[select.value][i][0]);
-              }
-
-          }
-      </script>
-
-	<p>
- 		<input type="text" name="newPage"></input>
-    	<input id="addPageButton" type="submit" name="command" value="Add Page"></input>
-	</p>
-
-    <select name="page" onChange="<portlet:namespace/>doSwitchPage(this)">
-      <option value="Select. . .">Select. . .</option>
-    <c:forEach items="${driverConfig.pages}" var="page">
-      <option value="<c:out value="${page.name}"/>"><c:out value="${page.name}"/></option>
-    </c:forEach>
-    </select>
-
-    <select name="placedPortlets" size="5">
-
-    </select>
-    <p>
-      <input id="removePageButton" type="submit" name="command" disabled="true" value="Remove Page"></input>
-      <input id="removeButton" type="submit" name="command" disabled="true" value="Remove Portlet"></input>
-    </p>
-  </p>
-</div>
-
-<div>
-  <h2>Portlet Applications</h2>
-  <p>
-
-    <script type="text/javascript">
-        var <portlet:namespace/>portlets = new Array();
-        <c:forEach items="${portletContainer.containerServices.portletContextService.portletContexts}" var="app">
-            <portlet:namespace/>portlets['<c:out value="${app.applicationName}"/>'] = new Array();
-            <portlet:namespace/>portlets['<c:out value="${app.applicationName}"/>'][0] = 'Select. . .';
-          <c:forEach items="${app.portletApplicationDefinition.portlets}" var="portlet" varStatus="loopStatus">
-            <portlet:namespace/>portlets['<c:out value="${app.applicationName}"/>'][<c:out value="${loopStatus.index + 1}"/>] = '<c:out value="${portlet.portletName}"/>';
-          </c:forEach>
-        </c:forEach>
-
-        function <portlet:namespace/>doSwitch(select) {
-            var portletsSelectBox = document.forms['adminForm'].elements['availablePortlets'];
-             while (portletsSelectBox.options.length > 0) {
-                portletsSelectBox.options[0] = null;
-            }
-            if (select.value == '-') {
-                document.forms['adminForm'].elements['availablePortlets'].disabled = true;
-            } else {
-                portletsSelectBox.disabled = false;
-                var pList = <portlet:namespace/>portlets[select.value];
-                for (i = 0; i < pList.length; i++) {
-                    portletsSelectBox.options[i] = new Option(pList[i], pList[i]);
-                }
-            }
-            <portlet:namespace/>doSwitchButton(portletsSelectBox);
-        }
-
-        function <portlet:namespace/>doSwitchButton(select) {
-        	//disable 'Add Portlet' button
-            document.forms['adminForm'].elements['command'][3].disabled = (select.value == 'Select. . .' || select.disabled);
-        }
-    </script>
-
-    <select name="applications" onChange="<portlet:namespace/>doSwitch(this)">
-      <option value='-'>Select. . .</option>
-      <c:forEach items="${portletContainer.containerServices.portletContextService.portletContexts}" var="app">
-      <option value="<c:out value="${app.applicationName}"/>"><c:out value="${app.applicationName}"/></option>
-      </c:forEach>
-    </select>
-
-    <select name="availablePortlets" disabled="true" onChange='<portlet:namespace/>doSwitchButton(this)'>
-
-    </select>
-
-    <p>
-        <input id="addButton" type="submit" name="command" disabled="true" value="Add Portlet"></input>
-    </p>
-  </p>
-</div>
-</form>
-<%-- Properties for link to app server deployer and help mode file --%>
-<fmt:bundle basename="AdminPortlet">
-	<fmt:message key="appserver.deployer.url" var="deployerURL"/>
-	<fmt:message key="appserver.deployer.help.page" var="deployerHelp"/>
-</fmt:bundle> 
-
-<portlet:renderURL portletMode="help" var="deployerhelpURL">
-	<%-- needed el taglib to be able to use fmt:message value above --%>
-	<portlet-el:param name="helpPage" value="${deployerHelp}"/>
-</portlet:renderURL>
-
-<div>
-<a href='<c:out value="${deployerURL}"/>' target="_blank">Upload and deploy a new portlet war</a> 
-<a href='<c:out value="${deployerhelpURL}"/>'>Help</a>
-</div>
+<%--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed  under the  License is distributed on an "AS IS" BASIS,
+WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
+implied.
+
+See the License for the specific language governing permissions and
+limitations under the License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
+<%@ taglib uri="http://portals.apache.org/pluto/portlet-el" prefix="portlet-el" %>
+
+<portlet:defineObjects/>
+
+<portlet:actionURL var="formActionUrl"/>
+<form name="adminForm" action="<c:out value="${formActionUrl}"/>" method="POST">
+<script type="text/javascript">
+
+
+</script>
+
+<div>
+  <h2>Portal Pages</h2>
+  <p>
+      <script type="text/javascript">
+          var <portlet:namespace/>placedPortlets = new Array();
+          <c:forEach items="${availablePages}" var="page">
+              <portlet:namespace/>placedPortlets['<c:out value="${page.id}"/>'] = new Array();
+              <c:forEach items="${page.portlets}" var="portlet" varStatus="loopStatus">
+              	<portlet:namespace/>placedPortlets['<c:out value="${page.id}"/>'][<c:out value="${loopStatus.index}"/>] = new Array();
+              	<portlet:namespace/>placedPortlets['<c:out value="${page.id}"/>'][<c:out value="${loopStatus.index}"/>][0] = '<c:out value="${portlet.id}"/>';
+              	<portlet:namespace/>placedPortlets['<c:out value="${page.id}"/>'][<c:out value="${loopStatus.index}"/>][1] = '<c:out value="${portlet.portletName}"/>';
+              </c:forEach>
+          </c:forEach>
+
+          function <portlet:namespace/>doSwitchPage(select) {
+              var placePortletsSelect = document.forms['adminForm'].elements['placedPortlets'];
+              while (placePortletsSelect.options.length > 0) {
+                  placePortletsSelect.options[0] = null;
+              }
+
+              var disabled = select.value == 'Select. . .'
+        	  //disable 'Remove Page' button
+              document.forms['adminForm'].elements['command'][1].disabled = disabled;
+        	  //disable 'Remove Portlet' button
+              document.forms['adminForm'].elements['command'][2].disabled = disabled;
+
+              if(disabled) {
+                  return;
+              }
+
+              for(var i=0; i < <portlet:namespace/>placedPortlets[select.value].length;i++) {
+                  placePortletsSelect[i] = new Option(<portlet:namespace/>placedPortlets[select.value][i][1], <portlet:namespace/>placedPortlets[select.value][i][0]);
+              }
+
+          }
+      </script>
+
+	<p>
+ 		<input type="text" name="newPage"></input>
+    	<input id="addPageButton" type="submit" name="command" value="Add Page"></input>
+	</p>
+
+    <select name="page" onChange="<portlet:namespace/>doSwitchPage(this)">
+      <option value="Select. . .">Select. . .</option>
+    <c:forEach items="${driverConfig.pages}" var="page">
+      <option value="<c:out value="${page.name}"/>"><c:out value="${page.name}"/></option>
+    </c:forEach>
+    </select>
+
+    <select name="placedPortlets" size="5">
+
+    </select>
+    <p>
+      <input id="removePageButton" type="submit" name="command" disabled="true" value="Remove Page"></input>
+      <input id="removeButton" type="submit" name="command" disabled="true" value="Remove Portlet"></input>
+    </p>
+  </p>
+</div>
+
+<div>
+  <h2>Portlet Applications</h2>
+  <p>
+
+    <script type="text/javascript">
+        var <portlet:namespace/>portlets = new Array();
+        <c:forEach items="${portletContainer.containerServices.portletContextService.portletContexts}" var="app">
+            <portlet:namespace/>portlets['<c:out value="${app.applicationName}"/>'] = new Array();
+            <portlet:namespace/>portlets['<c:out value="${app.applicationName}"/>'][0] = 'Select. . .';
+          <c:forEach items="${app.portletApplicationDefinition.portlets}" var="portlet" varStatus="loopStatus">
+            <portlet:namespace/>portlets['<c:out value="${app.applicationName}"/>'][<c:out value="${loopStatus.index + 1}"/>] = '<c:out value="${portlet.portletName}"/>';
+          </c:forEach>
+        </c:forEach>
+
+        function <portlet:namespace/>doSwitch(select) {
+            var portletsSelectBox = document.forms['adminForm'].elements['availablePortlets'];
+             while (portletsSelectBox.options.length > 0) {
+                portletsSelectBox.options[0] = null;
+            }
+            if (select.value == '-') {
+                document.forms['adminForm'].elements['availablePortlets'].disabled = true;
+            } else {
+                portletsSelectBox.disabled = false;
+                var pList = <portlet:namespace/>portlets[select.value];
+                for (i = 0; i < pList.length; i++) {
+                    portletsSelectBox.options[i] = new Option(pList[i], pList[i]);
+                }
+            }
+            <portlet:namespace/>doSwitchButton(portletsSelectBox);
+        }
+
+        function <portlet:namespace/>doSwitchButton(select) {
+        	//disable 'Add Portlet' button
+            document.forms['adminForm'].elements['command'][3].disabled = (select.value == 'Select. . .' || select.disabled);
+        }
+    </script>
+
+    <select name="applications" onChange="<portlet:namespace/>doSwitch(this)">
+      <option value='-'>Select. . .</option>
+      <c:forEach items="${portletContainer.containerServices.portletContextService.portletContexts}" var="app">
+      <option value="<c:out value="${app.applicationName}"/>"><c:out value="${app.applicationName}"/></option>
+      </c:forEach>
+    </select>
+
+    <select name="availablePortlets" disabled="true" onChange='<portlet:namespace/>doSwitchButton(this)'>
+
+    </select>
+
+    <p>
+        <input id="addButton" type="submit" name="command" disabled="true" value="Add Portlet"></input>
+    </p>
+  </p>
+</div>
+</form>
+<%-- Properties for link to app server deployer and help mode file --%>
+<fmt:bundle basename="AdminPortlet">
+	<fmt:message key="appserver.deployer.url" var="deployerURL"/>
+	<fmt:message key="appserver.deployer.help.page" var="deployerHelp"/>
+</fmt:bundle> 
+
+<portlet:renderURL portletMode="help" var="deployerhelpURL">
+	<portlet:param name="helpPage" value="${deployerHelp}"/>
+</portlet:renderURL>
+
+<div>
+<a href='<c:out value="${deployerURL}"/>' target="_blank">Upload and deploy a new portlet war</a> 
+<a href='<c:out value="${deployerhelpURL}"/>'>Help</a>
+</div>

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/bd96a224/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/view.jsp
----------------------------------------------------------------------
diff --git a/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/view.jsp b/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/view.jsp
index d96927d..3a5e065 100644
--- a/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/view.jsp
+++ b/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/view.jsp
@@ -1,53 +1,53 @@
-<%--
-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" %>
-
-<div>
-  <h2>Portlet Applications</h2>
-  <p>
-    <ul>
-      <c:forEach items="${driverConfig.portletApplications}" var="app">
-        <li>
-          <c:out value="${app.contextPath}"/>
-          <ul>
-            <c:forEach items="${app.portlets}" var="portlet">
-              <c:out value="${portlet.portletName}"/>
-            </c:forEach>
-          </ul>
-        </li>
-      </c:forEach>
-    </ul>
-  </p>
-</div>
-
-<div>
-  <h2>Portal Pages</h2>
-  <p>
-    <ul>
-      <c:forEach items="${driverConfig.pages}" var="page">
-        <li>
-          <c:out value="${page.name}"/><br/>
-          &nbsp;&nbsp;<small><c:out value="${page.uri}"/></small>
-        </li>
-      </c:forEach>
-    </ul>
-  </p>
-</div>
-
-
+<%--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed  under the  License is distributed on an "AS IS" BASIS,
+WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
+implied.
+
+See the License for the specific language governing permissions and
+limitations under the License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+
+<div>
+  <h2>Portlet Applications</h2>
+  <p>
+    <ul>
+      <c:forEach items="${driverConfig.portletApplications}" var="app">
+        <li>
+          <c:out value="${app.contextPath}"/>
+          <ul>
+            <c:forEach items="${app.portlets}" var="portlet">
+              <c:out value="${portlet.portletName}"/>
+            </c:forEach>
+          </ul>
+        </li>
+      </c:forEach>
+    </ul>
+  </p>
+</div>
+
+<div>
+  <h2>Portal Pages</h2>
+  <p>
+    <ul>
+      <c:forEach items="${driverConfig.pages}" var="page">
+        <li>
+          <c:out value="${page.name}"/><br/>
+          &nbsp;&nbsp;<small><c:out value="${page.uri}"/></small>
+        </li>
+      </c:forEach>
+    </ul>
+  </p>
+</div>
+
+

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/bd96a224/pluto-portal/src/main/webapp/WEB-INF/themes/navigation.jsp
----------------------------------------------------------------------
diff --git a/pluto-portal/src/main/webapp/WEB-INF/themes/navigation.jsp b/pluto-portal/src/main/webapp/WEB-INF/themes/navigation.jsp
index f51bf19..5d12bae 100644
--- a/pluto-portal/src/main/webapp/WEB-INF/themes/navigation.jsp
+++ b/pluto-portal/src/main/webapp/WEB-INF/themes/navigation.jsp
@@ -1,39 +1,39 @@
-<%--
-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://portals.apache.org/pluto" prefix="pluto" %>
-
-<div id="nav">
-    <ul id="navigation" >
-        <c:forEach var="page" items="${driverConfig.pages}">
-            <c:choose>
-                <c:when test="${page == currentPage}">
-                    <li class="selected">
-                        <a href='<c:out value="${pageContext.request.contextPath}"/>/portal/<c:out value="${page.name}"/>'><c:out value="${page.name}"/></a>
-                    </li>
-                </c:when>
-                <c:otherwise>
-                    <li>
-                        <a href='<c:out value="${pageContext.request.contextPath}"/>/portal/<c:out value="${page.name}"/>'><c:out value="${page.name}"/></a>
-                    </li>
-                </c:otherwise>
-            </c:choose>
-        </c:forEach>
-    </ul>
-</div>
+<%--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed  under the  License is distributed on an "AS IS" BASIS,
+WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
+implied.
+
+See the License for the specific language governing permissions and
+limitations under the License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://portals.apache.org/pluto" prefix="pluto" %>
+
+<div id="nav">
+    <ul id="navigation" >
+        <c:forEach var="page" items="${driverConfig.pages}">
+            <c:choose>
+                <c:when test="${page == currentPage}">
+                    <li class="selected">
+                        <a href='<c:out value="${pageContext.request.contextPath}"/>/portal/<c:out value="${page.name}"/>'><c:out value="${page.name}"/></a>
+                    </li>
+                </c:when>
+                <c:otherwise>
+                    <li>
+                        <a href='<c:out value="${pageContext.request.contextPath}"/>/portal/<c:out value="${page.name}"/>'><c:out value="${page.name}"/></a>
+                    </li>
+                </c:otherwise>
+            </c:choose>
+        </c:forEach>
+    </ul>
+</div>

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/bd96a224/pluto-portal/src/main/webapp/WEB-INF/themes/pluto-default-theme.jsp
----------------------------------------------------------------------
diff --git a/pluto-portal/src/main/webapp/WEB-INF/themes/pluto-default-theme.jsp b/pluto-portal/src/main/webapp/WEB-INF/themes/pluto-default-theme.jsp
index 9be7243..4dc3503 100644
--- a/pluto-portal/src/main/webapp/WEB-INF/themes/pluto-default-theme.jsp
+++ b/pluto-portal/src/main/webapp/WEB-INF/themes/pluto-default-theme.jsp
@@ -17,8 +17,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 --%>
 <%@page import="org.apache.pluto.driver.core.PortalRequestContext"%>
-<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <%@ taglib uri="http://portals.apache.org/pluto" prefix="pluto" %>
 <%@ page import="java.util.*,javax.portlet.*,org.apache.pluto.driver.url.*" %>
 <%@ page import="org.apache.pluto.driver.config.*,org.apache.pluto.driver.*" %>

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/bd96a224/pluto-portal/src/main/webapp/WEB-INF/themes/portlet-skin.jsp
----------------------------------------------------------------------
diff --git a/pluto-portal/src/main/webapp/WEB-INF/themes/portlet-skin.jsp b/pluto-portal/src/main/webapp/WEB-INF/themes/portlet-skin.jsp
index 082c6ea..d19dc57 100644
--- a/pluto-portal/src/main/webapp/WEB-INF/themes/portlet-skin.jsp
+++ b/pluto-portal/src/main/webapp/WEB-INF/themes/portlet-skin.jsp
@@ -1,50 +1,50 @@
-<%--
-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://portals.apache.org/pluto" prefix="pluto" %>
-<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
-
-<!-- Use pluto portlet tag to render the portlet -->
-<pluto:portlet portletId="${portlet}">
-
-  <!-- Assemble the rendering result -->
-  <div class="portlet">
-    <table class="header" width="100%">
-    	<tr>
-    	<td class="header" align="left">
-	      <!-- Portlet Title -->
-	      <h2 class="title"><pluto:title/></h2>
-	</td>
-        <td class="header" align="right">
-	      <!-- Portlet Mode Controls -->
-	      <pluto:modeDropDown />
-	
-	      <!-- Window State Controls -->
-	      <pluto:windowStateAnchor windowState="minimized" icon='<%= request.getContextPath() + "/images/controls/min.png"%>' />
-	      <pluto:windowStateAnchor windowState="maximized" icon='<%= request.getContextPath() + "/images/controls/max.png"%>' />
-	      <pluto:windowStateAnchor windowState="normal" icon='<%= request.getContextPath() + "/images/controls/norm.png"%>' />
-    	</td>
-    	</tr>
-    </table>
-    <div class="body">
-      <pluto:render/>
-    </div>
-  </div>
-
-</pluto:portlet>
-
+<%--
+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://portals.apache.org/pluto" prefix="pluto" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+
+<!-- Use pluto portlet tag to render the portlet -->
+<pluto:portlet portletId="${portlet}">
+
+  <!-- Assemble the rendering result -->
+  <div class="portlet">
+    <table class="header" width="100%">
+    	<tr>
+    	<td class="header" align="left">
+	      <!-- Portlet Title -->
+	      <h2 class="title"><pluto:title/></h2>
+	</td>
+        <td class="header" align="right">
+	      <!-- Portlet Mode Controls -->
+	      <pluto:modeDropDown />
+	
+	      <!-- Window State Controls -->
+	      <pluto:windowStateAnchor windowState="minimized" icon='<%= request.getContextPath() + "/images/controls/min.png"%>' />
+	      <pluto:windowStateAnchor windowState="maximized" icon='<%= request.getContextPath() + "/images/controls/max.png"%>' />
+	      <pluto:windowStateAnchor windowState="normal" icon='<%= request.getContextPath() + "/images/controls/norm.png"%>' />
+    	</td>
+    	</tr>
+    </table>
+    <div class="body">
+      <pluto:render/>
+    </div>
+  </div>
+
+</pluto:portlet>
+

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/bd96a224/pluto-portal/src/main/webapp/about.jsp
----------------------------------------------------------------------
diff --git a/pluto-portal/src/main/webapp/about.jsp b/pluto-portal/src/main/webapp/about.jsp
index eff5acb..558b9e2 100644
--- a/pluto-portal/src/main/webapp/about.jsp
+++ b/pluto-portal/src/main/webapp/about.jsp
@@ -1,94 +1,94 @@
-<%--
-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://portals.apache.org/pluto" prefix="pluto" %>
-
-<html>
-<head>
-    <title>Pluto Portal</title>
-    <style type="text/css" title="currentStyle" media="screen">
-        @import "<c:out value="${pageContext.request.contextPath}"/>/pluto.css";
-        @import "<c:out value="${pageContext.request.contextPath}"/>/portlet-spec-1.0.css";
-    </style>
-    <script type="text/javascript" src="<c:out value="${pageContext.request.contextPath}"/>/pluto.js">
-    </script>
-</head>
-
-<body>
-
-<div id="portal">
-
-    <!-- Header block: the Apache Pluto banner image and description -->
-    <div id="header">
-        <h1>Apache Pluto</h1>
-
-        <p>An Apache Portals Project</p>
-    </div>
-
-    <!-- Logout link -->
-    <c:if test="${pageContext.request.remoteUser != null}">
-        <div id="logout">
-            <a href="<c:url value='/Logout'/>">Logout</a>
-        </div>
-    </c:if>
-
-    <!-- Navigation block: links to portal pages -->
-    <jsp:include page="/WEB-INF/themes/navigation.jsp"/>
-
-    <!-- Content block: portlets are divided into two columns/groups -->
-    <div id="content">
-        <pluto:isMaximized var="isMax"/>
-
-        <!-- Left column -->
-        <c:choose>
-            <c:when test="${isMax}">
-                <c:set var="portlet" value="/pluto.AboutPortlet!A" scope="request"/>
-                <jsp:include page="/WEB-INF/themes/portlet-skin.jsp"/>
-                <c:set var="portlet" value="/pluto.AboutPortlet!B" scope="request"/>
-                <jsp:include page="/WEB-INF/themes/portlet-skin.jsp"/>
-            </c:when>
-
-            <c:otherwise>
-                <div id="portlets-left-column">
-                    <c:set var="portlet" value="/pluto.AboutPortlet" scope="request"/>
-                    <jsp:include page="/WEB-INF/themes/portlet-skin.jsp"/>
-                </div>
-
-                <!-- Right column -->
-                <div id="portlets-right-column">
-                    <c:set var="portlet" value="/testsuite.TestPortlet1" scope="request"/>
-                    <jsp:include page="/WEB-INF/themes/portlet-skin.jsp"/>
-                </div>
-            </c:otherwise>
-        </c:choose>
-
-    </div>
-
-    <!-- Footer block: copyright -->
-    <div id="footer">
-        &copy; 2003-2005 Apache Software Foundation
-    </div>
-
-</div>
-
-</body>
-
-</html>
-
-
+<%--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed  under the  License is distributed on an "AS IS" BASIS,
+WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
+implied.
+
+See the License for the specific language governing permissions and
+limitations under the License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://portals.apache.org/pluto" prefix="pluto" %>
+
+<html>
+<head>
+    <title>Pluto Portal</title>
+    <style type="text/css" title="currentStyle" media="screen">
+        @import "<c:out value="${pageContext.request.contextPath}"/>/pluto.css";
+        @import "<c:out value="${pageContext.request.contextPath}"/>/portlet-spec-1.0.css";
+    </style>
+    <script type="text/javascript" src="<c:out value="${pageContext.request.contextPath}"/>/pluto.js">
+    </script>
+</head>
+
+<body>
+
+<div id="portal">
+
+    <!-- Header block: the Apache Pluto banner image and description -->
+    <div id="header">
+        <h1>Apache Pluto</h1>
+
+        <p>An Apache Portals Project</p>
+    </div>
+
+    <!-- Logout link -->
+    <c:if test="${pageContext.request.remoteUser != null}">
+        <div id="logout">
+            <a href="<c:url value='/Logout'/>">Logout</a>
+        </div>
+    </c:if>
+
+    <!-- Navigation block: links to portal pages -->
+    <jsp:include page="/WEB-INF/themes/navigation.jsp"/>
+
+    <!-- Content block: portlets are divided into two columns/groups -->
+    <div id="content">
+        <pluto:isMaximized var="isMax"/>
+
+        <!-- Left column -->
+        <c:choose>
+            <c:when test="${isMax}">
+                <c:set var="portlet" value="/pluto.AboutPortlet!A" scope="request"/>
+                <jsp:include page="/WEB-INF/themes/portlet-skin.jsp"/>
+                <c:set var="portlet" value="/pluto.AboutPortlet!B" scope="request"/>
+                <jsp:include page="/WEB-INF/themes/portlet-skin.jsp"/>
+            </c:when>
+
+            <c:otherwise>
+                <div id="portlets-left-column">
+                    <c:set var="portlet" value="/pluto.AboutPortlet" scope="request"/>
+                    <jsp:include page="/WEB-INF/themes/portlet-skin.jsp"/>
+                </div>
+
+                <!-- Right column -->
+                <div id="portlets-right-column">
+                    <c:set var="portlet" value="/testsuite.TestPortlet1" scope="request"/>
+                    <jsp:include page="/WEB-INF/themes/portlet-skin.jsp"/>
+                </div>
+            </c:otherwise>
+        </c:choose>
+
+    </div>
+
+    <!-- Footer block: copyright -->
+    <div id="footer">
+        &copy; 2003-2005 Apache Software Foundation
+    </div>
+
+</div>
+
+</body>
+
+</html>
+
+

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/bd96a224/pluto-portal/src/main/webapp/login.jsp
----------------------------------------------------------------------
diff --git a/pluto-portal/src/main/webapp/login.jsp b/pluto-portal/src/main/webapp/login.jsp
index 6f3e703..cd568ea 100644
--- a/pluto-portal/src/main/webapp/login.jsp
+++ b/pluto-portal/src/main/webapp/login.jsp
@@ -1,74 +1,74 @@
-<%--
-  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/jstl/fmt" prefix="fmt" %>
-<% pageContext.setAttribute("now", new java.util.Date()); %>
-
-<html>
-  
-  <head>
-    <title>Pluto Portal</title>
-    <style type="text/css" title="currentStyle" media="screen">
-      @import "<c:out value="${pageContext.request.contextPath}"/>/pluto.css";
-    </style>
-    <script type="text/javascript"
-            src="<c:out value="${pageContext.request.contextPath}"/>/pluto.js">
-    </script>
-  </head>
-
-  <body>
-    <div id="portal" style="width: 600px;">
-      <div id="header">
-        <h1>Apache Pluto</h1>
-        <p>A Apache Portals Project</p>
-      </div>
-      <div id="content">
-        <c:if test='${param.error == "1"}'>
-          <p style="color:red;text-align:center">
-            Invalid credentials. Please try again
-          </p>
-        </c:if>
-        <form method="POST" action="j_security_check">
-          <fieldset>
-            <legend>Login to Pluto</legend>
-            <div>
-              <label for="j_username">User Name</label>
-              <input type="text" name="j_username" id="j_username"/>
-            </div>
-            <div>
-              <label for="j_password">Password</label>
-              <input type="password" name="j_password" id="j_password"/>
-            </div>
-            <div>
-              <label for="j_login"></label>
-              <input type="submit" value="Login" name="login" id="j_login"/>
-            </div>
-          </fieldset>
-        </form>
-      </div>
-      
-      <div id="footer">
-        &copy; 2003-<fmt:formatDate value="${now}" pattern="yyyy"/> Apache Software Foundation
-      </div>
-      
-    </div>
-  
-  </body>
-  
-</html>
-
-
+<%--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<% pageContext.setAttribute("now", new java.util.Date()); %>
+
+<html>
+  
+  <head>
+    <title>Pluto Portal</title>
+    <style type="text/css" title="currentStyle" media="screen">
+      @import "<c:out value="${pageContext.request.contextPath}"/>/pluto.css";
+    </style>
+    <script type="text/javascript"
+            src="<c:out value="${pageContext.request.contextPath}"/>/pluto.js">
+    </script>
+  </head>
+
+  <body>
+    <div id="portal" style="width: 600px;">
+      <div id="header">
+        <h1>Apache Pluto</h1>
+        <p>A Apache Portals Project</p>
+      </div>
+      <div id="content">
+        <c:if test='${param.error == "1"}'>
+          <p style="color:red;text-align:center">
+            Invalid credentials. Please try again
+          </p>
+        </c:if>
+        <form method="POST" action="j_security_check">
+          <fieldset>
+            <legend>Login to Pluto</legend>
+            <div>
+              <label for="j_username">User Name</label>
+              <input type="text" name="j_username" id="j_username"/>
+            </div>
+            <div>
+              <label for="j_password">Password</label>
+              <input type="password" name="j_password" id="j_password"/>
+            </div>
+            <div>
+              <label for="j_login"></label>
+              <input type="submit" value="Login" name="login" id="j_login"/>
+            </div>
+          </fieldset>
+        </form>
+      </div>
+      
+      <div id="footer">
+        &copy; 2003-<fmt:formatDate value="${now}" pattern="yyyy"/> Apache Software Foundation
+      </div>
+      
+    </div>
+  
+  </body>
+  
+</html>
+
+

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/bd96a224/pluto-testsuite/src/main/webapp/jsp/ExternalAppScopedAttributeTest.jsp
----------------------------------------------------------------------
diff --git a/pluto-testsuite/src/main/webapp/jsp/ExternalAppScopedAttributeTest.jsp b/pluto-testsuite/src/main/webapp/jsp/ExternalAppScopedAttributeTest.jsp
index 52c6c86..87d6152 100644
--- a/pluto-testsuite/src/main/webapp/jsp/ExternalAppScopedAttributeTest.jsp
+++ b/pluto-testsuite/src/main/webapp/jsp/ExternalAppScopedAttributeTest.jsp
@@ -1,68 +1,68 @@
-<%--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements.  See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed  under the  License is distributed on an "AS IS" BASIS,
-WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
-implied.
-
-See the License for the specific language governing permissions and
-limitations under the License.
---%>
-
-<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet"%>
-
-<portlet:defineObjects/>
-
-<script type="text/javascript">
-function openCompanionWindow() {
-	w = 500;
-	h = 400;
-	x = (screen.width - w) / 2;
-	y = (screen.height - h) / 2;
-	window.open('about:blank', '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>
-
+<%--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed  under the  License is distributed on an "AS IS" BASIS,
+WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
+implied.
+
+See the License for the specific language governing permissions and
+limitations under the License.
+--%>
+
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet"%>
+
+<portlet:defineObjects/>
+
+<script type="text/javascript">
+function openCompanionWindow() {
+	w = 500;
+	h = 400;
+	x = (screen.width - w) / 2;
+	y = (screen.height - h) / 2;
+	window.open('about:blank', '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" %>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/bd96a224/pluto-testsuite/src/main/webapp/jsp/ExternalAppScopedAttributeTest_companion.jsp
----------------------------------------------------------------------
diff --git a/pluto-testsuite/src/main/webapp/jsp/ExternalAppScopedAttributeTest_companion.jsp b/pluto-testsuite/src/main/webapp/jsp/ExternalAppScopedAttributeTest_companion.jsp
index 5abf618..8e3a250 100644
--- a/pluto-testsuite/src/main/webapp/jsp/ExternalAppScopedAttributeTest_companion.jsp
+++ b/pluto-testsuite/src/main/webapp/jsp/ExternalAppScopedAttributeTest_companion.jsp
@@ -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>
-
+<%--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed  under the  License is distributed on an "AS IS" BASIS,
+WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
+implied.
+
+See the License for the specific language governing permissions and
+limitations under the License.
+--%>
+
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+
+
+<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>
+


Mime
View raw message