You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2017/06/01 11:36:04 UTC

svn commit: r1013271 [24/25] - in /websites/production/struts/content: ./ core-developers/ core-developers/attachments/ getting-started/ security/

Added: websites/production/struts/content/core-developers/zero-configuration.html
==============================================================================
--- websites/production/struts/content/core-developers/zero-configuration.html (added)
+++ websites/production/struts/content/core-developers/zero-configuration.html Thu Jun  1 11:35:58 2017
@@ -0,0 +1,305 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8"/>
+  <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+  <meta name="Date-Revision-yyyymmdd" content="20140918"/>
+  <meta http-equiv="Content-Language" content="en"/>
+  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+
+  <title>Zero Configuration</title>
+
+  <link href="//fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600,700,400italic,600italic,700italic" rel="stylesheet" type="text/css">
+  <link href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" rel="stylesheet">
+  <link href="/css/main.css" rel="stylesheet">
+  <link href="/css/custom.css" rel="stylesheet">
+  <link href="/highlighter/github-theme.css" rel="stylesheet">
+
+  <script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
+  <script type="text/javascript" src="/bootstrap/js/bootstrap.js"></script>
+  <script type="text/javascript" src="/js/community.js"></script>
+</head>
+<body>
+
+<a href="http://github.com/apache/struts" class="github-ribbon">
+  <img style="position: absolute; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub">
+</a>
+
+<header>
+  <nav>
+    <div role="navigation" class="navbar navbar-default navbar-fixed-top">
+      <div class="container">
+        <div class="navbar-header">
+          <button type="button" data-toggle="collapse" data-target="#struts-menu" class="navbar-toggle">
+            Menu
+            <span class="sr-only">Toggle navigation</span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+          </button>
+          <a href="/index.html" class="navbar-brand logo"><img src="/img/struts-logo.svg"></a>
+        </div>
+        <div id="struts-menu" class="navbar-collapse collapse">
+          <ul class="nav navbar-nav">
+            <li class="dropdown">
+              <a data-toggle="dropdown" href="#" class="dropdown-toggle">
+                Home<b class="caret"></b>
+              </a>
+              <ul class="dropdown-menu">
+                <li><a href="/index.html">Welcome</a></li>
+                <li><a href="/downloads.html">Downloads</a></li>
+                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="http://www.apache.org/licenses/">License</a></li>
+                <li><a href="http://apache.org/foundation/thanks.html">Thanks!</a></li>
+                <li><a href="http://apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a data-toggle="dropdown" href="#" class="dropdown-toggle">
+                Support<b class="caret"></b>
+              </a>
+              <ul class="dropdown-menu">
+                <li><a href="/mail.html">User Mailing List</a></li>
+                <li><a href="https://issues.apache.org/jira/browse/WW">Issue Tracker</a></li>
+                <li><a href="/security.html">Reporting Security Issues</a></li>
+                <li class="divider"></li>
+                <li><a href="/maven/project-info.html">Project info</a></li>
+                <li><a href="/maven/struts2-core/dependencies.html">Struts Core dependencies</a></li>
+                <li><a href="/maven/struts2-plugins/modules.html">Plugin dependencies</a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a data-toggle="dropdown" href="#" class="dropdown-toggle">
+                Documentation<b class="caret"></b>
+              </a>
+              <ul class="dropdown-menu">
+                <li><a href="/birdseye.html">Birds Eye</a></li>
+                <li><a href="/primer.html">Key Technologies</a></li>
+                <li><a href="/kickstart.html">Kickstart FAQ</a></li>
+                <li><a href="https://cwiki.apache.org/confluence/display/WW/Home">Wiki</a></li>
+                <li class="divider"></li>
+                <li><a href="/getting-started/">Getting Started</a></li>
+                <li><a href="/docs/tutorials.html">Tutorials</a></li>
+                <li><a href="/docs/faqs.html">FAQs</a></li>
+                <li><a href="/docs/guides.html">Guides</a></li>
+                <li class="divider"></li>
+                <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
+                <li><a href="/docs/plugins.html">Plugin APIs</a></li>
+                <li><a href="/docs/tag-reference.html">Tag reference</a></li>
+                <li><a href="http://cwiki.apache.org/S2PLUGINS/home.html">Plugin registry</a></li>
+                <li class="divider"></li>
+                <li><a href="/security/">Security Guide (WIP)</a></li>
+                <li><a href="/core-developers/">Core Developers Guide (WIP)</a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a data-toggle="dropdown" href="#" class="dropdown-toggle">
+                Contributing<b class="caret"></b>
+              </a>
+              <ul class="dropdown-menu">
+                <li><a href="/youatstruts.html">You at Struts</a></li>
+                <li><a href="/helping.html">How to Help FAQ</a></li>
+                <li><a href="/dev-mail.html">Development Lists</a></li>
+                <li class="divider"></li>
+                <li><a href="/submitting-patches.html">Submitting patches</a></li>
+                <li><a href="/builds.html">Source Code</a></li>
+                <li><a href="/coding-standards.html">Coding standards</a></li>
+                <li class="divider"></li>
+                <li><a href="/releases.html">Release Guidelines</a></li>
+                <li><a href="/bylaws.html">PMC Charter</a></li>
+                <li><a href="/volunteers.html">Volunteers</a></li>
+                <li><a href="https://git-wip-us.apache.org/repos/asf?p=struts.git">Source Repository</a></li>
+              </ul>
+            </li>
+            <li class="apache"><a href="http://www.apache.org/"><img src="/img/apache.png"></a></li>
+          </ul>
+        </div>
+      </div>
+    </div>
+  </nav>
+</header>
+
+
+<article class="container">
+  <section class="col-md-12">
+    <a href="index.html" title="back to Core Developers Guide"><< back to Core Developers Guide</a>
+    <h1 id="zero-configuration">Zero Configuration</h1>
+
+<p><strong>(!) Deprecated Plugin</strong></p>
+
+<blockquote>
+
+</blockquote>
+
+<blockquote>
+
+</blockquote>
+
+<blockquote>
+  <p>Since 2.1 this plugin has been deprecated in favor of the <em>Convention Plugin</em></p>
+</blockquote>
+
+<blockquote>
+
+</blockquote>
+
+<p>A “Zero Configuration” Struts application or plugin uses no additional XML or properties files. Metadata is expressed through convention and annotation.</p>
+
+<p>As this is a new feature, and still being field-tested, the documentation is sketchy. But, here’s what we have so far:</p>
+
+<p>#####Finding Actions#####</p>
+
+<p>Set the “actionPackages” filter init param to a comma-separated list of packages containing Action classes in web.xml. The packages and their subpackages will be scanned. All classes in the designated packages that implement Action or end in “Action” are examined.  The latter is to allow for POJO Actions that don’t implement the Action interface.</p>
+
+<p><strong>Annotation Initialization actionPackages Filter Parameter in web.xml</strong></p>
+
+<div class="highlighter-rouge"><pre class="highlight"><code>
+&lt;filter&gt;
+  &lt;filter-name&gt;struts2&lt;/filter-name&gt;
+  &lt;filter-class&gt;org.apache.struts2.dispatcher.FilterDispatcher&lt;/filter-class&gt;
+  &lt;init-param&gt;
+    &lt;param-name&gt;actionPackages&lt;/param-name&gt;
+    &lt;param-value&gt;com.foo.bar,com.baz.quux&lt;/param-value&gt;
+  &lt;/init-param&gt;
+&lt;/filter&gt;
+
+</code></pre>
+</div>
+
+<p>We should probably add an action annotation, so that POJOs can itall with annotations.</p>
+
+<p>#####Examples#####</p>
+
+<p>The only example right now is in the showcase, where the person package uses the classpath scanning configuration.</p>
+
+<p>#####Action and Package name#####</p>
+
+<p>The subpackage name makes the namespace, and the action class name makes the action name.  If there is an “Action” suffix, it is dropped before creating the action name. Therefore, if the configured package is <em>com.myapp.actions</em>  and the Action is <em>com.myapp.actions.</em> <strong>member</strong>.EditAction, you can access it via <a href="http://server/myapp/member/edit\.action">http://server/myapp/member/edit.action</a>.  For multi-word actions, the first letter is lower-cased and the rest is left alone, so the Action</p>
+
+<div class="highlighter-rouge"><pre class="highlight"><code>MyCustomAction
+</code></pre>
+</div>
+<p>will map to</p>
+
+<div class="highlighter-rouge"><pre class="highlight"><code>myCustom.action
+</code></pre>
+</div>
+<p>.</p>
+
+<p>#####Results#####</p>
+
+<p><a href="#PAGE_43811">Results</a> are defined with the Result and Results annotations at the <strong>class level</strong>.</p>
+
+<p>#####Namespaces#####</p>
+
+<p>The <a href="#PAGE_68488">Namespace Annotation</a> overrides the namespace.</p>
+
+<p>#####Parent Package#####</p>
+
+<p>The <a href="#PAGE_68490">ParentPackage Annotation</a> configures the XWork package (an XWork package is created per Java package) to extend one or more defined packages. The best place for this annotation is on the package via the</p>
+
+<div class="highlighter-rouge"><pre class="highlight"><code>package-info.java
+</code></pre>
+</div>
+<p>file, however, for backward-compatibility, they can be specified on one or more Actions in the package.  To determine which parent packages should be set, first, it looks for the package annotation, then adds the action annotations as they are loaded.  Because the load order of Actions is undetermined, it is highly recommended you avoid putting the @ParentPackage annotation on Action classes themselves.</p>
+
+<p>For example, if you wanted to set the parent package for the</p>
+
+<div class="highlighter-rouge"><pre class="highlight"><code>com.mycompany.myapp.actions
+</code></pre>
+</div>
+<p>package, create this package-info.java file:</p>
+
+<div class="highlighter-rouge"><pre class="highlight"><code>
+@ParentPackage("my-parent-package")
+package com.mycompany.myapp.actions
+
+import org.apache.struts2.config.ParentPackage;
+
+</code></pre>
+</div>
+
+<p>To define multiple parent packages, list an array of package names:</p>
+
+<div class="highlighter-rouge"><pre class="highlight"><code>
+@ParentPackage({"my-parent-package1, my-parent-package2"})
+package com.mycompany.myapp.actions
+
+import org.apache.struts2.config.ParentPackage;
+
+</code></pre>
+</div>
+
+<p>#####Feedback#####</p>
+
+<p>Stay tuned to this page for additional details and documentation. If you have a chance to  try the zero configuration feature, please share any experiences on dev@ and here.</p>
+
+<p>#####See also#####</p>
+
+<ul>
+  <li>
+    <p><em>Zero Configuration Scanning</em>  Use Case</p>
+  </li>
+  <li>
+    <p><em>Codebehind Plugin</em></p>
+  </li>
+  <li>
+    <p><em>RESTfulActionMapper</em></p>
+  </li>
+</ul>
+
+  </section>
+</article>
+
+
+<footer class="container">
+  <div class="col-md-12">
+    Copyright &copy; 2000-2016 <a href="http://www.apache.org/">The Apache Software Foundation </a>.
+    All Rights Reserved.
+  </div>
+  <div class="col-md-12">
+    Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts project logos are
+    trademarks of The Apache Software Foundation.
+  </div>
+  <div class="col-md-12">Logo and website design donated by <a href="https://softwaremill.com/">SoftwareMill</a>.</div>
+</footer>
+
+<script>!function (d, s, id) {
+  var js, fjs = d.getElementsByTagName(s)[0];
+  if (!d.getElementById(id)) {
+    js = d.createElement(s);
+    js.id = id;
+    js.src = "//platform.twitter.com/widgets.js";
+    fjs.parentNode.insertBefore(js, fjs);
+  }
+}(document, "script", "twitter-wjs");</script>
+<script src="https://apis.google.com/js/platform.js" async="async" defer="defer"></script>
+
+<div id="fb-root"></div>
+
+<script>(function (d, s, id) {
+  var js, fjs = d.getElementsByTagName(s)[0];
+  if (d.getElementById(id)) return;
+  js = d.createElement(s);
+  js.id = id;
+  js.src = "//connect.facebook.net/en_GB/all.js#xfbml=1";
+  fjs.parentNode.insertBefore(js, fjs);
+}(document, 'script', 'facebook-jssdk'));</script>
+
+
+<script>
+$(function() {
+  return $("h2, h3, h4, h5, h6").each(function(i, el) {
+    var $el, id;
+    $el = $(el);
+    id = $el.attr('id');
+    if (id) {
+      $el.removeAttr('id');
+      return $el.before($("<a />").addClass('anchor').attr('name', id));
+    }
+  });
+});
+</script>
+
+</body>
+</html>

