You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@portals.apache.org by as...@apache.org on 2019/04/25 17:29:44 UTC

svn commit: r1858149 [1/18] - in /portals/site-live: ./ pluto/ pluto/css/ pluto/images/ pluto/subprojects/ pluto/v101/ pluto/v101/developer/ pluto/v101/userguide/ pluto/v11/ pluto/v20/ pluto/v30/ pluto/v301/ pluto/v310/

Author: asfgriff
Date: Thu Apr 25 17:29:43 2019
New Revision: 1858149

URL: http://svn.apache.org/viewvc?rev=1858149&view=rev
Log:
PLUTO-716 Committing site changes associated with the Pluto 3.1.0 release

Added:
    portals/site-live/pluto/v310/
    portals/site-live/pluto/v310/deploying.html   (with props)
    portals/site-live/pluto/v310/getting-started.html   (with props)
    portals/site-live/pluto/v310/maven-archetypes.html   (with props)
    portals/site-live/pluto/v310/mvcbean-portlets.html   (with props)
    portals/site-live/pluto/v310/portlet-api.html   (with props)
    portals/site-live/pluto/v310/release-notes.html   (with props)
    portals/site-live/pluto/v310/tck.html   (with props)
    portals/site-live/pluto/v310/v3Features.html   (with props)
Modified:
    portals/site-live/news.html
    portals/site-live/pluto/architecture.html
    portals/site-live/pluto/css/maven-base.css
    portals/site-live/pluto/css/print.css
    portals/site-live/pluto/css/site.css
    portals/site-live/pluto/download.html
    portals/site-live/pluto/faq.html
    portals/site-live/pluto/helping.html
    portals/site-live/pluto/images/collapsed.gif
    portals/site-live/pluto/images/expanded.gif
    portals/site-live/pluto/index.html
    portals/site-live/pluto/mission.html
    portals/site-live/pluto/news.html
    portals/site-live/pluto/resources.html
    portals/site-live/pluto/security.html
    portals/site-live/pluto/status.html
    portals/site-live/pluto/subprojects/anttasks.html
    portals/site-live/pluto/subprojects/container-api.html
    portals/site-live/pluto/subprojects/driver.html
    portals/site-live/pluto/subprojects/installer.html
    portals/site-live/pluto/subprojects/portal.html
    portals/site-live/pluto/subprojects/portlet-container.html
    portals/site-live/pluto/subprojects/skin.html
    portals/site-live/pluto/subprojects/subprojects.html
    portals/site-live/pluto/subprojects/tag-library.html
    portals/site-live/pluto/subprojects/testsuite.html
    portals/site-live/pluto/subprojects/utilities.html
    portals/site-live/pluto/v101/developer/arch.html
    portals/site-live/pluto/v101/developer/build_source.html
    portals/site-live/pluto/v101/developer/index.html
    portals/site-live/pluto/v101/developer/integrate.html
    portals/site-live/pluto/v101/developer/subversion.html
    portals/site-live/pluto/v101/install.html
    portals/site-live/pluto/v101/resources.html
    portals/site-live/pluto/v101/userguide/index.html
    portals/site-live/pluto/v101/userguide/portal.html
    portals/site-live/pluto/v101/userguide/testsuite.html
    portals/site-live/pluto/v11/deploying.html
    portals/site-live/pluto/v11/getting-started.html
    portals/site-live/pluto/v11/release-notes.html
    portals/site-live/pluto/v20/app-servers.html
    portals/site-live/pluto/v20/deploying.html
    portals/site-live/pluto/v20/embedding.html
    portals/site-live/pluto/v20/getting-started.html
    portals/site-live/pluto/v20/powered.html
    portals/site-live/pluto/v20/release-notes-2.0.0.html
    portals/site-live/pluto/v20/release-notes-2.0.1.html
    portals/site-live/pluto/v20/release-notes-2.0.2.html
    portals/site-live/pluto/v20/release-notes.html
    portals/site-live/pluto/v30/deploying.html
    portals/site-live/pluto/v30/getting-started.html
    portals/site-live/pluto/v30/portlet-api.html
    portals/site-live/pluto/v30/release-notes.html
    portals/site-live/pluto/v30/tck.html
    portals/site-live/pluto/v30/v3Features.html
    portals/site-live/pluto/v301/deploying.html
    portals/site-live/pluto/v301/getting-started.html
    portals/site-live/pluto/v301/portlet-api.html
    portals/site-live/pluto/v301/release-notes.html
    portals/site-live/pluto/v301/tck.html
    portals/site-live/pluto/v301/v3Features.html

Modified: portals/site-live/news.html
URL: http://svn.apache.org/viewvc/portals/site-live/news.html?rev=1858149&r1=1858148&r2=1858149&view=diff
==============================================================================
--- portals/site-live/news.html (original)
+++ portals/site-live/news.html Thu Apr 25 17:29:43 2019
@@ -154,6 +154,19 @@
     
 <div class="section">
 <div class="section">
+<h4>25 April 2019 - Portals Pluto 3.1.0<a name="a25_April_2019_-_Portals_Pluto_3.1.0"></a></h4>
+    
+<p>
+        The Apache Pluto project is proud to announce the General Availability release of Pluto 3.1.0.
+        This is the third GA release of Pluto conformant to the 
+        <a class="externalLink" href="http://www.jcp.org/en/jsr/detail?id=362">Java Portlet 3.0 Standard</a>.
+    </p>
+    
+<p>
+        The release contains the new MVCBean feature, which is an implementation of a large subset of the MVC 1.0 Specification. New demos are available that demonstrate the features and benfits of MVCBean portlet development. New Maven archetypes are available for MVCBean as well.
+    </p>
+    </div>
+<div class="section">
 <h4>21 June 2018 - Portals Pluto 3.0.1<a name="a21_June_2018_-_Portals_Pluto_3.0.1"></a></h4>
     
 <p>

