You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by rg...@apache.org on 2013/05/26 23:39:00 UTC
svn commit: r863224 [1/3] - in /websites/production/struts/content:
development/2.x/docs/ release/2.3.x/docs/
Author: rgielen
Date: Sun May 26 21:38:59 2013
New Revision: 863224
Log:
Updated docs to latest wiki docs
Added:
websites/production/struts/content/development/2.x/docs/cookieprovider-interceptor.html
websites/production/struts/content/development/2.x/docs/s2-014.html
websites/production/struts/content/development/2.x/docs/version-notes-23142.html
websites/production/struts/content/development/2.x/docs/version-notes-2315.html
websites/production/struts/content/release/2.3.x/docs/cookieprovider-interceptor.html
websites/production/struts/content/release/2.3.x/docs/default-workflow-interceptor.html
websites/production/struts/content/release/2.3.x/docs/s2-012.html
websites/production/struts/content/release/2.3.x/docs/s2-013.html
websites/production/struts/content/release/2.3.x/docs/s2-014.html
websites/production/struts/content/release/2.3.x/docs/struts-next.html
websites/production/struts/content/release/2.3.x/docs/version-notes-23141.html
websites/production/struts/content/release/2.3.x/docs/version-notes-23142.html
websites/production/struts/content/release/2.3.x/docs/version-notes-2315.html
Modified:
websites/production/struts/content/development/2.x/docs/cookie-interceptor.html
websites/production/struts/content/development/2.x/docs/guides.html
websites/production/struts/content/development/2.x/docs/interceptors.html
websites/production/struts/content/development/2.x/docs/migration-guide.html
websites/production/struts/content/development/2.x/docs/security-bulletins.html
websites/production/struts/content/development/2.x/docs/struts-next.html
websites/production/struts/content/release/2.3.x/docs/actionmapper.html
websites/production/struts/content/release/2.3.x/docs/building-struts-2-fast-track-release.html
websites/production/struts/content/release/2.3.x/docs/cookie-interceptor.html
websites/production/struts/content/release/2.3.x/docs/faqs.html
websites/production/struts/content/release/2.3.x/docs/guides.html
websites/production/struts/content/release/2.3.x/docs/home.html
websites/production/struts/content/release/2.3.x/docs/index.html
websites/production/struts/content/release/2.3.x/docs/interceptors.html
websites/production/struts/content/release/2.3.x/docs/logging.html
websites/production/struts/content/release/2.3.x/docs/migration-guide.html
websites/production/struts/content/release/2.3.x/docs/osgi-plugin.html
websites/production/struts/content/release/2.3.x/docs/parameters-interceptor.html
websites/production/struts/content/release/2.3.x/docs/sample-announcements.html
websites/production/struts/content/release/2.3.x/docs/security-bulletins.html
Modified: websites/production/struts/content/development/2.x/docs/cookie-interceptor.html
==============================================================================
--- websites/production/struts/content/development/2.x/docs/cookie-interceptor.html (original)
+++ websites/production/struts/content/development/2.x/docs/cookie-interceptor.html Sun May 26 21:38:59 2013
@@ -141,11 +141,10 @@ long as the cookie name matches those sp
<P>If cookiesValue is left empty it will assume that all cookie that match the cookieName
parameter will be injected into Struts' action.<P></P>
-<P>The action could implements CookiesAware in order to have a Map
+<P>The action could implement CookiesAware in order to have a Map
of filtered cookies set into it. <P></P>
-
<P>Parameters</P>
<P><UL>
@@ -164,8 +163,7 @@ of filtered cookies set into it. <P></P>
</UL></P>
-<P>?<BR>
-Extending the Interceptor</P>
+<P>Extending the Interceptor</P>
<P><UL>
populateCookieValueIntoStack - this method will decide if this cookie value is qualified to be
@@ -175,8 +173,7 @@ Extending the Interceptor</P>
</UL></P>
-<P>?<BR>
-Examples</P>
+<P>Examples</P>
<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
<PRE class="code-xml">
<!--
Added: websites/production/struts/content/development/2.x/docs/cookieprovider-interceptor.html
==============================================================================
--- websites/production/struts/content/development/2.x/docs/cookieprovider-interceptor.html (added)
+++ websites/production/struts/content/development/2.x/docs/cookieprovider-interceptor.html Sun May 26 21:38:59 2013
@@ -0,0 +1,147 @@
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE- 2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+ <HEAD>
+ <LINK type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
+ <STYLE type="text/css">
+ .dp-highlighter {
+ width:95% !important;
+ }
+ </STYLE>
+ <STYLE type="text/css">
+ .footer {
+ background-image: url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
+ background-repeat: repeat-x;
+ background-position: left top;
+ padding-top: 4px;
+ color: #666;
+ }
+ </STYLE>
+ <SCRIPT type="text/javascript" language="javascript">
+ var hide = null;
+ var show = null;
+ var children = null;
+
+ function init() {
+ /* Search form initialization */
+ var form = document.forms['search'];
+ if (form != null) {
+ form.elements['domains'].value = location.hostname;
+ form.elements['sitesearch'].value = location.hostname;
+ }
+
+ /* Children initialization */
+ hide = document.getElementById('hide');
+ show = document.getElementById('show');
+ children = document.all != null ?
+ document.all['children'] :
+ document.getElementById('children');
+ if (children != null) {
+ children.style.display = 'none';
+ show.style.display = 'inline';
+ hide.style.display = 'none';
+ }
+ }
+
+ function showChildren() {
+ children.style.display = 'block';
+ show.style.display = 'none';
+ hide.style.display = 'inline';
+ }
+
+ function hideChildren() {
+ children.style.display = 'none';
+ show.style.display = 'inline';
+ hide.style.display = 'none';
+ }
+ </SCRIPT>
+ <TITLE>CookieProvider Interceptor</TITLE>
+ <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+ <BODY onload="init()">
+ <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+ <TR class="topBar">
+ <TD align="left" valign="middle" class="topBarDiv" align="left" nowrap="">
+ <A href="home.html" title="Apache Struts 2 Documentation">Apache Struts 2 Documentation</A> > <A href="home.html" title="Home">Home</A> > <A href="guides.html" title="Guides">Guides</A> > <A href="core-developers-guide.html" title="Core Developers Guide">Core Developers Guide</A> > <A href="interceptors.html" title="Interceptors">Interceptors</A> > <A href="" title="CookieProvider Interceptor">CookieProvider Interceptor</A>
+ </TD>
+ <TD align="right" valign="middle" nowrap="">
+ <FORM name="search" action="http://www.google.com/search" method="get">
+ <INPUT type="hidden" name="ie" value="UTF-8">
+ <INPUT type="hidden" name="oe" value="UTF-8">
+ <INPUT type="hidden" name="domains" value="">
+ <INPUT type="hidden" name="sitesearch" value="">
+ <INPUT type="text" name="q" maxlength="255" value="">
+ <INPUT type="submit" name="btnG" value="Google Search">
+ </FORM>
+ </TD>
+ </TR>
+ </TABLE>
+
+ <DIV id="PageContent">
+ <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+ <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+ <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+ <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</DIV>
+ <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">CookieProvider Interceptor</DIV>
+
+ <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+ <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=31822465">
+ <IMG src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+ <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=31822465">Edit Page</A>
+
+ <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
+ <IMG src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+ <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</A>
+
+ <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=31822465">
+ <IMG src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+ <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=31822465">Add Page</A>
+
+ <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=31822465">
+ <IMG src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+ <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=31822465">Add News</A>
+ </DIV>
+ </DIV>
+
+ <DIV class="pagecontent">
+ <DIV class="wiki-content">
+ <DIV class="error"><SPAN class="error">Error formatting macro: snippet: java.lang.IndexOutOfBoundsException: Index: 20, Size: 20</SPAN> </DIV>
+
+<P>Parameters</P>
+<DIV class="error"><SPAN class="error">Error formatting macro: snippet: java.lang.IndexOutOfBoundsException: Index: 20, Size: 20</SPAN> </DIV>
+
+<P>Extending the Interceptor</P>
+<DIV class="error"><SPAN class="error">Error formatting macro: snippet: java.lang.IndexOutOfBoundsException: Index: 20, Size: 20</SPAN> </DIV>
+
+<P>Examples</P>
+<DIV class="error"><SPAN class="error">Error formatting macro: snippet: java.lang.IndexOutOfBoundsException: Index: 20, Size: 20</SPAN> </DIV>
+ </DIV>
+
+
+ </DIV>
+ </DIV>
+ <DIV class="footer">
+ Generated by
+ <A href="http://www.atlassian.com/confluence/">Atlassian Confluence</A> (Version: 3.4.9 Build: 2042 Feb 14, 2011)
+ <A href="http://could.it/autoexport/">Auto Export Plugin</A> (Version: 1.0.0-dkulp)
+ </DIV>
+ </BODY>
+</HTML>
\ No newline at end of file
Modified: websites/production/struts/content/development/2.x/docs/guides.html
==============================================================================
--- websites/production/struts/content/development/2.x/docs/guides.html (original)
+++ websites/production/struts/content/development/2.x/docs/guides.html Sun May 26 21:38:59 2013
@@ -352,6 +352,8 @@ under the License.
<H3><A name="Guides-VersionNotes2.3.x"></A>Version Notes 2.3.x</H3>
<UL>
+ <LI><A href="version-notes-2315.html" title="Version Notes 2.3.15">Version Notes 2.3.15</A></LI>
+ <LI><A href="version-notes-23142.html" title="Version Notes 2.3.14.2">Version Notes 2.3.14.2</A></LI>
<LI><A href="version-notes-23141.html" title="Version Notes 2.3.14.1">Version Notes 2.3.14.1</A></LI>
<LI><A href="version-notes-2314.html" title="Version Notes 2.3.14">Version Notes 2.3.14</A></LI>
<LI><A href="version-notes-2312.html" title="Version Notes 2.3.12">Version Notes 2.3.12</A></LI>
Modified: websites/production/struts/content/development/2.x/docs/interceptors.html
==============================================================================
--- websites/production/struts/content/development/2.x/docs/interceptors.html (original)
+++ websites/production/struts/content/development/2.x/docs/interceptors.html Sun May 26 21:38:59 2013
@@ -581,6 +581,11 @@ under the License.
<TD class="confluenceTd"> Inject cookie with a certain configurable name / value into action. (Since 2.0.7.) </TD>
</TR>
<TR>
+<TD class="confluenceTd"> <A href="cookieprovider-interceptor.html" title="CookieProvider Interceptor">CookieProvider Interceptor</A> </TD>
+<TD class="confluenceTd"> cookieProvider </TD>
+<TD class="confluenceTd"> Transfer cookies from action to response (Since 2.3.15.) </TD>
+</TR>
+<TR>
<TD class="confluenceTd"> <A href="conversion-error-interceptor.html" title="Conversion Error Interceptor">Conversion Error Interceptor</A> </TD>
<TD class="confluenceTd"> conversionError </TD>
<TD class="confluenceTd"> Adds conversion errors from the ActionContext to the Action's field errors </TD>
Modified: websites/production/struts/content/development/2.x/docs/migration-guide.html
==============================================================================
--- websites/production/struts/content/development/2.x/docs/migration-guide.html (original)
+++ websites/production/struts/content/development/2.x/docs/migration-guide.html Sun May 26 21:38:59 2013
@@ -129,6 +129,8 @@ under the License.
<H3><A name="MigrationGuide-VersionNotes2.3.x"></A>Version Notes 2.3.x</H3>
<UL>
+ <LI><A href="version-notes-2315.html" title="Version Notes 2.3.15">Version Notes 2.3.15</A></LI>
+ <LI><A href="version-notes-23142.html" title="Version Notes 2.3.14.2">Version Notes 2.3.14.2</A></LI>
<LI><A href="version-notes-23141.html" title="Version Notes 2.3.14.1">Version Notes 2.3.14.1</A></LI>
<LI><A href="version-notes-2314.html" title="Version Notes 2.3.14">Version Notes 2.3.14</A></LI>
<LI><A href="version-notes-2312.html" title="Version Notes 2.3.12">Version Notes 2.3.12</A></LI>
@@ -435,6 +437,9 @@ under the License.
<A href="version-notes-23141.html" title="Version Notes 2.3.14.1">Version Notes 2.3.14.1</A>
<SPAN class="smalltext">(Apache Struts 2 Documentation)</SPAN>
<BR>
+ <A href="version-notes-2315.html" title="Version Notes 2.3.15">Version Notes 2.3.15</A>
+ <SPAN class="smalltext">(Apache Struts 2 Documentation)</SPAN>
+ <BR>
</DIV>
</DIV>
Added: websites/production/struts/content/development/2.x/docs/s2-014.html
==============================================================================
--- websites/production/struts/content/development/2.x/docs/s2-014.html (added)
+++ websites/production/struts/content/development/2.x/docs/s2-014.html Sun May 26 21:38:59 2013
@@ -0,0 +1,246 @@
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE- 2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+ <HEAD>
+ <LINK type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
+ <STYLE type="text/css">
+ .dp-highlighter {
+ width:95% !important;
+ }
+ </STYLE>
+ <STYLE type="text/css">
+ .footer {
+ background-image: url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
+ background-repeat: repeat-x;
+ background-position: left top;
+ padding-top: 4px;
+ color: #666;
+ }
+ </STYLE>
+ <SCRIPT type="text/javascript" language="javascript">
+ var hide = null;
+ var show = null;
+ var children = null;
+
+ function init() {
+ /* Search form initialization */
+ var form = document.forms['search'];
+ if (form != null) {
+ form.elements['domains'].value = location.hostname;
+ form.elements['sitesearch'].value = location.hostname;
+ }
+
+ /* Children initialization */
+ hide = document.getElementById('hide');
+ show = document.getElementById('show');
+ children = document.all != null ?
+ document.all['children'] :
+ document.getElementById('children');
+ if (children != null) {
+ children.style.display = 'none';
+ show.style.display = 'inline';
+ hide.style.display = 'none';
+ }
+ }
+
+ function showChildren() {
+ children.style.display = 'block';
+ show.style.display = 'none';
+ hide.style.display = 'inline';
+ }
+
+ function hideChildren() {
+ children.style.display = 'none';
+ show.style.display = 'inline';
+ hide.style.display = 'none';
+ }
+ </SCRIPT>
+ <TITLE>S2-014</TITLE>
+ <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+ <BODY onload="init()">
+ <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+ <TR class="topBar">
+ <TD align="left" valign="middle" class="topBarDiv" align="left" nowrap="">
+ <A href="home.html" title="Apache Struts 2 Documentation">Apache Struts 2 Documentation</A> > <A href="home.html" title="Home">Home</A> > <A href="security-bulletins.html" title="Security Bulletins">Security Bulletins</A> > <A href="" title="S2-014">S2-014</A>
+ </TD>
+ <TD align="right" valign="middle" nowrap="">
+ <FORM name="search" action="http://www.google.com/search" method="get">
+ <INPUT type="hidden" name="ie" value="UTF-8">
+ <INPUT type="hidden" name="oe" value="UTF-8">
+ <INPUT type="hidden" name="domains" value="">
+ <INPUT type="hidden" name="sitesearch" value="">
+ <INPUT type="text" name="q" maxlength="255" value="">
+ <INPUT type="submit" name="btnG" value="Google Search">
+ </FORM>
+ </TD>
+ </TR>
+ </TABLE>
+
+ <DIV id="PageContent">
+ <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+ <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+ <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+ <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</DIV>
+ <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">S2-014</DIV>
+
+ <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+ <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=31822584">
+ <IMG src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+ <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=31822584">Edit Page</A>
+
+ <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
+ <IMG src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+ <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</A>
+
+ <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=31822584">
+ <IMG src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+ <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=31822584">Add Page</A>
+
+ <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=31822584">
+ <IMG src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+ <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=31822584">Add News</A>
+ </DIV>
+ </DIV>
+
+ <DIV class="pagecontent">
+ <DIV class="wiki-content">
+ <H2><A name="S2-014-Summary"></A>Summary</H2>
+
+
+<P>A vulnerability introduced by forcing parameter inclusion in the <EM>URL</EM> and <EM>Anchor</EM> Tag allows remote command execution, session access and manipulation and XSS attacks</P>
+
+
+<DIV class="table-wrap">
+<TABLE class="confluenceTable"><TBODY>
+<TR>
+<TH class="confluenceTh">Who should read this</TH>
+<TD class="confluenceTd">All Struts 2 developers and users</TD>
+</TR>
+<TR>
+<TH class="confluenceTh">Impact of vulnerability</TH>
+<TD class="confluenceTd">Remote command execution, remote server context manipulation, injection of malicious client side code</TD>
+</TR>
+<TR>
+<TH class="confluenceTh">Maximum security rating</TH>
+<TD class="confluenceTd">Highly Critical</TD>
+</TR>
+<TR>
+<TH class="confluenceTh">Recommendation</TH>
+<TD class="confluenceTd">Developers should immediately upgrade to <A href="http://struts.apache.org/download.cgi#struts23142" class="external-link" rel="nofollow">Struts 2.3.14.2</A></TD>
+</TR>
+<TR>
+<TH class="confluenceTh">Affected Software</TH>
+<TD class="confluenceTd"> Struts 2.0.0 - Struts 2.3.14.1 </TD>
+</TR>
+<TR>
+<TH class="confluenceTh">Reporter</TH>
+<TD class="confluenceTd"> Eric Kobrin and Douglas Rodrigues (Akamai), Coverity Security Research Laboratory, NSFOCUS Security Team </TD>
+</TR>
+<TR>
+<TH class="confluenceTh">CVE Identifier</TH>
+<TD class="confluenceTd"><A href="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2013-2115" class="external-link" rel="nofollow">CVE-2013-2115</A>, <A href="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2013-1966" class="external-link" rel="nofollow">CVE-2013-1966</A></TD>
+</TR>
+</TBODY></TABLE>
+</DIV>
+
+
+<H2><A name="S2-014-Problem"></A>Problem</H2>
+
+<P>Both the <A href="http://struts.apache.org/release/2.3.x/struts2-core/apidocs/org/apache/struts2/components/URL.html" class="external-link" rel="nofollow"><EM>s:url</EM></A> and <A href="http://struts.apache.org/release/2.3.x/struts2-core/apidocs/org/apache/struts2/components/Anchor.html" class="external-link" rel="nofollow"><EM>s:a</EM></A> tag provide an <EM>includeParams</EM> attribute. </P>
+
+<P>The main scope of that attribute is to understand whether includes http request parameter or not. </P>
+
+<P>The allowed values of includeParams are:</P>
+<OL>
+ <LI><EM>none</EM> - include no parameters in the URL (default)</LI>
+ <LI><EM>get</EM> - include only GET parameters in the URL</LI>
+ <LI><EM>all</EM> - include both GET and POST parameters in the URL</LI>
+</OL>
+
+
+<P>A request that included a specially crafted request parameter could be used to inject arbitrary OGNL code into the stack, afterward used as request parameter of an <EM>URL</EM> or <EM>A</EM> tag , which will cause a further evaluation. </P>
+
+<P>The second evaluation happens when the URL/A tag tries to resolve every parameters present in the original request.<BR>
+This lets malicious users put arbitrary OGNL statements into any request parameter (not necessarily managed by the code) and have it evaluated as an OGNL expression to enable method execution and execute arbitrary methods, bypassing Struts and OGNL library protections.</P>
+
+<P>The issue was originally addressed by Struts 2.3.14.1 and Security Announcement <A href="s2-013.html" title="S2-013">S2-013</A>. However, the solution introduced with 2.3.14.1 did not address all possible attack vectors, such that <B>every</B> version of Struts 2 before 2.3.14.2 is still vulnerable to such attacks.</P>
+
+<H2><A name="S2-014-Proofofconcept"></A>Proof of concept</H2>
+
+<OL>
+ <LI>Open HelloWorld.jsp present in the Struts Blank App and add to one of the url/a tag the following parameter:
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">
+ includeParams=<SPAN class="code-quote">"all"</SPAN>
+</PRE>
+</DIV></DIV>
+<P>Such that the line will be something look like this:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-xml">
+<SPAN class="code-tag"><s:url id=<SPAN class="code-quote">"url"</SPAN> action=<SPAN class="code-quote">"HelloWorld"</SPAN> includeParams=<SPAN class="code-quote">"all"</SPAN>></SPAN>
+</PRE>
+</DIV></DIV></LI>
+ <LI>Run struts2-blank app</LI>
+ <LI>Open the following url, resulting in calc application opening on Windows (try ....exec('open%20.')} to open a Finder window on Mac OS):
+ <DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">http:<SPAN class="code-comment">//localhost:8080/struts2-blank/example/HelloWorld.action?aaa=1${%23_memberAccess[%22allowStaticMethodAccess%22]=<SPAN class="code-keyword">true</SPAN>,@java.lang.<SPAN class="code-object">Runtime</SPAN>@getRuntime().exec('calc')}</SPAN></PRE>
+</DIV></DIV></LI>
+ <LI>Open the following url to modify session content:
+ <DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">http:<SPAN class="code-comment">//localhost:8080/struts2-blank/example/HelloWorld.action?aaa=1${%23session[%22hacked%22]='<SPAN class="code-keyword">true</SPAN>'}</SPAN></PRE>
+</DIV></DIV></LI>
+ <LI>Open the following url to print out session content and in combination with the previous example introduce arbitrary code into the resulting HTML output:
+ <DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-java">http:<SPAN class="code-comment">//localhost:8080/struts2-blank/example/HelloWorld.action?aaa=1${%23session[%22hacked%22]}</SPAN></PRE>
+</DIV></DIV></LI>
+</OL>
+
+
+<P>As you will notice, in this case, there is no way to escape/sanitize the malicious parameter, since it's not an expected parameter and even will not get evaluated the request parameters are processed. </P>
+
+<H2><A name="S2-014-Solution"></A>Solution</H2>
+
+<P>The URL rendering subsystem was changed to not pass any parameter name or value to OGNL evaluation.</P>
+
+<P>The MemberAccess component's allowStaticMethodAccess property is now immutable.</P>
+
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>Backward Compatibility</B><BR>A small amount of very elaborated <EM>URL</EM> or <EM>A</EM> tag usages depending on the now disabled evaluation might produce unexpected results now.<BR>
+Please, ensure that
+<OL>
+ <LI>all expressions that should get evaluated are explicitly introduced via <EM>PARAM</EM> tags within <EM>URL</EM> or <EM>A</EM> tags.</LI>
+ <LI>all expressions used in <EM>PARAM</EM> tags come from a sanitized input.</LI>
+</OL>
+</TD></TR></TABLE></DIV>
+
+<DIV class="panelMacro"><TABLE class="warningMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/forbidden.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD><B>It is strongly recommended to upgrade to <A href="http://struts.apache.org/download.cgi#struts23142" class="external-link" rel="nofollow">Struts 2.3.14.2</A>, which contains the corrected OGNL and XWork library.</B></TD></TR></TABLE></DIV>
+ </DIV>
+
+
+ </DIV>
+ </DIV>
+ <DIV class="footer">
+ Generated by
+ <A href="http://www.atlassian.com/confluence/">Atlassian Confluence</A> (Version: 3.4.9 Build: 2042 Feb 14, 2011)
+ <A href="http://could.it/autoexport/">Auto Export Plugin</A> (Version: 1.0.0-dkulp)
+ </DIV>
+ </BODY>
+</HTML>
\ No newline at end of file
Modified: websites/production/struts/content/development/2.x/docs/security-bulletins.html
==============================================================================
--- websites/production/struts/content/development/2.x/docs/security-bulletins.html (original)
+++ websites/production/struts/content/development/2.x/docs/security-bulletins.html Sun May 26 21:38:59 2013
@@ -124,7 +124,8 @@ under the License.
<DIV class="pagecontent">
<DIV class="wiki-content">
<P>The following security bulletins are available:</P>
-<UL><LI><A href="s2-001.html" title="S2-001">S2-001</A> — <SPAN class="smalltext">Remote code exploit on form validation error</SPAN></LI><LI><A href="s2-002.html" title="S2-002">S2-002</A> — <SPAN class="smalltext">Cross site scripting (XSS) vulnerability on <s:url> and <s:a> tags</SPAN></LI><LI><A href="s2-003.html" title="S2-003">S2-003</A> — <SPAN class="smalltext">XWork ParameterInterceptors bypass allows OGNL statement execution</SPAN></LI><LI><A href="s2-004.html" title="S2-004">S2-004</A> — <SPAN class="smalltext">Directory traversal vulnerability while serving static content</SPAN></LI><LI><A href="s2-005.html" title="S2-005">S2-005</A> — <SPAN class="smalltext">XWork ParameterInterceptors bypass allows remote command execution</SPAN></LI><LI><A href="s2-006.html" title="S2-006">S2-006</A> — <SPAN class="smalltext">Multiple Cross-Site Scripting (XSS) in XWork generated error pages</SPAN></LI><LI><A href="s2-007.html" t
itle="S2-007">S2-007</A> — <SPAN class="smalltext">User input is evaluated as an OGNL expression when there's a conversion error</SPAN></LI><LI><A href="s2-008.html" title="S2-008">S2-008</A> — <SPAN class="smalltext">Multiple critical vulnerabilities in Struts2</SPAN></LI><LI><A href="s2-009.html" title="S2-009">S2-009</A> — <SPAN class="smalltext">ParameterInterceptor vulnerability allows remote command execution</SPAN></LI><LI><A href="s2-010.html" title="S2-010">S2-010</A> — <SPAN class="smalltext">When using Struts 2 token mechanism for CSRF protection, token check may be bypassed by misusing known session attributes</SPAN></LI><LI><A href="s2-011.html" title="S2-011">S2-011</A> — <SPAN class="smalltext">Long request parameter names might significantly promote the effectiveness of DOS attacks</SPAN></LI><LI><A href="s2-012.html" title="S2-012">S2-012</A> — <SPAN class="smalltext">Showcase app vulnerability allows remote command execut
ion</SPAN></LI><LI><A href="s2-013.html" title="S2-013">S2-013</A> — <SPAN class="smalltext">A vulnerability, present in the <EM>includeParams</EM> attribute of the <EM>URL</EM> and <EM>Anchor</EM> Tag, allows remote command execution</SPAN></LI></UL>
+
+<UL><LI><A href="s2-001.html" title="S2-001">S2-001</A> — <SPAN class="smalltext">Remote code exploit on form validation error</SPAN></LI><LI><A href="s2-002.html" title="S2-002">S2-002</A> — <SPAN class="smalltext">Cross site scripting (XSS) vulnerability on <s:url> and <s:a> tags</SPAN></LI><LI><A href="s2-003.html" title="S2-003">S2-003</A> — <SPAN class="smalltext">XWork ParameterInterceptors bypass allows OGNL statement execution</SPAN></LI><LI><A href="s2-004.html" title="S2-004">S2-004</A> — <SPAN class="smalltext">Directory traversal vulnerability while serving static content</SPAN></LI><LI><A href="s2-005.html" title="S2-005">S2-005</A> — <SPAN class="smalltext">XWork ParameterInterceptors bypass allows remote command execution</SPAN></LI><LI><A href="s2-006.html" title="S2-006">S2-006</A> — <SPAN class="smalltext">Multiple Cross-Site Scripting (XSS) in XWork generated error pages</SPAN></LI><LI><A href="s2-007.html" t
itle="S2-007">S2-007</A> — <SPAN class="smalltext">User input is evaluated as an OGNL expression when there's a conversion error</SPAN></LI><LI><A href="s2-008.html" title="S2-008">S2-008</A> — <SPAN class="smalltext">Multiple critical vulnerabilities in Struts2</SPAN></LI><LI><A href="s2-009.html" title="S2-009">S2-009</A> — <SPAN class="smalltext">ParameterInterceptor vulnerability allows remote command execution</SPAN></LI><LI><A href="s2-010.html" title="S2-010">S2-010</A> — <SPAN class="smalltext">When using Struts 2 token mechanism for CSRF protection, token check may be bypassed by misusing known session attributes</SPAN></LI><LI><A href="s2-011.html" title="S2-011">S2-011</A> — <SPAN class="smalltext">Long request parameter names might significantly promote the effectiveness of DOS attacks</SPAN></LI><LI><A href="s2-012.html" title="S2-012">S2-012</A> — <SPAN class="smalltext">Showcase app vulnerability allows remote command execut
ion</SPAN></LI><LI><A href="s2-013.html" title="S2-013">S2-013</A> — <SPAN class="smalltext">A vulnerability, present in the <EM>includeParams</EM> attribute of the <EM>URL</EM> and <EM>Anchor</EM> Tag, allows remote command execution</SPAN></LI><LI><A href="s2-014.html" title="S2-014">S2-014</A> — <SPAN class="smalltext">A vulnerability introduced by forcing parameter inclusion in the <EM>URL</EM> and <EM>Anchor</EM> Tag allows remote command execution, session access and manipulation and XSS attacks</SPAN></LI></UL>
</DIV>
<DIV class="tabletitle">
@@ -174,6 +175,9 @@ under the License.
<A href="s2-013.html" title="S2-013">S2-013</A>
<SPAN class="smalltext">(Apache Struts 2 Documentation)</SPAN>
<BR>
+ <A href="s2-014.html" title="S2-014">S2-014</A>
+ <SPAN class="smalltext">(Apache Struts 2 Documentation)</SPAN>
+ <BR>
</DIV>
</DIV>
Modified: websites/production/struts/content/development/2.x/docs/struts-next.html
==============================================================================
--- websites/production/struts/content/development/2.x/docs/struts-next.html (original)
+++ websites/production/struts/content/development/2.x/docs/struts-next.html Sun May 26 21:38:59 2013
@@ -172,6 +172,7 @@ under the License.
<LI>Switch to Java 1.6</LI>
<LI>Rename XWork packages to org.apache.struts.xwork</LI>
<LI>Prepare the first release</LI>
+ <LI>Cleanup website</LI>
</OL>
@@ -181,6 +182,13 @@ under the License.
<LI>...</LI>
</OL>
+
+<H3><A name="StrutsNext-Cleanupwebsite"></A>Cleanup website</H3>
+
+<P>There should be just one project website - Apache Struts. Right now there is the main website - Apache Struts project, subsite Apache Struts 1 and another subsite Apache Struts 2. After announcing EOL of Struts 1, we basically supporting just one version or rather brunch - Apache Struts 2 which should be at some point converted just into Apache Struts (version 2.5, version 3.0, version 3.1, etc.).</P>
+
+<P>With that in mind we should have just one website to manage the project.</P>
+
</DIV>
Added: websites/production/struts/content/development/2.x/docs/version-notes-23142.html
==============================================================================
--- websites/production/struts/content/development/2.x/docs/version-notes-23142.html (added)
+++ websites/production/struts/content/development/2.x/docs/version-notes-23142.html Sun May 26 21:38:59 2013
@@ -0,0 +1,206 @@
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE- 2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+ <HEAD>
+ <LINK type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
+ <STYLE type="text/css">
+ .dp-highlighter {
+ width:95% !important;
+ }
+ </STYLE>
+ <STYLE type="text/css">
+ .footer {
+ background-image: url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
+ background-repeat: repeat-x;
+ background-position: left top;
+ padding-top: 4px;
+ color: #666;
+ }
+ </STYLE>
+ <SCRIPT type="text/javascript" language="javascript">
+ var hide = null;
+ var show = null;
+ var children = null;
+
+ function init() {
+ /* Search form initialization */
+ var form = document.forms['search'];
+ if (form != null) {
+ form.elements['domains'].value = location.hostname;
+ form.elements['sitesearch'].value = location.hostname;
+ }
+
+ /* Children initialization */
+ hide = document.getElementById('hide');
+ show = document.getElementById('show');
+ children = document.all != null ?
+ document.all['children'] :
+ document.getElementById('children');
+ if (children != null) {
+ children.style.display = 'none';
+ show.style.display = 'inline';
+ hide.style.display = 'none';
+ }
+ }
+
+ function showChildren() {
+ children.style.display = 'block';
+ show.style.display = 'none';
+ hide.style.display = 'inline';
+ }
+
+ function hideChildren() {
+ children.style.display = 'none';
+ show.style.display = 'inline';
+ hide.style.display = 'none';
+ }
+ </SCRIPT>
+ <TITLE>Version Notes 2.3.14.2</TITLE>
+ <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+ <BODY onload="init()">
+ <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+ <TR class="topBar">
+ <TD align="left" valign="middle" class="topBarDiv" align="left" nowrap="">
+ <A href="home.html" title="Apache Struts 2 Documentation">Apache Struts 2 Documentation</A> > <A href="home.html" title="Home">Home</A> > <A href="guides.html" title="Guides">Guides</A> > <A href="migration-guide.html" title="Migration Guide">Migration Guide</A> > <A href="" title="Version Notes 2.3.14.2">Version Notes 2.3.14.2</A>
+ </TD>
+ <TD align="right" valign="middle" nowrap="">
+ <FORM name="search" action="http://www.google.com/search" method="get">
+ <INPUT type="hidden" name="ie" value="UTF-8">
+ <INPUT type="hidden" name="oe" value="UTF-8">
+ <INPUT type="hidden" name="domains" value="">
+ <INPUT type="hidden" name="sitesearch" value="">
+ <INPUT type="text" name="q" maxlength="255" value="">
+ <INPUT type="submit" name="btnG" value="Google Search">
+ </FORM>
+ </TD>
+ </TR>
+ </TABLE>
+
+ <DIV id="PageContent">
+ <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+ <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+ <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+ <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</DIV>
+ <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">Version Notes 2.3.14.2</DIV>
+
+ <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+ <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=31822595">
+ <IMG src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+ <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=31822595">Edit Page</A>
+
+ <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
+ <IMG src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+ <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</A>
+
+ <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=31822595">
+ <IMG src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+ <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=31822595">Add Page</A>
+
+ <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=31822595">
+ <IMG src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+ <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=31822595">Add News</A>
+ </DIV>
+ </DIV>
+
+ <DIV class="pagecontent">
+ <DIV class="wiki-content">
+ <P><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"> These are the notes for the Struts 2.3.14.2 distribution.</P>
+
+<P><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"> For prior notes in this release series, see <A href="version-notes-23141.html" title="Version Notes 2.3.14.1">Version Notes 2.3.14.1</A></P>
+
+<UL>
+ <LI>If you are a Maven user, you might want to get started using the <A href="struts-2-maven-archetypes.html" title="Struts 2 Maven Archetypes">Maven Archetype</A>.</LI>
+ <LI>Another quick-start entry point is the <B>blank</B> application. Rename and deploy the WAR as a starting point for your own development.</LI>
+</UL>
+
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;"><B>Maven Dependency</B></DIV><DIV class="codeContent panelContent">
+<PRE class="code-xml">
+<SPAN class="code-tag"><dependency></SPAN>
+ <SPAN class="code-tag"><groupId></SPAN>org.apache.struts<SPAN class="code-tag"></groupId></SPAN>
+ <SPAN class="code-tag"><artifactId></SPAN>struts2-core<SPAN class="code-tag"></artifactId></SPAN>
+ <SPAN class="code-tag"><version></SPAN>2.3.14.2<SPAN class="code-tag"></version></SPAN>
+<SPAN class="code-tag"></dependency></SPAN>
+</PRE>
+</DIV></DIV>
+
+<P>You can also use Struts Archetype Catalog like below</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;"><B>Struts Archetype Catalog</B></DIV><DIV class="codeContent panelContent">
+<PRE class="code-none">
+mvn archetype:generate -DarchetypeCatalog=http://struts.apache.org/
+</PRE>
+</DIV></DIV>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;"><B>Staging Repository</B></DIV><DIV class="codeContent panelContent">
+<PRE class="code-xml"><SPAN class="code-tag"><repositories></SPAN>
+ <SPAN class="code-tag"><repository></SPAN>
+ <SPAN class="code-tag"><id></SPAN>apache.nexus<SPAN class="code-tag"></id></SPAN>
+ <SPAN class="code-tag"><name></SPAN>ASF Nexus Staging<SPAN class="code-tag"></name></SPAN>
+ <SPAN class="code-tag"><url></SPAN>https://repository.apache.org/content/groups/staging/<SPAN class="code-tag"></url></SPAN>
+ <SPAN class="code-tag"></repository></SPAN>
+<SPAN class="code-tag"></repositories></SPAN></PRE>
+</DIV></DIV>
+
+<H2><A name="VersionNotes2.3.14.2-InternalChanges"></A>Internal Changes</H2>
+
+<UL>
+ <LI>OGNL evaluation for included URL parameters has been dropped</LI>
+</UL>
+
+
+<H3><A name="VersionNotes2.3.14.2-IssueDetail"></A>Issue Detail</H3>
+
+<UL>
+ <LI><A href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311041&version=12324547" class="external-link" rel="nofollow">JIRA Release Notes 2.3.14.2</A></LI>
+ <LI><A href="https://cwiki.apache.org/confluence/display/WW/S2-014" title="S2-014">Security Bulletin S2-014</A></LI>
+</UL>
+
+
+<H3><A name="VersionNotes2.3.14.2-IssueList"></A>Issue List</H3>
+
+<UL>
+ <LI><A href="https://issues.apache.org/jira/issues/?filter=12324170" class="external-link" rel="nofollow">Struts 2.3.14.2 DONE</A></LI>
+ <LI><A href="https://issues.apache.org/jira/issues/?filter=12323783" class="external-link" rel="nofollow">Struts 2.3.15 TODO</A></LI>
+ <LI><A href="https://issues.apache.org/jira/issues/?filter=12318399" class="external-link" rel="nofollow">Struts 2.3.x TODO</A></LI>
+</UL>
+
+
+<H3><A name="VersionNotes2.3.14.2-Otherresources"></A>Other resources</H3>
+
+<UL>
+ <LI><A href="http://www.mail-archive.com/commits@struts.apache.org/" class="external-link" rel="nofollow">Commit Logs (Struts 1 and Struts 2)</A></LI>
+ <LI><A href="http://svn.apache.org/viewvc/struts/struts2/trunk/" class="external-link" rel="nofollow">Source Code Repository (includes change browsing)</A></LI>
+</UL>
+
+ </DIV>
+
+
+ </DIV>
+ </DIV>
+ <DIV class="footer">
+ Generated by
+ <A href="http://www.atlassian.com/confluence/">Atlassian Confluence</A> (Version: 3.4.9 Build: 2042 Feb 14, 2011)
+ <A href="http://could.it/autoexport/">Auto Export Plugin</A> (Version: 1.0.0-dkulp)
+ </DIV>
+ </BODY>
+</HTML>
\ No newline at end of file
Added: websites/production/struts/content/development/2.x/docs/version-notes-2315.html
==============================================================================
--- websites/production/struts/content/development/2.x/docs/version-notes-2315.html (added)
+++ websites/production/struts/content/development/2.x/docs/version-notes-2315.html Sun May 26 21:38:59 2013
@@ -0,0 +1,211 @@
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE- 2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+ <HEAD>
+ <LINK type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
+ <STYLE type="text/css">
+ .dp-highlighter {
+ width:95% !important;
+ }
+ </STYLE>
+ <STYLE type="text/css">
+ .footer {
+ background-image: url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
+ background-repeat: repeat-x;
+ background-position: left top;
+ padding-top: 4px;
+ color: #666;
+ }
+ </STYLE>
+ <SCRIPT type="text/javascript" language="javascript">
+ var hide = null;
+ var show = null;
+ var children = null;
+
+ function init() {
+ /* Search form initialization */
+ var form = document.forms['search'];
+ if (form != null) {
+ form.elements['domains'].value = location.hostname;
+ form.elements['sitesearch'].value = location.hostname;
+ }
+
+ /* Children initialization */
+ hide = document.getElementById('hide');
+ show = document.getElementById('show');
+ children = document.all != null ?
+ document.all['children'] :
+ document.getElementById('children');
+ if (children != null) {
+ children.style.display = 'none';
+ show.style.display = 'inline';
+ hide.style.display = 'none';
+ }
+ }
+
+ function showChildren() {
+ children.style.display = 'block';
+ show.style.display = 'none';
+ hide.style.display = 'inline';
+ }
+
+ function hideChildren() {
+ children.style.display = 'none';
+ show.style.display = 'inline';
+ hide.style.display = 'none';
+ }
+ </SCRIPT>
+ <TITLE>Version Notes 2.3.15</TITLE>
+ <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+ <BODY onload="init()">
+ <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+ <TR class="topBar">
+ <TD align="left" valign="middle" class="topBarDiv" align="left" nowrap="">
+ <A href="home.html" title="Apache Struts 2 Documentation">Apache Struts 2 Documentation</A> > <A href="home.html" title="Home">Home</A> > <A href="guides.html" title="Guides">Guides</A> > <A href="migration-guide.html" title="Migration Guide">Migration Guide</A> > <A href="" title="Version Notes 2.3.15">Version Notes 2.3.15</A>
+ </TD>
+ <TD align="right" valign="middle" nowrap="">
+ <FORM name="search" action="http://www.google.com/search" method="get">
+ <INPUT type="hidden" name="ie" value="UTF-8">
+ <INPUT type="hidden" name="oe" value="UTF-8">
+ <INPUT type="hidden" name="domains" value="">
+ <INPUT type="hidden" name="sitesearch" value="">
+ <INPUT type="text" name="q" maxlength="255" value="">
+ <INPUT type="submit" name="btnG" value="Google Search">
+ </FORM>
+ </TD>
+ </TR>
+ </TABLE>
+
+ <DIV id="PageContent">
+ <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+ <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+ <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+ <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</DIV>
+ <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">Version Notes 2.3.15</DIV>
+
+ <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+ <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=31822529">
+ <IMG src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+ <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=31822529">Edit Page</A>
+
+ <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
+ <IMG src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+ <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</A>
+
+ <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=31822529">
+ <IMG src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+ <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=31822529">Add Page</A>
+
+ <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=31822529">
+ <IMG src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+ <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=31822529">Add News</A>
+ </DIV>
+ </DIV>
+
+ <DIV class="pagecontent">
+ <DIV class="wiki-content">
+ <P><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"> These are the notes for the Struts 2.3.15 distribution.</P>
+
+<P><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/check.gif" height="16" width="16" align="absmiddle" alt="" border="0"> For prior notes in this release series, see <A href="version-notes-23141.html" title="Version Notes 2.3.14.1">Version Notes 2.3.14.1</A></P>
+
+<UL>
+ <LI>If you are a Maven user, you might want to get started using the <A href="struts-2-maven-archetypes.html" title="Struts 2 Maven Archetypes">Maven Archetype</A>.</LI>
+ <LI>Another quick-start entry point is the <B>blank</B> application. Rename and deploy the WAR as a starting point for your own development.</LI>
+</UL>
+
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;"><B>Maven Dependency</B></DIV><DIV class="codeContent panelContent">
+<PRE class="code-xml">
+<SPAN class="code-tag"><dependency></SPAN>
+ <SPAN class="code-tag"><groupId></SPAN>org.apache.struts<SPAN class="code-tag"></groupId></SPAN>
+ <SPAN class="code-tag"><artifactId></SPAN>struts2-core<SPAN class="code-tag"></artifactId></SPAN>
+ <SPAN class="code-tag"><version></SPAN>2.3.15<SPAN class="code-tag"></version></SPAN>
+<SPAN class="code-tag"></dependency></SPAN>
+</PRE>
+</DIV></DIV>
+
+<P>You can also use Struts Archetype Catalog like below</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;"><B>Struts Archetype Catalog</B></DIV><DIV class="codeContent panelContent">
+<PRE class="code-none">
+mvn archetype:generate -DarchetypeCatalog=http://struts.apache.org/
+</PRE>
+</DIV></DIV>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;"><B>Staging Repository</B></DIV><DIV class="codeContent panelContent">
+<PRE class="code-xml"><SPAN class="code-tag"><repositories></SPAN>
+ <SPAN class="code-tag"><repository></SPAN>
+ <SPAN class="code-tag"><id></SPAN>apache.nexus<SPAN class="code-tag"></id></SPAN>
+ <SPAN class="code-tag"><name></SPAN>ASF Nexus Staging<SPAN class="code-tag"></name></SPAN>
+ <SPAN class="code-tag"><url></SPAN>https://repository.apache.org/content/groups/staging/<SPAN class="code-tag"></url></SPAN>
+ <SPAN class="code-tag"></repository></SPAN>
+<SPAN class="code-tag"></repositories></SPAN></PRE>
+</DIV></DIV>
+
+<H2><A name="VersionNotes2.3.15-InternalChanges"></A>Internal Changes</H2>
+
+<UL>
+ <LI>Merged security fix from version 2.3.14.1</LI>
+ <LI>Resolved problem with memory leak in <TT>ContainerHolder</TT></LI>
+ <LI>Resolved bug related to <TT>struts.convention.action.includeJars</TT></LI>
+ <LI>Improved OSGi support to allow work in Glassfish 3, see <A href="https://issues.apache.org/jira/browse/WW-3958" class="external-link" rel="nofollow">WW-3958</A></LI>
+ <LI>Added support to create cookies from whitin an action <A href="https://issues.apache.org/jira/browse/WW-4037" class="external-link" rel="nofollow">WW-4037</A></LI>
+ <LI>New interface - <TT>ValidationAware</TT> - was added to allow notify actions when there are action/field errors <A href="https://issues.apache.org/jira/browse/WW-4071" class="external-link" rel="nofollow">WW-4071</A></LI>
+ <LI>and other small improvments</LI>
+</UL>
+
+
+<H3><A name="VersionNotes2.3.15-IssueDetail"></A>Issue Detail</H3>
+
+<UL>
+ <LI><A href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?version=12324267&projectId=12311041" class="external-link" rel="nofollow">JIRA Release Notes 2.3.15</A></LI>
+</UL>
+
+
+<H3><A name="VersionNotes2.3.15-IssueList"></A>Issue List</H3>
+
+<UL>
+ <LI><A href="https://issues.apache.org/jira/issues/?filter=12324167" class="external-link" rel="nofollow">Struts 2.3.15 DONE</A></LI>
+ <LI><A href="https://issues.apache.org/jira/issues/?filter=12324168" class="external-link" rel="nofollow">Struts 2.3.16 TODO</A></LI>
+ <LI><A href="https://issues.apache.org/jira/issues/?filter=12318399" class="external-link" rel="nofollow">Struts 2.3.x TODO</A></LI>
+</UL>
+
+
+<H3><A name="VersionNotes2.3.15-Otherresources"></A>Other resources</H3>
+
+<UL>
+ <LI><A href="http://www.mail-archive.com/commits@struts.apache.org/" class="external-link" rel="nofollow">Commit Logs (Struts 1 and Struts 2)</A></LI>
+ <LI><A href="http://svn.apache.org/viewvc/struts/struts2/trunk/" class="external-link" rel="nofollow">Source Code Repository (includes change browsing)</A></LI>
+</UL>
+
+ </DIV>
+
+
+ </DIV>
+ </DIV>
+ <DIV class="footer">
+ Generated by
+ <A href="http://www.atlassian.com/confluence/">Atlassian Confluence</A> (Version: 3.4.9 Build: 2042 Feb 14, 2011)
+ <A href="http://could.it/autoexport/">Auto Export Plugin</A> (Version: 1.0.0-dkulp)
+ </DIV>
+ </BODY>
+</HTML>
\ No newline at end of file
Modified: websites/production/struts/content/release/2.3.x/docs/actionmapper.html
==============================================================================
--- websites/production/struts/content/release/2.3.x/docs/actionmapper.html (original)
+++ websites/production/struts/content/release/2.3.x/docs/actionmapper.html Sun May 26 21:38:59 2013
@@ -123,7 +123,29 @@ under the License.
<DIV class="pagecontent">
<DIV class="wiki-content">
-
+ <DIV>
+<UL>
+ <LI><A href="#ActionMapper-Description">Description</A></LI>
+ <LI><A href="#ActionMapper-DefaultActionMapper">DefaultActionMapper</A></LI>
+<UL>
+ <LI><A href="#ActionMapper-Methodprefix">Method prefix</A></LI>
+ <LI><A href="#ActionMapper-Actionprefix">Action prefix</A></LI>
+ <LI><A href="#ActionMapper-Redirectprefix">Redirect prefix</A></LI>
+ <LI><A href="#ActionMapper-Redirectactionprefix">Redirect-action prefix</A></LI>
+</UL>
+ <LI><A href="#ActionMapper-CustomActionMapper">Custom ActionMapper</A></LI>
+ <LI><A href="#ActionMapper-CompositeActionMapper">CompositeActionMapper</A></LI>
+ <LI><A href="#ActionMapper-PrefixBasedActionMapper">PrefixBasedActionMapper</A></LI>
+ <LI><A href="#ActionMapper-ActionMapperandActionMappingobjects">ActionMapper and ActionMapping objects</A></LI>
+<UL>
+ <LI><A href="#ActionMapper-Customize">Customize</A></LI>
+</UL>
+ <LI><A href="#ActionMapper-Next%253AActionProxy%2526ActionProxyFactory">Next: Action Proxy & ActionProxy Factory</A></LI>
+</UL></DIV>
+
+<H2><A name="ActionMapper-Description"></A>Description</H2>
+
+
<P>The ActionMapper interface provides a mapping between HTTP requests and action invocation requests and vice-versa.
<P>
When given an HttpServletRequest, the ActionMapper may return null if no action invocation request matches,
@@ -259,43 +281,28 @@ struts.properties.
<H2><A name="ActionMapper-CompositeActionMapper"></A>CompositeActionMapper</H2>
-<P>A composite action mapper that is capable of delegating to a series of ActionMapper if the former
-failed to obtained a valid ActionMapping or uri.
-<P>
-It is configured through struts.properties.
-<P>
-For example, with the following entries in struts.properties
-<P>
-<PRE>
-<bean type="org.apache.struts2.dispatcher.mapper.ActionMapper" name="struts"
- class="org.apache.struts2.dispatcher.mapper.CompositeActionMapper" />
-<constant name="struts.mapper.composite"
- value="org.apache.struts2.dispatcher.mapper.DefaultActionMapper,org.apache.struts2.dispatcher.mapper.RestfulActionMapper,org.apache.struts2.dispatcher.mapper.Restful2ActionMapper" />
+<P>A composite action mapper that is capable of delegating to a series of <A href="" title="ActionMapper">ActionMapper</A> if the former failed to obtained a valid <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&title=ActionMapping&linkCreation=true&fromPageId=14128" class="createlink">ActionMapping</A> or uri.</P>
+
+<P>It is configured through <A href="strutsxml.html" title="struts.xml">struts.xml</A>. For example, with the following entries in struts.xml</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-xml">
+<SPAN class="code-tag"><constant name=<SPAN class="code-quote">"struts.mapper.class"</SPAN> value=<SPAN class="code-quote">"composite"</SPAN> /></SPAN>
+<SPAN class="code-tag"><constant name=<SPAN class="code-quote">"struts.mapper.composite"</SPAN> value=<SPAN class="code-quote">"struts,restful,restful2"</SPAN> /></SPAN>
</PRE>
-<P>
-When {@link CompositeActionMapper#getMapping(HttpServletRequest, ConfigurationManager)} or
-CompositeActionMapper#getUriFromActionMapping(ActionMapping) is invoked,
-CompositeActionMapper would go through these ActionMappers in sequence
-starting from ActionMapper identified by 'struts.mapper.composite.1', followed by
-'struts.mapper.composite.2' and finally 'struts.mapper.composite.3' (in this case) until either
-one of the ActionMapper return a valid result (not null) or it runs out of ActionMapper
-in which case it will just return null for both
-{@link CompositeActionMapper#getMapping(HttpServletRequest, ConfigurationManager)} and
-CompositeActionMapper#getUriFromActionMapping(ActionMapping) methods.
-<P></P>
+</DIV></DIV>
-<P>For example with the following in struts-*.xml :-
-<PRE>
- <bean type="org.apache.struts2.dispatcher.mapper.ActionMapper" name="struts"
- class="org.apache.struts2.dispatcher.mapper.CompositeActionMapper" />
- <constant name="struts.mapper.composite"
- value="org.apache.struts2.dispatcher.mapper.DefaultActionMapper,foo.bar.MyActionMapper,foo.bar.MyAnotherActionMapper" />
+<P>When <TT>CompositeActionMapper#getMapping(HttpServletRequest, ConfigurationManager)</TT> or <TT>CompositeActionMapper#getUriFromActionMapping(ActionMapping)</TT> is invoked, <TT>CompositeActionMapper</TT> would go through these <A href="" title="ActionMapper">ActionMapper</A>s in sequence starting from <A href="" title="ActionMapper">ActionMapper</A> identified by <TT>struts.mapper.composite.1</TT>, followed by <TT>struts.mapper.composite.2</TT> and finally <TT>struts.mapper.composite.3</TT> (in this case) until either one of the <A href="" title="ActionMapper">ActionMapper</A> return a valid result (not null) or it runs out of <A href="" title="ActionMapper">ActionMapper</A> in which case it will just return null for both <TT>CompositeActionMapper#getMapping(HttpServletRequest, ConfigurationManager)</TT> and <TT>CompositeActionMapper#getUriFromActionMapping(ActionMapping)</TT> methods.</P>
+
+<P>For example with the following in struts.xml:</P>
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-xml">
+<SPAN class="code-tag"><constant name=<SPAN class="code-quote">"struts.mapper.class"</SPAN> value=<SPAN class="code-quote">"composite"</SPAN> /></SPAN>
+<SPAN class="code-tag"><constant name=<SPAN class="code-quote">"struts.mapper.composite"</SPAN> value=<SPAN class="code-quote">"struts,restful"</SPAN> /></SPAN>
</PRE>
-<P>
-<CODE>CompositeActionMapper</CODE> will be configured with 3 ActionMapper, namely
-"DefaultActionMapper", "MyActionMapper" and "MyAnotherActionMapper".
-<CODE>CompositeActionMapper</CODE> would consult each of them in order described above.</P>
+</DIV></DIV>
+<P><TT>CompositeActionMapper</TT> will be configured with 2 ActionMapper, namely "struts" which is <TT>org.apache.struts2.dispatcher.mapper.DefaultActionMapper</TT> and "restful" which is <TT>org.apache.struts2.dispatcher.mapper.RestfulActionMapperRestfulActionMapper</TT>. <TT>CompositeActionMapper</TT> would consult each of them in order described above.</P>
<H2><A name="ActionMapper-PrefixBasedActionMapper"></A>PrefixBasedActionMapper</H2>
@@ -336,12 +343,12 @@ PrefixBasedActionMapper#getUriFromAction
<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
<PRE class="code-java">
<SPAN class="code-keyword">public</SPAN> class MyCustomActionMapper <SPAN class="code-keyword">implements</SPAN> ActionMapper {
- <SPAN class="code-keyword">public</SPAN> ActionMapping getMapping(HttpServletRequest request,
+ <SPAN class="code-keyword">public</SPAN> ActionMapping getMapping(HttpServletRequest request,
ConfigurationManager configManager) {
....
}
- <SPAN class="code-keyword">public</SPAN> <SPAN class="code-object">String</SPAN> getUriFromActionMapping(ActionMapping mapping) {
+ <SPAN class="code-keyword">public</SPAN> <SPAN class="code-object">String</SPAN> getUriFromActionMapping(ActionMapping mapping) {
....
}
}
@@ -351,7 +358,6 @@ PrefixBasedActionMapper#getUriFromAction
<P><IMG class="emoticon" src="https://cwiki.apache.org/confluence/images/icons/emoticons/lightbulb_on.gif" height="16" width="16" align="absmiddle" alt="" border="0"> See also: <A href="restfulactionmapper.html" title="RestfulActionMapper">RestfulActionMapper</A></P>
<H2><A name="ActionMapper-Next%3AActionProxy%26ActionProxyFactory"></A>Next: <A href="action-proxy-actionproxy-factory.html" title="Action Proxy & ActionProxy Factory">Action Proxy & ActionProxy Factory</A></H2>
-
</DIV>
<DIV class="tabletitle">
Modified: websites/production/struts/content/release/2.3.x/docs/building-struts-2-fast-track-release.html
==============================================================================
--- websites/production/struts/content/release/2.3.x/docs/building-struts-2-fast-track-release.html (original)
+++ websites/production/struts/content/release/2.3.x/docs/building-struts-2-fast-track-release.html Sun May 26 21:38:59 2013
@@ -125,33 +125,35 @@ under the License.
<DIV class="wiki-content">
<H1><A name="BuildingStruts2-Fasttrackrelease-Content"></A>Content</H1>
<STYLE type="text/css">/*<![CDATA[*/
-div.rbtoc1327103875776 {margin-left: 0px;padding: 0px;}
-div.rbtoc1327103875776 ul {list-style: none;margin-left: 0px;}
-div.rbtoc1327103875776 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1366362432289 {margin-left: 0px;padding: 0px;}
+div.rbtoc1366362432289 ul {list-style: none;margin-left: 0px;}
+div.rbtoc1366362432289 li {margin-left: 0px;padding-left: 0px;}
-/*]]>*/</STYLE><DIV class="rbtoc1327103875776">
+/*]]>*/</STYLE><DIV class="rbtoc1366362432289">
<UL>
<LI><SPAN class="TOCOutline">1</SPAN> <A href="#BuildingStruts2-Fasttrackrelease-BuildingSteps%2528Struts%2529">Building Steps (Struts)</A></LI>
<UL>
<LI><SPAN class="TOCOutline">1.1</SPAN> <A href="#BuildingStruts2-Fasttrackrelease-Gettingready">Getting ready</A></LI>
<LI><SPAN class="TOCOutline">1.2</SPAN> <A href="#BuildingStruts2-Fasttrackrelease-Obtainafreshcheckout.">Obtain a fresh checkout.</A></LI>
<LI><SPAN class="TOCOutline">1.3</SPAN> <A href="#BuildingStruts2-Fasttrackrelease-Changesitetarget">Change site target</A></LI>
- <LI><SPAN class="TOCOutline">1.4</SPAN> <A href="#BuildingStruts2-Fasttrackrelease-ReverttoSNAPSHOT">Revert to -SNAPSHOT</A></LI>
- <LI><SPAN class="TOCOutline">1.5</SPAN> <A href="#BuildingStruts2-Fasttrackrelease-Preparerelease">Prepare release</A></LI>
- <LI><SPAN class="TOCOutline">1.6</SPAN> <A href="#BuildingStruts2-Fasttrackrelease-Performtherelease">Perform the release</A></LI>
- <LI><SPAN class="TOCOutline">1.7</SPAN> <A href="#BuildingStruts2-Fasttrackrelease-Movetheassembliestothe%252Fwww%252Fpeople.apache.org%252Fbuilds%252Fstruts%252F%2524VERSIONdir">Move the assemblies to the /www/people.apache.org/builds/struts/$VERSION dir</A></LI>
- <LI><SPAN class="TOCOutline">1.8</SPAN> <A href="#BuildingStruts2-Fasttrackrelease-Jirastuff">Jira stuff</A></LI>
- <LI><SPAN class="TOCOutline">1.9</SPAN> <A href="#BuildingStruts2-Fasttrackrelease-Voteonit">Vote on it</A></LI>
- <LI><SPAN class="TOCOutline">1.10</SPAN> <A href="#BuildingStruts2-Fasttrackrelease-Copyfiles">Copy files</A></LI>
- <LI><SPAN class="TOCOutline">1.11</SPAN> <A href="#BuildingStruts2-Fasttrackrelease-Promoterelease">Promote release</A></LI>
- <LI><SPAN class="TOCOutline">1.12</SPAN> <A href="#BuildingStruts2-Fasttrackrelease-Cleanupoldreleases">Clean up old releases</A></LI>
- <LI><SPAN class="TOCOutline">1.13</SPAN> <A href="#BuildingStruts2-Fasttrackrelease-Waitforrsync">Wait for rsync</A></LI>
- <LI><SPAN class="TOCOutline">1.14</SPAN> <A href="#BuildingStruts2-Fasttrackrelease-%2528Optional%2529UpdateSecurityBulletins">(Optional) - Update Security Bulletins</A></LI>
- <LI><SPAN class="TOCOutline">1.15</SPAN> <A href="#BuildingStruts2-Fasttrackrelease-Updatesite%2528Struts2site%2529">Update site (Struts 2 site)</A></LI>
- <LI><SPAN class="TOCOutline">1.16</SPAN> <A href="#BuildingStruts2-Fasttrackrelease-Updatesite%2528Strutstoplevelsite%2529">Update site (Struts top level site)</A></LI>
- <LI><SPAN class="TOCOutline">1.17</SPAN> <A href="#BuildingStruts2-Fasttrackrelease-Redeploythedraftdocs">Redeploy the draft docs</A></LI>
- <LI><SPAN class="TOCOutline">1.18</SPAN> <A href="#BuildingStruts2-Fasttrackrelease-Permissions">Permissions</A></LI>
- <LI><SPAN class="TOCOutline">1.19</SPAN> <A href="#BuildingStruts2-Fasttrackrelease-Postannouncements">Post announcements</A></LI>
+ <LI><SPAN class="TOCOutline">1.4</SPAN> <A href="#BuildingStruts2-Fasttrackrelease-Changescminfo">Change scm info</A></LI>
+ <LI><SPAN class="TOCOutline">1.5</SPAN> <A href="#BuildingStruts2-Fasttrackrelease-ReverttoSNAPSHOT">Revert to -SNAPSHOT</A></LI>
+ <LI><SPAN class="TOCOutline">1.6</SPAN> <A href="#BuildingStruts2-Fasttrackrelease-Updateversionofarchetypes">Update version of archetypes</A></LI>
+ <LI><SPAN class="TOCOutline">1.7</SPAN> <A href="#BuildingStruts2-Fasttrackrelease-Preparerelease">Prepare release</A></LI>
+ <LI><SPAN class="TOCOutline">1.8</SPAN> <A href="#BuildingStruts2-Fasttrackrelease-Performtherelease">Perform the release</A></LI>
+ <LI><SPAN class="TOCOutline">1.9</SPAN> <A href="#BuildingStruts2-Fasttrackrelease-Movetheassembliestothe%252Fwww%252Fpeople.apache.org%252Fbuilds%252Fstruts%252F%2524VERSIONdir">Move the assemblies to the /www/people.apache.org/builds/struts/$VERSION dir</A></LI>
+ <LI><SPAN class="TOCOutline">1.10</SPAN> <A href="#BuildingStruts2-Fasttrackrelease-Jirastuff">Jira stuff</A></LI>
+ <LI><SPAN class="TOCOutline">1.11</SPAN> <A href="#BuildingStruts2-Fasttrackrelease-Voteonit">Vote on it</A></LI>
+ <LI><SPAN class="TOCOutline">1.12</SPAN> <A href="#BuildingStruts2-Fasttrackrelease-Copyfiles">Copy files</A></LI>
+ <LI><SPAN class="TOCOutline">1.13</SPAN> <A href="#BuildingStruts2-Fasttrackrelease-Promoterelease">Promote release</A></LI>
+ <LI><SPAN class="TOCOutline">1.14</SPAN> <A href="#BuildingStruts2-Fasttrackrelease-Cleanupoldreleases">Clean up old releases</A></LI>
+ <LI><SPAN class="TOCOutline">1.15</SPAN> <A href="#BuildingStruts2-Fasttrackrelease-Waitforrsync">Wait for rsync</A></LI>
+ <LI><SPAN class="TOCOutline">1.16</SPAN> <A href="#BuildingStruts2-Fasttrackrelease-%2528Optional%2529UpdateSecurityBulletins">(Optional) - Update Security Bulletins</A></LI>
+ <LI><SPAN class="TOCOutline">1.17</SPAN> <A href="#BuildingStruts2-Fasttrackrelease-Updatesite%2528Struts2site%2529">Update site (Struts 2 site)</A></LI>
+ <LI><SPAN class="TOCOutline">1.18</SPAN> <A href="#BuildingStruts2-Fasttrackrelease-Updatesite%2528Strutstoplevelsite%2529">Update site (Struts top level site)</A></LI>
+ <LI><SPAN class="TOCOutline">1.19</SPAN> <A href="#BuildingStruts2-Fasttrackrelease-Redeploythedraftdocs">Redeploy the draft docs</A></LI>
+ <LI><SPAN class="TOCOutline">1.20</SPAN> <A href="#BuildingStruts2-Fasttrackrelease-Permissions">Permissions</A></LI>
+ <LI><SPAN class="TOCOutline">1.21</SPAN> <A href="#BuildingStruts2-Fasttrackrelease-Postannouncements">Post announcements</A></LI>
</UL>
</UL></DIV>
@@ -159,8 +161,19 @@ div.rbtoc1327103875776 li {margin-left:
<H3><A name="BuildingStruts2-Fasttrackrelease-Gettingready"></A>Getting ready</H3>
<OL>
- <LI>When a serious security issue arises, we should try to create a <TT>STRUTS_#_#_#_X</TT> branch from the last GA release (from tag), and apply to that branch only<BR>
-the security patch.</LI>
+ <LI>When a serious security issue arises, we should try to create a <TT>STRUTS_#_#_#_X</TT> branch from the last GA release (from tag).
+<DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
+<PRE>mvn release:branch -DbranchName=STRUTS_#_#_#_X
+</PRE>
+</DIV></DIV>
+<P>Read the <A href="http://maven.apache.org/maven-release/maven-release-plugin/examples/branch.html" class="external-link" rel="nofollow">maven release:branch</A> docs for further details or alternatively </P>
+<DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
+<PRE>svn copy https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_#_#_# https://svn.apache.org/repos/asf/struts/struts2/branches/STRUTS_#_#_#_X -m "Creating new branch"
+</PRE>
+</DIV></DIV>
+<DIV class="panelMacro"><TABLE class="noteMacro"><COLGROUP><COL width="24"><COL></COLGROUP><TR><TD valign="top"><IMG src="https://cwiki.apache.org/confluence/images/icons/emoticons/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></TD><TD>The svn copy command just copies the struts branch from the struts tags, no info about the version will be changed, you have to update in the next steps <A href="#BuildingStruts2-Fasttrackrelease-Changescminfo">Change scm info</A>.</TD></TR></TABLE></DIV></LI>
+ <LI>Apply to that branch only the security patch</LI>
+ <LI>Commit the fix. No reference should be make to the commit being related to a security vulnerability.</LI>
<LI>If the patch first applies to some other dependency, implore the other group to do the same, to avoid side-effects from other changes.</LI>
<LI>Release the upcoming version in JIRA (under Administration/Manage Releases) and tag the release date</LI>
<LI>Create DONE and TODO filters for the new version, share with all, and remove obsolete TODO filter</LI>
@@ -190,6 +203,22 @@ svn co https:<SPAN class="code-comment">
</PRE>
</DIV></DIV>
+<H3><A name="BuildingStruts2-Fasttrackrelease-Changescminfo"></A>Change scm info</H3>
+
+<P>If you created the branch through the mvn release:branch command your scm info should be already fine.</P>
+
+<P>Edit every pom.xml files and replace the url inside the scm info such that points to the branch version previously created:</P>
+
+<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
+<PRE class="code-xml">
+<SPAN class="code-tag"><scm></SPAN>
+ <SPAN class="code-tag"><connection></SPAN>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/branches/STRUTS_#_#_#_X<SPAN class="code-tag"></connection></SPAN>
+ <SPAN class="code-tag"><developerConnection></SPAN>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/branches/STRUTS_#_#_#_X<SPAN class="code-tag"></developerConnection></SPAN>
+ <SPAN class="code-tag"><url></SPAN>http://svn.apache.org/viewcvs.cgi/struts/struts2/branches/STRUTS_#_#_#_X<SPAN class="code-tag"></url></SPAN>
+<SPAN class="code-tag"></scm></SPAN>
+</PRE>
+</DIV></DIV>
+
<P>commit the change</P>
<H3><A name="BuildingStruts2-Fasttrackrelease-ReverttoSNAPSHOT"></A>Revert to -SNAPSHOT</H3>
@@ -200,6 +229,9 @@ svn co https:<SPAN class="code-comment">
<P>build locally and commit</P>
+<H3><A name="BuildingStruts2-Fasttrackrelease-Updateversionofarchetypes"></A>Update version of archetypes</H3>
+<P>Edit <TT>src/site/resources/archetype-catalog.xml</TT> and change version of archetypes to current $VERSION, save and commit.</P>
+
<H3><A name="BuildingStruts2-Fasttrackrelease-Preparerelease"></A>Prepare release</H3>
<P>Tag the release by using the "release:prepare" goal of Maven: </P>
<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
@@ -416,7 +448,9 @@ mvn site-deploy
<P>After updating the site, be sure that the permissions are set to group writeable (<TT>$ chmod -R g+w .</TT> and <TT>$ chown -R :struts .</TT>) </P>
<H3><A name="BuildingStruts2-Fasttrackrelease-Postannouncements"></A>Post announcements </H3>
-<P>We leave this as the last step, once the artifacts have had time to sync up on the mirrors. Target it to: user@struts.a.o and announcements@struts.a.o, samples are available at <A href="sample-announcements.html" title="Sample announcements">Sample announcements</A> page</P>
+<P>We leave this as the last step, once the artifacts have had time to sync up on the mirrors. <BR>
+Announce the release and the vulnerability. Typically this will be sent to the reporter, the project's users list (user@struts.a.o), the project's dev list (dev@struts.a.o), the project's announce list (announcements@struts.a.o), security@apache.org, full-disclosure@lists.grok.org.uk and bugtraq@securityfocus.com.<BR>
+Samples are available at <A href="sample-announcements.html" title="Sample announcements">Sample announcements</A> page.</P>
</DIV>
Modified: websites/production/struts/content/release/2.3.x/docs/cookie-interceptor.html
==============================================================================
--- websites/production/struts/content/release/2.3.x/docs/cookie-interceptor.html (original)
+++ websites/production/struts/content/release/2.3.x/docs/cookie-interceptor.html Sun May 26 21:38:59 2013
@@ -141,11 +141,10 @@ long as the cookie name matches those sp
<P>If cookiesValue is left empty it will assume that all cookie that match the cookieName
parameter will be injected into Struts' action.<P></P>
-<P>The action could implements CookiesAware in order to have a Map
+<P>The action could implement CookiesAware in order to have a Map
of filtered cookies set into it. <P></P>
-
<P>Parameters</P>
<P><UL>
@@ -164,8 +163,7 @@ of filtered cookies set into it. <P></P>
</UL></P>
-<P>?<BR>
-Extending the Interceptor</P>
+<P>Extending the Interceptor</P>
<P><UL>
populateCookieValueIntoStack - this method will decide if this cookie value is qualified to be
@@ -175,8 +173,7 @@ Extending the Interceptor</P>
</UL></P>
-<P>?<BR>
-Examples</P>
+<P>Examples</P>
<DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
<PRE class="code-xml">
<!--
Added: websites/production/struts/content/release/2.3.x/docs/cookieprovider-interceptor.html
==============================================================================
--- websites/production/struts/content/release/2.3.x/docs/cookieprovider-interceptor.html (added)
+++ websites/production/struts/content/release/2.3.x/docs/cookieprovider-interceptor.html Sun May 26 21:38:59 2013
@@ -0,0 +1,147 @@
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE- 2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+ <HEAD>
+ <LINK type="text/css" rel="stylesheet" href="https://struts.apache.org/css/default.css">
+ <STYLE type="text/css">
+ .dp-highlighter {
+ width:95% !important;
+ }
+ </STYLE>
+ <STYLE type="text/css">
+ .footer {
+ background-image: url('https://cwiki.apache.org/confluence/images/border/border_bottom.gif');
+ background-repeat: repeat-x;
+ background-position: left top;
+ padding-top: 4px;
+ color: #666;
+ }
+ </STYLE>
+ <SCRIPT type="text/javascript" language="javascript">
+ var hide = null;
+ var show = null;
+ var children = null;
+
+ function init() {
+ /* Search form initialization */
+ var form = document.forms['search'];
+ if (form != null) {
+ form.elements['domains'].value = location.hostname;
+ form.elements['sitesearch'].value = location.hostname;
+ }
+
+ /* Children initialization */
+ hide = document.getElementById('hide');
+ show = document.getElementById('show');
+ children = document.all != null ?
+ document.all['children'] :
+ document.getElementById('children');
+ if (children != null) {
+ children.style.display = 'none';
+ show.style.display = 'inline';
+ hide.style.display = 'none';
+ }
+ }
+
+ function showChildren() {
+ children.style.display = 'block';
+ show.style.display = 'none';
+ hide.style.display = 'inline';
+ }
+
+ function hideChildren() {
+ children.style.display = 'none';
+ show.style.display = 'inline';
+ hide.style.display = 'none';
+ }
+ </SCRIPT>
+ <TITLE>CookieProvider Interceptor</TITLE>
+ <META http-equiv="Content-Type" content="text/html;charset=UTF-8"></HEAD>
+ <BODY onload="init()">
+ <TABLE border="0" cellpadding="2" cellspacing="0" width="100%">
+ <TR class="topBar">
+ <TD align="left" valign="middle" class="topBarDiv" align="left" nowrap="">
+ <A href="home.html" title="Apache Struts 2 Documentation">Apache Struts 2 Documentation</A> > <A href="home.html" title="Home">Home</A> > <A href="guides.html" title="Guides">Guides</A> > <A href="core-developers-guide.html" title="Core Developers Guide">Core Developers Guide</A> > <A href="interceptors.html" title="Interceptors">Interceptors</A> > <A href="" title="CookieProvider Interceptor">CookieProvider Interceptor</A>
+ </TD>
+ <TD align="right" valign="middle" nowrap="">
+ <FORM name="search" action="http://www.google.com/search" method="get">
+ <INPUT type="hidden" name="ie" value="UTF-8">
+ <INPUT type="hidden" name="oe" value="UTF-8">
+ <INPUT type="hidden" name="domains" value="">
+ <INPUT type="hidden" name="sitesearch" value="">
+ <INPUT type="text" name="q" maxlength="255" value="">
+ <INPUT type="submit" name="btnG" value="Google Search">
+ </FORM>
+ </TD>
+ </TR>
+ </TABLE>
+
+ <DIV id="PageContent">
+ <DIV class="pageheader" style="padding: 6px 0px 0px 0px;">
+ <!-- We'll enable this once we figure out how to access (and save) the logo resource -->
+ <!--img src="/wiki/images/confluence_logo.gif" style="float: left; margin: 4px 4px 4px 10px;" border="0"-->
+ <DIV style="margin: 0px 10px 0px 10px" class="smalltext">Apache Struts 2 Documentation</DIV>
+ <DIV style="margin: 0px 10px 8px 10px" class="pagetitle">CookieProvider Interceptor</DIV>
+
+ <DIV class="greynavbar" align="right" style="padding: 2px 10px; margin: 0px;">
+ <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=31822465">
+ <IMG src="https://cwiki.apache.org/confluence/images/icons/notep_16.gif" height="16" width="16" border="0" align="absmiddle" title="Edit Page"></A>
+ <A href="https://cwiki.apache.org/confluence/pages/editpage.action?pageId=31822465">Edit Page</A>
+
+ <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">
+ <IMG src="https://cwiki.apache.org/confluence/images/icons/browse_space.gif" height="16" width="16" border="0" align="absmiddle" title="Browse Space"></A>
+ <A href="https://cwiki.apache.org/confluence/pages/listpages.action?key=WW">Browse Space</A>
+
+ <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=31822465">
+ <IMG src="https://cwiki.apache.org/confluence/images/icons/add_page_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add Page"></A>
+ <A href="https://cwiki.apache.org/confluence/pages/createpage.action?spaceKey=WW&fromPageId=31822465">Add Page</A>
+
+ <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=31822465">
+ <IMG src="https://cwiki.apache.org/confluence/images/icons/add_blogentry_16.gif" height="16" width="16" border="0" align="absmiddle" title="Add News"></A>
+ <A href="https://cwiki.apache.org/confluence/pages/createblogpost.action?spaceKey=WW&fromPageId=31822465">Add News</A>
+ </DIV>
+ </DIV>
+
+ <DIV class="pagecontent">
+ <DIV class="wiki-content">
+ <DIV class="error"><SPAN class="error">Error formatting macro: snippet: java.lang.IndexOutOfBoundsException: Index: 20, Size: 20</SPAN> </DIV>
+
+<P>Parameters</P>
+<DIV class="error"><SPAN class="error">Error formatting macro: snippet: java.lang.IndexOutOfBoundsException: Index: 20, Size: 20</SPAN> </DIV>
+
+<P>Extending the Interceptor</P>
+<DIV class="error"><SPAN class="error">Error formatting macro: snippet: java.lang.IndexOutOfBoundsException: Index: 20, Size: 20</SPAN> </DIV>
+
+<P>Examples</P>
+<DIV class="error"><SPAN class="error">Error formatting macro: snippet: java.lang.IndexOutOfBoundsException: Index: 20, Size: 20</SPAN> </DIV>
+ </DIV>
+
+
+ </DIV>
+ </DIV>
+ <DIV class="footer">
+ Generated by
+ <A href="http://www.atlassian.com/confluence/">Atlassian Confluence</A> (Version: 3.4.9 Build: 2042 Feb 14, 2011)
+ <A href="http://could.it/autoexport/">Auto Export Plugin</A> (Version: 1.0.0-dkulp)
+ </DIV>
+ </BODY>
+</HTML>
\ No newline at end of file