Modified: websites/production/struts/content/dev-mail.html
==============================================================================
--- websites/production/struts/content/dev-mail.html (original)
+++ websites/production/struts/content/dev-mail.html Thu Jun  1 11:35:58 2017
@@ -78,7 +78,7 @@
                 <li><a href="/kickstart.html">Kickstart FAQ</a></li>
                 <li><a href="https://cwiki.apache.org/confluence/display/WW/Home">Wiki</a></li>
                 <li class="divider"></li>
-                <li><a href="/docs/home.html">Getting started</a></li>
+                <li><a href="/getting-started/">Getting Started</a></li>
                 <li><a href="/docs/tutorials.html">Tutorials</a></li>
                 <li><a href="/docs/faqs.html">FAQs</a></li>
                 <li><a href="/docs/guides.html">Guides</a></li>
@@ -88,7 +88,8 @@
                 <li><a href="/docs/tag-reference.html">Tag reference</a></li>
                 <li><a href="http://cwiki.apache.org/S2PLUGINS/home.html">Plugin registry</a></li>
                 <li class="divider"></li>
-                <li><a href="/getting-started/">Getting Started (WIP)</a></li>
+                <li><a href="/security/">Security Guide (WIP)</a></li>
+                <li><a href="/core-developers/">Core Developers Guide (WIP)</a></li>
               </ul>
             </li>
             <li class="dropdown">

Modified: websites/production/struts/content/download.html
==============================================================================
--- websites/production/struts/content/download.html (original)
+++ websites/production/struts/content/download.html Thu Jun  1 11:35:58 2017
@@ -78,7 +78,7 @@
                 <li><a href="/kickstart.html">Kickstart FAQ</a></li>
                 <li><a href="https://cwiki.apache.org/confluence/display/WW/Home">Wiki</a></li>
                 <li class="divider"></li>
-                <li><a href="/docs/home.html">Getting started</a></li>
+                <li><a href="/getting-started/">Getting Started</a></li>
                 <li><a href="/docs/tutorials.html">Tutorials</a></li>
                 <li><a href="/docs/faqs.html">FAQs</a></li>
                 <li><a href="/docs/guides.html">Guides</a></li>
@@ -88,7 +88,8 @@
                 <li><a href="/docs/tag-reference.html">Tag reference</a></li>
                 <li><a href="http://cwiki.apache.org/S2PLUGINS/home.html">Plugin registry</a></li>
                 <li class="divider"></li>
-                <li><a href="/getting-started/">Getting Started (WIP)</a></li>
+                <li><a href="/security/">Security Guide (WIP)</a></li>
+                <li><a href="/core-developers/">Core Developers Guide (WIP)</a></li>
               </ul>
             </li>
             <li class="dropdown">

Modified: websites/production/struts/content/downloads.html
==============================================================================
--- websites/production/struts/content/downloads.html (original)
+++ websites/production/struts/content/downloads.html Thu Jun  1 11:35:58 2017
@@ -78,7 +78,7 @@
                 <li><a href="/kickstart.html">Kickstart FAQ</a></li>
                 <li><a href="https://cwiki.apache.org/confluence/display/WW/Home">Wiki</a></li>
                 <li class="divider"></li>
-                <li><a href="/docs/home.html">Getting started</a></li>
+                <li><a href="/getting-started/">Getting Started</a></li>
                 <li><a href="/docs/tutorials.html">Tutorials</a></li>
                 <li><a href="/docs/faqs.html">FAQs</a></li>
                 <li><a href="/docs/guides.html">Guides</a></li>
@@ -88,7 +88,8 @@
                 <li><a href="/docs/tag-reference.html">Tag reference</a></li>
                 <li><a href="http://cwiki.apache.org/S2PLUGINS/home.html">Plugin registry</a></li>
                 <li class="divider"></li>
-                <li><a href="/getting-started/">Getting Started (WIP)</a></li>
+                <li><a href="/security/">Security Guide (WIP)</a></li>
+                <li><a href="/core-developers/">Core Developers Guide (WIP)</a></li>
               </ul>
             </li>
             <li class="dropdown">

Modified: websites/production/struts/content/getting-started/annotations.html
==============================================================================
--- websites/production/struts/content/getting-started/annotations.html (original)
+++ websites/production/struts/content/getting-started/annotations.html Thu Jun  1 11:35:58 2017
@@ -78,7 +78,7 @@
                 <li><a href="/kickstart.html">Kickstart FAQ</a></li>
                 <li><a href="https://cwiki.apache.org/confluence/display/WW/Home">Wiki</a></li>
                 <li class="divider"></li>
-                <li><a href="/docs/home.html">Getting started</a></li>
+                <li><a href="/getting-started/">Getting Started</a></li>
                 <li><a href="/docs/tutorials.html">Tutorials</a></li>
                 <li><a href="/docs/faqs.html">FAQs</a></li>
                 <li><a href="/docs/guides.html">Guides</a></li>
@@ -88,7 +88,8 @@
                 <li><a href="/docs/tag-reference.html">Tag reference</a></li>
                 <li><a href="http://cwiki.apache.org/S2PLUGINS/home.html">Plugin registry</a></li>
                 <li class="divider"></li>
-                <li><a href="/getting-started/">Getting Started (WIP)</a></li>
+                <li><a href="/security/">Security Guide (WIP)</a></li>
+                <li><a href="/core-developers/">Core Developers Guide (WIP)</a></li>
               </ul>
             </li>
             <li class="dropdown">

Modified: websites/production/struts/content/getting-started/coding-actions.html
==============================================================================
--- websites/production/struts/content/getting-started/coding-actions.html (original)
+++ websites/production/struts/content/getting-started/coding-actions.html Thu Jun  1 11:35:58 2017
@@ -78,7 +78,7 @@
                 <li><a href="/kickstart.html">Kickstart FAQ</a></li>
                 <li><a href="https://cwiki.apache.org/confluence/display/WW/Home">Wiki</a></li>
                 <li class="divider"></li>
-                <li><a href="/docs/home.html">Getting started</a></li>
+                <li><a href="/getting-started/">Getting Started</a></li>
                 <li><a href="/docs/tutorials.html">Tutorials</a></li>
                 <li><a href="/docs/faqs.html">FAQs</a></li>
                 <li><a href="/docs/guides.html">Guides</a></li>
@@ -88,7 +88,8 @@
                 <li><a href="/docs/tag-reference.html">Tag reference</a></li>
                 <li><a href="http://cwiki.apache.org/S2PLUGINS/home.html">Plugin registry</a></li>
                 <li class="divider"></li>
-                <li><a href="/getting-started/">Getting Started (WIP)</a></li>
+                <li><a href="/security/">Security Guide (WIP)</a></li>
+                <li><a href="/core-developers/">Core Developers Guide (WIP)</a></li>
               </ul>
             </li>
             <li class="dropdown">

Modified: websites/production/struts/content/getting-started/control-tags.html
==============================================================================
--- websites/production/struts/content/getting-started/control-tags.html (original)
+++ websites/production/struts/content/getting-started/control-tags.html Thu Jun  1 11:35:58 2017
@@ -78,7 +78,7 @@
                 <li><a href="/kickstart.html">Kickstart FAQ</a></li>
                 <li><a href="https://cwiki.apache.org/confluence/display/WW/Home">Wiki</a></li>
                 <li class="divider"></li>
-                <li><a href="/docs/home.html">Getting started</a></li>
+                <li><a href="/getting-started/">Getting Started</a></li>
                 <li><a href="/docs/tutorials.html">Tutorials</a></li>
                 <li><a href="/docs/faqs.html">FAQs</a></li>
                 <li><a href="/docs/guides.html">Guides</a></li>
@@ -88,7 +88,8 @@
                 <li><a href="/docs/tag-reference.html">Tag reference</a></li>
                 <li><a href="http://cwiki.apache.org/S2PLUGINS/home.html">Plugin registry</a></li>
                 <li class="divider"></li>
-                <li><a href="/getting-started/">Getting Started (WIP)</a></li>
+                <li><a href="/security/">Security Guide (WIP)</a></li>
+                <li><a href="/core-developers/">Core Developers Guide (WIP)</a></li>
               </ul>
             </li>
             <li class="dropdown">

Modified: websites/production/struts/content/getting-started/debugging-struts.html
==============================================================================
--- websites/production/struts/content/getting-started/debugging-struts.html (original)
+++ websites/production/struts/content/getting-started/debugging-struts.html Thu Jun  1 11:35:58 2017
@@ -78,7 +78,7 @@
                 <li><a href="/kickstart.html">Kickstart FAQ</a></li>
                 <li><a href="https://cwiki.apache.org/confluence/display/WW/Home">Wiki</a></li>
                 <li class="divider"></li>
