struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lukaszlen...@apache.org
Subject svn commit: r992866 [2/2] - in /websites/production/struts/content: ./ docs/
Date Fri, 15 Jul 2016 06:29:46 GMT
Modified: websites/production/struts/content/docs/webxml.html
==============================================================================
--- websites/production/struts/content/docs/webxml.html (original)
+++ websites/production/struts/content/docs/webxml.html Fri Jul 15 06:29:45 2016
@@ -138,15 +138,24 @@ under the License.
 
     <div class="pagecontent">
         <div class="wiki-content">
-            <div id="ConfluenceContent"><p>The <code>web.xml</code>
web application descriptor file represents the core of the Java web application, so it is
appropriate that it is also part of the core of the Struts framework. In the <code>web.xml</code>
file, Struts defines its FilterDispatcher, the Servlet Filter class that initializes the Struts
framework and handles all requests. This filter can contain initialization parameters that
affect what, if any, additional configuration files are loaded and how the framework should
behave.</p><h2 id="web.xml-SimpleExample">Simple Example</h2><p>Configuring
<code>web.xml</code> for the framework is a matter of adding a filter and filter-mapping.</p><div
class="code panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader
pdl" style="border-bottom-width: 1px;"><b>FilterDispatcher Example (web.xml)</b></div><div
class="codeContent panelContent pdl">
-<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;web-app
id="WebApp_9" version="2.4" 
+            <div id="ConfluenceContent"><p><style type="text/css">/*<![CDATA[*/
+div.rbtoc1468563267575 {padding: 0px;}
+div.rbtoc1468563267575 ul {list-style: disc;margin-left: 0px;}
+div.rbtoc1468563267575 li {margin-left: 0px;padding-left: 0px;}
+
+/*]]>*/</style></p><div class="toc-macro rbtoc1468563267575">
+<ul class="toc-indentation"><li><a shape="rect" href="#web.xml-SimpleExample">Simple
Example</a>
+<ul class="toc-indentation"><li><a shape="rect" href="#web.xml-ChangedfilterpackageinStruts&gt;=2.5">Changed
filter package in Struts &gt;= 2.5</a></li><li><a shape="rect" href="#web.xml-ChangedFilterStructureinStruts&gt;=2.1.3">Changed
Filter Structure in Struts &gt;= 2.1.3</a></li><li><a shape="rect"
href="#web.xml-ExcludespecificURLs">Exclude specific URLs</a></li></ul>
+</li><li><a shape="rect" href="#web.xml-TaglibExample">Taglib Example</a></li><li><a
shape="rect" href="#web.xml-CustomFileManagerandFileManagerFactoryimplementations">Custom
FileManager and FileManagerFactory implementations</a></li><li><a shape="rect"
href="#web.xml-Customconfigurationprovider">Custom configuration provider</a></li></ul>
+</div><p>The <code>web.xml</code> web application descriptor file
represents the core of the Java web application, so it is appropriate that it is also part
of the core of the Struts framework. In the <code>web.xml</code> file, Struts
defines its FilterDispatcher, the Servlet Filter class that initializes the Struts framework
and handles all requests. This filter can contain initialization parameters that affect what,
if any, additional configuration files are loaded and how the framework should behave.</p><h1
id="web.xml-SimpleExample">Simple Example</h1><p>Configuring <code>web.xml</code>
for the framework is a matter of adding a filter and filter-mapping.</p><div class="code
panel pdl" style="border-width: 1px;"><div class="codeHeader panelHeader pdl" style="border-bottom-width:
1px;"><b>FilterDispatcher Example (web.xml)</b></div><div class="codeContent
panelContent pdl">
+<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;web-app
id="MyStrutsApp" version="2.4" 
 	xmlns="http://java.sun.com/xml/ns/j2ee" 
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"&gt;
 
     &lt;filter&gt;
         &lt;filter-name&gt;struts2&lt;/filter-name&gt;
