This is an automated email from the ASF dual-hosted git repository.
yasserzamani pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/struts-site.git
The following commit(s) were added to refs/heads/master by this push:
new 17c293d Replaces \+\s\n+~~~~~~~\n([^\n]+)\n~~~~~~~\n with \+ `$1`
17c293d is described below
commit 17c293d710cf72ef9ebb678aff2593519f661c09
Author: Yasser Zamani <yasserzam...@apache.org>
AuthorDate: Thu Nov 23 23:49:00 2017 +0330
Replaces \+\s\n+~~~~~~~\n([^\n]+)\n~~~~~~~\n with \+ `$1`
---
.../configuration-provider-and-configuration.md | 28 ++---------
source/core-developers/freemarker-support.md | 49 +++---------------
source/core-developers/object-factory.md | 49 +++---------------
source/core-developers/result-annotation.md | 58 ++++------------------
4 files changed, 27 insertions(+), 157 deletions(-)
diff --git a/source/core-developers/configuration-provider-and-configuration.md
b/source/core-developers/configuration-provider-and-configuration.md
index 6d79f90..cf78400 100644
--- a/source/core-developers/configuration-provider-and-configuration.md
+++ b/source/core-developers/configuration-provider-and-configuration.md
@@ -34,37 +34,17 @@ ConfigurationProvider
~~~~~~~
is the basic piece of configuration used to tie all the options together in
`ConfigurationManager`\. There is few different implementations that are
already used internally by the Apache Struts:
-+
++ `XmlConfigurationProvider` \- proprietary XWork implementation which are
using `xwork.xml` file as source of configuration
-~~~~~~~
-XmlConfigurationProvider
-~~~~~~~
- \- proprietary XWork implementation which are using `xwork.xml` file as
source of configuration
-
-+
-
-~~~~~~~
-StrutsXmlConfigurationProvider
-~~~~~~~
- \- primary configuration provider, represents `struts.xml` and
`struts-plugin.xml` files
++ `StrutsXmlConfigurationProvider` \- primary configuration provider,
represents `struts.xml` and `struts-plugin.xml` files
-+
-
-~~~~~~~
-PropertiesConfigurationProvider
-~~~~~~~
- \- used to load
++ `PropertiesConfigurationProvider` \- used to load
~~~~~~~
struts.properties
~~~~~~~
-+
-
-~~~~~~~
-ServletContextAwareConfigurationProvider
-~~~~~~~
- \- marking interface allowing to inject `ServletContext` into provider
++ `ServletContextAwareConfigurationProvider` \- marking interface allowing to
inject `ServletContext` into provider
To inject your custom configuration provider use
diff --git a/source/core-developers/freemarker-support.md
b/source/core-developers/freemarker-support.md
index 2703e42..37ce6dc 100644
--- a/source/core-developers/freemarker-support.md
+++ b/source/core-developers/freemarker-support.md
@@ -49,56 +49,21 @@ __Objects in the Context__
The following variables exist in the FreeMarker views
-+
++ `req` \- the current HttpServletRequest
-~~~~~~~
-req
-~~~~~~~
- \- the current HttpServletRequest
-
-+
++ `res` \- the current HttpServletResponse
-~~~~~~~
-res
-~~~~~~~
- \- the current HttpServletResponse
++ `stack` \- the current OgnlValueStack
-+
-
-~~~~~~~
-stack
-~~~~~~~
- \- the current OgnlValueStack
-
-+
-
-~~~~~~~
-ognl
-~~~~~~~
- \- the OgnlTool instance
++ `ognl` \- the OgnlTool instance
+ 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)
-+
-
-~~~~~~~
-struts
-~~~~~~~
- \- an instance of StrutsBeanWrapper
-
-+
++ `struts` \- an instance of StrutsBeanWrapper
-~~~~~~~
-action
-~~~~~~~
- \- the current Struts action
-
-+
++ `action` \- the current Struts action
-~~~~~~~
-exception
-~~~~~~~
- \- _optional_ the Exception instance, if the view is a JSP exception or
Servlet exception view
++ `exception` \- _optional_ the Exception instance, if the view is a JSP
exception or Servlet exception view
__FreeMarker configuration with recent releases__
diff --git a/source/core-developers/object-factory.md
b/source/core-developers/object-factory.md
index 581b0b1..bdfec01 100644
--- a/source/core-developers/object-factory.md
+++ b/source/core-developers/object-factory.md
@@ -40,51 +40,16 @@ If you want to just extend one part of ObjectFactory, ie\.
to change how [Result
List of Factory interfaces:
-+
++ `ResultFactory` \- dedicated interfaces used by to create [Result
Types](result-types.html)
-~~~~~~~
-ResultFactory
-~~~~~~~
- \- dedicated interfaces used by to create [Result Types](result-types.html)
-
- +
+ + `StrutsResultFactory` it's internal implementation which checks if Result
implements `ParamNameAwareResult` interface to restrict names of parameters set
on the instance of Result, see [Result Types](result-types.html) for more info\.
-~~~~~~~
-StrutsResultFactory
-~~~~~~~
- it's internal implementation which checks if Result implements
`ParamNameAwareResult` interface to restrict names of parameters set on the
instance of Result, see [Result Types](result-types.html) for more info\.
++ `ActionFactory` \- dedicated interface used by to actions
-+
++ `InterceptorFactory` \- dedicated interface used by to create interceptors
-~~~~~~~
-ActionFactory
-~~~~~~~
- \- dedicated interface used by to actions
-
-+
-
-~~~~~~~
-InterceptorFactory
-~~~~~~~
- \- dedicated interface used by to create interceptors
++ `ValidatorFactory` \- dedicated interface used by to create validators
-+
++ `ConverterFactory` \- dedicated interface used by to create instances of
_TypeConverter_
-~~~~~~~
-ValidatorFactory
-~~~~~~~
- \- dedicated interface used by to create validators
-
-+
-
-~~~~~~~
-ConverterFactory
-~~~~~~~
- \- dedicated interface used by to create instances of _TypeConverter_
-
-+
-
-~~~~~~~
-UnknownHandlerFactory
-~~~~~~~
- \- dedicated interfaces used by to create instances of [Unknown
Handlers](unknown-handlers.html) (as from version 2\.3\.18)
++ `UnknownHandlerFactory` \- dedicated interfaces used by to create instances
of [Unknown Handlers](unknown-handlers.html) (as from version 2\.3\.18)
diff --git a/source/core-developers/result-annotation.md
b/source/core-developers/result-annotation.md
index 7400477..835e83c 100644
--- a/source/core-developers/result-annotation.md
+++ b/source/core-developers/result-annotation.md
@@ -33,55 +33,15 @@ In order for `@Result` and `@Results` annotations to be
configured correctly you
+ type \- Type of result; default `NullResult`\. For example:
- +
-
-~~~~~~~
-NullResult.class
-~~~~~~~
-
- +
-
-~~~~~~~
-FreemarkerResult.class
-~~~~~~~
-
- +
-
-~~~~~~~
-PlainTextResult.class
-~~~~~~~
-
- +
-
-~~~~~~~
-VelocityResult.class
-~~~~~~~
-
- +
-
-~~~~~~~
-ServletDispatcherResult.class
-~~~~~~~
-
- +
-
-~~~~~~~
-ServletRedirectResult.class
-~~~~~~~
-
- +
-
-~~~~~~~
-ServletActionRedirectResult.class
-~~~~~~~
- \- equivalent to the `redirectAction` type in XML config
-
- +
-
-~~~~~~~
-TilesResult.class
-~~~~~~~
-
+ + `NullResult.class`
+ + `FreemarkerResult.class`
+ + `PlainTextResult.class`
+ + `VelocityResult.class`
+ + `ServletDispatcherResult.class`
+ + `ServletRedirectResult.class`
+ + `ServletActionRedirectResult.class` \- equivalent to the `redirectAction`
type in XML config
+
+ + `TilesResult.class`
+ \.\. (for more result, please consult the API docs, and look for
implementations of the XWork `Result` interface)
+ params \- An Array of the parameters in the form \{key1, value1, key2,
value2\}
--
To stop receiving notification emails like this one, please contact
['"commits@struts.apache.org" <commits@struts.apache.org>'].