-                <li><a href="/docs/home.html">Getting started</a></li>
+                <li><a href="/getting-started/">Getting Started</a></li>
                 <li><a href="/docs/tutorials.html">Tutorials</a></li>
                 <li><a href="/docs/faqs.html">FAQs</a></li>
                 <li><a href="/docs/guides.html">Guides</a></li>
@@ -88,7 +88,8 @@
                 <li><a href="/docs/tag-reference.html">Tag reference</a></li>
                 <li><a href="http://cwiki.apache.org/S2PLUGINS/home.html">Plugin registry</a></li>
                 <li class="divider"></li>
-                <li><a href="/getting-started/">Getting Started (WIP)</a></li>
+                <li><a href="/security/">Security Guide (WIP)</a></li>
+                <li><a href="/core-developers/">Core Developers Guide (WIP)</a></li>
               </ul>
             </li>
             <li class="dropdown">

Modified: websites/production/struts/content/getting-started/exception-handling.html
==============================================================================
--- websites/production/struts/content/getting-started/exception-handling.html (original)
+++ websites/production/struts/content/getting-started/exception-handling.html Thu Jun  1 11:35:58 2017
@@ -78,7 +78,7 @@
                 <li><a href="/kickstart.html">Kickstart FAQ</a></li>
                 <li><a href="https://cwiki.apache.org/confluence/display/WW/Home">Wiki</a></li>
                 <li class="divider"></li>
-                <li><a href="/docs/home.html">Getting started</a></li>
+                <li><a href="/getting-started/">Getting Started</a></li>
                 <li><a href="/docs/tutorials.html">Tutorials</a></li>
                 <li><a href="/docs/faqs.html">FAQs</a></li>
                 <li><a href="/docs/guides.html">Guides</a></li>
@@ -88,7 +88,8 @@
                 <li><a href="/docs/tag-reference.html">Tag reference</a></li>
                 <li><a href="http://cwiki.apache.org/S2PLUGINS/home.html">Plugin registry</a></li>
                 <li class="divider"></li>
-                <li><a href="/getting-started/">Getting Started (WIP)</a></li>
+                <li><a href="/security/">Security Guide (WIP)</a></li>
+                <li><a href="/core-developers/">Core Developers Guide (WIP)</a></li>
               </ul>
             </li>
             <li class="dropdown">

Modified: websites/production/struts/content/getting-started/exclude-parameters.html
==============================================================================
--- websites/production/struts/content/getting-started/exclude-parameters.html (original)
+++ websites/production/struts/content/getting-started/exclude-parameters.html Thu Jun  1 11:35:58 2017
@@ -78,7 +78,7 @@
                 <li><a href="/kickstart.html">Kickstart FAQ</a></li>
                 <li><a href="https://cwiki.apache.org/confluence/display/WW/Home">Wiki</a></li>
                 <li class="divider"></li>
-                <li><a href="/docs/home.html">Getting started</a></li>
+                <li><a href="/getting-started/">Getting Started</a></li>
                 <li><a href="/docs/tutorials.html">Tutorials</a></li>
                 <li><a href="/docs/faqs.html">FAQs</a></li>
                 <li><a href="/docs/guides.html">Guides</a></li>
@@ -88,7 +88,8 @@
                 <li><a href="/docs/tag-reference.html">Tag reference</a></li>
                 <li><a href="http://cwiki.apache.org/S2PLUGINS/home.html">Plugin registry</a></li>
                 <li class="divider"></li>
-                <li><a href="/getting-started/">Getting Started (WIP)</a></li>
+                <li><a href="/security/">Security Guide (WIP)</a></li>
+                <li><a href="/core-developers/">Core Developers Guide (WIP)</a></li>
               </ul>
             </li>
             <li class="dropdown">

Modified: websites/production/struts/content/getting-started/form-tags.html
==============================================================================
--- websites/production/struts/content/getting-started/form-tags.html (original)
+++ websites/production/struts/content/getting-started/form-tags.html Thu Jun  1 11:35:58 2017
@@ -78,7 +78,7 @@
                 <li><a href="/kickstart.html">Kickstart FAQ</a></li>
                 <li><a href="https://cwiki.apache.org/confluence/display/WW/Home">Wiki</a></li>
                 <li class="divider"></li>
-                <li><a href="/docs/home.html">Getting started</a></li>
+                <li><a href="/getting-started/">Getting Started</a></li>
                 <li><a href="/docs/tutorials.html">Tutorials</a></li>
                 <li><a href="/docs/faqs.html">FAQs</a></li>
                 <li><a href="/docs/guides.html">Guides</a></li>
@@ -88,7 +88,8 @@
                 <li><a href="/docs/tag-reference.html">Tag reference</a></li>
                 <li><a href="http://cwiki.apache.org/S2PLUGINS/home.html">Plugin registry</a></li>
                 <li class="divider"></li>
-                <li><a href="/getting-started/">Getting Started (WIP)</a></li>
+                <li><a href="/security/">Security Guide (WIP)</a></li>
+                <li><a href="/core-developers/">Core Developers Guide (WIP)</a></li>
               </ul>
             </li>
             <li class="dropdown">

Modified: websites/production/struts/content/getting-started/form-validation-using-xml.html
==============================================================================
--- websites/production/struts/content/getting-started/form-validation-using-xml.html (original)
+++ websites/production/struts/content/getting-started/form-validation-using-xml.html Thu Jun  1 11:35:58 2017
@@ -78,7 +78,7 @@
                 <li><a href="/kickstart.html">Kickstart FAQ</a></li>
                 <li><a href="https://cwiki.apache.org/confluence/display/WW/Home">Wiki</a></li>
                 <li class="divider"></li>
-                <li><a href="/docs/home.html">Getting started</a></li>
+                <li><a href="/getting-started/">Getting Started</a></li>
                 <li><a href="/docs/tutorials.html">Tutorials</a></li>
                 <li><a href="/docs/faqs.html">FAQs</a></li>
                 <li><a href="/docs/guides.html">Guides</a></li>
@@ -88,7 +88,8 @@
                 <li><a href="/docs/tag-reference.html">Tag reference</a></li>
                 <li><a href="http://cwiki.apache.org/S2PLUGINS/home.html">Plugin registry</a></li>
                 <li class="divider"></li>
-                <li><a href="/getting-started/">Getting Started (WIP)</a></li>
+                <li><a href="/security/">Security Guide (WIP)</a></li>
+                <li><a href="/core-developers/">Core Developers Guide (WIP)</a></li>
               </ul>
             </li>
             <li class="dropdown">

Modified: websites/production/struts/content/getting-started/form-validation.html
==============================================================================
--- websites/production/struts/content/getting-started/form-validation.html (original)
+++ websites/production/struts/content/getting-started/form-validation.html Thu Jun  1 11:35:58 2017
@@ -78,7 +78,7 @@
                 <li><a href="/kickstart.html">Kickstart FAQ</a></li>
                 <li><a href="https://cwiki.apache.org/confluence/display/WW/Home">Wiki</a></li>
                 <li class="divider"></li>
-                <li><a href="/docs/home.html">Getting started</a></li>
+                <li><a href="/getting-started/">Getting Started</a></li>
                 <li><a href="/docs/tutorials.html">Tutorials</a></li>
                 <li><a href="/docs/faqs.html">FAQs</a></li>
                 <li><a href="/docs/guides.html">Guides</a></li>
@@ -88,7 +88,8 @@
                 <li><a href="/docs/tag-reference.html">Tag reference</a></li>
                 <li><a href="http://cwiki.apache.org/S2PLUGINS/home.html">Plugin registry</a></li>
                 <li class="divider"></li>
-                <li><a href="/getting-started/">Getting Started (WIP)</a></li>
+                <li><a href="/security/">Security Guide (WIP)</a></li>
+                <li><a href="/core-developers/">Core Developers Guide (WIP)</a></li>
               </ul>
             </li>
             <li class="dropdown">

Modified: websites/production/struts/content/getting-started/hello-world-using-struts2.html
==============================================================================
--- websites/production/struts/content/getting-started/hello-world-using-struts2.html (original)
+++ websites/production/struts/content/getting-started/hello-world-using-struts2.html Thu Jun  1 11:35:58 2017
@@ -78,7 +78,7 @@
                 <li><a href="/kickstart.html">Kickstart FAQ</a></li>
                 <li><a href="https://cwiki.apache.org/confluence/display/WW/Home">Wiki</a></li>
                 <li class="divider"></li>
-                <li><a href="/docs/home.html">Getting started</a></li>
+                <li><a href="/getting-started/">Getting Started</a></li>
                 <li><a href="/docs/tutorials.html">Tutorials</a></li>
                 <li><a href="/docs/faqs.html">FAQs</a></li>
                 <li><a href="/docs/guides.html">Guides</a></li>
@@ -88,7 +88,8 @@
                 <li><a href="/docs/tag-reference.html">Tag reference</a></li>
                 <li><a href="http://cwiki.apache.org/S2PLUGINS/home.html">Plugin registry</a></li>
                 <li class="divider"></li>
-                <li><a href="/getting-started/">Getting Started (WIP)</a></li>
+                <li><a href="/security/">Security Guide (WIP)</a></li>
+                <li><a href="/core-developers/">Core Developers Guide (WIP)</a></li>
               </ul>
             </li>
             <li class="dropdown">

Modified: websites/production/struts/content/getting-started/how-to-create-a-struts2-web-application.html
==============================================================================
--- websites/production/struts/content/getting-started/how-to-create-a-struts2-web-application.html (original)
+++ websites/production/struts/content/getting-started/how-to-create-a-struts2-web-application.html Thu Jun  1 11:35:58 2017
@@ -78,7 +78,7 @@
                 <li><a href="/kickstart.html">Kickstart FAQ</a></li>
                 <li><a href="https://cwiki.apache.org/confluence/display/WW/Home">Wiki</a></li>
                 <li class="divider"></li>
-                <li><a href="/docs/home.html">Getting started</a></li>
+                <li><a href="/getting-started/">Getting Started</a></li>
                 <li><a href="/docs/tutorials.html">Tutorials</a></li>
                 <li><a href="/docs/faqs.html">FAQs</a></li>
                 <li><a href="/docs/guides.html">Guides</a></li>
@@ -88,7 +88,8 @@
                 <li><a href="/docs/tag-reference.html">Tag reference</a></li>
                 <li><a href="http://cwiki.apache.org/S2PLUGINS/home.html">Plugin registry</a></li>
                 <li class="divider"></li>
-                <li><a href="/getting-started/">Getting Started (WIP)</a></li>
+                <li><a href="/security/">Security Guide (WIP)</a></li>
+                <li><a href="/core-developers/">Core Developers Guide (WIP)</a></li>
               </ul>
             </li>
             <li class="dropdown">