-        &lt;filter-class&gt;org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter&lt;/filter-class&gt;
+        &lt;filter-class&gt;org.apache.struts2.dispatcher.filter.StrutsPrepareAndExecuteFilter&lt;/filter-class&gt;
     &lt;/filter&gt;
 
     &lt;filter-mapping&gt;
@@ -158,8 +167,8 @@ under the License.
 
 &lt;/web-app&gt;
 </pre>
-</div></div><div class="confluence-information-macro confluence-information-macro-note"><p
class="title">Changed Filter package in Struts &gt;= 2.5</p><span class="aui-icon
aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div
class="confluence-information-macro-body"><p>As from Struts 2.5 all filters were
moved to dedicated package, see the example:</p><div class="code panel pdl" style="border-width:
1px;"><div class="codeContent panelContent pdl">
-<pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">&lt;web-app
id="WebApp_9" version="2.4" 
+</div></div><h2 id="web.xml-ChangedfilterpackageinStruts&gt;=2.5">Changed
filter package in Struts &gt;= 2.5</h2><p><span>As from Struts 2.5 all
filters were moved to dedicated package, see the example:</span></p><div class="code
panel pdl" style="border-width: 1px;"><div class="codeContent panelContent pdl">
+<pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;web-app
id="WebApp_9" version="2.4" 
 	xmlns="http://java.sun.com/xml/ns/j2ee" 
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"&gt;
@@ -168,21 +177,20 @@ under the License.
         &lt;filter-name&gt;struts2&lt;/filter-name&gt;
         &lt;filter-class&gt;org.apache.struts2.dispatcher.filter.StrutsPrepareAndExecuteFilter&lt;/filter-class&gt;
     ...</pre>
-</div></div></div></div><div class="confluence-information-macro
confluence-information-macro-note"><p class="title">Changed Filter Structure in Struts
&gt;= 2.1.3</p><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div
class="confluence-information-macro-body"><p>To split up the the dispatcher phases,
FilterDispatcher is deprecated since Struts 2.1.3. If working with older versions, you need
to use</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent
panelContent pdl">
+</div></div><h2 id="web.xml-ChangedFilterStructureinStruts&gt;=2.1.3">Changed
Filter Structure in Struts &gt;= 2.1.3</h2><p><span>To split up the
the dispatcher phases, FilterDispatcher is deprecated since Struts 2.1.3. If working with
older versions, you need to use</span></p><div class="code panel pdl" style="border-width:
1px;"><div class="codeContent panelContent pdl">
 <pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">   
...
     &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;
     ...
 </pre>
