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 9c5041c Following previous 6 commits, finalizes fixing breaking
paragraphs by replacing ~ blocks
9c5041c is described below
commit 9c5041c81edd3fed573dbf211f298ee7fe593aa1
Author: Yasser Zamani <yasserzam...@apache.org>
AuthorDate: Fri Nov 24 00:30:13 2017 +0330
Following previous 6 commits, finalizes fixing breaking paragraphs by
replacing ~ blocks
---
.../configuration-provider-and-configuration.md | 25 ++--------------
source/core-developers/file-upload.md | 33 ++++------------------
source/core-developers/freemarker-support.md | 6 +---
source/core-developers/weblogic-6-1.md | 14 ++-------
source/core-developers/weblogic.md | 14 ++-------
source/tag-developers/form-tags.md | 14 ++-------
6 files changed, 15 insertions(+), 91 deletions(-)
diff --git a/source/core-developers/configuration-provider-and-configuration.md
b/source/core-developers/configuration-provider-and-configuration.md
index cf78400..f104acb 100644
--- a/source/core-developers/configuration-provider-and-configuration.md
+++ b/source/core-developers/configuration-provider-and-configuration.md
@@ -28,32 +28,13 @@ The ConfigurationProvider interface describes the
framework's configuration\. By
## Configuration provider
-
-~~~~~~~
-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:
+`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
+ `StrutsXmlConfigurationProvider` \- primary configuration provider,
represents `struts.xml` and `struts-plugin.xml` files
-+ `PropertiesConfigurationProvider` \- used to load
-
-~~~~~~~
-struts.properties
-~~~~~~~
-
++ `PropertiesConfigurationProvider` \- used to load `struts.properties`
+ `ServletContextAwareConfigurationProvider` \- marking interface allowing to
inject `ServletContext` into provider
-To inject your custom configuration provider use
-
-~~~~~~~
-configProviders
-~~~~~~~
-
-
-~~~~~~~
-<init-param/>
-~~~~~~~
- in [web.xml](web-xml.html)
+To inject your custom configuration provider use `configProviders`
`<init-param/>` in [web.xml](web-xml.html)
diff --git a/source/core-developers/file-upload.md
b/source/core-developers/file-upload.md
index 1e625c5..5426291 100644
--- a/source/core-developers/file-upload.md
+++ b/source/core-developers/file-upload.md
@@ -67,17 +67,8 @@ The `org.apache.struts2.interceptor.FileUploadInterceptor`
class is included as
~~~~~~~
-A form must be create with a form field of type file,
-
-~~~~~~~
-<INPUT type="file" name="upload">
-~~~~~~~
-\. The form used to upload the file must have its encoding type set to
multipart/form\-data,
-
-~~~~~~~
-<FORM action="doUpload" enctype="multipart/form-data" method="post">
-~~~~~~~
-\. The standard procedure for adding these elements is by using the Struts 2
tag libraries as shown in the following example:
+A form must be create with a form field of type file, `<INPUT type="file"
name="upload">`\. The form used to upload the file must have its encoding type
set to multipart/form\-data,
+`<FORM action="doUpload" enctype="multipart/form-data" method="post">`\. The
standard procedure for adding these elements is by using the Struts 2 tag
libraries as shown in the following example:
**Example JSP form tags:**
@@ -322,11 +313,7 @@ Additionally the `fileUpload` interceptor has settings
that can be put in place
__File Size Limits__
There are two separate file size limits\. First is `struts.multipart.maxSize`
which comes from the Struts 2 `default.properties` 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 framework to receive\. If you are uploading
more than one file on a form the [...]
-
-~~~~~~~
-maximumSize
-~~~~~~~
-, 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:
+`maximumSize`, 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:
~~~~~~~
@@ -393,12 +380,7 @@ __Alternate Libraries__
The `struts.multipart.parser` 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 Struts
2 plugin, for more details s [...]
-As from Struts version 2\.3\.18 a new implementation of `MultiPartRequest` was
added \-
-
-~~~~~~~
-JakartaStreamMultiPartRequest
-~~~~~~~
-\. It can be used to handle large files, see
[WW\-3025](https://issues\.apache\.org/jira/browse/WW\-3025)^[https://issues\.apache\.org/jira/browse/WW\-3025]
for more details, but you can simple set
+As from Struts version 2\.3\.18 a new implementation of `MultiPartRequest` was
added \- `JakartaStreamMultiPartRequest`\. It can be used to handle large
files, see
[WW\-3025](https://issues\.apache\.org/jira/browse/WW\-3025)^[https://issues\.apache\.org/jira/browse/WW\-3025]
for more details, but you can simple set
@@ -419,12 +401,7 @@ Please read
[RFC1341](https://www\.w3\.org/Protocols/rfc1341/7\_2\_Multipart\.h
__Disabling file upload support__
-You can alternatively disable the whole file upload mechanism defining a
constant in
-
-~~~~~~~
-struts.xml
-~~~~~~~
-:
+You can alternatively disable the whole file upload mechanism defining a
constant in `struts.xml`:
~~~~~~~
diff --git a/source/core-developers/freemarker-support.md
b/source/core-developers/freemarker-support.md
index 37ce6dc..63e321c 100644
--- a/source/core-developers/freemarker-support.md
+++ b/source/core-developers/freemarker-support.md
@@ -27,11 +27,7 @@ __Property Resoloution__
Your action properties are automatically resolved \- just like in a velocity
view\.
**for example**
-
-~~~~~~~
-${name
-~~~~~~~
-\} will result in `stack.findValue("name")`, which _generaly_ results in
`action.getName()` being executed\.
+`${name}` will result in `stack.findValue("name")`, which _generaly_ results
in `action.getName()` being executed\.
A search process is used to resolve the variable, searching the following
scopes in order, until a value is found :
diff --git a/source/core-developers/weblogic-6-1.md
b/source/core-developers/weblogic-6-1.md
index dded5d7..bb3ab07 100644
--- a/source/core-developers/weblogic-6-1.md
+++ b/source/core-developers/weblogic-6-1.md
@@ -25,19 +25,9 @@ However, the framework code cannot be modifed to do this,
because this will brea
The framework has already been modified slightly to make the above effort
possible:
-1. **RequestLifecycleFilter** is modified to retrieve its servlet context from
the method `getServletContext`. This method,
+1. **RequestLifecycleFilter** is modified to retrieve its servlet context from
the method `getServletContext`. This method, `getServletContext`, 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 `getServletContext` to retrieve the servlet context from a
different location as we'll see below.
-~~~~~~~
-getServletContext
-~~~~~~~
-, 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 `getServletContext` to retrieve the servlet context
from a different location as we'll see below.
-
-1. **SessionLifecycleListener** is modified in the same way as
RequestLifecycleFilter. The method,
-
-~~~~~~~
-getServletContext
-~~~~~~~
-, is implemented to return the servlet context, in this case also from the
session object. Again, subclasses can override the `getServletContext` method
to restore the servlet context from a different source. Again, this class's
functionality is unchanged.
+1. **SessionLifecycleListener** is modified in the same way as
RequestLifecycleFilter. The method, `getServletContext`, is implemented to
return the servlet context, in this case also from the session object. Again,
subclasses can override the `getServletContext` method to restore the servlet
context from a different source. Again, this class's functionality is unchanged.
Now, in a separate project, the following classes are added and compiled into
a separate JAR:
diff --git a/source/core-developers/weblogic.md
b/source/core-developers/weblogic.md
index d265f0a..6559da6 100644
--- a/source/core-developers/weblogic.md
+++ b/source/core-developers/weblogic.md
@@ -32,19 +32,9 @@ struts.velocity.configfile = struts-velocity.properties
+ Create the corresponding Velocity properties file
("struts\-velocity\.properties"), preferably in the same location as the
`struts.properties` file\.
-+ Copy into the Velocity properties file the contents of the
`velocity.properties` file that is the the SAF
++ Copy into the Velocity properties file the contents of the
`velocity.properties` file that is the the SAF `velocity-dep.jar`\.
-~~~~~~~
-velocity-dep.jar
-~~~~~~~
-\.
-
-+ In your new `struts-velocity.properties` file, find he section titled "
-
-~~~~~~~
-T E M P L A T E L O A D E R S
-~~~~~~~
-", and change this section as so:
++ In your new `struts-velocity.properties` file, find he section titled `T E
M P L A T E L O A D E R S`, and change this section as so:
diff --git a/source/tag-developers/form-tags.md
b/source/tag-developers/form-tags.md
index 94a3a6e..c9e7462 100644
--- a/source/tag-developers/form-tags.md
+++ b/source/tag-developers/form-tags.md
@@ -34,19 +34,9 @@ The downside of using the simple theme is that it doesn't
support as many of the
__Common Attributes__
-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:
+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:
`templated-related`, javascript-related, and general attributes. The individual
attributes are documented on each tag's reference page.
-~~~~~~~
-templated-related
-~~~~~~~
-, javascript-related, and general attributes. The individual attributes are
documented on each tag's reference page.
-
-In addition to the common attributes, a special attribute exists for all form
element tags:
-
-~~~~~~~
-form
-~~~~~~~
- (\${parameters.form}). The `form` 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}.
+In addition to the common attributes, a special attribute exists for all form
element tags: `form` (\${parameters.form}). The `form` 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}.
__Template-Related Attributes__
--
To stop receiving notification emails like this one, please contact
['"commits@struts.apache.org" <commits@struts.apache.org>'].