Modified: websites/production/struts/content/getting-started/http-session.html
==============================================================================
--- websites/production/struts/content/getting-started/http-session.html (original)
+++ websites/production/struts/content/getting-started/http-session.html Thu Jun  1 11:35:58 2017
@@ -78,7 +78,7 @@
                 <li><a href="/kickstart.html">Kickstart FAQ</a></li>
                 <li><a href="https://cwiki.apache.org/confluence/display/WW/Home">Wiki</a></li>
                 <li class="divider"></li>
-                <li><a href="/docs/home.html">Getting started</a></li>
+                <li><a href="/getting-started/">Getting Started</a></li>
                 <li><a href="/docs/tutorials.html">Tutorials</a></li>
                 <li><a href="/docs/faqs.html">FAQs</a></li>
                 <li><a href="/docs/guides.html">Guides</a></li>
@@ -88,7 +88,8 @@
                 <li><a href="/docs/tag-reference.html">Tag reference</a></li>
                 <li><a href="http://cwiki.apache.org/S2PLUGINS/home.html">Plugin registry</a></li>
                 <li class="divider"></li>
-                <li><a href="/getting-started/">Getting Started (WIP)</a></li>
+                <li><a href="/security/">Security Guide (WIP)</a></li>
+                <li><a href="/core-developers/">Core Developers Guide (WIP)</a></li>
               </ul>
             </li>
             <li class="dropdown">

Modified: websites/production/struts/content/getting-started/index.html
==============================================================================
--- websites/production/struts/content/getting-started/index.html (original)
+++ websites/production/struts/content/getting-started/index.html Thu Jun  1 11:35:58 2017
@@ -78,7 +78,7 @@
                 <li><a href="/kickstart.html">Kickstart FAQ</a></li>
                 <li><a href="https://cwiki.apache.org/confluence/display/WW/Home">Wiki</a></li>
                 <li class="divider"></li>
-                <li><a href="/docs/home.html">Getting started</a></li>
+                <li><a href="/getting-started/">Getting Started</a></li>
                 <li><a href="/docs/tutorials.html">Tutorials</a></li>
                 <li><a href="/docs/faqs.html">FAQs</a></li>
                 <li><a href="/docs/guides.html">Guides</a></li>
@@ -88,7 +88,8 @@
                 <li><a href="/docs/tag-reference.html">Tag reference</a></li>
                 <li><a href="http://cwiki.apache.org/S2PLUGINS/home.html">Plugin registry</a></li>
                 <li class="divider"></li>
-                <li><a href="/getting-started/">Getting Started (WIP)</a></li>
+                <li><a href="/security/">Security Guide (WIP)</a></li>
+                <li><a href="/core-developers/">Core Developers Guide (WIP)</a></li>
               </ul>
             </li>
             <li class="dropdown">

Modified: websites/production/struts/content/getting-started/introducing-interceptors.html
==============================================================================
--- websites/production/struts/content/getting-started/introducing-interceptors.html (original)
+++ websites/production/struts/content/getting-started/introducing-interceptors.html Thu Jun  1 11:35:58 2017
@@ -78,7 +78,7 @@
                 <li><a href="/kickstart.html">Kickstart FAQ</a></li>
                 <li><a href="https://cwiki.apache.org/confluence/display/WW/Home">Wiki</a></li>
                 <li class="divider"></li>
-                <li><a href="/docs/home.html">Getting started</a></li>
+                <li><a href="/getting-started/">Getting Started</a></li>
                 <li><a href="/docs/tutorials.html">Tutorials</a></li>
                 <li><a href="/docs/faqs.html">FAQs</a></li>
                 <li><a href="/docs/guides.html">Guides</a></li>
@@ -88,7 +88,8 @@
                 <li><a href="/docs/tag-reference.html">Tag reference</a></li>
                 <li><a href="http://cwiki.apache.org/S2PLUGINS/home.html">Plugin registry</a></li>
                 <li class="divider"></li>
-                <li><a href="/getting-started/">Getting Started (WIP)</a></li>
+                <li><a href="/security/">Security Guide (WIP)</a></li>
+                <li><a href="/core-developers/">Core Developers Guide (WIP)</a></li>
               </ul>
             </li>
             <li class="dropdown">

Modified: websites/production/struts/content/getting-started/message-resource-files.html
==============================================================================
--- websites/production/struts/content/getting-started/message-resource-files.html (original)
+++ websites/production/struts/content/getting-started/message-resource-files.html Thu Jun  1 11:35:58 2017
@@ -78,7 +78,7 @@
                 <li><a href="/kickstart.html">Kickstart FAQ</a></li>
                 <li><a href="https://cwiki.apache.org/confluence/display/WW/Home">Wiki</a></li>
                 <li class="divider"></li>
-                <li><a href="/docs/home.html">Getting started</a></li>
+                <li><a href="/getting-started/">Getting Started</a></li>
                 <li><a href="/docs/tutorials.html">Tutorials</a></li>
                 <li><a href="/docs/faqs.html">FAQs</a></li>
                 <li><a href="/docs/guides.html">Guides</a></li>
@@ -88,7 +88,8 @@
                 <li><a href="/docs/tag-reference.html">Tag reference</a></li>
                 <li><a href="http://cwiki.apache.org/S2PLUGINS/home.html">Plugin registry</a></li>
                 <li class="divider"></li>
-                <li><a href="/getting-started/">Getting Started (WIP)</a></li>
+                <li><a href="/security/">Security Guide (WIP)</a></li>
+                <li><a href="/core-developers/">Core Developers Guide (WIP)</a></li>
               </ul>
             </li>
             <li class="dropdown">

Modified: websites/production/struts/content/getting-started/preperable-interface.html
==============================================================================
--- websites/production/struts/content/getting-started/preperable-interface.html (original)
+++ websites/production/struts/content/getting-started/preperable-interface.html Thu Jun  1 11:35:58 2017
@@ -78,7 +78,7 @@
                 <li><a href="/kickstart.html">Kickstart FAQ</a></li>
                 <li><a href="https://cwiki.apache.org/confluence/display/WW/Home">Wiki</a></li>
                 <li class="divider"></li>
-                <li><a href="/docs/home.html">Getting started</a></li>
+                <li><a href="/getting-started/">Getting Started</a></li>
                 <li><a href="/docs/tutorials.html">Tutorials</a></li>
                 <li><a href="/docs/faqs.html">FAQs</a></li>
                 <li><a href="/docs/guides.html">Guides</a></li>
@@ -88,7 +88,8 @@
                 <li><a href="/docs/tag-reference.html">Tag reference</a></li>
                 <li><a href="http://cwiki.apache.org/S2PLUGINS/home.html">Plugin registry</a></li>
                 <li class="divider"></li>
-                <li><a href="/getting-started/">Getting Started (WIP)</a></li>
+                <li><a href="/security/">Security Guide (WIP)</a></li>
+                <li><a href="/core-developers/">Core Developers Guide (WIP)</a></li>
               </ul>
             </li>
             <li class="dropdown">

Modified: websites/production/struts/content/getting-started/processing-forms.html
==============================================================================
--- websites/production/struts/content/getting-started/processing-forms.html (original)
+++ websites/production/struts/content/getting-started/processing-forms.html Thu Jun  1 11:35:58 2017
@@ -78,7 +78,7 @@
                 <li><a href="/kickstart.html">Kickstart FAQ</a></li>
                 <li><a href="https://cwiki.apache.org/confluence/display/WW/Home">Wiki</a></li>
                 <li class="divider"></li>
-                <li><a href="/docs/home.html">Getting started</a></li>
+                <li><a href="/getting-started/">Getting Started</a></li>
                 <li><a href="/docs/tutorials.html">Tutorials</a></li>
                 <li><a href="/docs/faqs.html">FAQs</a></li>
                 <li><a href="/docs/guides.html">Guides</a></li>
@@ -88,7 +88,8 @@
                 <li><a href="/docs/tag-reference.html">Tag reference</a></li>
                 <li><a href="http://cwiki.apache.org/S2PLUGINS/home.html">Plugin registry</a></li>
                 <li class="divider"></li>
-                <li><a href="/getting-started/">Getting Started (WIP)</a></li>
+                <li><a href="/security/">Security Guide (WIP)</a></li>
+                <li><a href="/core-developers/">Core Developers Guide (WIP)</a></li>
               </ul>
             </li>
             <li class="dropdown">

Modified: websites/production/struts/content/getting-started/spring.html
==============================================================================
--- websites/production/struts/content/getting-started/spring.html (original)
+++ websites/production/struts/content/getting-started/spring.html Thu Jun  1 11:35:58 2017
@@ -78,7 +78,7 @@
                 <li><a href="/kickstart.html">Kickstart FAQ</a></li>
                 <li><a href="https://cwiki.apache.org/confluence/display/WW/Home">Wiki</a></li>
                 <li class="divider"></li>
-                <li><a href="/docs/home.html">Getting started</a></li>
+                <li><a href="/getting-started/">Getting Started</a></li>
                 <li><a href="/docs/tutorials.html">Tutorials</a></li>
                 <li><a href="/docs/faqs.html">FAQs</a></li>
                 <li><a href="/docs/guides.html">Guides</a></li>
@@ -88,7 +88,8 @@
                 <li><a href="/docs/tag-reference.html">Tag reference</a></li>
                 <li><a href="http://cwiki.apache.org/S2PLUGINS/home.html">Plugin registry</a></li>
                 <li class="divider"></li>
-                <li><a href="/getting-started/">Getting Started (WIP)</a></li>
+                <li><a href="/security/">Security Guide (WIP)</a></li>
+                <li><a href="/core-developers/">Core Developers Guide (WIP)</a></li>
               </ul>
             </li>
             <li class="dropdown">

Modified: websites/production/struts/content/getting-started/themes.html
==============================================================================
--- websites/production/struts/content/getting-started/themes.html (original)
+++ websites/production/struts/content/getting-started/themes.html Thu Jun  1 11:35:58 2017
@@ -78,7 +78,7 @@
                 <li><a href="/kickstart.html">Kickstart FAQ</a></li>
                 <li><a href="https://cwiki.apache.org/confluence/display/WW/Home">Wiki</a></li>
                 <li class="divider"></li>
-                <li><a href="/docs/home.html">Getting started</a></li>
+                <li><a href="/getting-started/">Getting Started</a></li>
                 <li><a href="/docs/tutorials.html">Tutorials</a></li>
                 <li><a href="/docs/faqs.html">FAQs</a></li>
                 <li><a href="/docs/guides.html">Guides</a></li>
@@ -88,7 +88,8 @@
                 <li><a href="/docs/tag-reference.html">Tag reference</a></li>
                 <li><a href="http://cwiki.apache.org/S2PLUGINS/home.html">Plugin registry</a></li>
                 <li class="divider"></li>