-</div></div><p>See <a shape="rect" href="sitemesh-plugin.html">SiteMesh
Plugin</a> for an example on when to use seperate Filters for prepare and execution
phase</p></div></div><div class="confluence-information-macro confluence-information-macro-note"><p
class="title">Why the Filter is mapped with /* and how to configure explicit exclusions
(since 2.1.7)</p><span class="aui-icon aui-icon-small aui-iconfont-warning confluence-information-macro-icon"></span><div
class="confluence-information-macro-body"><p>In the example above we've mapped the
Struts 2 dispatcher to <code>/*</code>, so Struts 2 has a crack at all incoming
requests. This is because Struts 2 serves static content from its jar files, including Dojo
JavaScript files (if using S2.0, or the Dojo plugin in S2.1+) and FreeMarker templates for
the Struts 2 tags that produce HTML.</p><p>If we change the filter mapping to
something else, for example <code>/*.html</code>, we must take this in to account
and extract the content t
 hat would normally be served from the Struts 2 jar files, or some other solution.</p><p>Since
Struts 2.1.7, you are able to provide a comma seperated list of patterns for which when matching
against the<br clear="none"> request URL the Filter will just pass by. This is done
via the configuration option struts.action.excludePattern, for example in your struts.xml</p><div
class="code panel pdl" style="border-width: 1px;"><div class="codeContent panelContent
pdl">
+</div></div><p><span>See </span><a shape="rect" href="sitemesh-plugin.html">SiteMesh
Plugin</a><span> for an example on when to use seperate Filters for prepare and
execution phase</span></p><h2 id="web.xml-ExcludespecificURLs">Exclude specific
URLs</h2><p>In the example above we've mapped the Struts 2 dispatcher to <code>/*</code>,
so Struts 2 has a crack at all incoming requests. This is because Struts 2 serves static content
from its jar files, including Dojo JavaScript files (if using S2.0, or the Dojo plugin in
S2.1+) and FreeMarker templates for the Struts 2 tags that produce HTML.</p><p>If
we change the filter mapping to something else, for example <code>/*.html</code>,
we must take this in to account and extract the content that would normally be served from
the Struts 2 jar files, or some other solution.</p><p>Since Struts 2.1.7, you
are able to provide a comma seperated list of patterns for which when matching against the<br
clear="none"> request URL the Filter will just p
 ass by. This is done via the configuration option struts.action.excludePattern, for example
in your struts.xml</p><p>&#160;</p><div class="code panel pdl" style="border-width:
1px;"><div class="codeContent panelContent pdl">
 <pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;struts&gt;
     &lt;constant name="struts.action.excludePattern" value=".*unfiltered.*,.*\\.nofilter"/&gt;
     ...
 
-&lt;/struts&gt;
-</pre>
-</div></div></div></div><h2 id="web.xml-TaglibExample">Taglib
Example</h2><p>Typically, configuring a taglib is neither required nor recommended.
The taglib is included in <code>struts-core.jar</code>, and the container will
discover it automatically.</p><p><img class="emoticon emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png"
data-emoticon-name="tick" alt="(tick)"> If, for some reason, a taglib configuration is
needed within web.xml, extract the TLD file from the <code>struts-core.jar</code>
<code>META-INF</code> folder, and add a <code>taglib</code> element
to the <code>web.xml</code>.</p><div class="code panel pdl" style="border-width:
1px;"><div class="codeContent panelContent pdl">
+&lt;/struts&gt;</pre>
+</div></div><h1 id="web.xml-TaglibExample">Taglib Example</h1><p>Typically,
configuring a taglib is neither required nor recommended. The taglib is included in <code>struts-core.jar</code>,
and the container will discover it automatically.</p><p><img class="emoticon
emoticon-tick" src="https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png"
data-emoticon-name="tick" alt="(tick)"> If, for some reason, a taglib configuration is
needed within web.xml, extract the TLD file from the <code>struts-core.jar</code>
<code>META-INF</code> folder, and add a <code>taglib</code> element
to the <code>web.xml</code>.</p><div class="code panel pdl" style="border-width:
1px;"><div class="codeContent panelContent pdl">
 <pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">   
&lt;!-- ... --&gt;
     &lt;/welcome-file-list&gt;
 
@@ -192,7 +200,7 @@ under the License.
     &lt;/taglib&gt;
 &lt;/web-app&gt;
 </pre>
-</div></div><h2 id="web.xml-CustomFileManagerandFileManagerFactoryimplementations">Custom
FileManager and FileManagerFactory implementations</h2><p>If there is a need to
support an App Server's specific file system (eg. VFS in JBoss), you can implement your own
version of FileManager. But it must be registered at "the beginning" to support bootstrap
of the whole framework.</p><p>To register your own FileManger you can do it with
&lt;init-param/&gt; as below:</p><div class="code panel pdl" style="border-width:
1px;"><div class="codeContent panelContent pdl">
+</div></div><h1 id="web.xml-CustomFileManagerandFileManagerFactoryimplementations">Custom
FileManager and FileManagerFactory implementations</h1><p>If there is a need to
support an App Server's specific file system (eg. VFS in JBoss), you can implement your own
version of FileManager. But it must be registered at "the beginning" to support bootstrap
of the whole framework.</p><p>To register your own FileManger you can do it with
&lt;init-param/&gt; as below:</p><div class="code panel pdl" style="border-width:
1px;"><div class="codeContent panelContent pdl">
 <pre class="brush: xml; gutter: false; theme: Default" style="font-size:12px;">&lt;filter&gt;
      &lt;filter-name&gt;struts2&lt;/filter-name&gt;
      &lt;filter-class&gt;org.apache.struts2.dispatcher.filter.StrutsPrepareAndExecuteFilter&lt;/filter-class&gt;
@@ -212,7 +220,7 @@ under the License.
      &lt;/init-param&gt;
 &lt;/filter&gt;
 </pre>
-</div></div><p>Take a look on default implementations - DefaultFileManager.java
and DefaultFileManagerFactory.java to understand how and why.</p><h2 id="web.xml-Customconfigurationprovider">Custom
configuration provider</h2><p>It is possible to use your custom&#160;<code>ConfigurationProvider</code>
to programmatically configure your application. To do this use&#160;<code>configProviders</code>&#160;(it
can be a comma-separated list of class names)&#160;<code>&lt;init-param/&gt;</code>&#160;as
below:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent
panelContent pdl">
+</div></div><p>Take a look on default implementations - DefaultFileManager.java
and DefaultFileManagerFactory.java to understand how and why.</p><h1 id="web.xml-Customconfigurationprovider">Custom
configuration provider</h1><p>It is possible to use your custom&#160;<code>ConfigurationProvider</code>
to programmatically configure your application. To do this use&#160;<code>configProviders</code>&#160;(it
can be a comma-separated list of class names)&#160;<code>&lt;init-param/&gt;</code>&#160;as
below:</p><div class="code panel pdl" style="border-width: 1px;"><div class="codeContent
panelContent pdl">
 <pre class="brush: java; gutter: false; theme: Default" style="font-size:12px;">&lt;filter&gt;
      &lt;filter-name&gt;struts2&lt;/filter-name&gt;
      &lt;filter-class&gt;org.apache.struts2.dispatcher.filter.StrutsPrepareAndExecuteFilter&lt;/filter-class&gt;
@@ -221,7 +229,7 @@ under the License.
          &lt;param-value&gt;com.company.MyConfigurationProvider&lt;/param-value&gt;
      &lt;/init-param&gt;
 &lt;/filter&gt;</pre>
-</div></div><p>See&#160;<a shape="rect" href="configuration-provider-configuration.html">Configuration
Provider &amp; Configuration</a>&#160;for more details.</p></div>
+</div></div><p>See&#160;<a shape="rect" href="configuration-provider-configuration.html">Configuration
Provider &amp; Configuration</a>&#160;for more details.</p><p>&#160;</p></div>
         </div>
 
         

Modified: websites/production/struts/content/download.html
==============================================================================
--- websites/production/struts/content/download.html (original)
+++ websites/production/struts/content/download.html Fri Jul 15 06:29:45 2016
@@ -177,27 +177,27 @@
 <h1>Full Releases</h1>
 <a class="anchor" name="struts-ga"></a>
 
-<a class="anchor" name="struts251"></a>
-<h2>Struts 2.5.1</h2>
+<a class="anchor" name="struts252"></a>
+<h2>Struts 2.5.2</h2>
 
 <p>
-  <a href="http://struts.apache.org/">Apache Struts 2.5.1</a> is an elegant,
extensible
+  <a href="http://struts.apache.org/">Apache Struts 2.5.2</a> is an elegant,
extensible
   framework for creating enterprise-ready Java web applications. It is available in a full
distribution,
   or as separate library, source, example and documentation distributions.
-  Struts 2.5.1 is the "best available" version of Struts in the 2.5 series.
+  Struts 2.5.2 is the "best available" version of Struts in the 2.5 series.
 </p>
 
 <ul>
   <li>
-    <a href="http://struts.apache.org/docs/version-notes-251.html">Version Notes</a>
+    <a href="http://struts.apache.org/docs/version-notes-252.html">Version Notes</a>
   </li>
 
   <li>Full Distribution:
     <ul>
       <li>
-        <a href="[preferred]struts/2.5.1/struts-2.5.1-all.zip">struts-2.5.1-all.zip</a>
(65MB)
-        [<a href="http://www.apache.org/dist/struts/2.5.1/struts-2.5.1-all.zip.asc">PGP</a>]
-        [<a href="http://www.apache.org/dist/struts/2.5.1/struts-2.5.1-all.zip.md5">MD5</a>]
+        <a href="[preferred]struts/2.5.2/struts-2.5.2-all.zip">struts-2.5.2-all.zip</a>
(65MB)
+        [<a href="http://www.apache.org/dist/struts/2.5.2/struts-2.5.2-all.zip.asc">PGP</a>]
+        [<a href="http://www.apache.org/dist/struts/2.5.2/struts-2.5.2-all.zip.md5">MD5</a>]
       </li>
     </ul>
   </li>
@@ -205,9 +205,9 @@
   <li>Example Applications:
     <ul>
       <li>
-        <a href="[preferred]struts/2.5.1/struts-2.5.1-apps.zip">struts-2.5.1-apps.zip</a>
(35MB)
-        [<a href="http://www.apache.org/dist/struts/2.5.1/struts-2.5.1-apps.zip.asc">PGP</a>]
-        [<a href="http://www.apache.org/dist/struts/2.5.1/struts-2.5.1-apps.zip.md5">MD5</a>]
+        <a href="[preferred]struts/2.5.2/struts-2.5.2-apps.zip">struts-2.5.2-apps.zip</a>
(35MB)
+        [<a href="http://www.apache.org/dist/struts/2.5.2/struts-2.5.2-apps.zip.asc">PGP</a>]
+        [<a href="http://www.apache.org/dist/struts/2.5.2/struts-2.5.2-apps.zip.md5">MD5</a>]
       </li>
     </ul>
   </li>
@@ -215,9 +215,9 @@
   <li>Essential Dependencies Only:
     <ul>
       <li>
-        <a href="[preferred]struts/2.5.1/struts-2.5.1-min-lib.zip">struts-2.5.1-min-lib.zip</a>
(4MB)
-        [<a href="http://www.apache.org/dist/struts/2.5.1/struts-2.5.1-min-lib.zip.asc">PGP</a>]
-        [<a href="http://www.apache.org/dist/struts/2.5.1/struts-2.5.1-min-lib.zip.md5">MD5</a>]
+        <a href="[preferred]struts/2.5.2/struts-2.5.2-min-lib.zip">struts-2.5.2-min-lib.zip</a>
(4MB)
+        [<a href="http://www.apache.org/dist/struts/2.5.2/struts-2.5.2-min-lib.zip.asc">PGP</a>]
+        [<a href="http://www.apache.org/dist/struts/2.5.2/struts-2.5.2-min-lib.zip.md5">MD5</a>]
       </li>
     </ul>
   </li>
@@ -225,9 +225,9 @@
   <li>All Dependencies:
     <ul>
       <li>
-        <a href="[preferred]struts/2.5.1/struts-2.5.1-lib.zip">struts-2.5.1-lib.zip</a>
(19MB)
-        [<a href="http://www.apache.org/dist/struts/2.5.1/struts-2.5.1-lib.zip.asc">PGP</a>]
-        [<a href="http://www.apache.org/dist/struts/2.5.1/struts-2.5.1-lib.zip.md5">MD5</a>]
+        <a href="[preferred]struts/2.5.2/struts-2.5.2-lib.zip">struts-2.5.2-lib.zip</a>
(19MB)
+        [<a href="http://www.apache.org/dist/struts/2.5.2/struts-2.5.2-lib.zip.asc">PGP</a>]
+        [<a href="http://www.apache.org/dist/struts/2.5.2/struts-2.5.2-lib.zip.md5">MD5</a>]
       </li>
     </ul>
   </li>
@@ -235,9 +235,9 @@
   <li>Documentation:
     <ul>
       <li>
-        <a href="[preferred]struts/2.5.1/struts-2.5.1-docs.zip">struts-2.5.1-docs.zip</a>
(13MB)
-        [<a href="http://www.apache.org/dist/struts/2.5.1/struts-2.5.1-docs.zip.asc">PGP</a>]
-        [<a href="http://www.apache.org/dist/struts/2.5.1/struts-2.5.1-docs.zip.md5">MD5</a>]
+        <a href="[preferred]struts/2.5.2/struts-2.5.2-docs.zip">struts-2.5.2-docs.zip</a>
(13MB)
+        [<a href="http://www.apache.org/dist/struts/2.5.2/struts-2.5.2-docs.zip.asc">PGP</a>]
+        [<a href="http://www.apache.org/dist/struts/2.5.2/struts-2.5.2-docs.zip.md5">MD5</a>]
       </li>
     </ul>
   </li>
@@ -245,17 +245,17 @@
   <li>Source:
     <ul>
       <li>
-        <a href="[preferred]struts/2.5.1/struts-2.5.1-src.zip">struts-2.5.1-src.zip</a>
(7MB)
-        [<a href="http://www.apache.org/dist/struts/2.5.1/struts-2.5.1-src.zip.asc">PGP</a>]
-        [<a href="http://www.apache.org/dist/struts/2.5.1/struts-2.5.1-src.zip.md5">MD5</a>]
+        <a href="[preferred]struts/2.5.2/struts-2.5.2-src.zip">struts-2.5.2-src.zip</a>
(7MB)
+        [<a href="http://www.apache.org/dist/struts/2.5.2/struts-2.5.2-src.zip.asc">PGP</a>]
+        [<a href="http://www.apache.org/dist/struts/2.5.2/struts-2.5.2-src.zip.md5">MD5</a>]
       </li>
     </ul>
   </li>
 
 </ul>
 
-<a class="anchor" name="struts2329"></a>
-<h2>Struts 2.3.29</h2>
+<a class="anchor" name="struts-2330"></a>
+<h2>Struts 2.3.30</h2>
 
 <ul>
   <li>
@@ -265,9 +265,9 @@
   <li>Full Distribution:
     <ul>
       <li>
-        <a href="[preferred]struts/2.3.29/struts-2.3.29-all.zip">struts-2.3.29-all.zip</a>
(65MB)
-        [<a href="http://www.apache.org/dist/struts/2.3.29/struts-2.3.29-all.zip.asc">PGP</a>]
-        [<a href="http://www.apache.org/dist/struts/2.3.29/struts-2.3.29-all.zip.md5">MD5</a>]
+        <a href="[preferred]struts/2.3.30/struts-2.3.30-all.zip">struts-2.3.30-all.zip</a>
(65MB)
+        [<a href="http://www.apache.org/dist/struts/2.3.30/struts-2.3.30-all.zip.asc">PGP</a>]
+        [<a href="http://www.apache.org/dist/struts/2.3.30/struts-2.3.30-all.zip.md5">MD5</a>]
       </li>
     </ul>
   </li>
@@ -275,9 +275,9 @@
   <li>Example Applications:
     <ul>
       <li>
-        <a href="[preferred]struts/2.3.29/struts-2.3.29-apps.zip">struts-2.3.29-apps.zip</a>
(35MB)
-        [<a href="http://www.apache.org/dist/struts/2.3.29/struts-2.3.29-apps.zip.asc">PGP</a>]
-        [<a href="http://www.apache.org/dist/struts/2.3.29/struts-2.3.29-apps.zip.md5">MD5</a>]
+        <a href="[preferred]struts/2.3.30/struts-2.3.30-apps.zip">struts-2.3.30-apps.zip</a>
(35MB)
+        [<a href="http://www.apache.org/dist/struts/2.3.30/struts-2.3.30-apps.zip.asc">PGP</a>]
+        [<a href="http://www.apache.org/dist/struts/2.3.30/struts-2.3.30-apps.zip.md5">MD5</a>]
       </li>
     </ul>
   </li>
@@ -285,9 +285,9 @@
   <li>Essential Dependencies Only:
     <ul>
       <li>
-        <a href="[preferred]struts/2.3.29/struts-2.3.29-min-lib.zip">struts-2.3.29-min-lib.zip</a>
(4MB)
-        [<a href="http://www.apache.org/dist/struts/2.3.29/struts-2.3.29-min-lib.zip.asc">PGP</a>]
-        [<a href="http://www.apache.org/dist/struts/2.3.29/struts-2.3.29-min-lib.zip.md5">MD5</a>]
+        <a href="[preferred]struts/2.3.30/struts-2.3.30-min-lib.zip">struts-2.3.30-min-lib.zip</a>
(4MB)
+        [<a href="http://www.apache.org/dist/struts/2.3.30/struts-2.3.30-min-lib.zip.asc">PGP</a>]
+        [<a href="http://www.apache.org/dist/struts/2.3.30/struts-2.3.30-min-lib.zip.md5">MD5</a>]
       </li>
     </ul>
   </li>
@@ -295,9 +295,9 @@
   <li>All Dependencies:
     <ul>
       <li>
-        <a href="[preferred]struts/2.3.29/struts-2.3.29-lib.zip">struts-2.3.29-lib.zip</a>
(19MB)
-        [<a href="http://www.apache.org/dist/struts/2.3.29/struts-2.3.29-lib.zip.asc">PGP</a>]
-        [<a href="http://www.apache.org/dist/struts/2.3.29/struts-2.3.29-lib.zip.md5">MD5</a>]
+        <a href="[preferred]struts/2.3.30/struts-2.3.30-lib.zip">struts-2.3.30-lib.zip</a>
(19MB)
+        [<a href="http://www.apache.org/dist/struts/2.3.30/struts-2.3.30-lib.zip.asc">PGP</a>]
+        [<a href="http://www.apache.org/dist/struts/2.3.30/struts-2.3.30-lib.zip.md5">MD5</a>]
       </li>
     </ul>
   </li>
@@ -305,9 +305,9 @@
   <li>Documentation:
     <ul>
       <li>
-        <a href="[preferred]struts/2.3.29/struts-2.3.29-docs.zip">struts-2.3.29-docs.zip</a>
(13MB)
-        [<a href="http://www.apache.org/dist/struts/2.3.29/struts-2.3.29-docs.zip.asc">PGP</a>]
-        [<a href="http://www.apache.org/dist/struts/2.3.29/struts-2.3.29-docs.zip.md5">MD5</a>]
+        <a href="[preferred]struts/2.3.30/struts-2.3.30-docs.zip">struts-2.3.30-docs.zip</a>
(13MB)
+        [<a href="http://www.apache.org/dist/struts/2.3.30/struts-2.3.30-docs.zip.asc">PGP</a>]
+        [<a href="http://www.apache.org/dist/struts/2.3.30/struts-2.3.30-docs.zip.md5">MD5</a>]
       </li>
     </ul>
   </li>
@@ -315,9 +315,9 @@
   <li>Source:
     <ul>
       <li>
-        <a href="[preferred]struts/2.3.29/struts-2.3.29-src.zip">struts-2.3.29-src.zip</a>
(7MB)
-        [<a href="http://www.apache.org/dist/struts/2.3.29/struts-2.3.29-src.zip.asc">PGP</a>]
-        [<a href="http://www.apache.org/dist/struts/2.3.29/struts-2.3.29-src.zip.md5">MD5</a>]
+        <a href="[preferred]struts/2.3.30/struts-2.3.30-src.zip">struts-2.3.30-src.zip</a>
(7MB)
+        [<a href="http://www.apache.org/dist/struts/2.3.30/struts-2.3.30-src.zip.asc">PGP</a>]
+        [<a href="http://www.apache.org/dist/struts/2.3.30/struts-2.3.30-src.zip.md5">MD5</a>]
       </li>
     </ul>
   </li>
@@ -350,8 +350,8 @@
     <ul>
       <li>
         <a href="[preferred]struts/2.5-BETA3/struts-2.5-BETA3-all.zip">struts-2.5-BETA3-all.zip</a>
(65MB)
-        [<a href="http://www.apache.org/dist/struts/2.5.1/struts-2.5-BETA3-all.zip.asc">PGP</a>]
-        [<a href="http://www.apache.org/dist/struts/2.5.1/struts-2.5-BETA3-all.zip.md5">MD5</a>]
+        [<a href="http://www.apache.org/dist/struts/2.5.2/struts-2.5-BETA3-all.zip.asc">PGP</a>]
+        [<a href="http://www.apache.org/dist/struts/2.5.2/struts-2.5-BETA3-all.zip.md5">MD5</a>]
       </li>
     </ul>
   </li>

Modified: websites/production/struts/content/downloads.html
==============================================================================
--- websites/production/struts/content/downloads.html (original)
+++ websites/production/struts/content/downloads.html Fri Jul 15 06:29:45 2016
@@ -137,7 +137,7 @@
     <ul>
       <li>
         <a href="http://struts.apache.org/download.cgi#struts-ga">
-          Struts 2.5.1
+          Struts 2.5.2
         </a> ("best available")
       </li>
     </ul>
@@ -222,6 +222,30 @@
   <tbody>
   <tr>
     <td class="no-wrap">
+      Struts 2.5.1
+    </td>
+    <td class="no-wrap">18 Jun 2016</td>
+    <td>
+      <br/>
+    </td>
+    <td>
+      <a href="/docs/version-notes-251.html">Version notes</a>
+    </td>
+  </tr>
+  <tr>
+    <td class="no-wrap">
+      Struts 2.3.29
+    </td>
+    <td class="no-wrap">17 June 2016</td>
+    <td>
+      <br/>
+    </td>
+    <td>
+      <a href="/docs/version-notes-2330.html">Version notes</a>
+    </td>
+  </tr>
+  <tr>
+    <td class="no-wrap">
       Struts 2.5
     </td>
     <td class="no-wrap">9 May 2016</td>

Modified: websites/production/struts/content/index.html
==============================================================================
--- websites/production/struts/content/index.html (original)
+++ websites/production/struts/content/index.html Fri Jul 15 06:29:45 2016
@@ -125,7 +125,7 @@
       extensible using a plugin architecture, and ships with plugins to support
       REST, AJAX and JSON.
     </p>
-    <a href="/download.cgi#struts251" class="btn btn-primary btn-large">
+    <a href="/download.cgi#struts252" class="btn btn-primary btn-large">
       <img src="img/download-icon.svg"> Download
     </a>
     <a href="primer.html" class="btn btn-info btn-large">
@@ -145,19 +145,19 @@
         </p>
       </div>
       <div class="column col-md-4">
-        <h2>Apache Struts 2.5.1 GA</h2>
+        <h2>Apache Struts 2.5.2 GA</h2>
         <p>
-          Apache Struts 2.5.1 GA has been released<br/>on 18 june 2016.
+          Apache Struts 2.5.2 GA has been released<br/>on 07 july 2016.
         </p>
-        Read more in <a href="announce.html#a20160618">Announcement</a> or in
-        <a href="/docs/version-notes-251.html">Version notes</a>
+        Read more in <a href="announce.html#a20160707">Announcement</a> or in
+        <a href="/docs/version-notes-252.html">Version notes</a>
       </div>
       <div class="column col-md-4">
-        <h2>Apache Struts 2.3.29 GA</h2>
+        <h2>Apache Struts 2.3.30 GA</h2>
         <p>
           It's the latest release of Struts 2.3.x,
-          read more in <a href="announce.html#a20160617">Announcement</a> or
in
-          <a href="/docs/version-notes-2329.html">Version notes</a>
+          read more in <a href="announce.html#a20160707-2">Announcement</a> or
in
+          <a href="/docs/version-notes-2330.html">Version notes</a>
         </p>
       </div>
     </div>



Mime
View raw message