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 df09ab9 Updates production by Jenkins
df09ab9 is described below
commit df09ab922d936f74a5f1ca160130ff87391f4c1b
Author: jenkins <bui...@apache.org>
AuthorDate: Thu Nov 23 20:22:26 2017 +0000
Updates production by Jenkins
---
.../configuration-provider-and-configuration.html | 40 +++--------
content/core-developers/freemarker-support.html | 82 ++++++---------------
content/core-developers/object-factory.html | 82 ++++++---------------
content/core-developers/result-annotation.html | 83 ++++------------------
4 files changed, 66 insertions(+), 221 deletions(-)
diff --git
a/content/core-developers/configuration-provider-and-configuration.html
b/content/core-developers/configuration-provider-and-configuration.html
index 32a6ac6..2343dfd 100644
--- a/content/core-developers/configuration-provider-and-configuration.html
+++ b/content/core-developers/configuration-provider-and-configuration.html
@@ -154,45 +154,25 @@
<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>
<ul>
- <li></li>
+ <li>
+ <p><code class="highlighter-rouge">XmlConfigurationProvider</code> -
proprietary XWork implementation which are using <code
class="highlighter-rouge">xwork.xml</code> file as source of configuration </p>
+ </li>
+ <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>XmlConfigurationProvider
-</code></pre>
-</div>
-<p>- proprietary XWork implementation which are using <code
class="highlighter-rouge">xwork.xml</code> file as source of configuration </p>
-
-<ul>
- <li></li>
-</ul>
-
-<div class="highlighter-rouge"><pre
class="highlight"><code>StrutsXmlConfigurationProvider
-</code></pre>
-</div>
-<p>- primary configuration provider, represents <code
class="highlighter-rouge">struts.xml</code> and <code
class="highlighter-rouge">struts-plugin.xml</code> files</p>
-
-<ul>
- <li></li>
-</ul>
-
-<div class="highlighter-rouge"><pre
class="highlight"><code>PropertiesConfigurationProvider
-</code></pre>
-</div>
-<p>- used to load </p>
-
<div class="highlighter-rouge"><pre class="highlight"><code>struts.properties
</code></pre>
</div>
<ul>
- <li></li>
+ <li><code
class="highlighter-rouge">ServletContextAwareConfigurationProvider</code> -
marking interface allowing to inject <code
class="highlighter-rouge">ServletContext</code> into provider</li>
</ul>
-<div class="highlighter-rouge"><pre
class="highlight"><code>ServletContextAwareConfigurationProvider
-</code></pre>
-</div>
-<p>- marking interface allowing to inject <code
class="highlighter-rouge">ServletContext</code> into provider</p>
-
<p>To inject your custom configuration provider use </p>
<div class="highlighter-rouge"><pre class="highlight"><code>configProviders
diff --git a/content/core-developers/freemarker-support.html
b/content/core-developers/freemarker-support.html
index e229356..832fd5a 100644
--- a/content/core-developers/freemarker-support.html
+++ b/content/core-developers/freemarker-support.html
@@ -180,71 +180,33 @@
<p>The following variables exist in the FreeMarker views</p>
<ul>
- <li></li>
-</ul>
-
-<div class="highlighter-rouge"><pre class="highlight"><code>req
-</code></pre>
-</div>
-<p>- the current HttpServletRequest</p>
-
-<ul>
- <li></li>
-</ul>
-
-<div class="highlighter-rouge"><pre class="highlight"><code>res
-</code></pre>
-</div>
-<p>- the current HttpServletResponse</p>
-
-<ul>
- <li></li>
-</ul>
-
-<div class="highlighter-rouge"><pre class="highlight"><code>stack
-</code></pre>
-</div>
-<p>- the current OgnlValueStack</p>
-
-<ul>
- <li></li>
-</ul>
-
-<div class="highlighter-rouge"><pre class="highlight"><code>ognl
-</code></pre>
-</div>
-<p>- the OgnlTool instance</p>
-
-<ul>
<li>
- <p>This class contains useful methods to execute OGNL expressions against
arbitary objects, and a method to generate a select list using the
<s:select> pattern. (i.e. taking the name of the list property, a listKey
and listValue)</p>
+ <p><code class="highlighter-rouge">req</code> - the current
HttpServletRequest</p>
</li>
- <li></li>
-</ul>
-
-<div class="highlighter-rouge"><pre class="highlight"><code>struts
-</code></pre>
-</div>
-<p>- an instance of StrutsBeanWrapper</p>
-
-<ul>
- <li></li>
-</ul>
-
-<div class="highlighter-rouge"><pre class="highlight"><code>action
-</code></pre>
-</div>
-<p>- the current Struts action</p>
+ <li>
+ <p><code class="highlighter-rouge">res</code> - the current
HttpServletResponse</p>
+ </li>
+ <li>
+ <p><code class="highlighter-rouge">stack</code> - the current
OgnlValueStack</p>
+ </li>
+ <li>
+ <p><code class="highlighter-rouge">ognl</code> - the OgnlTool instance</p>
-<ul>
- <li></li>
+ <ul>
+ <li>This class contains useful methods to execute OGNL expressions
against arbitary objects, and a method to generate a select list using the
<s:select> pattern. (i.e. taking the name of the list property, a listKey
and listValue)</li>
+ </ul>
+ </li>
+ <li>
+ <p><code class="highlighter-rouge">struts</code> - an instance of
StrutsBeanWrapper</p>
+ </li>
+ <li>
+ <p><code class="highlighter-rouge">action</code> - the current Struts
action</p>
+ </li>
+ <li>
+ <p><code class="highlighter-rouge">exception</code> - <em>optional</em>
the Exception instance, if the view is a JSP exception or Servlet exception
view</p>
+ </li>
</ul>
-<div class="highlighter-rouge"><pre class="highlight"><code>exception
-</code></pre>
-</div>
-<p>- <em>optional</em> the Exception instance, if the view is a JSP exception
or Servlet exception view</p>
-
<p><strong>FreeMarker configuration with recent releases</strong></p>
<p>To configure the freemarker engine that Struts uses, just add a file <code
class="highlighter-rouge">freemarker.properties</code> to the classpath. The
supported properties are those that the Freemarker Configuration object expects
- see the <a
href="http://freemarker\.org/docs/api/freemarker/template/Configuration\.html\#setSetting(java\.lang\.String,%20java\.lang\.String)">Freemarker
documentation</a>^[http://freemarker.org/docs/api/freemarker/template/Configuration.html#setSetting(
[...]
diff --git a/content/core-developers/object-factory.html
b/content/core-developers/object-factory.html
index 7f3b9c7..30de4ca 100644
--- a/content/core-developers/object-factory.html
+++ b/content/core-developers/object-factory.html
@@ -166,68 +166,30 @@
<p>List of Factory interfaces:</p>
<ul>
- <li></li>
+ <li>
+ <p><code class="highlighter-rouge">ResultFactory</code> - dedicated
interfaces used by to create <a href="result-types.html">Result Types</a></p>
+
+ <ul>
+ <li><code class="highlighter-rouge">StrutsResultFactory</code> it’s
internal implementation which checks if Result implements <code
class="highlighter-rouge">ParamNameAwareResult</code> interface to restrict
names of parameters set on the instance of Result, see <a
href="result-types.html">Result Types</a> for more info.</li>
+ </ul>
+ </li>
+ <li>
+ <p><code class="highlighter-rouge">ActionFactory</code> - dedicated
interface used by to actions</p>
+ </li>
+ <li>
+ <p><code class="highlighter-rouge">InterceptorFactory</code> - dedicated
interface used by to create interceptors</p>
+ </li>
+ <li>
+ <p><code class="highlighter-rouge">ValidatorFactory</code> - dedicated
interface used by to create validators</p>
+ </li>
+ <li>
+ <p><code class="highlighter-rouge">ConverterFactory</code> - dedicated
interface used by to create instances of <em>TypeConverter</em></p>
+ </li>
+ <li>
+ <p><code class="highlighter-rouge">UnknownHandlerFactory</code> -
dedicated interfaces used by to create instances of <a
href="unknown-handlers.html">Unknown Handlers</a> (as from version 2.3.18)</p>
+ </li>
</ul>
-<div class="highlighter-rouge"><pre class="highlight"><code>ResultFactory
-</code></pre>
-</div>
-<p>- dedicated interfaces used by to create <a
href="result-types.html">Result Types</a></p>
-
-<ul>
- <li></li>
-</ul>
-
-<div class="highlighter-rouge"><pre class="highlight"><code>StrutsResultFactory
-</code></pre>
-</div>
-<p>it’s internal implementation which checks if Result implements <code
class="highlighter-rouge">ParamNameAwareResult</code> interface to restrict
names of parameters set on the instance of Result, see <a
href="result-types.html">Result Types</a> for more info.</p>
-
-<ul>
- <li></li>
-</ul>
-
-<div class="highlighter-rouge"><pre class="highlight"><code>ActionFactory
-</code></pre>
-</div>
-<p>- dedicated interface used by to actions</p>
-
-<ul>
- <li></li>
-</ul>
-
-<div class="highlighter-rouge"><pre class="highlight"><code>InterceptorFactory
-</code></pre>
-</div>
-<p>- dedicated interface used by to create interceptors</p>
-
-<ul>
- <li></li>
-</ul>
-
-<div class="highlighter-rouge"><pre class="highlight"><code>ValidatorFactory
-</code></pre>
-</div>
-<p>- dedicated interface used by to create validators</p>
-
-<ul>
- <li></li>
-</ul>
-
-<div class="highlighter-rouge"><pre class="highlight"><code>ConverterFactory
-</code></pre>
-</div>
-<p>- dedicated interface used by to create instances of
<em>TypeConverter</em></p>
-
-<ul>
- <li></li>
-</ul>
-
-<div class="highlighter-rouge"><pre
class="highlight"><code>UnknownHandlerFactory
-</code></pre>
-</div>
-<p>- dedicated interfaces used by to create instances of <a
href="unknown-handlers.html">Unknown Handlers</a> (as from version 2.3.18)</p>
-
</section>
</article>
diff --git a/content/core-developers/result-annotation.html
b/content/core-developers/result-annotation.html
index 90ff390..b879ab5 100644
--- a/content/core-developers/result-annotation.html
+++ b/content/core-developers/result-annotation.html
@@ -166,79 +166,20 @@
<p>type - Type of result; default <code
class="highlighter-rouge">NullResult</code>. For example:</p>
<ul>
- <li></li>
+ <li><code class="highlighter-rouge">NullResult.class</code></li>
+ <li><code class="highlighter-rouge">FreemarkerResult.class</code></li>
+ <li><code class="highlighter-rouge">PlainTextResult.class</code></li>
+ <li><code class="highlighter-rouge">VelocityResult.class</code></li>
+ <li><code
class="highlighter-rouge">ServletDispatcherResult.class</code></li>
+ <li><code
class="highlighter-rouge">ServletRedirectResult.class</code></li>
+ <li>
+ <p><code
class="highlighter-rouge">ServletActionRedirectResult.class</code> - equivalent
to the <code class="highlighter-rouge">redirectAction</code> type in XML
config</p>
+ </li>
+ <li><code class="highlighter-rouge">TilesResult.class</code></li>
+ <li>.. (for more result, please consult the API docs, and look for
implementations of the XWork <code class="highlighter-rouge">Result</code>
interface)</li>
</ul>
</li>
-</ul>
-
-<div class="highlighter-rouge"><pre class="highlight"><code>NullResult.class
-</code></pre>
-</div>
-
-<ul>
- <li></li>
-</ul>
-
-<div class="highlighter-rouge"><pre
class="highlight"><code>FreemarkerResult.class
-</code></pre>
-</div>
-
-<ul>
- <li></li>
-</ul>
-
-<div class="highlighter-rouge"><pre
class="highlight"><code>PlainTextResult.class
-</code></pre>
-</div>
-
-<ul>
- <li></li>
-</ul>
-
-<div class="highlighter-rouge"><pre
class="highlight"><code>VelocityResult.class
-</code></pre>
-</div>
-
-<ul>
- <li></li>
-</ul>
-
-<div class="highlighter-rouge"><pre
class="highlight"><code>ServletDispatcherResult.class
-</code></pre>
-</div>
-
-<ul>
- <li></li>
-</ul>
-
-<div class="highlighter-rouge"><pre
class="highlight"><code>ServletRedirectResult.class
-</code></pre>
-</div>
-
-<ul>
- <li></li>
-</ul>
-
-<div class="highlighter-rouge"><pre
class="highlight"><code>ServletActionRedirectResult.class
-</code></pre>
-</div>
-<p>- equivalent to the <code class="highlighter-rouge">redirectAction</code>
type in XML config</p>
-
-<ul>
- <li></li>
-</ul>
-
-<div class="highlighter-rouge"><pre class="highlight"><code>TilesResult.class
-</code></pre>
-</div>
-
-<ul>
- <li>
- <p>.. (for more result, please consult the API docs, and look for
implementations of the XWork <code class="highlighter-rouge">Result</code>
interface)</p>
- </li>
- <li>
- <p>params - An Array of the parameters in the form {key1, value1, key2,
value2}</p>
- </li>
+ <li>params - An Array of the parameters in the form {key1, value1, key2,
value2}</li>
</ul>
<h2 id="result--defining-a-single-result">@Result – Defining a Single
Result</h2>
--
To stop receiving notification emails like this one, please contact
['"commits@struts.apache.org" <commits@struts.apache.org>'].