-                <li><a href="/getting-started/">Getting Started (WIP)</a></li>
+                <li><a href="/security/">Security Guide (WIP)</a></li>
+                <li><a href="/core-developers/">Core Developers Guide (WIP)</a></li>
               </ul>
             </li>
             <li class="dropdown">

Modified: websites/production/struts/content/getting-started/unit-testing.html
==============================================================================
--- websites/production/struts/content/getting-started/unit-testing.html (original)
+++ websites/production/struts/content/getting-started/unit-testing.html Thu Jun  1 11:35:58 2017
@@ -78,7 +78,7 @@
                 <li><a href="/kickstart.html">Kickstart FAQ</a></li>
                 <li><a href="https://cwiki.apache.org/confluence/display/WW/Home">Wiki</a></li>
                 <li class="divider"></li>
-                <li><a href="/docs/home.html">Getting started</a></li>
+                <li><a href="/getting-started/">Getting Started</a></li>
                 <li><a href="/docs/tutorials.html">Tutorials</a></li>
                 <li><a href="/docs/faqs.html">FAQs</a></li>
                 <li><a href="/docs/guides.html">Guides</a></li>
@@ -88,7 +88,8 @@
                 <li><a href="/docs/tag-reference.html">Tag reference</a></li>
                 <li><a href="http://cwiki.apache.org/S2PLUGINS/home.html">Plugin registry</a></li>
                 <li class="divider"></li>
-                <li><a href="/getting-started/">Getting Started (WIP)</a></li>
+                <li><a href="/security/">Security Guide (WIP)</a></li>
+                <li><a href="/core-developers/">Core Developers Guide (WIP)</a></li>
               </ul>
             </li>
             <li class="dropdown">

Modified: websites/production/struts/content/getting-started/using-tags.html
==============================================================================
--- websites/production/struts/content/getting-started/using-tags.html (original)
+++ websites/production/struts/content/getting-started/using-tags.html Thu Jun  1 11:35:58 2017
@@ -78,7 +78,7 @@
                 <li><a href="/kickstart.html">Kickstart FAQ</a></li>
                 <li><a href="https://cwiki.apache.org/confluence/display/WW/Home">Wiki</a></li>
                 <li class="divider"></li>
-                <li><a href="/docs/home.html">Getting started</a></li>
+                <li><a href="/getting-started/">Getting Started</a></li>
                 <li><a href="/docs/tutorials.html">Tutorials</a></li>
                 <li><a href="/docs/faqs.html">FAQs</a></li>
                 <li><a href="/docs/guides.html">Guides</a></li>
@@ -88,7 +88,8 @@
                 <li><a href="/docs/tag-reference.html">Tag reference</a></li>
                 <li><a href="http://cwiki.apache.org/S2PLUGINS/home.html">Plugin registry</a></li>
                 <li class="divider"></li>
-                <li><a href="/getting-started/">Getting Started (WIP)</a></li>
+                <li><a href="/security/">Security Guide (WIP)</a></li>
+                <li><a href="/core-developers/">Core Developers Guide (WIP)</a></li>
               </ul>
             </li>
             <li class="dropdown">

Modified: websites/production/struts/content/getting-started/wildcard-method-selection.html
==============================================================================
--- websites/production/struts/content/getting-started/wildcard-method-selection.html (original)
+++ websites/production/struts/content/getting-started/wildcard-method-selection.html Thu Jun  1 11:35:58 2017
@@ -78,7 +78,7 @@
                 <li><a href="/kickstart.html">Kickstart FAQ</a></li>
                 <li><a href="https://cwiki.apache.org/confluence/display/WW/Home">Wiki</a></li>
                 <li class="divider"></li>
-                <li><a href="/docs/home.html">Getting started</a></li>
+                <li><a href="/getting-started/">Getting Started</a></li>
                 <li><a href="/docs/tutorials.html">Tutorials</a></li>
                 <li><a href="/docs/faqs.html">FAQs</a></li>
                 <li><a href="/docs/guides.html">Guides</a></li>
@@ -88,7 +88,8 @@
                 <li><a href="/docs/tag-reference.html">Tag reference</a></li>
                 <li><a href="http://cwiki.apache.org/S2PLUGINS/home.html">Plugin registry</a></li>
                 <li class="divider"></li>
-                <li><a href="/getting-started/">Getting Started (WIP)</a></li>
+                <li><a href="/security/">Security Guide (WIP)</a></li>
+                <li><a href="/core-developers/">Core Developers Guide (WIP)</a></li>
               </ul>
             </li>
             <li class="dropdown">

Modified: websites/production/struts/content/helping.html
==============================================================================
--- websites/production/struts/content/helping.html (original)
+++ websites/production/struts/content/helping.html Thu Jun  1 11:35:58 2017
@@ -78,7 +78,7 @@
                 <li><a href="/kickstart.html">Kickstart FAQ</a></li>
                 <li><a href="https://cwiki.apache.org/confluence/display/WW/Home">Wiki</a></li>
                 <li class="divider"></li>
-                <li><a href="/docs/home.html">Getting started</a></li>
+                <li><a href="/getting-started/">Getting Started</a></li>
                 <li><a href="/docs/tutorials.html">Tutorials</a></li>
                 <li><a href="/docs/faqs.html">FAQs</a></li>
                 <li><a href="/docs/guides.html">Guides</a></li>
@@ -88,7 +88,8 @@
                 <li><a href="/docs/tag-reference.html">Tag reference</a></li>
                 <li><a href="http://cwiki.apache.org/S2PLUGINS/home.html">Plugin registry</a></li>
                 <li class="divider"></li>
-                <li><a href="/getting-started/">Getting Started (WIP)</a></li>
+                <li><a href="/security/">Security Guide (WIP)</a></li>
+                <li><a href="/core-developers/">Core Developers Guide (WIP)</a></li>
               </ul>
             </li>
             <li class="dropdown">

Modified: websites/production/struts/content/index.html
==============================================================================
--- websites/production/struts/content/index.html (original)
+++ websites/production/struts/content/index.html Thu Jun  1 11:35:58 2017
@@ -76,7 +76,7 @@
                 <li><a href="/kickstart.html">Kickstart FAQ</a></li>
                 <li><a href="https://cwiki.apache.org/confluence/display/WW/Home">Wiki</a></li>
                 <li class="divider"></li>
-                <li><a href="/docs/home.html">Getting started</a></li>
+                <li><a href="/getting-started/">Getting Started</a></li>
                 <li><a href="/docs/tutorials.html">Tutorials</a></li>
                 <li><a href="/docs/faqs.html">FAQs</a></li>
                 <li><a href="/docs/guides.html">Guides</a></li>
@@ -86,7 +86,8 @@
                 <li><a href="/docs/tag-reference.html">Tag reference</a></li>
                 <li><a href="http://cwiki.apache.org/S2PLUGINS/home.html">Plugin registry</a></li>
                 <li class="divider"></li>
-                <li><a href="/getting-started/">Getting Started (WIP)</a></li>
+                <li><a href="/security/">Security Guide (WIP)</a></li>
+                <li><a href="/core-developers/">Core Developers Guide (WIP)</a></li>
               </ul>
             </li>
             <li class="dropdown">

Modified: websites/production/struts/content/kickstart.html
==============================================================================
--- websites/production/struts/content/kickstart.html (original)
+++ websites/production/struts/content/kickstart.html Thu Jun  1 11:35:58 2017
@@ -78,7 +78,7 @@
                 <li><a href="/kickstart.html">Kickstart FAQ</a></li>
                 <li><a href="https://cwiki.apache.org/confluence/display/WW/Home">Wiki</a></li>
                 <li class="divider"></li>
-                <li><a href="/docs/home.html">Getting started</a></li>
+                <li><a href="/getting-started/">Getting Started</a></li>
                 <li><a href="/docs/tutorials.html">Tutorials</a></li>
                 <li><a href="/docs/faqs.html">FAQs</a></li>
                 <li><a href="/docs/guides.html">Guides</a></li>
@@ -88,7 +88,8 @@
                 <li><a href="/docs/tag-reference.html">Tag reference</a></li>
                 <li><a href="http://cwiki.apache.org/S2PLUGINS/home.html">Plugin registry</a></li>
                 <li class="divider"></li>
-                <li><a href="/getting-started/">Getting Started (WIP)</a></li>
+                <li><a href="/security/">Security Guide (WIP)</a></li>
+                <li><a href="/core-developers/">Core Developers Guide (WIP)</a></li>
               </ul>
             </li>
             <li class="dropdown">

Modified: websites/production/struts/content/mail.html
==============================================================================
--- websites/production/struts/content/mail.html (original)
+++ websites/production/struts/content/mail.html Thu Jun  1 11:35:58 2017
@@ -78,7 +78,7 @@
                 <li><a href="/kickstart.html">Kickstart FAQ</a></li>
                 <li><a href="https://cwiki.apache.org/confluence/display/WW/Home">Wiki</a></li>
                 <li class="divider"></li>
-                <li><a href="/docs/home.html">Getting started</a></li>
+                <li><a href="/getting-started/">Getting Started</a></li>
                 <li><a href="/docs/tutorials.html">Tutorials</a></li>
                 <li><a href="/docs/faqs.html">FAQs</a></li>
                 <li><a href="/docs/guides.html">Guides</a></li>
@@ -88,7 +88,8 @@
                 <li><a href="/docs/tag-reference.html">Tag reference</a></li>
                 <li><a href="http://cwiki.apache.org/S2PLUGINS/home.html">Plugin registry</a></li>
                 <li class="divider"></li>
-                <li><a href="/getting-started/">Getting Started (WIP)</a></li>
+                <li><a href="/security/">Security Guide (WIP)</a></li>
+                <li><a href="/core-developers/">Core Developers Guide (WIP)</a></li>
               </ul>
             </li>
             <li class="dropdown">

Modified: websites/production/struts/content/primer.html
==============================================================================
--- websites/production/struts/content/primer.html (original)
+++ websites/production/struts/content/primer.html Thu Jun  1 11:35:58 2017
@@ -78,7 +78,7 @@
                 <li><a href="/kickstart.html">Kickstart FAQ</a></li>
                 <li><a href="https://cwiki.apache.org/confluence/display/WW/Home">Wiki</a></li>
                 <li class="divider"></li>
-                <li><a href="/docs/home.html">Getting started</a></li>
+                <li><a href="/getting-started/">Getting Started</a></li>
                 <li><a href="/docs/tutorials.html">Tutorials</a></li>
                 <li><a href="/docs/faqs.html">FAQs</a></li>
                 <li><a href="/docs/guides.html">Guides</a></li>