Modified: portals/site-live/pluto/architecture.html
URL: http://svn.apache.org/viewvc/portals/site-live/pluto/architecture.html?rev=1858149&r1=1858148&r2=1858149&view=diff
==============================================================================
--- portals/site-live/pluto/architecture.html (original)
+++ portals/site-live/pluto/architecture.html Thu Apr 25 17:29:43 2019
@@ -1,298 +1,155 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-
-
-
-
-
-
-
-
-
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Pluto - Pluto Architecture</title>
-    <style type="text/css" media="all">
-      @import url("./css/maven-base.css");
-      @import url("./css/maven-theme.css");
-      @import url("./css/site.css");
-    </style>
-    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-          </head>
-  <body class="composite">
-    <div id="banner">
-                  <a href="http://portals.apache.org/pluto/" id="bannerLeft">
-    
-                                    <img src="http://portals.apache.org/pluto/images/apache-portals.gif" alt="" />
-    
-            </a>
-                          <span id="bannerRight">
-    
-                                    <img src="http://portals.apache.org/pluto/images/banner.png" alt="" />
-    
-            </span>
-            <div class="clear">
-        <hr/>
-      </div>
-    </div>
-    <div id="breadcrumbs">
-          
-  
-
-  
-    
-            
-  
-    
-            <div class="xleft">
-        Last Published: 2018-06-22
-                          |   
-                <a href="http://portals.apache.org/pluto" class="externalLink">Home</a>
-                          </div>
-            <div class="xright">            <a href="portlet-3.0-apidocs/index.html">Portlet 3.0 API</a>
-            |
-                <a href="portlet-2.0-apidocs/index.html">Portlet 2.0 API</a>
-            |
-                <a href="portlet-1.0-apidocs/index.html">Portlet 1.0 API</a>
-            |
-                <a href="http://jcp.org/en/jsr/detail?id=362" class="externalLink">JSR 362 JCP Page</a>
-            |
-                <a href="http://jcp.org/en/jsr/detail?id=286" class="externalLink">JSR 286 JCP Page</a>
-            |
-                <a href="http://jcp.org/en/jsr/detail?id=168" class="externalLink">JSR 168 JCP Page</a>
-            
-  
-
-  
-    
-            
-  
-    
-  </div>
-      <div class="clear">
-        <hr/>
-      </div>
-    </div>
-    <div id="leftColumn">
-      <div id="navcolumn">
-           
-  
-
-  
-    
-            
-  
-    
-                   <h5>The Pluto Project</h5>
-            <ul>
-              
-    <li class="none">
-                    <a href="index.html">About Pluto</a>
-          </li>
-              
-    <li class="none">
-                    <a href="mission.html">Mission</a>
-          </li>
-              
-    <li class="none">
-                    <a href="download.html">Download</a>
-          </li>
-              
-    <li class="none">
-                    <a href="news.html">News</a>
-          </li>
-              
-    <li class="none">
-                    <a href="security.html">Security</a>
-          </li>
-              
-    <li class="none">
-                    <a href="status.html">Status</a>
-          </li>
-              
-    <li class="none">
-              <strong>Architecture</strong>
-        </li>
-              
-    <li class="none">
-                    <a href="resources.html">Resources</a>
-          </li>
-              
-    <li class="none">
-                    <a href="faq.html">FAQ</a>
-          </li>
-              
-    <li class="none">
-                    <a href="http://wiki.apache.org/portals/Pluto" class="externalLink">Wiki</a>
-          </li>
-              
-    <li class="none">
-                    <a href="https://issues.apache.org/jira/browse/PLUTO" class="externalLink">Issue Tracker (JIRA)</a>
-          </li>
-              
-    <li class="none">
-                    <a href="helping.html">Get Involved</a>
-          </li>
-          </ul>
-              <h5>Pluto 3.0</h5>
-            <ul>
-              
-    <li class="none">
-                    <a href="v301/getting-started.html">Getting Started</a>
-          </li>
-              
-    <li class="none">
-                    <a href="v301/deploying.html">Deploying Portlets</a>
-          </li>
-              
-    <li class="none">
-                    <a href="v301/portlet-api.html">Portlet Concepts</a>
-          </li>
-              
-    <li class="none">
-                    <a href="v301/v3Features.html">Version 3 Features</a>
-          </li>
-              
-    <li class="none">
-                    <a href="v301/tck.html">Using the TCK</a>
-          </li>
-              
-    <li class="none">
-                    <a href="v301/release-notes.html">Release Notes</a>
-          </li>
-          </ul>
-              <h5>Pluto 2.0</h5>
-            <ul>
-              
-    <li class="none">
-                    <a href="v20/getting-started.html">Getting Started</a>
-          </li>
-              
-    <li class="none">
-                    <a href="v20/deploying.html">Deploying</a>
-          </li>
-              
-    <li class="none">
-                    <a href="v20/embedding.html">Embedding</a>
-          </li>
-              
-    <li class="none">
-                    <a href="v20/release-notes.html">Release Notes</a>
-          </li>
-              
-    <li class="none">
-                    <a href="v20/app-servers.html">App Servers</a>
-          </li>
-              
-    <li class="none">
-                    <a href="v20/powered.html">Powered By Pluto</a>
-          </li>
-          </ul>
-              <h5>Pluto 1.1</h5>
-            <ul>
-              
-    <li class="none">
-                    <a href="v11/getting-started.html">Getting Started</a>
-          </li>
-              
-    <li class="none">
-                    <a href="v11/deploying.html">Deploying</a>
-          </li>
-              
-    <li class="none">
-                    <a href="v11/release-notes.html">Release Notes</a>
-          </li>
-          </ul>
-              <h5>Subprojects</h5>
-            <ul>
-              
-    <li class="none">
-                    <a href="subprojects/subprojects.html">Overview</a>
-          </li>
-          </ul>
-              <h5>Project Info</h5>
-            <ul>
-              
-    <li class="none">
-                    <a href="project-summary.html">Project Summary</a>
-          </li>
-              
-    <li class="none">
-                    <a href="team-list.html">Project Team</a>
-          </li>
-              
-    <li class="none">
-                    <a href="license.html">Project License</a>
-          </li>
-              
-    <li class="none">
-                    <a href="mail-lists.html">Mailing Lists</a>
-          </li>
-              
-    <li class="none">
-                    <a href="source-repository.html">Source Repository</a>
-          </li>
-              
-    <li class="none">
-                    <a href="issue-tracking.html">Issue Tracking</a>
-          </li>
-          </ul>
-                                           <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
-            <img alt="Built by Maven" src="./images/logos/maven-feather.png"></img>
-          </a>
-                       
-  
-
-  
-    
-            
-  
-    
-        </div>
-    </div>
-    <div id="bodyColumn">
-      <div id="contentBox">
-        <div class="section"><h2><a name="Pluto_Architecture"></a>Pluto Architecture</h2>
-<p><p>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!-- Generated by Apache Maven Doxia Site Renderer 1.8.1 from src/site/xdoc/architecture.xml at 2019-04-25 -->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <title>Pluto &#x2013; Pluto Architecture</title>
+    <style type="text/css" media="all">
+      @import url("./css/maven-base.css");
+      @import url("./css/maven-theme.css");
+      @import url("./css/site.css");
+    </style>
+    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
+    <meta http-equiv="Content-Language" content="en" />
+    
+  </head>
+  <body class="composite">
+    <div id="banner">
+<a href="http://portals.apache.org/pluto/" id="bannerLeft"><img src="http://portals.apache.org/pluto/images/apache-portals.gif"  alt="Pluto"/></a>
+<div id="bannerRight">
+<img src="http://portals.apache.org/pluto/images/banner.png"  alt=""/></div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="breadcrumbs">
+      <div class="xleft">
+        <span id="publishDate">Last Published: 2019-04-25</span>
+          | <a href="http://portals.apache.org/pluto" class="externalLink" title="Home">Home</a> &gt;
+Pluto Architecture
+      </div>
+      <div class="xright"><a href="portlet-3.0-apidocs/index.html" title="Portlet 3.0 API">Portlet 3.0 API</a> |
+<a href="portlet-2.0-apidocs/index.html" title="Portlet 2.0 API">Portlet 2.0 API</a> |
+<a href="portlet-1.0-apidocs/index.html" title="Portlet 1.0 API">Portlet 1.0 API</a> |
+<a href="http://jcp.org/en/jsr/detail?id=362" class="externalLink" title="JSR 362 JCP Page">JSR 362 JCP Page</a> |
+<a href="http://jcp.org/en/jsr/detail?id=286" class="externalLink" title="JSR 286 JCP Page">JSR 286 JCP Page</a> |
+<a href="http://jcp.org/en/jsr/detail?id=168" class="externalLink" title="JSR 168 JCP Page">JSR 168 JCP Page</a>      </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="leftColumn">
+      <div id="navcolumn">
+       <h5>The Pluto Project</h5>
+    <ul>
+     <li class="none"><a href="index.html" title="About Pluto">About Pluto</a></li>
+     <li class="none"><a href="mission.html" title="Mission">Mission</a></li>
+     <li class="none"><a href="download.html" title="Download">Download</a></li>
+     <li class="none"><a href="news.html" title="News">News</a></li>
+     <li class="none"><a href="security.html" title="Security">Security</a></li>
+     <li class="none"><a href="status.html" title="Status">Status</a></li>
+     <li class="none"><strong>Architecture</strong></li>
+     <li class="none"><a href="resources.html" title="Resources">Resources</a></li>
+     <li class="none"><a href="faq.html" title="FAQ">FAQ</a></li>
+     <li class="none"><a href="http://wiki.apache.org/portals/Pluto" class="externalLink" title="Wiki">Wiki</a></li>
+     <li class="none"><a href="https://issues.apache.org/jira/browse/PLUTO" class="externalLink" title="Issue Tracker (JIRA)">Issue Tracker (JIRA)</a></li>
+     <li class="none"><a href="helping.html" title="Get Involved">Get Involved</a></li>
+    </ul>
+       <h5>Pluto 3.1</h5>
+    <ul>
+     <li class="none"><a href="v310/mvcbean-portlets.html" title="MVCBean Portlets">MVCBean Portlets</a></li>
+     <li class="none"><a href="v310/getting-started.html" title="Getting Started">Getting Started</a></li>
+     <li class="none"><a href="v310/maven-archetypes.html" title="Maven Archetypes">Maven Archetypes</a></li>
+     <li class="none"><a href="v310/deploying.html" title="Deploying Portlets">Deploying Portlets</a></li>
+     <li class="none"><a href="v310/portlet-api.html" title="Portlet Concepts">Portlet Concepts</a></li>
+     <li class="none"><a href="v310/v3Features.html" title="Version 3 Features">Version 3 Features</a></li>
+     <li class="none"><a href="v310/tck.html" title="Using the TCK">Using the TCK</a></li>
+     <li class="none"><a href="v310/release-notes.html" title="Release Notes">Release Notes</a></li>
+    </ul>
+       <h5>Pluto 3.0</h5>
+    <ul>
+     <li class="none"><a href="v301/getting-started.html" title="Getting Started">Getting Started</a></li>
+     <li class="none"><a href="v301/deploying.html" title="Deploying Portlets">Deploying Portlets</a></li>
+     <li class="none"><a href="v301/portlet-api.html" title="Portlet Concepts">Portlet Concepts</a></li>
+     <li class="none"><a href="v301/v3Features.html" title="Version 3 Features">Version 3 Features</a></li>
+     <li class="none"><a href="v301/tck.html" title="Using the TCK">Using the TCK</a></li>
+     <li class="none"><a href="v301/release-notes.html" title="Release Notes">Release Notes</a></li>
+    </ul>
+       <h5>Pluto 2.0</h5>
+    <ul>
+     <li class="none"><a href="v20/getting-started.html" title="Getting Started">Getting Started</a></li>
+     <li class="none"><a href="v20/deploying.html" title="Deploying">Deploying</a></li>
+     <li class="none"><a href="v20/embedding.html" title="Embedding">Embedding</a></li>
+     <li class="none"><a href="v20/release-notes.html" title="Release Notes">Release Notes</a></li>
+     <li class="none"><a href="v20/app-servers.html" title="App Servers">App Servers</a></li>
+     <li class="none"><a href="v20/powered.html" title="Powered By Pluto">Powered By Pluto</a></li>
+    </ul>
+       <h5>Pluto 1.1</h5>
+    <ul>
+     <li class="none"><a href="v11/getting-started.html" title="Getting Started">Getting Started</a></li>
+     <li class="none"><a href="v11/deploying.html" title="Deploying">Deploying</a></li>
+     <li class="none"><a href="v11/release-notes.html" title="Release Notes">Release Notes</a></li>
+    </ul>
+       <h5>Subprojects</h5>
+    <ul>
+     <li class="none"><a href="subprojects/subprojects.html" title="Overview">Overview</a></li>
+    </ul>
+       <h5>Project Info</h5>
+    <ul>
+     <li class="none"><a href="project-summary.html" title="Project Summary">Project Summary</a></li>
+     <li class="none"><a href="team-list.html" title="Project Team">Project Team</a></li>
+     <li class="none"><a href="license.html" title="Project License">Project License</a></li>
+     <li class="none"><a href="mail-lists.html" title="Mailing Lists">Mailing Lists</a></li>
+     <li class="none"><a href="source-repository.html" title="Source Repository">Source Repository</a></li>
+     <li class="none"><a href="issue-tracking.html" title="Issue Tracking">Issue Tracking</a></li>
+    </ul>
+      <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
+        <img class="poweredBy" alt="Built by Maven" src="./images/logos/maven-feather.png" />
+      </a>
+      </div>
+    </div>
+    <div id="bodyColumn">
+      <div id="contentBox">
+
+  
+  
+    <div class="section">
+<h2><a name="Pluto_Architecture"></a>Pluto Architecture</h2>
+    
+<p>
+      
+<p>
 Portlets are run inside a portlet container (Pluto). This container provides the portlet with the 
 required runtime environment. The portlet container manages the life cycle of all the portlets and provides
 interfaces for portlets to call into. The container also invokes methods on portlets targeted by an end-user 
 interaction with the portal page. The portlet container passes on requests from the portal to the hosted portlets. The portlet container 
