This is an automated email from the ASF dual-hosted git repository.
git-site-role pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/struts-site.git
The following commit(s) were added to refs/heads/asf-site by this push:
new a9331c1 Updates production by Jenkins
a9331c1 is described below
commit a9331c1ecd623c9468f2950a2a9bee339466714a
Author: jenkins <bui...@apache.org>
AuthorDate: Thu Nov 23 21:17:09 2017 +0000
Updates production by Jenkins
---
.../configuration-provider-and-configuration.html | 28 ++---------------
content/core-developers/file-upload.html | 35 ++++------------------
content/core-developers/freemarker-support.html | 8 ++---
content/core-developers/weblogic-6-1.html | 21 ++++---------
content/core-developers/weblogic.html | 19 +++---------
content/tag-developers/form-tags.html | 14 ++-------
6 files changed, 23 insertions(+), 102 deletions(-)
diff --git
a/content/core-developers/configuration-provider-and-configuration.html
b/content/core-developers/configuration-provider-and-configuration.html
index 2343dfd..f12b480 100644
--- a/content/core-developers/configuration-provider-and-configuration.html
+++ b/content/core-developers/configuration-provider-and-configuration.html
@@ -148,10 +148,7 @@
<h2 id="configuration-provider">Configuration provider</h2>
-<div class="highlighter-rouge"><pre
class="highlight"><code>ConfigurationProvider
-</code></pre>
-</div>
-<p>is the basic piece of configuration used to tie all the options together in
<code class="highlighter-rouge">ConfigurationManager</code>. There is few
different implementations that are already used internally by the Apache
Struts:</p>
+<p><code class="highlighter-rouge">ConfigurationProvider</code> is the basic
piece of configuration used to tie all the options together in <code
class="highlighter-rouge">ConfigurationManager</code>. There is few different
implementations that are already used internally by the Apache Struts:</p>
<ul>
<li>
@@ -160,30 +157,11 @@
<li>
<p><code class="highlighter-rouge">StrutsXmlConfigurationProvider</code> -
primary configuration provider, represents <code
class="highlighter-rouge">struts.xml</code> and <code
class="highlighter-rouge">struts-plugin.xml</code> files</p>
</li>
- <li>
- <p><code class="highlighter-rouge">PropertiesConfigurationProvider</code>
- used to load </p>
- </li>
-</ul>
-
-<div class="highlighter-rouge"><pre class="highlight"><code>struts.properties
-</code></pre>
-</div>
-
-<ul>
+ <li><code class="highlighter-rouge">PropertiesConfigurationProvider</code> -
used to load <code class="highlighter-rouge">struts.properties</code></li>
<li><code
class="highlighter-rouge">ServletContextAwareConfigurationProvider</code> -
marking interface allowing to inject <code
class="highlighter-rouge">ServletContext</code> into provider</li>
</ul>
-<p>To inject your custom configuration provider use </p>
-
-<div class="highlighter-rouge"><pre class="highlight"><code>configProviders
-</code></pre>
-</div>
-<p> </p>
-
-<div class="highlighter-rouge"><pre class="highlight"><code><init-param/>
-</code></pre>
-</div>
-<p>in <a href="web-xml.html">web.xml</a></p>
+<p>To inject your custom configuration provider use <code
class="highlighter-rouge">configProviders</code> <code
class="highlighter-rouge"><init-param/></code> in <a
href="web-xml.html">web.xml</a></p>
</section>
</article>
diff --git a/content/core-developers/file-upload.html
b/content/core-developers/file-upload.html
index 0db1c5b..7da1b52 100644
--- a/content/core-developers/file-upload.html
+++ b/content/core-developers/file-upload.html
@@ -209,17 +209,8 @@
</code></pre>
</div>
-<p>A form must be create with a form field of type file,</p>
-
-<div class="highlighter-rouge"><pre class="highlight"><code><INPUT
type="file" name="upload">
-</code></pre>
-</div>
-<p>. The form used to upload the file must have its encoding type set to
multipart/form-data,</p>
-
-<div class="highlighter-rouge"><pre class="highlight"><code><FORM
action="doUpload" enctype="multipart/form-data" method="post">
-</code></pre>
-</div>
-<p>. The standard procedure for adding these elements is by using the Struts 2
tag libraries as shown in the following example:</p>
+<p>A form must be create with a form field of type file, <code
class="highlighter-rouge"><INPUT type="file" name="upload"></code>. The
form used to upload the file must have its encoding type set to
multipart/form-data,
+<code class="highlighter-rouge"><FORM action="doUpload"
enctype="multipart/form-data" method="post"></code>. The standard procedure
for adding these elements is by using the Struts 2 tag libraries as shown in
the following example:</p>
<p><strong>Example JSP form tags:</strong></p>
@@ -478,12 +469,8 @@ struts.multipart.maxSize=2097152
<p><strong>File Size Limits</strong></p>
-<p>There are two separate file size limits. First is <code
class="highlighter-rouge">struts.multipart.maxSize</code> which comes from the
Struts 2 <code class="highlighter-rouge">default.properties</code> file. This
setting exists for security reasons to prohibit a malicious user from uploading
extremely large files to file up your servers disk space. This setting defaults
to approximately 2 megabytes and should be adjusted to the maximum size file (2
gigs max) that your will need the fr [...]
-
-<div class="highlighter-rouge"><pre class="highlight"><code>maximumSize
-</code></pre>
-</div>
-<p>, is an interceptor setting that is used to ensure a particular Action does
not receive a file that is too large. Notice the locations of both settings in
the following example:</p>
+<p>There are two separate file size limits. First is <code
class="highlighter-rouge">struts.multipart.maxSize</code> which comes from the
Struts 2 <code class="highlighter-rouge">default.properties</code> file. This
setting exists for security reasons to prohibit a malicious user from uploading
extremely large files to file up your servers disk space. This setting defaults
to approximately 2 megabytes and should be adjusted to the maximum size file (2
gigs max) that your will need the fr [...]
+<code class="highlighter-rouge">maximumSize</code>, is an interceptor setting
that is used to ensure a particular Action does not receive a file that is too
large. Notice the locations of both settings in the following example:</p>
<div class="highlighter-rouge"><pre class="highlight"><code><span
class="cp"><?xml version="1.0" encoding="UTF-8"?></span>
<span class="cp"><!DOCTYPE struts PUBLIC
@@ -574,12 +561,7 @@ struts.multipart.maxSize=2097152
<p>The <code class="highlighter-rouge">struts.multipart.parser</code> used by
the fileUpload interceptor to handle HTTP POST requests, encoded using the
MIME-type multipart/form-data, can be changed out. Currently there are two
choices, jakarta and pell. The jakarta parser is a standard part of the Struts
2 framework needing only its required libraries added to a project. The pell
parser uses Jason Pell’s multipart parser instead of the Commons-FileUpload
library. The pell parser is a St [...]
-<p>As from Struts version 2.3.18 a new implementation of <code
class="highlighter-rouge">MultiPartRequest</code> was added - </p>
-
-<div class="highlighter-rouge"><pre
class="highlight"><code>JakartaStreamMultiPartRequest
-</code></pre>
-</div>
-<p>. It can be used to handle large files, see <a
href="https://issues\.apache\.org/jira/browse/WW\-3025";>WW-3025</a>^[https://issues.apache.org/jira/browse/WW-3025]
for more details, but you can simple set</p>
+<p>As from Struts version 2.3.18 a new implementation of <code
class="highlighter-rouge">MultiPartRequest</code> was added - <code
class="highlighter-rouge">JakartaStreamMultiPartRequest</code>. It can be used
to handle large files, see <a
href="https://issues\.apache\.org/jira/browse/WW\-3025";>WW-3025</a>^[https://issues.apache.org/jira/browse/WW-3025]
for more details, but you can simple set</p>
<blockquote>
<p><constant name=”struts.multipart.parser” value=”jakarta-stream”
/></p>
@@ -599,12 +581,7 @@ struts.multipart.maxSize=2097152
<p><strong>Disabling file upload support</strong></p>
-<p>You can alternatively disable the whole file upload mechanism defining a
constant in </p>
-
-<div class="highlighter-rouge"><pre class="highlight"><code>struts.xml
-</code></pre>
-</div>
-<p>:</p>
+<p>You can alternatively disable the whole file upload mechanism defining a
constant in <code class="highlighter-rouge">struts.xml</code>:</p>
<div class="highlighter-rouge"><pre class="highlight"><code><constant
name="struts.multipart.enabled" value="false"/>
</code></pre>
diff --git a/content/core-developers/freemarker-support.html
b/content/core-developers/freemarker-support.html
index 832fd5a..f422b14 100644
--- a/content/core-developers/freemarker-support.html
+++ b/content/core-developers/freemarker-support.html
@@ -148,12 +148,8 @@
<p>Your action properties are automatically resolved - just like in a velocity
view.</p>
-<p><strong>for example</strong></p>
-
-<div class="highlighter-rouge"><pre class="highlight"><code>${name
-</code></pre>
-</div>
-<p>} will result in <code
class="highlighter-rouge">stack.findValue("name")</code>, which
<em>generaly</em> results in <code
class="highlighter-rouge">action.getName()</code> being executed.</p>
+<p><strong>for example</strong>
+<code class="highlighter-rouge">${name}</code> will result in <code
class="highlighter-rouge">stack.findValue("name")</code>, which
<em>generaly</em> results in <code
class="highlighter-rouge">action.getName()</code> being executed.</p>
<p>A search process is used to resolve the variable, searching the following
scopes in order, until a value is found :</p>
diff --git a/content/core-developers/weblogic-6-1.html
b/content/core-developers/weblogic-6-1.html
index 173afb1..dc9f933 100644
--- a/content/core-developers/weblogic-6-1.html
+++ b/content/core-developers/weblogic-6-1.html
@@ -149,23 +149,14 @@
<p>The framework has already been modified slightly to make the above effort
possible:</p>
<ol>
- <li><strong>RequestLifecycleFilter</strong> is modified to retrieve its
servlet context from the method <code
class="highlighter-rouge">getServletContext</code>. This method,</li>
-</ol>
-
-<div class="highlighter-rouge"><pre class="highlight"><code>getServletContext
-</code></pre>
-</div>
-<p>, is then implemented to return the servlet context from where it is
available in Servlet 2.3: the session object. The logical operation is
unchanged, but now subclasses can override <code
class="highlighter-rouge">getServletContext</code> to retrieve the servlet
context from a different location as we’ll see below.</p>
-
-<ol>
- <li><strong>SessionLifecycleListener</strong> is modified in the same way as
RequestLifecycleFilter. The method,</li>
+ <li>
+ <p><strong>RequestLifecycleFilter</strong> is modified to retrieve its
servlet context from the method <code
class="highlighter-rouge">getServletContext</code>. This method, <code
class="highlighter-rouge">getServletContext</code>, is then implemented to
return the servlet context from where it is available in Servlet 2.3: the
session object. The logical operation is unchanged, but now subclasses can
override <code class="highlighter-rouge">getServletContext</code> to retrieve
the se [...]
+ </li>
+ <li>
+ <p><strong>SessionLifecycleListener</strong> is modified in the same way
as RequestLifecycleFilter. The method, <code
class="highlighter-rouge">getServletContext</code>, is implemented to return
the servlet context, in this case also from the session object. Again,
subclasses can override the <code
class="highlighter-rouge">getServletContext</code> method to restore the
servlet context from a different source. Again, this class’s functionality is
unchanged.</p>
+ </li>
</ol>
-<div class="highlighter-rouge"><pre class="highlight"><code>getServletContext
-</code></pre>
-</div>
-<p>, is implemented to return the servlet context, in this case also from the
session object. Again, subclasses can override the <code
class="highlighter-rouge">getServletContext</code> method to restore the
servlet context from a different source. Again, this class’s functionality is
unchanged.</p>
-
<p>Now, in a separate project, the following classes are added and compiled
into a separate JAR:</p>
<p><strong>RequestLifecycleFilterCompatWeblogic61</strong></p>
diff --git a/content/core-developers/weblogic.html
b/content/core-developers/weblogic.html
index 00c5abc..42f28c3 100644
--- a/content/core-developers/weblogic.html
+++ b/content/core-developers/weblogic.html
@@ -168,24 +168,13 @@ struts.velocity.configfile = struts-velocity.properties
<p>Create the corresponding Velocity properties file
(“struts-velocity.properties”), preferably in the same location as the <code
class="highlighter-rouge">struts.properties</code> file.</p>
</li>
<li>
- <p>Copy into the Velocity properties file the contents of the <code
class="highlighter-rouge">velocity.properties</code> file that is the the
SAF</p>
+ <p>Copy into the Velocity properties file the contents of the <code
class="highlighter-rouge">velocity.properties</code> file that is the the SAF
<code class="highlighter-rouge">velocity-dep.jar</code>.</p>
+ </li>
+ <li>
+ <p>In your new <code
class="highlighter-rouge">struts-velocity.properties</code> file, find he
section titled <code class="highlighter-rouge">T E M P L A T E L O A D E R
S</code>, and change this section as so:</p>
</li>
</ul>
-<div class="highlighter-rouge"><pre class="highlight"><code>velocity-dep.jar
-</code></pre>
-</div>
-<p>.</p>
-
-<ul>
- <li>In your new <code
class="highlighter-rouge">struts-velocity.properties</code> file, find he
section titled “</li>
-</ul>
-
-<div class="highlighter-rouge"><pre class="highlight"><code>T E M P L A T E L
O A D E R S
-</code></pre>
-</div>
-<p>”, and change this section as so:</p>
-
<div class="highlighter-rouge"><pre class="highlight"><code>
===========================================
resource.loader = class
diff --git a/content/tag-developers/form-tags.html
b/content/tag-developers/form-tags.html
index 86d7588..20b9485 100644
--- a/content/tag-developers/form-tags.html
+++ b/content/tag-developers/form-tags.html
@@ -188,19 +188,9 @@
<p><strong>Common Attributes</strong></p>
-<p>All the form tags extend the UIBean class. This base class provides a set
of common attributes, that can be grouped in to three categories:</p>
+<p>All the form tags extend the UIBean class. This base class provides a set
of common attributes, that can be grouped in to three categories: <code
class="highlighter-rouge">templated-related</code>, javascript-related, and
general attributes. The individual attributes are documented on each tag’s
reference page.</p>
-<div class="highlighter-rouge"><pre class="highlight"><code>templated-related
-</code></pre>
-</div>
-<p>, javascript-related, and general attributes. The individual attributes are
documented on each tag’s reference page.</p>
-
-<p>In addition to the common attributes, a special attribute exists for all
form element tags:</p>
-
-<div class="highlighter-rouge"><pre class="highlight"><code>form
-</code></pre>
-</div>
-<p>(${parameters.form}). The <code class="highlighter-rouge">form</code>
property represents the attributes used to render the form tag, such as the
form’s id. In a template, the form’s ID can be found by calling
${parameters.form.id}.</p>
+<p>In addition to the common attributes, a special attribute exists for all
form element tags: <code class="highlighter-rouge">form</code>
(${parameters.form}). The <code class="highlighter-rouge">form</code> property
represents the attributes used to render the form tag, such as the form’s id.
In a template, the form’s ID can be found by calling ${parameters.form.id}.</p>
<p><strong>Template-Related Attributes</strong></p>
--
To stop receiving notification emails like this one, please contact
['"commits@struts.apache.org" <commits@struts.apache.org>'].