@@ -88,7 +88,8 @@
                 <li><a href="/docs/tag-reference.html">Tag reference</a></li>
                 <li><a href="http://cwiki.apache.org/S2PLUGINS/home.html">Plugin registry</a></li>
                 <li class="divider"></li>
-                <li><a href="/getting-started/">Getting Started (WIP)</a></li>
+                <li><a href="/security/">Security Guide (WIP)</a></li>
+                <li><a href="/core-developers/">Core Developers Guide (WIP)</a></li>
               </ul>
             </li>
             <li class="dropdown">

Modified: websites/production/struts/content/releases.html
==============================================================================
--- websites/production/struts/content/releases.html (original)
+++ websites/production/struts/content/releases.html Thu Jun  1 11:35:58 2017
@@ -78,7 +78,7 @@
                 <li><a href="/kickstart.html">Kickstart FAQ</a></li>
                 <li><a href="https://cwiki.apache.org/confluence/display/WW/Home">Wiki</a></li>
                 <li class="divider"></li>
-                <li><a href="/docs/home.html">Getting started</a></li>
+                <li><a href="/getting-started/">Getting Started</a></li>
                 <li><a href="/docs/tutorials.html">Tutorials</a></li>
                 <li><a href="/docs/faqs.html">FAQs</a></li>
                 <li><a href="/docs/guides.html">Guides</a></li>
@@ -88,7 +88,8 @@
                 <li><a href="/docs/tag-reference.html">Tag reference</a></li>
                 <li><a href="http://cwiki.apache.org/S2PLUGINS/home.html">Plugin registry</a></li>
                 <li class="divider"></li>
-                <li><a href="/getting-started/">Getting Started (WIP)</a></li>
+                <li><a href="/security/">Security Guide (WIP)</a></li>
+                <li><a href="/core-developers/">Core Developers Guide (WIP)</a></li>
               </ul>
             </li>
             <li class="dropdown">

Modified: websites/production/struts/content/security.html
==============================================================================
--- websites/production/struts/content/security.html (original)
+++ websites/production/struts/content/security.html Thu Jun  1 11:35:58 2017
@@ -78,7 +78,7 @@
                 <li><a href="/kickstart.html">Kickstart FAQ</a></li>
                 <li><a href="https://cwiki.apache.org/confluence/display/WW/Home">Wiki</a></li>
                 <li class="divider"></li>
-                <li><a href="/docs/home.html">Getting started</a></li>
+                <li><a href="/getting-started/">Getting Started</a></li>
                 <li><a href="/docs/tutorials.html">Tutorials</a></li>
                 <li><a href="/docs/faqs.html">FAQs</a></li>
                 <li><a href="/docs/guides.html">Guides</a></li>
@@ -88,7 +88,8 @@
                 <li><a href="/docs/tag-reference.html">Tag reference</a></li>
                 <li><a href="http://cwiki.apache.org/S2PLUGINS/home.html">Plugin registry</a></li>
                 <li class="divider"></li>
-                <li><a href="/getting-started/">Getting Started (WIP)</a></li>
+                <li><a href="/security/">Security Guide (WIP)</a></li>
+                <li><a href="/core-developers/">Core Developers Guide (WIP)</a></li>
               </ul>
             </li>
             <li class="dropdown">