-does not aggregate the content produced by the portlets; that is the portal’s job. 
-	</p>
-</p>
+does not aggregate the content produced by the portlets; that is the portal&#x2019;s job. 
+	</p> 
+    
+      
 <p>
         The following diagram depicts the architectural components of Pluto 2.0. Notice that the Portlet Container, Pluto, is embedded inside a Portal. Then
         cross-context (across web applications) request dispatches are made to render the portlet contents, as portlets will normally reside in a different applications
         from the portal and container. Depending on the implementation, often a PortletServlet is required, as shown below, in the class loader of the portlet application.
         This servlet is actually a part of the Pluto container implementation.          
-        <img src="images/architecture.png" /></p>
-</div>
-
-      </div>
-    </div>
-    <div class="clear">
-      <hr/>
-    </div>
-    <div id="footer">
-      <div class="xright">&#169;  
-          2004-2018
-    
-          Apache Software Foundation
-          
-  
-
-  
-    
-            
-  
-    
-  </div>
-      <div class="clear">
-        <hr/>
-      </div>
-    </div>
-  </body>
-</html>
+        <img src="images/architecture.png" alt="" />
+      </p>
+    </div>
+  
+  
+
+      </div>
+    </div>
+    <div class="clear">
+      <hr/>
+    </div>
+    <div id="footer">
+      <div class="xright">
+        Copyright &#169;      2004&#x2013;2019 <a href="http://www.apache.org/">Apache Software Foundation</a>.
+All rights reserved.      </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+  </body>
+</html>

Modified: portals/site-live/pluto/css/maven-base.css
URL: http://svn.apache.org/viewvc/portals/site-live/pluto/css/maven-base.css?rev=1858149&r1=1858148&r2=1858149&view=diff
==============================================================================
--- portals/site-live/pluto/css/maven-base.css (original)
+++ portals/site-live/pluto/css/maven-base.css Thu Apr 25 17:29:43 2019
@@ -1,143 +1,164 @@
-body {
-  margin: 0px;
-  padding: 0px;
-}
-img {
-  border:none;
-}
-table {
-  padding:0px;
-  width: 100%;
-  margin-left: -2px;
-  margin-right: -2px;
-}
-acronym {
-  cursor: help;
-  border-bottom: 1px dotted #feb;
-}
-table.bodyTable th, table.bodyTable td {
-  padding: 2px 4px 2px 4px;
-  vertical-align: top;
-}
-div.clear{
-  clear:both;
-  visibility: hidden;
-}
-div.clear hr{
-  display: none;
-}
-#bannerLeft, #bannerRight {
-  font-size: xx-large;
-  font-weight: bold;
-}
-#bannerLeft img, #bannerRight img {
-  margin: 0px;
-}
-.xleft, #bannerLeft img {
-  float:left;
-}
-.xright, #bannerRight {
-  float:right;
-}
-#banner {
-  padding: 0px;
-}
-#banner img {
-  border: none;
-}
-#breadcrumbs {
-  padding: 3px 10px 3px 10px;
-}
-#leftColumn {
- width: 170px;
- float:left;
- overflow: auto;
-}
-#bodyColumn {
-  margin-right: 1.5em;
-  margin-left: 197px;
-}
-#legend {
-  padding: 8px 0 8px 0;
-}
-#navcolumn {
-  padding: 8px 4px 0 8px;
-}
-#navcolumn h5 {
-  margin: 0;
-  padding: 0;
-  font-size: small;
-}
-#navcolumn ul {
-  margin: 0;
-  padding: 0;
-  font-size: small;
-}
-#navcolumn li {
-  list-style-type: none;
-  background-image: none;
-  background-repeat: no-repeat;
-  background-position: 0 0.4em;
-  padding-left: 16px;
-  list-style-position: outside;
-  line-height: 1.2em;
-  font-size: smaller;
-}
-#navcolumn li.expanded {
-  background-image: url(../images/expanded.gif);
-}
-#navcolumn li.collapsed {
-  background-image: url(../images/collapsed.gif);
-}
-#poweredBy {
-  text-align: center;
-}
-#navcolumn img {
-  margin-top: 10px;
-  margin-bottom: 3px;
-}
-#poweredBy img {
-  display:block;
-  margin: 20px 0 20px 17px;
-}
-#search img {
-    margin: 0px;
-    display: block;
-}
-#search #q, #search #btnG {
-    border: 1px solid #999;
-    margin-bottom:10px;
-}
-#search form {
-    margin: 0px;
-}
-#lastPublished {
-  font-size: x-small;
-}
-.navSection {
-  margin-bottom: 2px;
-  padding: 8px;
-}
-.navSectionHead {
-  font-weight: bold;
-  font-size: x-small;
-}
-.section {
-  padding: 4px;
-}
-#footer {
-  padding: 3px 10px 3px 10px;
-  font-size: x-small;
-}
-#breadcrumbs {
-  font-size: x-small;
-  margin: 0pt;
-}
-.source {
-  padding: 12px;
-  margin: 1em 7px 1em 7px;
-}
-.source pre {
-  margin: 0px;
-  padding: 0px;
-}
+/*
+* 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.
+*/
+body {
+  margin: 0px;
+  padding: 0px;
+}
+img {
+  border:none;
+}
+table {
+  padding:0px;
+  width: 100%;
+  margin-left: -2px;
+  margin-right: -2px;
+}
+acronym {
+  cursor: help;
+  border-bottom: 1px dotted #feb;
+}
+table.bodyTable th, table.bodyTable td {
+  padding: 2px 4px 2px 4px;
+  vertical-align: top;
+}
+div.clear{
+  clear:both;
+  visibility: hidden;
+}
+div.clear hr{
+  display: none;
+}
+#bannerLeft, #bannerRight {
+  font-size: xx-large;
+  font-weight: bold;
+}
+#bannerLeft img, #bannerRight img {
+  margin: 0px;
+}
+.xleft, #bannerLeft img {
+  float:left;
+  text-shadow: #7CFC00;
+}
+.xright, #bannerRight img {
+  float:right;
+  text-shadow: #7CFC00;
+}
+#banner {
+  padding: 0px;
+}
+#banner img {
+  border: none;
+}
+#breadcrumbs {
+  padding: 3px 10px 3px 10px;
+}
+#leftColumn {
+ width: 170px;
+ float:left;
+ overflow: auto;
+}
+#bodyColumn {
+  margin-right: 1.5em;
+  margin-left: 197px;
+}
+#legend {
+  padding: 8px 0 8px 0;
+}
+#navcolumn {
+  padding: 8px 4px 0 8px;
+}
+#navcolumn h5 {
+  margin: 0;
+  padding: 0;
+  font-size: small;
+}
+#navcolumn ul {
+  margin: 0;
+  padding: 0;
+  font-size: small;
+}
+#navcolumn li {
+  list-style-type: none;
+  background-image: none;
+  background-repeat: no-repeat;
+  background-position: 0 0.4em;
+  padding-left: 16px;
+  list-style-position: outside;
+  line-height: 1.2em;
+  font-size: smaller;
+}
+#navcolumn li.expanded {
+  background-image: url(../images/expanded.gif);
+}
+#navcolumn li.collapsed {
+  background-image: url(../images/collapsed.gif);
+}
+#poweredBy {
+  text-align: center;
+}
+#navcolumn img {
+  margin-top: 10px;
+  margin-bottom: 3px;
+}
+#poweredBy img {
+  display:block;
+  margin: 20px 0 20px 17px;
+  border: 1px solid black;
+  width: 90px;
+  height: 30px;
+}
+#search img {
+    margin: 0px;
+    display: block;
+}
+#search #q, #search #btnG {
+    border: 1px solid #999;
+    margin-bottom:10px;
+}
+#search form {
+    margin: 0px;
+}
+#lastPublished {
+  font-size: x-small;
+}
+.navSection {
+  margin-bottom: 2px;
+  padding: 8px;
+}
+.navSectionHead {
+  font-weight: bold;
+  font-size: x-small;
+}
+.section {
+  padding: 4px;
+}
+#footer {
+  padding: 3px 10px 3px 10px;
+  font-size: x-small;
+}
+#breadcrumbs {
+  font-size: x-small;
+  margin: 0pt;
+}
+.source {
+  padding: 12px;
+  margin: 1em 7px 1em 7px;
+}
+.source pre {
+  margin: 0px;
+  padding: 0px;
+}

Modified: portals/site-live/pluto/css/print.css
URL: http://svn.apache.org/viewvc/portals/site-live/pluto/css/print.css?rev=1858149&r1=1858148&r2=1858149&view=diff
==============================================================================
--- portals/site-live/pluto/css/print.css (original)
+++ portals/site-live/pluto/css/print.css Thu Apr 25 17:29:43 2019
@@ -1,7 +1,26 @@
-#banner, #footer, #leftcol, #breadcrumbs, .docs #toc, .docs .courtesylinks, #leftColumn, #navColumn {
-	display: none !important;
-}
-#bodyColumn, body.docs div.docs {
-	margin: 0 !important;
-	border: none !important
-}
+/*
+ * 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.
+ */
+
+#banner, #footer, #leftcol, #breadcrumbs, .docs #toc, .docs .courtesylinks, #leftColumn, #navColumn {
+	display: none !important;
+}
+#bodyColumn, body.docs div.docs {
+	margin: 0 !important;
+	border: none !important
+}

Modified: portals/site-live/pluto/css/site.css
URL: http://svn.apache.org/viewvc/portals/site-live/pluto/css/site.css?rev=1858149&r1=1858148&r2=1858149&view=diff
==============================================================================
--- portals/site-live/pluto/css/site.css (original)
+++ portals/site-live/pluto/css/site.css Thu Apr 25 17:29:43 2019
@@ -1,216 +1,216 @@
-/*
-* 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.
-*/
-/**
- * =============================================================================
- * Customized stylesheet for maven-generated site.
- * =============================================================================
- */
-
-
-html {
-    border-width: 10px;
-    border-style: solid;
-    border-color: #2E6794;
-}
-
-body {
-    
-}
-
-.composite {
-    background-color: #FFFFFF;
-    border-width: 1px;
-    border-style: solid;
-    border-color: #000000;
-}
-
-/**
- * The top banner, which contains the apache portals logo and pluto logo.
- */
-#banner {
-    background-color: #8DB7DF;
-    border-bottom-width: 1px;
-    border-bottom-style: solid;
-    border-bottom-color: #000000;
-    vertical-align: top;
-}
-
-/**
- * The left part of the top banner, which is the apache portals logo.
- */
-#bannerLeft {
-    display: none;
-}
-
-/**
- * The right part of the top banner.
- */
-#bannerRight {
-    width: 450px;
-    margin: 0px;
-    float: left;
-}
-
-/**
- * Breadcrumbs under the top banner: last published date and quick links.
- */
-#breadcrumbs {
-    background-color: #F0F0F0;
-}
-
-.highlightBox {
-    width: 240px;
-    float: right;
-    clear: right;
-    background-color: #EEEEEE;
-    margin: 0px 0px 20px 20px;
-    padding: 5px;
-    border-width: 1px;
-    border-style: solid;
-    border-color: #909090;
-}
-
-.highlightBox h5 {
-    margin: 0;
-    padding: 0;
-    color: #000000;
-    font-size: smaller;
-    border-width: 0px 0px 1px 0px;
-    border-style: solid;
-    border-color: #909090;
-}
-
-.highlightBox p {
-    margin: 1em 0 0.5em 0;
-    padding: 0;
-    font-size: smaller;
-}
-
-.highlightBox ul {
-    margin-top: 0;
-    margin-bottom: 1em;
-    list-style-type: square;
-}
-
-.highlightBox li {  
-    margin: 0;
-    padding: 0;
-    font-size: smaller;
-}
-
-#leftColumn {
-    background-color: #FFFFFF;
-    border-width: 1px;
-    border-style: solid;
-    border-color: #CCCCCC;
-}
-
-
-#bodyColumn {
-    
-}
-
-/**
- * The section title.
- */
-.section h2 {
-    padding: 0em;
-    margin: 0.25em 0em 0.25em 0em;
-    background-color: #FFFFFF;
-    color: #6D97BF;
-    font-family: "Trebuchet MS", Trebuchet, Arial, Verdana, Sans-serif;
-    font-weight: bold;
-    white-space: nowrap;
-    border-width: 0px 0px 1px 0px;
-    border-style: solid;
-    border-color: #8DB7DF;
-}
-
-/**
- * The subsection title.
- */
-.section h3 {
-    padding: 0em;
-    margin: 0.25em 0em 0.25em 0em;
-    background-color: #FFFFFF;
-    color: #000000;
-    font-family: "Trebuchet MS", Trebuchet, Arial, Verdana, Sans-serif;
-    font-weight: bold;
-    white-space: nowrap;
-    border-width: 0px;
-}
-
-/**
- * The subsection title.
- */
-.section h4 {
-    padding: 0em;
-    margin: 0.25em 0em 0.25em 0em;
-    background-color: #FFFFFF;
-    color: #000000;
-    font-family: "Trebuchet MS", Trebuchet, Arial, Verdana, Sans-serif;
-    font-size: 120%;
-    font-weight: bold;
-    border-width: 0px;
-}
-
-/**
- * The FAQ.
- */
-
-.section dl {
-    background-color: #FFFFFF;
-    border-width: 0px;
-}
-
-.section dt {
-    padding: 10px 0px 5px 0px;
-}
-
-.section dt b {
-    font-family: "Trebuchet MS", Trebuchet, Arial, Verdana, Sans-serif;
-    font-size: 120%;
-}
-
-.section dd {
-    border-width: 0px 0px 1px 0px;
-    border-color: #808080;
-    border-style: dotted;
-}
-
-.section dd hr {
-    visibility: hidden;
-}
-
-/**
- * The footer.
- */
-
-#footer {
-    border-top-width: 1px;
-    border-top-style: solid;
-    border-top-color: #2E6794;
-}
-
-/**
- * inline monocode for use with span tag
- */
-
-.monoCode {
-    font-family: monospace;
-}
-
+/*
+* 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.
+*/
+/**
+ * =============================================================================
+ * Customized stylesheet for maven-generated site.
+ * =============================================================================
+ */
+
+
+html {
+    border-width: 10px;
+    border-style: solid;
+    border-color: #2E6794;
+}
+
+body {
+    
+}
+
+.composite {
+    background-color: #FFFFFF;
+    border-width: 1px;
+    border-style: solid;
+    border-color: #000000;
+}
+
+/**
+ * The top banner, which contains the apache portals logo and pluto logo.
+ */
+#banner {
+    background-color: #8DB7DF;
+    border-bottom-width: 1px;
+    border-bottom-style: solid;
+    border-bottom-color: #000000;
+    vertical-align: top;
+}
+
+/**
+ * The left part of the top banner, which is the apache portals logo.
+ */
+#bannerLeft {
+    display: none;
+}
+
+/**
+ * The right part of the top banner.
+ */
+#bannerRight {
+    width: 450px;
+    margin: 0px;
+    float: left;
+}
+
+/**
+ * Breadcrumbs under the top banner: last published date and quick links.
+ */
+#breadcrumbs {
+    background-color: #F0F0F0;
+}
+
+.highlightBox {
+    width: 240px;
+    float: right;
+    clear: right;
+    background-color: #EEEEEE;
+    margin: 0px 0px 20px 20px;
+    padding: 5px;
+    border-width: 1px;
+    border-style: solid;
+    border-color: #909090;
+}
+
+.highlightBox h5 {
+    margin: 0;
+    padding: 0;
+    color: #000000;
+    font-size: smaller;
+    border-width: 0px 0px 1px 0px;
+    border-style: solid;
+    border-color: #909090;
+}
+
+.highlightBox p {
+    margin: 1em 0 0.5em 0;
+    padding: 0;
+    font-size: smaller;
+}
+
+.highlightBox ul {
+    margin-top: 0;
+    margin-bottom: 1em;
+    list-style-type: square;
+}
+
+.highlightBox li {  
+    margin: 0;
+    padding: 0;
+    font-size: smaller;
+}
+
+#leftColumn {
+    background-color: #FFFFFF;
+    border-width: 1px;
+    border-style: solid;
+    border-color: #CCCCCC;
+}
+
+
+#bodyColumn {
+    
+}
+
+/**
+ * The section title.
+ */
+.section h2 {
+    padding: 0em;
+    margin: 0.25em 0em 0.25em 0em;
+    background-color: #FFFFFF;
+    color: #6D97BF;
+    font-family: "Trebuchet MS", Trebuchet, Arial, Verdana, Sans-serif;
+    font-weight: bold;
+    white-space: nowrap;
+    border-width: 0px 0px 1px 0px;
+    border-style: solid;
+    border-color: #8DB7DF;
+}
+
+/**
+ * The subsection title.
+ */
+.section h3 {
+    padding: 0em;
+    margin: 0.25em 0em 0.25em 0em;
+    background-color: #FFFFFF;
+    color: #000000;
+    font-family: "Trebuchet MS", Trebuchet, Arial, Verdana, Sans-serif;
+    font-weight: bold;
+    white-space: nowrap;
+    border-width: 0px;
+}
+
+/**
+ * The subsection title.
+ */
+.section h4 {
+    padding: 0em;
+    margin: 0.25em 0em 0.25em 0em;
+    background-color: #FFFFFF;
+    color: #000000;
+    font-family: "Trebuchet MS", Trebuchet, Arial, Verdana, Sans-serif;
+    font-size: 120%;
+    font-weight: bold;
+    border-width: 0px;
+}
+
+/**
+ * The FAQ.
+ */
+
+.section dl {
+    background-color: #FFFFFF;
+    border-width: 0px;
+}
+
+.section dt {
+    padding: 10px 0px 5px 0px;
+}
+
+.section dt b {
+    font-family: "Trebuchet MS", Trebuchet, Arial, Verdana, Sans-serif;
+    font-size: 120%;
+}
+
+.section dd {
+    border-width: 0px 0px 1px 0px;
+    border-color: #808080;
+    border-style: dotted;
+}
+
+.section dd hr {
+    visibility: hidden;
+}
+
+/**
+ * The footer.
+ */
+
+#footer {
+    border-top-width: 1px;
+    border-top-style: solid;
+    border-top-color: #2E6794;
+}
+
+/**
+ * inline monocode for use with span tag
+ */
+
+.monoCode {
+    font-family: monospace;
+}
+