Added: websites/production/struts/content/security/index.html
==============================================================================
--- websites/production/struts/content/security/index.html (added)
+++ websites/production/struts/content/security/index.html Thu Jun  1 11:35:58 2017
@@ -0,0 +1,531 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8"/>
+  <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+  <meta name="Date-Revision-yyyymmdd" content="20140918"/>
+  <meta http-equiv="Content-Language" content="en"/>
+  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+
+  <title>Security (WIP)</title>
+
+  <link href="//fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600,700,400italic,600italic,700italic" rel="stylesheet" type="text/css">
+  <link href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" rel="stylesheet">
+  <link href="/css/main.css" rel="stylesheet">
+  <link href="/css/custom.css" rel="stylesheet">
+  <link href="/highlighter/github-theme.css" rel="stylesheet">
+
+  <script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
+  <script type="text/javascript" src="/bootstrap/js/bootstrap.js"></script>
+  <script type="text/javascript" src="/js/community.js"></script>
+</head>
+<body>
+
+<a href="http://github.com/apache/struts" class="github-ribbon">
+  <img style="position: absolute; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub">
+</a>
+
+<header>
+  <nav>
+    <div role="navigation" class="navbar navbar-default navbar-fixed-top">
+      <div class="container">
+        <div class="navbar-header">
+          <button type="button" data-toggle="collapse" data-target="#struts-menu" class="navbar-toggle">
+            Menu
+            <span class="sr-only">Toggle navigation</span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+          </button>
+          <a href="/index.html" class="navbar-brand logo"><img src="/img/struts-logo.svg"></a>
+        </div>
+        <div id="struts-menu" class="navbar-collapse collapse">
+          <ul class="nav navbar-nav">
+            <li class="dropdown">
+              <a data-toggle="dropdown" href="#" class="dropdown-toggle">
+                Home<b class="caret"></b>
+              </a>
+              <ul class="dropdown-menu">
+                <li><a href="/index.html">Welcome</a></li>
+                <li><a href="/downloads.html">Downloads</a></li>
+                <li><a href="/announce.html">Announcements</a></li>
+                <li><a href="http://www.apache.org/licenses/">License</a></li>
+                <li><a href="http://apache.org/foundation/thanks.html">Thanks!</a></li>
+                <li><a href="http://apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a data-toggle="dropdown" href="#" class="dropdown-toggle">
+                Support<b class="caret"></b>
+              </a>
+              <ul class="dropdown-menu">
+                <li><a href="/mail.html">User Mailing List</a></li>
+                <li><a href="https://issues.apache.org/jira/browse/WW">Issue Tracker</a></li>
+                <li><a href="/security.html">Reporting Security Issues</a></li>
+                <li class="divider"></li>
+                <li><a href="/maven/project-info.html">Project info</a></li>
+                <li><a href="/maven/struts2-core/dependencies.html">Struts Core dependencies</a></li>
+                <li><a href="/maven/struts2-plugins/modules.html">Plugin dependencies</a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a data-toggle="dropdown" href="#" class="dropdown-toggle">
+                Documentation<b class="caret"></b>
+              </a>
+              <ul class="dropdown-menu">
+                <li><a href="/birdseye.html">Birds Eye</a></li>
+                <li><a href="/primer.html">Key Technologies</a></li>
+                <li><a href="/kickstart.html">Kickstart FAQ</a></li>
+                <li><a href="https://cwiki.apache.org/confluence/display/WW/Home">Wiki</a></li>
+                <li class="divider"></li>
+                <li><a href="/getting-started/">Getting Started</a></li>
+                <li><a href="/docs/tutorials.html">Tutorials</a></li>
+                <li><a href="/docs/faqs.html">FAQs</a></li>
+                <li><a href="/docs/guides.html">Guides</a></li>
+                <li class="divider"></li>
+                <li><a href="/maven/struts2-core/apidocs/index.html">Struts Core API</a></li>
+                <li><a href="/docs/plugins.html">Plugin APIs</a></li>
+                <li><a href="/docs/tag-reference.html">Tag reference</a></li>
+                <li><a href="http://cwiki.apache.org/S2PLUGINS/home.html">Plugin registry</a></li>
+                <li class="divider"></li>
+                <li><a href="/security/">Security Guide (WIP)</a></li>
+                <li><a href="/core-developers/">Core Developers Guide (WIP)</a></li>
+              </ul>
+            </li>
+            <li class="dropdown">
+              <a data-toggle="dropdown" href="#" class="dropdown-toggle">
+                Contributing<b class="caret"></b>
+              </a>
+              <ul class="dropdown-menu">
+                <li><a href="/youatstruts.html">You at Struts</a></li>
+                <li><a href="/helping.html">How to Help FAQ</a></li>
+                <li><a href="/dev-mail.html">Development Lists</a></li>
+                <li class="divider"></li>
+                <li><a href="/submitting-patches.html">Submitting patches</a></li>
+                <li><a href="/builds.html">Source Code</a></li>
+                <li><a href="/coding-standards.html">Coding standards</a></li>
+                <li class="divider"></li>
+                <li><a href="/releases.html">Release Guidelines</a></li>
+                <li><a href="/bylaws.html">PMC Charter</a></li>
+                <li><a href="/volunteers.html">Volunteers</a></li>
+                <li><a href="https://git-wip-us.apache.org/repos/asf?p=struts.git">Source Repository</a></li>
+              </ul>
+            </li>
+            <li class="apache"><a href="http://www.apache.org/"><img src="/img/apache.png"></a></li>
+          </ul>
+        </div>
+      </div>
+    </div>
+  </nav>
+</header>
+
+
+<article class="container">
+  <section class="col-md-12">
+    <h1 id="security">Security</h1>
+
+<p>#####Security tips#####</p>
+
+<p>The Apache Struts 2 doesn’t provide any security mechanism - it is just a pure web framework. Below are few tips you should consider during application development with the Apache Struts 2.</p>
+
+<p><strong>Restrict access to the Config Browser</strong></p>
+
+<p><em>Config Browser Plugin</em>  exposes internal configuration and should be used only during development phase. If you must use it on production site, we strictly recommend restricting access to it - you can use  Basic Authentication or any other security mechanism (e.g. <a href="http://shiro\.apache\.org/">Apache Shiro</a>^[http://shiro.apache.org/])</p>
+
+<p><strong>Don’t mix different access levels in the same namespace</strong></p>
+
+<p>Very often access to different resources is controlled based on URL patterns, see snippet below. Because of that you cannot mix actions with different security levels in the same namespace. Always group actions in one namespace by security level.</p>
+
+<div class="highlighter-rouge"><pre class="highlight"><code>    &lt;security-constraint&gt;
+        &lt;web-resource-collection&gt;
+            &lt;web-resource-name&gt;admin&lt;/web-resource-name&gt;
+            &lt;url-pattern&gt;/secure/*&lt;/url-pattern&gt;
+        &lt;/web-resource-collection&gt;
+        &lt;auth-constraint&gt;
+            &lt;role-name&gt;admin&lt;/role-name&gt;
+        &lt;/auth-constraint&gt;
+    &lt;/security-constraint&gt;
+
+</code></pre>
+</div>
+
+<p><strong>Never expose JSP files directly</strong></p>
+
+<p>You must always hide JSP file behind an action, you cannot allow for direct access to the JSP files as this can leads to unpredictable security vulnerabilities. You can achieve this by putting all your JSP files under the </p>
+
+<div class="highlighter-rouge"><pre class="highlight"><code>WEB-INF
+</code></pre>
+</div>
+<p>folder - most of the JEE containers restrict access to files placed under the </p>
+
+<div class="highlighter-rouge"><pre class="highlight"><code>WEB-INF
+</code></pre>
+</div>
+<p>folder. Second option is to add security constraint to the</p>
+
+<div class="highlighter-rouge"><pre class="highlight"><code>web.xml
+</code></pre>
+</div>
+<p> file:</p>
+
+<div class="highlighter-rouge"><pre class="highlight"><code>&lt;!-- Restricts access to pure JSP files - access available only via Struts action --&gt;
+&lt;security-constraint&gt;
+    &lt;display-name&gt;No direct JSP access&lt;/display-name&gt;
+    &lt;web-resource-collection&gt;
+        &lt;web-resource-name&gt;No-JSP&lt;/web-resource-name&gt;
+        &lt;url-pattern&gt;*.jsp&lt;/url-pattern&gt;
+    &lt;/web-resource-collection&gt;
+    &lt;auth-constraint&gt;
+        &lt;role-name&gt;no-users&lt;/role-name&gt;
+    &lt;/auth-constraint&gt;
+&lt;/security-constraint&gt;
+
+&lt;security-role&gt;
+    &lt;description&gt;Don't assign users to this role&lt;/description&gt;
+    &lt;role-name&gt;no-users&lt;/role-name&gt;
+&lt;/security-role&gt;
+</code></pre>
+</div>
+
+<p>The best approach is to used the both solutions.</p>
+
+<p><strong>Disable devMode</strong></p>
+
+<p>The </p>
+
+<div class="highlighter-rouge"><pre class="highlight"><code>devMode
+</code></pre>
+</div>
+<p>is a very useful option during development time, allowing for deep introspection and debugging into you app.</p>
+
+<p>However, in production it exposes your application to be presenting too many informations on application’s internals or to evaluating risky parameter expressions. Please **always disable </p>
+
+<div class="highlighter-rouge"><pre class="highlight"><code>devMode
+</code></pre>
+</div>
+<p>** before deploying your application to a production environment. While it is disabled by default, your</p>
+
+<div class="highlighter-rouge"><pre class="highlight"><code>struts.xml
+</code></pre>
+</div>
+<p> might include a line setting it to</p>
+
+<div class="highlighter-rouge"><pre class="highlight"><code>true
+</code></pre>
+</div>
+<p>. The best way is to ensure the following setting is applied to our</p>
+
+<div class="highlighter-rouge"><pre class="highlight"><code>struts.xml
+</code></pre>
+</div>
+<p> for production deployment:</p>
+
+<table>
+  <tbody>
+    <tr>
+      <td>&lt; constant name =”struts.devMode” value=”false” /&gt;</td>
+    </tr>
+  </tbody>
+</table>
+
+<table>
+  <tbody>
+    <tr>
+    </tr>
+  </tbody>
+</table>
+
+<p><strong>Reduce logging level</strong></p>
+
+<p>It’s a good practice to reduce logging level from <strong>DEBUG</strong> to <strong>INFO</strong> or less. Framework’s classes can produce a lot of logging entries which will pollute the log file. You can even set logging level to <strong>WARN</strong> for classes that belongs to the framework, see example Log4j2 configuration:</p>
+
+<div class="highlighter-rouge"><pre class="highlight"><code><span class="cp">&lt;?xml version="1.0" encoding="UTF-8"?&gt;</span>
+<span class="nt">&lt;Configuration&gt;</span>
+    <span class="nt">&lt;Appenders&gt;</span>
+        <span class="nt">&lt;Console</span> <span class="na">name=</span><span class="s">"STDOUT"</span> <span class="na">target=</span><span class="s">"SYSTEM_OUT"</span><span class="nt">&gt;</span>
+            <span class="nt">&lt;PatternLayout</span> <span class="na">pattern=</span><span class="s">"%d %-5p [%t] %C{2} (%F:%L) - %m%n"</span><span class="nt">/&gt;</span>
+        <span class="nt">&lt;/Console&gt;</span>
+    <span class="nt">&lt;/Appenders&gt;</span>
+    <span class="nt">&lt;Loggers&gt;</span>
+        <span class="nt">&lt;Logger</span> <span class="na">name=</span><span class="s">"com.opensymphony.xwork2"</span> <span class="na">level=</span><span class="s">"warn"</span><span class="nt">/&gt;</span>
+        <span class="nt">&lt;Logger</span> <span class="na">name=</span><span class="s">"org.apache.struts2"</span> <span class="na">level=</span><span class="s">"warn"</span><span class="nt">/&gt;</span>
+        <span class="nt">&lt;Root</span> <span class="na">level=</span><span class="s">"info"</span><span class="nt">&gt;</span>
+            <span class="nt">&lt;AppenderRef</span> <span class="na">ref=</span><span class="s">"STDOUT"</span><span class="nt">/&gt;</span>
+        <span class="nt">&lt;/Root&gt;</span>
+    <span class="nt">&lt;/Loggers&gt;</span>
+<span class="nt">&lt;/Configuration&gt;</span>
+</code></pre>
+</div>
+
+<p><strong>Use UTF-8 encoding</strong></p>
+
+<p>Always use </p>
+
+<div class="highlighter-rouge"><pre class="highlight"><code>UTF-8
+</code></pre>
+</div>
+<p>encoding when building an application with the Apache Struts 2, when using JSPs please add the following header to each JSP file</p>
+
+<div class="highlighter-rouge"><pre class="highlight"><code>&lt;%@ page contentType="text/html; charset=UTF-8" %&gt;
+</code></pre>
+</div>
+
+<p><strong>Do not define setters when not needed</strong></p>
+
+<p>You should carefully design your actions without exposing anything via setters and getters, thus can leads to potential security vulnerabilities. Any action’s setter can be used to set incoming untrusted user’s value which can contain suspicious expression. Some Struts </p>
+
+<div class="highlighter-rouge"><pre class="highlight"><code>Result
+</code></pre>
+</div>
+<p>s automatically populate params based on values in </p>
+
+<div class="highlighter-rouge"><pre class="highlight"><code>ValueStack
+</code></pre>
+</div>
+<p>(action in most cases is the root) which means incoming value will be evaluated as an expression during this process.</p>
+
+<p><strong>Do not use incoming values as an input for localisation logic</strong></p>
+
+<p>All </p>
+
+<div class="highlighter-rouge"><pre class="highlight"><code>TextProvider
+</code></pre>
+</div>
+<p>’s</p>
+
+<div class="highlighter-rouge"><pre class="highlight"><code>getText(...) 
+</code></pre>
+</div>
+<p>methods (e.g in </p>
+
+<div class="highlighter-rouge"><pre class="highlight"><code>ActionSupport
+</code></pre>
+</div>
+<p>) perform evaluation of parameters included in a message to properly localize the text. This means using incoming request parameters with </p>
+
+<div class="highlighter-rouge"><pre class="highlight"><code>getText(...)
+</code></pre>
+</div>
+<p>methods is potentially dangerous and should be avoided. See example below, assuming that an action implements getter and setter for property </p>
+
+<div class="highlighter-rouge"><pre class="highlight"><code>message
+</code></pre>
+</div>
+<p>, the below code allows inject an OGNL expression:</p>
+
+<div class="highlighter-rouge"><pre class="highlight"><code>public String execute() throws Exception {
+    setMessage(getText(getMessage()));
+    return SUCCESS;
+}
+</code></pre>
+</div>
+
+<p>Never use value of incoming request parameter as part of your localisation logic.</p>
+
+<p>#####Internal security mechanism#####</p>
+
+<p>The Apache Struts 2 contains internal security manager which blocks access to particular classes and Java packages - it’s a OGNL-wide mechanism which means it affects any aspect of the framework ie. incoming parameters, expressions used in JSPs, etc.</p>
+
+<p>There are three options that can be used to configure excluded packages and classes:</p>
+
+<ul>
+  <li></li>
+</ul>
+
+<div class="highlighter-rouge"><pre class="highlight"><code>struts.excludedClasses
+</code></pre>
+</div>
+<p>- comma-separated list of excluded classes</p>
+
+<ul>
+  <li></li>
+</ul>
+
+<div class="highlighter-rouge"><pre class="highlight"><code>struts.excludedPackageNamePatterns
+</code></pre>
+</div>
+<p>- patterns used to exclude packages based on RegEx - this option is slower than simple string comparison but it’s more flexible</p>
+
+<ul>
+  <li></li>
+</ul>
+
+<div class="highlighter-rouge"><pre class="highlight"><code>struts.excludedPackageNames
+</code></pre>
+</div>
+<p>- comma-separated list of excluded packages, it is used with simple string comparison via </p>
+
+<div class="highlighter-rouge"><pre class="highlight"><code>startWith
+</code></pre>
+</div>
+<p>and </p>
+
+<div class="highlighter-rouge"><pre class="highlight"><code>equals
+</code></pre>
+</div>
+
+<p>The defaults are as follow:</p>
+
+<div class="highlighter-rouge"><pre class="highlight"><code>&lt;constant name="struts.excludedClasses"
+          value="com.opensymphony.xwork2.ActionContext" /&gt;
+
+&lt;!-- this must be valid regex, each '.' in package name must be escaped! --&gt;
+&lt;!-- it's more flexible but slower than simple string comparison --&gt;
+&lt;!-- constant name="struts.excludedPackageNamePatterns" value="^java\.lang\..*,^ognl.*,^(?!javax\.servlet\..+)(javax\..+)" / --&gt;
+
+&lt;!-- this is simpler version of the above used with string comparison --&gt;
+&lt;constant name="struts.excludedPackageNames" value="java.lang,ognl,javax" /&gt;
+</code></pre>
+</div>
+
+<p>Any expression or target which evaluates to one of these will be blocked and you see a WARN in logs:</p>
+
+<div class="highlighter-rouge"><pre class="highlight"><code>[WARNING] Target class [class example.MyBean] or declaring class of member type [public example.MyBean()] are excluded!
+</code></pre>
+</div>
+
+<p>In that case </p>
+
+<div class="highlighter-rouge"><pre class="highlight"><code>new MyBean()
+</code></pre>
+</div>
+<p>was used to create a new instance of class (inside JSP) - it’s blocked because </p>
+
+<div class="highlighter-rouge"><pre class="highlight"><code>target
+</code></pre>
+</div>
+<p>of such expression is evaluated to </p>
+
+<div class="highlighter-rouge"><pre class="highlight"><code>java.lang.Class
+</code></pre>
+</div>
+
+<p>It is possible to redefine the above constants in struts.xml but try to avoid this and rather change design of your application!</p>
+
+<table>
+  <tbody>
+    <tr>
+    </tr>
+  </tbody>
+</table>
+
+<p><strong>Accessing static methods</strong></p>
+
+<p>Support for accessing static methods from expression will be disabled soon, please consider re-factoring your application to avoid further problems! Please check <a href="https://issues\.apache\.org/jira/browse/WW\-4348">WW-4348</a>^[https://issues.apache.org/jira/browse/WW-4348].</p>
+
+<blockquote>
+
+</blockquote>
+
+<p><strong>OGNL is used to call action’s methods</strong></p>
+
+<p>This can impact actions which have large inheritance hierarchy and use the same method’s name throughout the hierarchy, this was reported as an issue <a href="https://issues\.apache\.org/jira/browse/WW\-4405">WW-4405</a>^[https://issues.apache.org/jira/browse/WW-4405]. See the example below:</p>
+
+<div class="highlighter-rouge"><pre class="highlight"><code>public class RealAction extends BaseAction {  
+    @Action("save")
+    public String save() throws Exception {
+        super.save();
+        return SUCCESS;
+    }
+}    
+ 
+public class BaseAction extends AbstractAction {
+    public String save() throws Exception {
+        save(Double.MAX_VALUE);
+        return SUCCESS;
+    }
+}
+ 
+public abstract class AbstractAction extends ActionSupport {
+    protected void save(Double val) {
+        // some logic
+    }
+}
+</code></pre>
+</div>
+
+<p>In such case OGNL cannot properly map which method to call when request is coming. This is do the OGNL limitation. To solve the problem don’t use the same method’s names through the hierarchy, you can simply change the action’s method from </p>
+
+<div class="highlighter-rouge"><pre class="highlight"><code>save()
+</code></pre>
+</div>
+<p>to </p>
+
+<div class="highlighter-rouge"><pre class="highlight"><code>saveAction()
+</code></pre>
+</div>
+<p> and leaving annotation as is to allow call this action via </p>
+
+<div class="highlighter-rouge"><pre class="highlight"><code>/save.action
+</code></pre>
+</div>
+<p>request.</p>
+
+<p><strong>Accepted / Excluded patterns</strong></p>
+
+<p>As from version 2.3.20 the framework provides two new interfaces which are used to accept / exclude param names and values - <a href="http://struts\.apache\.org/maven/struts2\-core/apidocs/com/opensymphony/xwork2/security/AcceptedPatternsChecker\.html">AcceptedPatternsChecker</a>^[http://struts.apache.org/maven/struts2-core/apidocs/com/opensymphony/xwork2/security/AcceptedPatternsChecker.html] and <a href="http://struts\.apache\.org/maven/struts2\-core/apidocs/com/opensymphony/xwork2/security/ExcludedPatternsChecker\.html">ExcludedPatternsChecker</a>^[http://struts.apache.org/maven/struts2-core/apidocs/com/opensymphony/xwork2/security/ExcludedPatternsChecker.html] with default implementations. These two interfaces are used by <a href="../core-developers/parameters-interceptor.html">Parameters Interceptor</a> and <a href="../core-developers/cookie-interceptor.html">Cookie Interceptor</a> to check if param can be accepted or must be excluded. If you were using </p>
+
+<div class="highlighter-rouge"><pre class="highlight"><code>excludeParams
+</code></pre>
+</div>
+<p>previously please compare patterns used by you with these provided by the framework in default implementation.</p>
+
+<p><strong>Strict Method Invocation</strong></p>
+
+<p>This mechanism was introduced in version 2.5. It allows control what methods can be accessed with the bang “!” operator via <a href="../core-developers/action-configuration.html#dynamic-method-invocation">Dynamic Method Invocation</a>. Please read more in Strict Method Invocation section of <a href="../core-developers/action-configuration.html">Action Configuration</a>.</p>
+
+  </section>
+</article>
+
+
+<footer class="container">
+  <div class="col-md-12">
+    Copyright &copy; 2000-2016 <a href="http://www.apache.org/">The Apache Software Foundation </a>.
+    All Rights Reserved.
+  </div>
+  <div class="col-md-12">
+    Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts project logos are
+    trademarks of The Apache Software Foundation.
+  </div>
+  <div class="col-md-12">Logo and website design donated by <a href="https://softwaremill.com/">SoftwareMill</a>.</div>
+</footer>
+
+<script>!function (d, s, id) {
+  var js, fjs = d.getElementsByTagName(s)[0];
+  if (!d.getElementById(id)) {
+    js = d.createElement(s);
+    js.id = id;
+    js.src = "//platform.twitter.com/widgets.js";
+    fjs.parentNode.insertBefore(js, fjs);
+  }
+}(document, "script", "twitter-wjs");</script>
+<script src="https://apis.google.com/js/platform.js" async="async" defer="defer"></script>
+
+<div id="fb-root"></div>
+
+<script>(function (d, s, id) {
+  var js, fjs = d.getElementsByTagName(s)[0];
+  if (d.getElementById(id)) return;
+  js = d.createElement(s);
+  js.id = id;
+  js.src = "//connect.facebook.net/en_GB/all.js#xfbml=1";
+  fjs.parentNode.insertBefore(js, fjs);
+}(document, 'script', 'facebook-jssdk'));</script>
+
+
+<script>
+$(function() {
+  return $("h2, h3, h4, h5, h6").each(function(i, el) {
+    var $el, id;
+    $el = $(el);
+    id = $el.attr('id');
+    if (id) {
+      $el.removeAttr('id');
+      return $el.before($("<a />").addClass('anchor').attr('name', id));
+    }
+  });
+});
+</script>
+
+</body>
+</html>

Modified: websites/production/struts/content/struts1eol-announcement.html
==============================================================================
--- websites/production/struts/content/struts1eol-announcement.html (original)
+++ websites/production/struts/content/struts1eol-announcement.html Thu Jun  1 11:35:58 2017
@@ -78,7 +78,7 @@
                 <li><a href="/kickstart.html">Kickstart FAQ</a></li>
                 <li><a href="https://cwiki.apache.org/confluence/display/WW/Home">Wiki</a></li>
                 <li class="divider"></li>
-                <li><a href="/docs/home.html">Getting started</a></li>
+                <li><a href="/getting-started/">Getting Started</a></li>
                 <li><a href="/docs/tutorials.html">Tutorials</a></li>
                 <li><a href="/docs/faqs.html">FAQs</a></li>
                 <li><a href="/docs/guides.html">Guides</a></li>
@@ -88,7 +88,8 @@
                 <li><a href="/docs/tag-reference.html">Tag reference</a></li>
                 <li><a href="http://cwiki.apache.org/S2PLUGINS/home.html">Plugin registry</a></li>
                 <li class="divider"></li>
-                <li><a href="/getting-started/">Getting Started (WIP)</a></li>
+                <li><a href="/security/">Security Guide (WIP)</a></li>
+                <li><a href="/core-developers/">Core Developers Guide (WIP)</a></li>
               </ul>
             </li>
             <li class="dropdown">

Modified: websites/production/struts/content/struts1eol-press.html
==============================================================================
--- websites/production/struts/content/struts1eol-press.html (original)
+++ websites/production/struts/content/struts1eol-press.html Thu Jun  1 11:35:58 2017
@@ -78,7 +78,7 @@
                 <li><a href="/kickstart.html">Kickstart FAQ</a></li>
                 <li><a href="https://cwiki.apache.org/confluence/display/WW/Home">Wiki</a></li>
                 <li class="divider"></li>
-                <li><a href="/docs/home.html">Getting started</a></li>
+                <li><a href="/getting-started/">Getting Started</a></li>
                 <li><a href="/docs/tutorials.html">Tutorials</a></li>
                 <li><a href="/docs/faqs.html">FAQs</a></li>
                 <li><a href="/docs/guides.html">Guides</a></li>
@@ -88,7 +88,8 @@
                 <li><a href="/docs/tag-reference.html">Tag reference</a></li>
                 <li><a href="http://cwiki.apache.org/S2PLUGINS/home.html">Plugin registry</a></li>
                 <li class="divider"></li>
-                <li><a href="/getting-started/">Getting Started (WIP)</a></li>
+                <li><a href="/security/">Security Guide (WIP)</a></li>
+                <li><a href="/core-developers/">Core Developers Guide (WIP)</a></li>
               </ul>
             </li>
             <li class="dropdown">

Modified: websites/production/struts/content/submitting-patches.html
==============================================================================
--- websites/production/struts/content/submitting-patches.html (original)
+++ websites/production/struts/content/submitting-patches.html Thu Jun  1 11:35:58 2017
@@ -78,7 +78,7 @@
                 <li><a href="/kickstart.html">Kickstart FAQ</a></li>
                 <li><a href="https://cwiki.apache.org/confluence/display/WW/Home">Wiki</a></li>
                 <li class="divider"></li>
-                <li><a href="/docs/home.html">Getting started</a></li>
+                <li><a href="/getting-started/">Getting Started</a></li>
                 <li><a href="/docs/tutorials.html">Tutorials</a></li>
                 <li><a href="/docs/faqs.html">FAQs</a></li>
                 <li><a href="/docs/guides.html">Guides</a></li>
@@ -88,7 +88,8 @@
                 <li><a href="/docs/tag-reference.html">Tag reference</a></li>
                 <li><a href="http://cwiki.apache.org/S2PLUGINS/home.html">Plugin registry</a></li>
                 <li class="divider"></li>
-                <li><a href="/getting-started/">Getting Started (WIP)</a></li>
+                <li><a href="/security/">Security Guide (WIP)</a></li>
+                <li><a href="/core-developers/">Core Developers Guide (WIP)</a></li>
               </ul>
             </li>
             <li class="dropdown">

Modified: websites/production/struts/content/volunteers.html
==============================================================================
--- websites/production/struts/content/volunteers.html (original)
+++ websites/production/struts/content/volunteers.html Thu Jun  1 11:35:58 2017
@@ -78,7 +78,7 @@
                 <li><a href="/kickstart.html">Kickstart FAQ</a></li>
                 <li><a href="https://cwiki.apache.org/confluence/display/WW/Home">Wiki</a></li>
                 <li class="divider"></li>
-                <li><a href="/docs/home.html">Getting started</a></li>
+                <li><a href="/getting-started/">Getting Started</a></li>
                 <li><a href="/docs/tutorials.html">Tutorials</a></li>
                 <li><a href="/docs/faqs.html">FAQs</a></li>
                 <li><a href="/docs/guides.html">Guides</a></li>
@@ -88,7 +88,8 @@
                 <li><a href="/docs/tag-reference.html">Tag reference</a></li>
                 <li><a href="http://cwiki.apache.org/S2PLUGINS/home.html">Plugin registry</a></li>
                 <li class="divider"></li>
-                <li><a href="/getting-started/">Getting Started (WIP)</a></li>
+                <li><a href="/security/">Security Guide (WIP)</a></li>
+                <li><a href="/core-developers/">Core Developers Guide (WIP)</a></li>
               </ul>
             </li>
             <li class="dropdown">