Modified: portals/site-live/pluto/download.html
URL: http://svn.apache.org/viewvc/portals/site-live/pluto/download.html?rev=1858149&r1=1858148&r2=1858149&view=diff
==============================================================================
--- portals/site-live/pluto/download.html (original)
+++ portals/site-live/pluto/download.html Thu Apr 25 17:29:43 2019
@@ -1,306 +1,176 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-
-
-
-
-
-
-
-
-
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Pluto - Apache Pluto Downloads</title>
-    <style type="text/css" media="all">
-      @import url("./css/maven-base.css");
-      @import url("./css/maven-theme.css");
-      @import url("./css/site.css");
-    </style>
-    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-          </head>
-  <body class="composite">
-    <div id="banner">
-                  <a href="http://portals.apache.org/pluto/" id="bannerLeft">
-    
-                                    <img src="http://portals.apache.org/pluto/images/apache-portals.gif" alt="" />
-    
-            </a>
-                          <span id="bannerRight">
-    
-                                    <img src="http://portals.apache.org/pluto/images/banner.png" alt="" />
-    
-            </span>
-            <div class="clear">
-        <hr/>
-      </div>
-    </div>
-    <div id="breadcrumbs">
-          
-  
-
-  
-    
-            
-  
-    
-            <div class="xleft">
-        Last Published: 2018-06-22
-                          |   
-                <a href="http://portals.apache.org/pluto" class="externalLink">Home</a>
-                          </div>
-            <div class="xright">            <a href="portlet-3.0-apidocs/index.html">Portlet 3.0 API</a>
-            |
-                <a href="portlet-2.0-apidocs/index.html">Portlet 2.0 API</a>
-            |
-                <a href="portlet-1.0-apidocs/index.html">Portlet 1.0 API</a>
-            |
-                <a href="http://jcp.org/en/jsr/detail?id=362" class="externalLink">JSR 362 JCP Page</a>
-            |
-                <a href="http://jcp.org/en/jsr/detail?id=286" class="externalLink">JSR 286 JCP Page</a>
-            |
-                <a href="http://jcp.org/en/jsr/detail?id=168" class="externalLink">JSR 168 JCP Page</a>
-            
-  
-
-  
-    
-            
-  
-    
-  </div>
-      <div class="clear">
-        <hr/>
-      </div>
-    </div>
-    <div id="leftColumn">
-      <div id="navcolumn">
-           
-  
-
-  
-    
-            
-  
-    
-                   <h5>The Pluto Project</h5>
-            <ul>
-              
-    <li class="none">
-                    <a href="index.html">About Pluto</a>
-          </li>
-              
-    <li class="none">
-                    <a href="mission.html">Mission</a>
-          </li>
-              
-    <li class="none">
-              <strong>Download</strong>
-        </li>
-              
-    <li class="none">
-                    <a href="news.html">News</a>
-          </li>
-              
-    <li class="none">
-                    <a href="security.html">Security</a>
-          </li>
-              
-    <li class="none">
-                    <a href="status.html">Status</a>
-          </li>
-              
-    <li class="none">
-                    <a href="architecture.html">Architecture</a>
-          </li>
-              
-    <li class="none">
-                    <a href="resources.html">Resources</a>
-          </li>
-              
-    <li class="none">
-                    <a href="faq.html">FAQ</a>
-          </li>
-              
-    <li class="none">
-                    <a href="http://wiki.apache.org/portals/Pluto" class="externalLink">Wiki</a>
-          </li>
-              
-    <li class="none">
-                    <a href="https://issues.apache.org/jira/browse/PLUTO" class="externalLink">Issue Tracker (JIRA)</a>
-          </li>
-              
-    <li class="none">
-                    <a href="helping.html">Get Involved</a>
-          </li>
-          </ul>
-              <h5>Pluto 3.0</h5>
-            <ul>
-              
-    <li class="none">
-                    <a href="v301/getting-started.html">Getting Started</a>
-          </li>
-              
-    <li class="none">
-                    <a href="v301/deploying.html">Deploying Portlets</a>
-          </li>
-              
-    <li class="none">
-                    <a href="v301/portlet-api.html">Portlet Concepts</a>
-          </li>
-              
-    <li class="none">
-                    <a href="v301/v3Features.html">Version 3 Features</a>
-          </li>
-              
-    <li class="none">
-                    <a href="v301/tck.html">Using the TCK</a>
-          </li>
-              
-    <li class="none">
-                    <a href="v301/release-notes.html">Release Notes</a>
-          </li>
-          </ul>
-              <h5>Pluto 2.0</h5>
-            <ul>
-              
-    <li class="none">
-                    <a href="v20/getting-started.html">Getting Started</a>
-          </li>
-              
-    <li class="none">
-                    <a href="v20/deploying.html">Deploying</a>
-          </li>
-              
-    <li class="none">
-                    <a href="v20/embedding.html">Embedding</a>
-          </li>
-              
-    <li class="none">
-                    <a href="v20/release-notes.html">Release Notes</a>
-          </li>
-              
-    <li class="none">
-                    <a href="v20/app-servers.html">App Servers</a>
-          </li>
-              
-    <li class="none">
-                    <a href="v20/powered.html">Powered By Pluto</a>
-          </li>
-          </ul>
-              <h5>Pluto 1.1</h5>
-            <ul>
-              
-    <li class="none">
-                    <a href="v11/getting-started.html">Getting Started</a>
-          </li>
-              
-    <li class="none">
-                    <a href="v11/deploying.html">Deploying</a>
-          </li>
-              
-    <li class="none">
-                    <a href="v11/release-notes.html">Release Notes</a>
-          </li>
-          </ul>
-              <h5>Subprojects</h5>
-            <ul>
-              
-    <li class="none">
-                    <a href="subprojects/subprojects.html">Overview</a>
-          </li>
-          </ul>
-              <h5>Project Info</h5>
-            <ul>
-              
-    <li class="none">
-                    <a href="project-summary.html">Project Summary</a>
-          </li>
-              
-    <li class="none">
-                    <a href="team-list.html">Project Team</a>
-          </li>
-              
-    <li class="none">
-                    <a href="license.html">Project License</a>
-          </li>
-              
-    <li class="none">
-                    <a href="mail-lists.html">Mailing Lists</a>
-          </li>
-              
-    <li class="none">
-                    <a href="source-repository.html">Source Repository</a>
-          </li>
-              
-    <li class="none">
-                    <a href="issue-tracking.html">Issue Tracking</a>
-          </li>
-          </ul>
-                                           <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
-            <img alt="Built by Maven" src="./images/logos/maven-feather.png"></img>
-          </a>
-                       
-  
-
-  
-    
-            
-  
-    
-        </div>
-    </div>
-    <div id="bodyColumn">
-      <div id="contentBox">
-        <div class="section"><h2><a name="Download_Pluto"></a>Download Pluto</h2>
-<div class="highlightBox"><h4>About Pluto Distributions</h4>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!-- Generated by Apache Maven Doxia Site Renderer 1.8.1 from src/site/xdoc/download.xml at 2019-04-25 -->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <title>Pluto &#x2013; Apache Pluto Downloads</title>
+    <style type="text/css" media="all">
+      @import url("./css/maven-base.css");
+      @import url("./css/maven-theme.css");
+      @import url("./css/site.css");
+    </style>
+    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
+    <meta http-equiv="Content-Language" content="en" />
+    
+  </head>
+  <body class="composite">
+    <div id="banner">
+<a href="http://portals.apache.org/pluto/" id="bannerLeft"><img src="http://portals.apache.org/pluto/images/apache-portals.gif"  alt="Pluto"/></a>
+<div id="bannerRight">
+<img src="http://portals.apache.org/pluto/images/banner.png"  alt=""/></div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="breadcrumbs">
+      <div class="xleft">
+        <span id="publishDate">Last Published: 2019-04-25</span>
+          | <a href="http://portals.apache.org/pluto" class="externalLink" title="Home">Home</a> &gt;
+Apache Pluto Downloads
+      </div>
+      <div class="xright"><a href="portlet-3.0-apidocs/index.html" title="Portlet 3.0 API">Portlet 3.0 API</a> |
+<a href="portlet-2.0-apidocs/index.html" title="Portlet 2.0 API">Portlet 2.0 API</a> |
+<a href="portlet-1.0-apidocs/index.html" title="Portlet 1.0 API">Portlet 1.0 API</a> |
+<a href="http://jcp.org/en/jsr/detail?id=362" class="externalLink" title="JSR 362 JCP Page">JSR 362 JCP Page</a> |
+<a href="http://jcp.org/en/jsr/detail?id=286" class="externalLink" title="JSR 286 JCP Page">JSR 286 JCP Page</a> |
+<a href="http://jcp.org/en/jsr/detail?id=168" class="externalLink" title="JSR 168 JCP Page">JSR 168 JCP Page</a>      </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="leftColumn">
+      <div id="navcolumn">
+       <h5>The Pluto Project</h5>
+    <ul>
+     <li class="none"><a href="index.html" title="About Pluto">About Pluto</a></li>
+     <li class="none"><a href="mission.html" title="Mission">Mission</a></li>
+     <li class="none"><strong>Download</strong></li>
+     <li class="none"><a href="news.html" title="News">News</a></li>
+     <li class="none"><a href="security.html" title="Security">Security</a></li>
+     <li class="none"><a href="status.html" title="Status">Status</a></li>
+     <li class="none"><a href="architecture.html" title="Architecture">Architecture</a></li>
+     <li class="none"><a href="resources.html" title="Resources">Resources</a></li>
+     <li class="none"><a href="faq.html" title="FAQ">FAQ</a></li>
+     <li class="none"><a href="http://wiki.apache.org/portals/Pluto" class="externalLink" title="Wiki">Wiki</a></li>
+     <li class="none"><a href="https://issues.apache.org/jira/browse/PLUTO" class="externalLink" title="Issue Tracker (JIRA)">Issue Tracker (JIRA)</a></li>
+     <li class="none"><a href="helping.html" title="Get Involved">Get Involved</a></li>
+    </ul>
+       <h5>Pluto 3.1</h5>
+    <ul>
+     <li class="none"><a href="v310/mvcbean-portlets.html" title="MVCBean Portlets">MVCBean Portlets</a></li>
+     <li class="none"><a href="v310/getting-started.html" title="Getting Started">Getting Started</a></li>
+     <li class="none"><a href="v310/maven-archetypes.html" title="Maven Archetypes">Maven Archetypes</a></li>
+     <li class="none"><a href="v310/deploying.html" title="Deploying Portlets">Deploying Portlets</a></li>
+     <li class="none"><a href="v310/portlet-api.html" title="Portlet Concepts">Portlet Concepts</a></li>
+     <li class="none"><a href="v310/v3Features.html" title="Version 3 Features">Version 3 Features</a></li>
+     <li class="none"><a href="v310/tck.html" title="Using the TCK">Using the TCK</a></li>
+     <li class="none"><a href="v310/release-notes.html" title="Release Notes">Release Notes</a></li>
+    </ul>
+       <h5>Pluto 3.0</h5>
+    <ul>
+     <li class="none"><a href="v301/getting-started.html" title="Getting Started">Getting Started</a></li>
+     <li class="none"><a href="v301/deploying.html" title="Deploying Portlets">Deploying Portlets</a></li>
+     <li class="none"><a href="v301/portlet-api.html" title="Portlet Concepts">Portlet Concepts</a></li>
+     <li class="none"><a href="v301/v3Features.html" title="Version 3 Features">Version 3 Features</a></li>
+     <li class="none"><a href="v301/tck.html" title="Using the TCK">Using the TCK</a></li>
+     <li class="none"><a href="v301/release-notes.html" title="Release Notes">Release Notes</a></li>
+    </ul>
+       <h5>Pluto 2.0</h5>
+    <ul>
+     <li class="none"><a href="v20/getting-started.html" title="Getting Started">Getting Started</a></li>
+     <li class="none"><a href="v20/deploying.html" title="Deploying">Deploying</a></li>
+     <li class="none"><a href="v20/embedding.html" title="Embedding">Embedding</a></li>
+     <li class="none"><a href="v20/release-notes.html" title="Release Notes">Release Notes</a></li>
+     <li class="none"><a href="v20/app-servers.html" title="App Servers">App Servers</a></li>
+     <li class="none"><a href="v20/powered.html" title="Powered By Pluto">Powered By Pluto</a></li>
+    </ul>
+       <h5>Pluto 1.1</h5>
+    <ul>
+     <li class="none"><a href="v11/getting-started.html" title="Getting Started">Getting Started</a></li>
+     <li class="none"><a href="v11/deploying.html" title="Deploying">Deploying</a></li>
+     <li class="none"><a href="v11/release-notes.html" title="Release Notes">Release Notes</a></li>
+    </ul>
+       <h5>Subprojects</h5>
+    <ul>
+     <li class="none"><a href="subprojects/subprojects.html" title="Overview">Overview</a></li>
+    </ul>
+       <h5>Project Info</h5>
+    <ul>
+     <li class="none"><a href="project-summary.html" title="Project Summary">Project Summary</a></li>
+     <li class="none"><a href="team-list.html" title="Project Team">Project Team</a></li>
+     <li class="none"><a href="license.html" title="Project License">Project License</a></li>
+     <li class="none"><a href="mail-lists.html" title="Mailing Lists">Mailing Lists</a></li>
+     <li class="none"><a href="source-repository.html" title="Source Repository">Source Repository</a></li>
+     <li class="none"><a href="issue-tracking.html" title="Issue Tracking">Issue Tracking</a></li>
+    </ul>
+      <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
+        <img class="poweredBy" alt="Built by Maven" src="./images/logos/maven-feather.png" />
+      </a>
+      </div>
+    </div>
+    <div id="bodyColumn">
+      <div id="contentBox">
+
+  
+  
+    
+    <div class="section">
+<h2><a name="Download_Pluto"></a>Download Pluto</h2>
+      
+<div class="highlightBox">
+        
+<div class="section">
+<div class="section">
+<h4><a name="About_Pluto_Distributions"></a>About Pluto Distributions</h4>
+        
 <p>
           There are a number of distributions to choose from depending
           on your needs.
-          <ul><li><strong>pluto-bundle</strong> - Provides Pluto and Tomcat bundled together.
+          </p>
+<ul>
+            
+<li><b>pluto-bundle</b> - Provides Pluto and Tomcat bundled together.
                 If you are getting started with Pluto, this is the distribution you
                 want.</li>
-<li><strong>pluto-source-release</strong> - Provides the Pluto source code; requires
+            
+<li><b>pluto-source-release</b> - Provides the Pluto source code; requires
                 that you build and deploy Pluto on your own.</li>
-</ul>
-</p>
-</div><p>
-        The latest 3.0.1 version of Apache Pluto source and binary distributions can be downloaded from
+          </ul>
+        
+      </div>
+      
+<p>
+        The latest 3.1.0 version of Apache Pluto source and binary distributions can be downloaded from
         <a class="externalLink" href="http://www.apache.org/dyn/closer.cgi/portals/pluto/">a Pluto
         distribution mirror</a>.
       </p>
-</div>
-<div class="section"><h2><a name="Browse_Distribution_Archives"></a>Browse Distribution Archives</h2>
+    </div></div></div>
+    
+    
+<div class="section">
+<h2><a name="Browse_Distribution_Archives"></a>Browse Distribution Archives</h2>
+      
 <p>
         You can browse and download our distribution archive
         <a class="externalLink" href="http://archive.apache.org/dist/portals/pluto/">from here</a>.
       </p>
-</div>
-
-      </div>
-    </div>
-    <div class="clear">
-      <hr/>
-    </div>
-    <div id="footer">
-      <div class="xright">&#169;  
-          2004-2018
-    
-          Apache Software Foundation
-          
-  
-
-  
-    
-            
-  
-    
-  </div>
-      <div class="clear">
-        <hr/>
-      </div>
-    </div>
-  </body>
-</html>
+    </div>
+
+  
+  
+
+      </div>
+    </div>
+    <div class="clear">
+      <hr/>
+    </div>
+    <div id="footer">
+      <div class="xright">
+        Copyright &#169;      2004&#x2013;2019 <a href="http://www.apache.org/">Apache Software Foundation</a>.
+All rights reserved.      </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+  </body>
+</html>

Modified: portals/site-live/pluto/faq.html
URL: http://svn.apache.org/viewvc/portals/site-live/pluto/faq.html?rev=1858149&r1=1858148&r2=1858149&view=diff
==============================================================================
--- portals/site-live/pluto/faq.html (original)
+++ portals/site-live/pluto/faq.html Thu Apr 25 17:29:43 2019
@@ -1,261 +1,119 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-
-
-
-
-
-
-
-
-
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Pluto - Frequently Asked Questions</title>
-    <style type="text/css" media="all">
-      @import url("./css/maven-base.css");
-      @import url("./css/maven-theme.css");
-      @import url("./css/site.css");
-    </style>
-    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-          </head>
-  <body class="composite">
-    <div id="banner">
-                  <a href="http://portals.apache.org/pluto/" id="bannerLeft">
-    
-                                    <img src="http://portals.apache.org/pluto/images/apache-portals.gif" alt="" />
-    
-            </a>
-                          <span id="bannerRight">
-    
-                                    <img src="http://portals.apache.org/pluto/images/banner.png" alt="" />
-    
-            </span>
-            <div class="clear">
-        <hr/>
-      </div>
-    </div>
-    <div id="breadcrumbs">
-          
-  
-
-  
-    
-            
-  
-    
-            <div class="xleft">
-        Last Published: 2018-06-22
-                          |   
-                <a href="http://portals.apache.org/pluto" class="externalLink">Home</a>
-                          </div>
-            <div class="xright">            <a href="portlet-3.0-apidocs/index.html">Portlet 3.0 API</a>
-            |
-                <a href="portlet-2.0-apidocs/index.html">Portlet 2.0 API</a>
-            |
-                <a href="portlet-1.0-apidocs/index.html">Portlet 1.0 API</a>
-            |
-                <a href="http://jcp.org/en/jsr/detail?id=362" class="externalLink">JSR 362 JCP Page</a>
-            |
-                <a href="http://jcp.org/en/jsr/detail?id=286" class="externalLink">JSR 286 JCP Page</a>
-            |
-                <a href="http://jcp.org/en/jsr/detail?id=168" class="externalLink">JSR 168 JCP Page</a>
-            
-  
-
-  
-    
-            
-  
-    
-  </div>
-      <div class="clear">
-        <hr/>
-      </div>
-    </div>
-    <div id="leftColumn">
-      <div id="navcolumn">
-           
-  
-
-  
-    
-            
-  
-    
-                   <h5>The Pluto Project</h5>
-            <ul>
-              
-    <li class="none">
-                    <a href="index.html">About Pluto</a>
-          </li>
-              
-    <li class="none">
-                    <a href="mission.html">Mission</a>
-          </li>
-              
-    <li class="none">
-                    <a href="download.html">Download</a>
-          </li>
-              
-    <li class="none">
-                    <a href="news.html">News</a>
-          </li>
-              
-    <li class="none">
-                    <a href="security.html">Security</a>
-          </li>
-              
-    <li class="none">
-                    <a href="status.html">Status</a>
-          </li>
-              
-    <li class="none">
-                    <a href="architecture.html">Architecture</a>
-          </li>
-              
-    <li class="none">
-                    <a href="resources.html">Resources</a>
-          </li>
-              
-    <li class="none">
-              <strong>FAQ</strong>
-        </li>
-              
-    <li class="none">
-                    <a href="http://wiki.apache.org/portals/Pluto" class="externalLink">Wiki</a>
-          </li>
-              
-    <li class="none">
-                    <a href="https://issues.apache.org/jira/browse/PLUTO" class="externalLink">Issue Tracker (JIRA)</a>
-          </li>
-              
-    <li class="none">
-                    <a href="helping.html">Get Involved</a>
-          </li>
-          </ul>
-              <h5>Pluto 3.0</h5>
-            <ul>
-              
-    <li class="none">
-                    <a href="v301/getting-started.html">Getting Started</a>
-          </li>
-              
-    <li class="none">
-                    <a href="v301/deploying.html">Deploying Portlets</a>
-          </li>
-              
-    <li class="none">
-                    <a href="v301/portlet-api.html">Portlet Concepts</a>
-          </li>
-              
-    <li class="none">
-                    <a href="v301/v3Features.html">Version 3 Features</a>
-          </li>
-              
-    <li class="none">
-                    <a href="v301/tck.html">Using the TCK</a>
-          </li>
-              
-    <li class="none">
-                    <a href="v301/release-notes.html">Release Notes</a>
-          </li>
-          </ul>
-              <h5>Pluto 2.0</h5>
-            <ul>
-              
-    <li class="none">
-                    <a href="v20/getting-started.html">Getting Started</a>
-          </li>
-              
-    <li class="none">
-                    <a href="v20/deploying.html">Deploying</a>
-          </li>
-              
-    <li class="none">
-                    <a href="v20/embedding.html">Embedding</a>
-          </li>
-              
-    <li class="none">
-                    <a href="v20/release-notes.html">Release Notes</a>
-          </li>
-              
-    <li class="none">
-                    <a href="v20/app-servers.html">App Servers</a>
-          </li>
-              
-    <li class="none">
-                    <a href="v20/powered.html">Powered By Pluto</a>
-          </li>
-          </ul>
-              <h5>Pluto 1.1</h5>
-            <ul>
-              
-    <li class="none">
-                    <a href="v11/getting-started.html">Getting Started</a>
-          </li>
-              
-    <li class="none">
-                    <a href="v11/deploying.html">Deploying</a>
-          </li>
-              
-    <li class="none">
-                    <a href="v11/release-notes.html">Release Notes</a>
-          </li>
-          </ul>
-              <h5>Subprojects</h5>
-            <ul>
-              
-    <li class="none">
-                    <a href="subprojects/subprojects.html">Overview</a>
-          </li>
-          </ul>
-              <h5>Project Info</h5>
-            <ul>
-              
-    <li class="none">
-                    <a href="project-summary.html">Project Summary</a>
-          </li>
-              
-    <li class="none">
-                    <a href="team-list.html">Project Team</a>
-          </li>
-              
-    <li class="none">
-                    <a href="license.html">Project License</a>
-          </li>
-              
-    <li class="none">
-                    <a href="mail-lists.html">Mailing Lists</a>
-          </li>
-              
-    <li class="none">
-                    <a href="source-repository.html">Source Repository</a>
-          </li>
-              
-    <li class="none">
-                    <a href="issue-tracking.html">Issue Tracking</a>
-          </li>
-          </ul>
-                                           <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
-            <img alt="Built by Maven" src="./images/logos/maven-feather.png"></img>
-          </a>
-                       
-  
-
-  
-    
-            
-  
-    
-        </div>
-    </div>
-    <div id="bodyColumn">
-      <div id="contentBox">
-        <div class="section"><h2><a name="top">Frequently Asked Questions</a></h2>
-<ol type="1"><li><a href="#version">Which version of Pluto 3.0 should I use?</a></li>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!-- Generated by Apache Maven Doxia Site Renderer 1.8.1 from src/site/fml/faq.fml at 2019-04-25 -->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <title>Pluto &#x2013; Frequently Asked Questions</title>
+    <style type="text/css" media="all">
+      @import url("./css/maven-base.css");
+      @import url("./css/maven-theme.css");
+      @import url("./css/site.css");
+    </style>
+    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
+    <meta http-equiv="Content-Language" content="en" />
+    
+  </head>
+  <body class="composite">
+    <div id="banner">
+<a href="http://portals.apache.org/pluto/" id="bannerLeft"><img src="http://portals.apache.org/pluto/images/apache-portals.gif"  alt="Pluto"/></a>
+<div id="bannerRight">
+<img src="http://portals.apache.org/pluto/images/banner.png"  alt=""/></div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="breadcrumbs">
+      <div class="xleft">
+        <span id="publishDate">Last Published: 2019-04-25</span>
+          | <a href="http://portals.apache.org/pluto" class="externalLink" title="Home">Home</a> &gt;
+Frequently Asked Questions
+      </div>
+      <div class="xright"><a href="portlet-3.0-apidocs/index.html" title="Portlet 3.0 API">Portlet 3.0 API</a> |
+<a href="portlet-2.0-apidocs/index.html" title="Portlet 2.0 API">Portlet 2.0 API</a> |
+<a href="portlet-1.0-apidocs/index.html" title="Portlet 1.0 API">Portlet 1.0 API</a> |
+<a href="http://jcp.org/en/jsr/detail?id=362" class="externalLink" title="JSR 362 JCP Page">JSR 362 JCP Page</a> |
+<a href="http://jcp.org/en/jsr/detail?id=286" class="externalLink" title="JSR 286 JCP Page">JSR 286 JCP Page</a> |
+<a href="http://jcp.org/en/jsr/detail?id=168" class="externalLink" title="JSR 168 JCP Page">JSR 168 JCP Page</a>      </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="leftColumn">
+      <div id="navcolumn">
+       <h5>The Pluto Project</h5>
+    <ul>
+     <li class="none"><a href="index.html" title="About Pluto">About Pluto</a></li>
+     <li class="none"><a href="mission.html" title="Mission">Mission</a></li>
+     <li class="none"><a href="download.html" title="Download">Download</a></li>
+     <li class="none"><a href="news.html" title="News">News</a></li>
+     <li class="none"><a href="security.html" title="Security">Security</a></li>
+     <li class="none"><a href="status.html" title="Status">Status</a></li>
+     <li class="none"><a href="architecture.html" title="Architecture">Architecture</a></li>
+     <li class="none"><a href="resources.html" title="Resources">Resources</a></li>
+     <li class="none"><strong>FAQ</strong></li>
+     <li class="none"><a href="http://wiki.apache.org/portals/Pluto" class="externalLink" title="Wiki">Wiki</a></li>
+     <li class="none"><a href="https://issues.apache.org/jira/browse/PLUTO" class="externalLink" title="Issue Tracker (JIRA)">Issue Tracker (JIRA)</a></li>
+     <li class="none"><a href="helping.html" title="Get Involved">Get Involved</a></li>
+    </ul>
+       <h5>Pluto 3.1</h5>
+    <ul>
+     <li class="none"><a href="v310/mvcbean-portlets.html" title="MVCBean Portlets">MVCBean Portlets</a></li>
+     <li class="none"><a href="v310/getting-started.html" title="Getting Started">Getting Started</a></li>
+     <li class="none"><a href="v310/maven-archetypes.html" title="Maven Archetypes">Maven Archetypes</a></li>
+     <li class="none"><a href="v310/deploying.html" title="Deploying Portlets">Deploying Portlets</a></li>
+     <li class="none"><a href="v310/portlet-api.html" title="Portlet Concepts">Portlet Concepts</a></li>
+     <li class="none"><a href="v310/v3Features.html" title="Version 3 Features">Version 3 Features</a></li>
+     <li class="none"><a href="v310/tck.html" title="Using the TCK">Using the TCK</a></li>
+     <li class="none"><a href="v310/release-notes.html" title="Release Notes">Release Notes</a></li>
+    </ul>
+       <h5>Pluto 3.0</h5>
+    <ul>
+     <li class="none"><a href="v301/getting-started.html" title="Getting Started">Getting Started</a></li>
+     <li class="none"><a href="v301/deploying.html" title="Deploying Portlets">Deploying Portlets</a></li>
+     <li class="none"><a href="v301/portlet-api.html" title="Portlet Concepts">Portlet Concepts</a></li>
+     <li class="none"><a href="v301/v3Features.html" title="Version 3 Features">Version 3 Features</a></li>
+     <li class="none"><a href="v301/tck.html" title="Using the TCK">Using the TCK</a></li>
+     <li class="none"><a href="v301/release-notes.html" title="Release Notes">Release Notes</a></li>
+    </ul>
+       <h5>Pluto 2.0</h5>
+    <ul>
+     <li class="none"><a href="v20/getting-started.html" title="Getting Started">Getting Started</a></li>
+     <li class="none"><a href="v20/deploying.html" title="Deploying">Deploying</a></li>
+     <li class="none"><a href="v20/embedding.html" title="Embedding">Embedding</a></li>
+     <li class="none"><a href="v20/release-notes.html" title="Release Notes">Release Notes</a></li>
+     <li class="none"><a href="v20/app-servers.html" title="App Servers">App Servers</a></li>
+     <li class="none"><a href="v20/powered.html" title="Powered By Pluto">Powered By Pluto</a></li>
+    </ul>
+       <h5>Pluto 1.1</h5>
+    <ul>
+     <li class="none"><a href="v11/getting-started.html" title="Getting Started">Getting Started</a></li>
+     <li class="none"><a href="v11/deploying.html" title="Deploying">Deploying</a></li>
+     <li class="none"><a href="v11/release-notes.html" title="Release Notes">Release Notes</a></li>
+    </ul>
+       <h5>Subprojects</h5>
+    <ul>
+     <li class="none"><a href="subprojects/subprojects.html" title="Overview">Overview</a></li>
+    </ul>
+       <h5>Project Info</h5>
+    <ul>
+     <li class="none"><a href="project-summary.html" title="Project Summary">Project Summary</a></li>
+     <li class="none"><a href="team-list.html" title="Project Team">Project Team</a></li>
+     <li class="none"><a href="license.html" title="Project License">Project License</a></li>
+     <li class="none"><a href="mail-lists.html" title="Mailing Lists">Mailing Lists</a></li>
+     <li class="none"><a href="source-repository.html" title="Source Repository">Source Repository</a></li>
+     <li class="none"><a href="issue-tracking.html" title="Issue Tracking">Issue Tracking</a></li>
+    </ul>
+      <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
+        <img class="poweredBy" alt="Built by Maven" src="./images/logos/maven-feather.png" />
+      </a>
+      </div>
+    </div>
+    <div id="bodyColumn">
+      <div id="contentBox">
+<div class="section">
+<h2><a name="Frequently_Asked_Questions"></a><a name="top">Frequently Asked Questions</a></h2>
+<ol style="list-style-type: decimal">
+<li><a href="#version">Which version of Pluto 3.0 should I use?</a></li>
 <li><a href="#version2.0">Which version of Pluto 2.0 should I use?</a></li>
 <li><a href="#a10">I've seen references to Pluto 1.0.x and 1.1x. What are versions 1.x used for?</a></li>
 <li><a href="#portal">Is Pluto an Enterprise Portal?</a></li>
@@ -264,60 +122,67 @@
 <li><a href="#xml-parsing">
             Do I need to have xml parsers in an endorsed classloader? (e.g.in
             Tomcat's 5.5 common/endorsed directory)
-        </a></li>
-</ol>
-</div>
-<dl><dt><a name="version">Which version of Pluto 3.0 should I use?</a></dt>
+        </a></li></ol></div>
+<dl>
+<dt><a name="version">Which version of Pluto 3.0 should I use?</a></dt>
 <dd>
-        <p>
-          Version 3.0.1 is the latest stable release available from the download site. 
+        
+<p>
+          Version 3.1.0 is the latest stable release available from the download site. 
           If you want to build the current development version, please see the Pluto 3.0
-          <a href="./v301/getting-started.html">Getting Started</a> section for information on cloning 
+          <a href="./v310/getting-started.html">Getting Started</a> section for information on cloning 
           the Pluto repository, building the portal, and learning from the version 3.0 sample portlets.
        </p>
-        <p>
+        
+<p>
           All Pluto 2.x and 1.x versions are no longer active and only maintained for bug fixes. 
        </p>
-      <table border="0"><tr><td align="right"><a href="#top">[top]</a></td></tr></table><hr />
-</dd>
+      
+<p align="right"><a href="#top">[top]</a></p><hr /></dd>
 <dt><a name="version2.0">Which version of Pluto 2.0 should I use?</a></dt>
 <dd>
-        <p>
+        
+<p>
           The latest release from the 2.0 series (2.0.3) is the current
           stable release. We recommend that you use this if you
           are looking for a stable release. 2.0 implements JSR 286 Java Portlet Specification 2.0 and requires Java 5 as minimum.
        </p>
-        <p>
+        
+<p>
           All Pluto 1.x versions are no longer active and only maintained for bug fixes. 
        </p>
-      <table border="0"><tr><td align="right"><a href="#top">[top]</a></td></tr></table><hr />
-</dd>
+      
+<p align="right"><a href="#top">[top]</a></p><hr /></dd>
 <dt><a name="a10">I've seen references to Pluto 1.0.x and 1.1x. What are versions 1.x used for?</a></dt>
 <dd>
-        <p>
+        
+<p>
           Pluto 1.0.x is based off of the code base which was
           originally donated to the ASF by IBM. The first release
           candidate in this series was published on October 8, 2004.
           Pluto 1.0.x is only maintained for bug fixes.         
        </p>
-        <p>
+        
+<p>
         Pluto 1.0.1 is the portlet container embedded in all Jetspeed release up until version 2.2.0. 
         From version 2.2.0 onward, Jetspeed embeds Pluto 2.0.x.
        </p>
-        <p>
+        
+<p>
           The 1.1.x series is a refactoring/rewrite of Pluto 1.0.x. It's
           entire purpose is to simplify the container and make it
           easier for both Portlet Developers and Portal Developers
           looking to embed Pluto into their portal to use Pluto.
        </p>
-        <p>
+        
+<p>
           Now that Pluto 2.0.0 has been released, our team highly
           recommends that you migrate to it. Pluto 1.0.x development
           has been stagnant for some time and there are no plans to
           support it in the future. 
        </p>
-      <table border="0"><tr><td align="right"><a href="#top">[top]</a></td></tr></table><hr />
-</dd>
+      
+<p align="right"><a href="#top">[top]</a></p><hr /></dd>
 <dt><a name="portal">Is Pluto an Enterprise Portal?</a></dt>
 <dd>
         No, the Pluto project aims to provide a Java Specification
@@ -329,121 +194,125 @@
         portal hosted by the Apache Software Foundation. Sakai and uPortal
         are both educational portals which utilize Pluto as their container.
         There are many other open source portals.
-      <table border="0"><tr><td align="right"><a href="#top">[top]</a></td></tr></table><hr />
-</dd>
+      
+<p align="right"><a href="#top">[top]</a></p><hr /></dd>
 <dt><a name="simple-embed">What's the easiest way to include a portlet in my webapp (applies to Pluto 1.x only)</a></dt>
 <dd>
-        <p>
-          Simple, use the Pluto Portal Drivers "PortalDriverFilter". This allows
+        
+<p>
+          Simple, use the Pluto Portal Drivers &quot;PortalDriverFilter&quot;. This allows
           you to embed a portlet directly into a jsp page. To use it, do the following:
        </p>
-        <p>
-        <ul>
-          <li>Add the Portal Driver listener Configuration to your web.xml
+        
+<p>
+        </p>
+<ul>
+          
+<li>Add the Portal Driver listener Configuration to your web.xml
             <textarea style="border:0; width: 100%; background:transparent; color:#555555" rows="3" readonly="true">
-<listener>
-    <listener-class>org.apache.pluto.driver.PortalStartupListener</listener-class>
-</listener>
+
+    org.apache.pluto.driver.PortalStartupListener
+
            </textarea>
          </li>
-          <li>Add the PortalDriverFilter configuration to your web.xml
+          
+<li>Add the PortalDriverFilter configuration to your web.xml
             <textarea style="border:0; width: 100%; background:transparent; color:#555555" rows="15" readonly="true">
-<filter>
-  <filter-name>plutoPortalDriver</filter-name>
-  <filter-class>org.apache.pluto.driver.PortalDriverFilter</filter-class>
-</filter>
-
-<filter-mapping>
-  <filter-name>plutoPortalDriver</filter-name>
-  <url-pattern>/about.jsp</url-pattern>
-</filter-mapping>
-
-<filter-mapping>
-  <filter-name>plutoPortalDriver</filter-name>
-  <url-pattern>/about.jsp/*</url-pattern>
-</filter-mapping>
+
+  plutoPortalDriver
+  org.apache.pluto.driver.PortalDriverFilter
+
+
+
+  plutoPortalDriver
+  /about.jsp
+
+
+
+  plutoPortalDriver
+  /about.jsp/*
+
            </textarea>
          </li>
-          <li>Include the portlet (and perhaps some controls?) in your jsp.
+          
+<li>Include the portlet (and perhaps some controls?) in your jsp.
             <textarea style="border:0; width: 100%; background:transparent; color:#555555" rows="15" readonly="true">
-%@ taglib uri="http://portals.apache.org/pluto" prefix="pluto" %
+%@ taglib uri=&quot;http://portals.apache.org/pluto&quot; prefix=&quot;pluto&quot; %
 
-<pluto:portlet portletId="${portlet}">
-  <div class="portlet" id="&gt;c:out value=&quot;${portlet}&quot;/&gt;">
-    <div class="header">
-      <h2 class="title"><pluto:title></pluto:title></h2>
+
+  
+<div class="portlet" id="&gt;c:out value=&quot;${portlet}&quot;/&gt;">
+    
+<div class="header">
+      
+<div class="title">
+<h2 class="title"></h2>
    </div>
-    <div class="body">
-      <pluto:render></pluto:render>
+    
+<div class="body">
+      
    </div>
  </div>
-</pluto:portlet>
+
            </textarea>
          </li>
        </ul>
-       </p>
-      <table border="0"><tr><td align="right"><a href="#top">[top]</a></td></tr></table><hr />
-</dd>
+       
+      
+<p align="right"><a href="#top">[top]</a></p><hr /></dd>
 <dt><a name="encoding">How can I change the default encoding of the Pluto Portal</a></dt>
 <dd>
-            <p>
+            
+<p>
               This is currently not supported with Pluto 3.0. The character encoding for 
               render requests is set to UTF-8.
            </p>
-            <p>As of Pluto 1.1.5 you can change the default encoding of the Pluto Portal by
+            
+<p>As of Pluto 1.1.5 you can change the default encoding of the Pluto Portal by
                editing the Pluto Portlet Servlet's web.xml.  Add an init-param with
-               the name of "charset" and set the value to the desired character set.</p>
+               the name of &quot;charset&quot; and set the value to the desired character set.</p>
             <textarea style="border:0; width: 100%; background:transparent; color:#555555" rows="15" readonly="true">
-  <servlet>
-    <servlet-name>plutoPortalDriver</servlet-name>
-    <display-name>Pluto Portal Driver</display-name>
-    <description>Pluto Portal Driver Controller</description>
-    <servlet-class>org.apache.pluto.driver.PortalDriverServlet</servlet-class>
-    <init-param>
-      <param-name>charset</param-name>
-      <param-value>UTF-8</param-value>
-   </init-param>
- </servlet>
+  
+    plutoPortalDriver
+    Pluto Portal Driver
+    Pluto Portal Driver Controller
+    org.apache.pluto.driver.PortalDriverServlet
+    
+      charset
+      UTF-8
+   
+ 
            </textarea>
-        <table border="0"><tr><td align="right"><a href="#top">[top]</a></td></tr></table><hr />
-</dd>
+        
+<p align="right"><a href="#top">[top]</a></p><hr /></dd>
 <dt><a name="xml-parsing">
             Do I need to have xml parsers in an endorsed classloader? (e.g.in
             Tomcat's 5.5 common/endorsed directory)
         </a></dt>
 <dd>
-            <p>If you have installed Pluto 1.1.5 or greater, and are running on
+            
+<p>If you have installed Pluto 1.1.5 or greater, and are running on
             Java 5 or greater, then you do not need to endorse any XML
             libraries.  Pluto will use JAXP.</p>
-            <p>The Pluto 1.1.x codebase targets Java 1.4, and so the bundled
+            
+<p>The Pluto 1.1.x codebase targets Java 1.4, and so the bundled
             distribution of Pluto includes Tomcat with XML libraries in
-            <code>common/endorsed</code>.  Simply remove the XML libraries
-            from <code>common/endorsed</code> if you meet the above requirements.</p>
-        <table border="0"><tr><td align="right"><a href="#top">[top]</a></td></tr></table></dd>
-</dl>
-
-      </div>
-    </div>
-    <div class="clear">
-      <hr/>
-    </div>
-    <div id="footer">
-      <div class="xright">&#169;  
-          2004-2018
-    
-          Apache Software Foundation
-          
-  
-
-  
-    
-            
-  
-    
-  </div>
-      <div class="clear">
-        <hr/>
-      </div>
-    </div>
-  </body>
-</html>
+            <tt>common/endorsed</tt>.  Simply remove the XML libraries
+            from <tt>common/endorsed</tt> if you meet the above requirements.</p>
+        
+<p align="right"><a href="#top">[top]</a></p></dd></dl>
+      </div>
+    </div>
+    <div class="clear">
+      <hr/>
+    </div>
+    <div id="footer">
+      <div class="xright">
+        Copyright &#169;      2004&#x2013;2019 <a href="http://www.apache.org/">Apache Software Foundation</a>.
+All rights reserved.      </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+  </body>
+</html>