You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2017/06/28 15:49:16 UTC

[1/4] struts-site git commit: Adds link to allow edit page on GitHub

Repository: struts-site
Updated Branches:
  refs/heads/master f79613b87 -> c9f61f03d


Adds link to allow edit page on GitHub


Project: http://git-wip-us.apache.org/repos/asf/struts-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts-site/commit/ff1e0f8e
Tree: http://git-wip-us.apache.org/repos/asf/struts-site/tree/ff1e0f8e
Diff: http://git-wip-us.apache.org/repos/asf/struts-site/diff/ff1e0f8e

Branch: refs/heads/master
Commit: ff1e0f8ef3a59e923a7cf6d9a18dc643f358f017
Parents: f79613b
Author: Lukasz Lenart <lu...@gmail.com>
Authored: Mon Jun 19 08:34:47 2017 +0200
Committer: Lukasz Lenart <lu...@gmail.com>
Committed: Mon Jun 19 08:34:47 2017 +0200

----------------------------------------------------------------------
 source/css/custom.css    | 6 +++++-
 source/security/index.md | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/struts-site/blob/ff1e0f8e/source/css/custom.css
----------------------------------------------------------------------
diff --git a/source/css/custom.css b/source/css/custom.css
index a858dba..d8ee911 100644
--- a/source/css/custom.css
+++ b/source/css/custom.css
@@ -33,7 +33,7 @@ a.anchor {
   visibility: hidden;
 }
 
-.edit-on-gh {
+a.edit-on-gh {
   position: absolute;
   right: 0;
   top: 0;
@@ -44,3 +44,7 @@ a.anchor {
   background-color: #AA0000;
   color: #fff;
 }
+
+a.edit-on-gh:hover {
+  color: #fff;
+}

http://git-wip-us.apache.org/repos/asf/struts-site/blob/ff1e0f8e/source/security/index.md
----------------------------------------------------------------------
diff --git a/source/security/index.md b/source/security/index.md
index 3d0665c..f136091 100644
--- a/source/security/index.md
+++ b/source/security/index.md
@@ -5,6 +5,7 @@ title: Security
 
 # Security
 {:.no_toc}
+[Edit on GitHub]({{ site.repository_url }}/edit/master/source/{{ page.path }}){: .edit-on-gh title="Edit this page on GitHub"}
 
 * Will be replaced with the ToC, excluding a header
 {:toc}


[3/4] struts-site git commit: Cleans up MD

Posted by lu...@apache.org.
Cleans up MD


Project: http://git-wip-us.apache.org/repos/asf/struts-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts-site/commit/5cc381e2
Tree: http://git-wip-us.apache.org/repos/asf/struts-site/tree/5cc381e2
Diff: http://git-wip-us.apache.org/repos/asf/struts-site/diff/5cc381e2

Branch: refs/heads/master
Commit: 5cc381e2eb48477a8fc29a6a26086e0ec304eb47
Parents: 55ee066
Author: Lukasz Lenart <lu...@gmail.com>
Authored: Wed Jun 28 17:35:49 2017 +0200
Committer: Lukasz Lenart <lu...@gmail.com>
Committed: Wed Jun 28 17:35:49 2017 +0200

----------------------------------------------------------------------
 source/core-developers/nutshell.md | 171 +++++++++++++++-----------------
 1 file changed, 81 insertions(+), 90 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/struts-site/blob/5cc381e2/source/core-developers/nutshell.md
----------------------------------------------------------------------
diff --git a/source/core-developers/nutshell.md b/source/core-developers/nutshell.md
index d780136..a70022a 100644
--- a/source/core-developers/nutshell.md
+++ b/source/core-developers/nutshell.md
@@ -5,29 +5,27 @@ title: Nutshell
 
 # Nutshell
 
- The framework documentation is written for active web developers and assumes a working knowledge about how Java web applications are built\. For more about the underlying nuts and bolts, see the [Key Technologies Primer](http://struts\.apache\.org/primer\.html)^[http://struts\.apache\.org/primer\.html]\.
+The framework documentation is written for active web developers and assumes a working knowledge about how 
+Java web applications are built. For more about the underlying nuts and bolts, see 
+the [Key Technologies Primer](../primer.html).
 
-> 
-
-####Apache Struts 2 Architecture in a Nutshell####
+## Apache Struts 2 Architecture in a Nutshell
 
 ![struts2-arch.png](attachments/struts2-arch.png)
 
-1. The web browser requests a resource (/mypage.action, /reports/myreport.pdf, et cetera)\
-2. The Filter Dispatcher looks at the request and determines the appropriate Action\
-3. The Interceptors automatically apply common functionality to the request, like workflow, validation, and file upload handling\
-4. The Action method executes, usually storing and/or retrieving information from a database\
-5. The Result renders the output to the browser, be it HTML, images, PDF, or something else\
-
-|
-|------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+1. The web browser requests a resource - `/mypage.action`, `/reports/myreport.pdf`, etc
+2. The Filter Dispatcher looks at the request and determines the appropriate Action
+3. The Interceptors automatically apply common functionality to the request, like workflow, validation, and file upload handling
+4. The Action method executes, usually storing and/or retrieving information from a database
+5. The Result renders the output to the browser, be it HTML, images, PDF, or something else
 
-####Struts Tags in a nutshell####
+## Struts Tags in a nutshell
 
-The Struts Tags help you create rich web applications with a minimum of coding\. Often, much of the coding effort in a web application goes into the pages\. The Struts Tags reduce effort by reducing code\.
+The Struts Tags help you create rich web applications with a minimum of coding. Often, much of the coding effort 
+in a web application goes into the pages. The Struts Tags reduce effort by reducing code.
 
 
-~~~~~~~
+```html
 
 <% User user = ... %>
 <form action="Profile_update.action" method="post">
@@ -44,59 +42,42 @@ The Struts Tags help you create rich web applications with a minimum of coding\.
     </table>
 </form>
 ...
-
-~~~~~~~
-
-Looking over the markup, it's easy to see why Java web development without the aid from a modern framework is hard\!  So far, we've only coded two controls, and there are six more to go\! Let's rewrite and finish the form using Struts Tags\.
-
-|\
-\
-![nutshell\.GIF](/Users/lukaszlenart/Projects/Apache/struts\-site/target/md/attachments/att1846\_nutshell\.GIF)
-|\
-\<s:actionerror/\>\
-\<s:form action="Profile\_update" validate="true"\>\
-    \<s:textfield label="Username" name="username"/\>\
-    \<s:password label="Password" name="password"/\>\
-    \<s:password label="(Repeat) Password" name="password2"/\>\
-    \<s:textfield label="Full Name" name="fullName"/\>\
-    \<s:textfield label="From Address" name="fromAddress"/\>\
-    \<s:textfield label="Reply To Address" name="replyToAddress"/\>\
-    \<s:submit value="Save" name="Save"/\>\
-    \<s:submit action="Register\_cancel" value="Cancel" name="Cancel"  onclick="form\.onsubmit=null"/\>\
-\</s:form\>\
- The Struts Tags also support validation and localization as first\-class features\. So not only is there less code, but there is _more_  utility\. \
-In about the same amount of code as two conventional controls, the Struts Tags can create an entire data\-input form with eight controls\. Not only is there less code, but the code is easier to read and maintain\. |
-|--------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 ----------------------------------------------------------------------------------|
-
-####Struts Configuration in a Nutshell####
-
-A web application uses a deployment descriptor to initialize resources like filters and listeners\. The web deployment descriptor is formatted as a XML document and named 
-
-~~~~~~~
-web.xml
-~~~~~~~
-\. Struts can either initialize its resources by scanning your classes using Java packages declared in this 
-
-~~~~~~~
-web.xml
-~~~~~~~
- file, or you can have full control over the configuration via a configuration file, named 
-
-~~~~~~~
-struts.xml
-~~~~~~~
-\. These resources include action mappings, to direct input to server\-side Action classes, and result types, to select output pages\. 
-
-Here's a typical configuration (
-
-~~~~~~~
-struts.xml
-~~~~~~~
-) for a login workflow:
-
-
-~~~~~~~
-
+```
+
+Looking over the markup, it's easy to see why Java web development without the aid from a modern framework is hard!
+So far, we've only coded two controls, and there are six more to go! Let's rewrite and finish the form using Struts Tags.
+
+![nutshell.gif](attachments/att1846_nutshell.gif)
+
+```html
+<s:actionerror/>
+<s:form action="Profile\_update" validate="true">
+    <s:textfield label="Username" name="username"/>
+    <s:password label="Password" name="password"/>
+    <s:password label="(Repeat) Password" name="password2"/>
+    <s:textfield label="Full Name" name="fullName"/>
+    <s:textfield label="From Address" name="fromAddress"/>
+    <s:textfield label="Reply To Address" name="replyToAddress"/>
+    <s:submit value="Save" name="Save"/>
+    <s:submit action="Register_cancel" value="Cancel" name="Cancel"  onclick="form.onsubmit=null"/>
+</s:form>
+```
+
+The Struts Tags also support validation and localization as first-class features. So not only is there less code, 
+but there is _more_ utility. In about the same amount of code as two conventional controls, the Struts Tags can create 
+an entire data-input form with eight controls. Not only is there less code, but the code is easier to read and maintain.
+
+## Struts Configuration in a Nutshell
+
+A web application uses a deployment descriptor to initialize resources like filters and listeners. The web deployment 
+descriptor is formatted as a XML document and named `web.xml`. Struts can either initialize its resources by scanning 
+your classes using Java packages declared in this `web.xml` file, or you can have full control over the configuration 
+via a configuration file, named `struts.xml`. These resources include action mappings, to direct input to server-side 
+Action classes, and result types, to select output pages. 
+
+Here's a typical configuration (`struts.xml`) for a login workflow:
+
+```xml
 <struts>
     <package name="default" extends="struts-default">
         <action name="Logon" class="mailreader2.Logon">
@@ -111,40 +92,50 @@ struts.xml
         </action>
     </package>
 </struts>
+```
 
-~~~~~~~
+> The framework provides general-purpose defaults, so we can start using Struts right away, "out of the box". 
+Any factory defaults can be overridden in an application's configuration, as needed.
 
-(light\-on) The framework provides general\-purpose defaults, so we can start using Struts right away, "out of the box"\. Any factory defaults can be overridden in an application's configuration, as needed\.
+## Struts MVC in a Nutshell
 
-####Struts MVC in a Nutshell####
+Struts is a [Model View Controller](../primer.html#mvc) framework. Struts provides Controller and View components, 
+and integrates with other technologies to provide the Model. The framework's Controller acts as a bridge between 
+the application's Model and the web View. 
 
-Struts is a [Model View Controller](http://struts\.apache\.org/primer\.html\#mvc)^[http://struts\.apache\.org/primer\.html\#mvc] framework\. Struts provides Controller and View components, and integrates with other technologies to provide the Model\. The framework's Controller acts as a bridge between the application's Model and the web View\. 
+To make it easier to present dynamic data, the framework includes a library of markup tags. The tags interact with 
+the framework's validation and internationalization features, to ensure that input is correct and output is localized. 
+The tag library can be used with JSP, FreeMarker, or Velocity. Of course, other tag libraries, JSTL, and AJAX can also 
+be used, with or without the Struts tags. JavaServer Faces components are also supported.
 
-To make it easier to present dynamic data, the framework includes a library of markup tags\. The tags interact with the framework's validation and internationalization features, to ensure that input is correct and output is localized\. The tag library can be used with JSP, FreeMarker, or Velocity\. Of course, other tag libraries, JSTL, and AJAX can also be used, with or without the Struts tags\. JavaServer Faces components are also supported\.
+When a request is received, the Controller invokes an Action class. The Action class examines or updates 
+the application's state by consulting the Model (or, preferably, an interface representing the Model). To transfer 
+data between the Model and the View, properties can be placed on the Action class, or on a plain old JavaBean. 
 
-When a request is received, the Controller invokes an Action class\. The Action class examines or updates the application's state by consulting the Model (or, preferably, an interface representing the Model)\. To transfer data between the Model and the View, properties can be placed on the Action class, or on a plain old JavaBean\. 
+Most often, the Model is represented as a graph of JavaBean objects. The Model should do the "heavy lifting", 
+and the Action will act as a "traffic cop" or adapter. The framework provides sophisticated, automatic type conversion 
+to simplify transferring data between rich domain objects and text-only HTTP requests. 
 
-Most often, the Model is represented as a graph of JavaBean objects\. The Model should do the "heavy lifting", and the Action will act as a "traffic cop" or adapter\. The framework provides sophisticated, automatic type conversion to simplify transfering data between rich domain objects and text\-only HTTP requests\. 
+Struts is extensible. _Very_  extensible. Every class deployed by the framework is based on an interface. We provide 
+all the base classes an application may ever need, but if we missed something, it's easy to add your own. We provide 
+the general-purpose framework, but you can still write _your_  application _your_  way.
 
-Struts is extensible\. _Very_  extensible\. Every class deployed by the framework is based on an interface\. We provide all the base classes an application may ever need, but if we missed something, it's easy to add your own\. We provide the general\-purpose framework, but you can still write _your_  application _your_  way\.
+## Is Struts the best choice for every project?
 
-####Is Struts the best choice for every project?####
+Apache Struts 2 helps you create an extensible development environment for enterprise-grade applications, based on 
+industry standards and proven design patterns. If you need to write a very simple application, with a handful of pages, 
+then you might consider a "Model 1" solution that uses only server pages.
 
-Apache Struts 2 helps you create an extensible development environment for enterprise\-grade applications, based on industry standards and proven design patterns\. If you need to write a very simple application, with a handful of pages, then you might consider a "Model 1" solution that uses only server pages\.
+But, if you are writing a more complicated application, with dozens of pages, that need to be maintained over time, 
+then Struts can help. For more about whether Model 1 or MVC/Model 2 is right for you, 
+see [Understanding JavaServer Pages Model 2 architecture](http://www.javaworld.com/javaworld/jw-12-1999/jw-12-ssj-jspmvc.html). 
 
-But, if you are writing a more complicated application, with dozens of pages, that need to be maintained over time, then Struts can help\. For more about whether Model 1 or MVC/Model 2 is right for you, see [Understanding JavaServer Pages Model 2 architecture](http://www\.javaworld\.com/javaworld/jw\-12\-1999/jw\-12\-ssj\-jspmvc\.html)^[http://www\.javaworld\.com/javaworld/jw\-12\-1999/jw\-12\-ssj\-jspmvc\.html]\. 
-
-####Platform Requirements####
+## Platform Requirements
 
 Struts 2 requires 
 
-+ Servlet API 2\.4
-
-+ JSP API 2\.0
-
-+ Java 5
-
-For a full list of requirements, including dependencies used by optional plugins, see [Project Dependencies](http://struts\.apache\.org/2\.x/struts2\-core/dependencies\.html)^[http://struts\.apache\.org/2\.x/struts2\-core/dependencies\.html]
-
- (ok)  An alternate set of JARs for Java 4 are also available\. See the "J4" distribution\. 
+- Servlet API 2.4
+- JSP API 2.0
+- Java 7
 
+For a full list of requirements, including dependencies used by optional plugins, see [Project Dependencies](../maven/dependencies.html).


[4/4] struts-site git commit: Cleans up MD

Posted by lu...@apache.org.
Cleans up MD


Project: http://git-wip-us.apache.org/repos/asf/struts-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts-site/commit/c9f61f03
Tree: http://git-wip-us.apache.org/repos/asf/struts-site/tree/c9f61f03
Diff: http://git-wip-us.apache.org/repos/asf/struts-site/diff/c9f61f03

Branch: refs/heads/master
Commit: c9f61f03d7f229d58452b05b9654ecb4532116c6
Parents: 5cc381e
Author: Lukasz Lenart <lu...@gmail.com>
Authored: Wed Jun 28 17:49:04 2017 +0200
Committer: Lukasz Lenart <lu...@gmail.com>
Committed: Wed Jun 28 17:49:04 2017 +0200

----------------------------------------------------------------------
 source/core-developers/ajax.md | 147 ++++++++++++++++++------------------
 1 file changed, 72 insertions(+), 75 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/struts-site/blob/c9f61f03/source/core-developers/ajax.md
----------------------------------------------------------------------
diff --git a/source/core-developers/ajax.md b/source/core-developers/ajax.md
index b8a39be..9deceba 100644
--- a/source/core-developers/ajax.md
+++ b/source/core-developers/ajax.md
@@ -5,36 +5,39 @@ title: AJAX
 
 # AJAX
 
-AJAX is an acronym for Asynchronous JavaScript and XML\. Essentially, a JavaScript can make a HTTP request and update portions of a page directly, without going through a conventional POST or GET and refreshing the entire page\. Better yet, a page can contain several JavaScripts making simultaneous (asynchronous) requests\.
+AJAX is an acronym for Asynchronous JavaScript and XML. Essentially, a JavaScript can make a HTTP request and update 
+portions of a page directly, without going through a conventional POST or GET and refreshing the entire page. 
+Better yet, a page can contain several JavaScripts making simultaneous (asynchronous) requests.
 
-The key point is that when a script makes an "Ajax request" (XHR), the server doesn't know it came from a script, and handles it like any other request\. One reason Ajax is so successful is that it works just fine with existing server technologies, including Struts\.
+The key point is that when a script makes an "Ajax request" (XHR), the server doesn't know it came from a script, 
+and handles it like any other request. One reason Ajax is so successful is that it works just fine with existing server 
+technologies, including Struts.
 
-It's not the Ajax request that is different, but the Ajax response\. Instead of returning an entire page for the browser to display (or redisplay), an Ajax response will just return a portion of a page\. The response can take the form of XML, or HTML, or plain text, another script, or whatever else the calling script may want\.
+It's not the Ajax request that is different, but the Ajax response. Instead of returning an entire page for the browser 
+to display (or redisplay), an Ajax response will just return a portion of a page. The response can take the form of XML, 
+or HTML, or plain text, another script, or whatever else the calling script may want.
 
-Both Struts 1 and Struts 2 can return any type of response\. We are not limited to forwarding to a server page\. In Struts 1, you can just do something like:
+Both Struts 1 and Struts 2 can return any type of response. We are not limited to forwarding to a server page. 
+In Struts 1, you can just do something like:
 
-
-~~~~~~~
+```java
 response.setContentType("text/html");
 PrintWriter out = response.getWriter();
 out.println("Hello World!  This is an AJAX response from a Struts Action.");
 out.flush();
 return null;
+```
 
-~~~~~~~
-
-In Struts 2, we can do the same thing with a Stream result\.
-
+In Struts 2, we can do the same thing with a Stream result.
 
 
-| Using a Struts 2 plugin (e\.g\., _JSON plugin_ , jQuery plugin, etc\.) is, in general, preferred to writing the response directly from within an action\. See sections following this for further details\.
+> Using a Struts 2 plugin (e.g., _JSON plugin_ , jQuery plugin, etc.) is, in general, preferred to writing the response 
+directly from within an action. See sections following this for further details.
 
-| 
 
 **Struts 2 Stream result Action**
 
-
-~~~~~~~
+```java
 package actions;
 
 import java.io.InputStream;
@@ -52,93 +55,87 @@ public class TextResult extends ActionSupport  {
         return SUCCESS;
     }
 }
-
-~~~~~~~
+```
 
 **Struts 2 Configuring the TextResult Action**
 
-
-~~~~~~~
+```xml
 <action name="text-result" class="actions.TextResult">
     <result type="stream">
         <param name="contentType">text/html</param>
         <param name="inputName">inputStream</param>
     </result>
 </action>
+```
 
-~~~~~~~
-
- (ok)  Struts 2 can also return a JSON (JavaScript Object Notation) response, using a [plugin](http://cwiki\.apache\.org/S2PLUGINS/json\-plugin\.html)^[http://cwiki\.apache\.org/S2PLUGINS/json\-plugin\.html]\.
-
-On the client side, there are two basic strategies, which can be mixed and matched\.
-
-First, you can use some type of JSP tag\. Here, you don't have to know very much at all about Ajax or JavaScript\. The taglib does all the work, and you just have to figure out how to use the taglib\. The standard Struts 2 taglib includes several _Ajax JSP tags_ , and many third\-party libraries are available, including:
-
-+ [Ajax Tags](http://ajaxtags\.sourceforge\.net/)^[http://ajaxtags\.sourceforge\.net/]
+> Struts 2 can also return a JSON (JavaScript Object Notation) response, using a [plugin](http://cwiki.apache.org/S2PLUGINS/json-plugin.html).
 
-+ [AjaxParts Taglib](http://javawebparts\.sourceforge\.net/)^[http://javawebparts\.sourceforge\.net/]
+On the client side, there are two basic strategies, which can be mixed and matched.
 
-+ [ColdTags Suite](http://servletsuite\.blogspot\.com/2006/06/coldtags\-suite\-ajax\-edition\.html)^[http://servletsuite\.blogspot\.com/2006/06/coldtags\-suite\-ajax\-edition\.html]
+First, you can use some type of JSP tag. Here, you don't have to know very much at all about Ajax or JavaScript. 
+The taglib does all the work, and you just have to figure out how to use the taglib. The standard Struts 2 taglib 
+includes several _Ajax JSP tags_ , and many third-party libraries are available, including:
 
-+ [Prize Tags](http://www\.jenkov\.com/prizetags/introduction\.tmpl)^[http://www\.jenkov\.com/prizetags/introduction\.tmpl]
+- [Ajax Tags](http://ajaxtags.sourceforge.net/)
+- [AjaxParts Taglib](http://javawebparts.sourceforge.net/)
+- [ColdTags Suite](http://servletsuite.blogspot.com/2006/06/coldtags-suite-ajax-edition.html)
+- [Prize Tags](http://www.jenkov.com/prizetags/introduction.tmpl)
+- [JSON-taglib](http://json-taglib.sourceforge.net/)
 
-+ [JSON\-taglib](http://json\-taglib\.sourceforge\.net/)^[http://json\-taglib\.sourceforge\.net/]
+Alternatively, you can use a plain-old Ajax widget on a plain-old HTML page, using libraries like 
+[Dojo](http://dojotoolkit.org/), [JQuery](http://jquery.com/), or [YUI](http://developer.yahoo.com/yui/), 
+and the StreamResult or the [JSON Plugin](http://cwiki.apache.org/S2PLUGINS/json-plugin.html). 
+Here, the sky's the limit, but you actually have to learn something about JavaScript as a language.
 
-Alternatively, you can use a plain\-old Ajax widget on a plain\-old HTML page, using libraries like [Dojo](http://dojotoolkit\.org/)^[http://dojotoolkit\.org/], [JQuery](http://jquery\.com/)^[http://jquery\.com/], or [YUI](http://developer\.yahoo\.com/yui/)^[http://developer\.yahoo\.com/yui/], and the StreamResult or the [JSON Plugin](http://cwiki\.apache\.org/S2PLUGINS/json\-plugin\.html)^[http://cwiki\.apache\.org/S2PLUGINS/json\-plugin\.html]\. Here, the sky's the limit, but you actually have to learn something about JavaScript as a language\.
+## Ajax Plugins
 
-####Ajax Plugins####
+While Struts works fine with Ajax out-of-the-box, for added value, several Ajax-centric plugins are available.
 
-While Struts works fine with Ajax out\-of\-the\-box, for added value, several Ajax\-centric plugins are available\.
+### Ajax Tag Plugins
 
-#####Ajax Tag Plugins#####
+- **jQuery** - The [jQuery Plugin](https://github.com/struts-community-plugins/struts2-jquery) provides ajax 
+  functionality and UI Widgets an JavaScript Grid based on the jQuery javascript framework.
+- **Ajax Parts** - The [AjaxParts Taglib (APT)](http://code.google.com/p/struts2ajaxpartstaglibplugin/) is a component 
+  of the Java Web Parts (JWP) project ([http://javawebparts.sourceforge.net](http://javawebparts.sourceforge.net)) that 
+  allows for 100% declarative (read: no Javascript coding required!) AJAX functionality within a Java-based webapp.
+- **Dojo** - The _Ajax Tags Dojo Plugin_  was represented as a theme for Struts 2.0. For Struts 2.1, the Dojo tags are 
+  bundled as a plugin until version 2.3.x. Since version 2.5 this plugin is not part of th Struts2 distribution anymore. 
+- **YUI** - The [Yahoo User Interface (YUI) Plugin](https://code.google.com/p/struts2yuiplugin/) has only a few tags 
+  are available so far, but the YUI tags tend to be easier to use than the Dojo versions.
 
-+ **jQuery** \- The [jQuery Plugin](https://github\.com/struts\-community\-plugins/struts2\-jquery)^[https://github\.com/struts\-community\-plugins/struts2\-jquery] provide ajax functionality and UI Widgets an JavaScript Grid based on the jQuery javascript framework\.**
-**
+### Other Ajax Plugins
 
-+ **Ajax Parts** \- The [AjaxParts Taglib (APT)](http://code\.google\.com/p/struts2ajaxpartstaglibplugin/)^[http://code\.google\.com/p/struts2ajaxpartstaglibplugin/] is a component of the Java Web Parts (JWP) project ([http://javawebparts\.sourceforge\.net](http://javawebparts\.sourceforge\.net)) that allows for 100% declarative (read: no Javascript coding required\!) AJAX functionality within a Java\-based webapp\.
+- **Ajax File Upload** - With the [Ajax File Upload Plugin](http://www.davidjc.com/ajaxfileupload/demo!input.action)
+  we can upload a file to the server and asynchronously monitor its progress.
+- **GWT** - The [Google Web Toolkit Plugin](https://code.google.com/p/struts2gwtplugin/) exposes Struts 2 actions to 
+  the GWT RPC mechanism.
+- **JSON** - The _JSON Plugin_  serializes Actions properties into JSON, making it easy to respond to JavaScript requests.
 
-+ **Dojo** \- The _Ajax Tags Dojo Plugin_  was represented as a theme for Struts 2\.0\. For Struts 2\.1, the Dojo tags are bundled as a plugin until version 2\.3\.x\. Since version 2\.5 this plugin is not part of th Struts2 distribution anymore 
+See the [Struts Plugin Repository](http://cwiki.apache.org/S2PLUGINS/home.html) for a complete list of Struts 2 plugins.
 
-+ **YUI** \- The [Yahoo User Interface (YUI) Plugin](https://code\.google\.com/p/struts2yuiplugin/)^[https://code\.google\.com/p/struts2yuiplugin/] has only a few tags are available so far, but the YUI tags tend to be easier to use than the Dojo versions\.
+## Ajax Results with JSP
 
-#####Other Ajax Plugins#####
+While server pages are most often used to generate HTML, we can use server pages to create other types of data streams.
+Here's an example:
 
-+ **Ajax File Upload** \- With the [Ajax File Upload Plugin](http://www\.davidjc\.com/ajaxfileupload/demo\!input\.action)^[http://www\.davidjc\.com/ajaxfileupload/demo\!input\.action] we can upload a file to the server and asynchronously monitor its progress\.
+**book.jsp**
 
-+ **GWT** \- The [Google Web Toolkit Plugin](https://code\.google\.com/p/struts2gwtplugin/)^[https://code\.google\.com/p/struts2gwtplugin/] exposes Struts 2 actions to the GWT RPC mechanism\.
-
-+ **JSON** \- The _JSON Plugin_  serializes Actions properties into JSON, making it easy to respond to JavaScript requests\.
-
-See the [Struts Plugin Repository](http://cwiki\.apache\.org/S2PLUGINS/home\.html)^[http://cwiki\.apache\.org/S2PLUGINS/home\.html] for a complete list of Struts 2 plugins\.
-
-####Ajax Results with JSP####
-
-While server pages are most often used to generate HTML, we can use server pages to create other types of data streams\. Here's an example:
-
-**book\.jsp**
-
-
-~~~~~~~
+```jsp
 <%@ page import="java.util.Iterator,
-		 java.util.List,
-		 com.esolaria.dojoex.Book,
-		 com.esolaria.dojoex.BookManager" %>
+    java.util.List,
+    com.esolaria.dojoex.Book,
+    com.esolaria.dojoex.BookManager" %>
 <%
-	String bookIdStr = request.getParameter("bookId");
-	int bookId = (bookIdStr == null || "".equals(bookIdStr.trim())) 
-		? 0 : Integer.parseInt(bookIdStr);
-	Book book = BookManager.getBook(bookId);
-	if (book != null) {
-		out.println(book.toJSONString());
-		System.out.println("itis: " + book.toJSONString());
-	}
+    String bookIdStr = request.getParameter("bookId");
+    int bookId = (bookIdStr == null || "".equals(bookIdStr.trim())) 
+        ? 0 : Integer.parseInt(bookIdStr);
+    Book book = BookManager.getBook(bookId);
+    if (book != null) {
+        out.println(book.toJSONString());
+        System.out.println("itis: " + book.toJSONString());
+    }
 %>
+```
 
-~~~~~~~
-
-In the code example, we use 
-
-~~~~~~~
-System.out.println
-~~~~~~~
- to return a JSON data stream as the response\. For more about this technique, see the article [Using Dojo and JSON to Build Ajax Applications](http://today\.java\.net/pub/a/today/2006/04/27/building\-ajax\-with\-dojo\-and\-json\.html)^[http://today\.java\.net/pub/a/today/2006/04/27/building\-ajax\-with\-dojo\-and\-json\.html]\.
+In the code example, we use `System.out.println` to return a JSON data stream as the response. For more about this 
+technique, see the article [Using Dojo and JSON to Build Ajax Applications](http://today.java.net/pub/a/today/2006/04/27/building-ajax-with-dojo-and-json.html).


[2/4] struts-site git commit: Adds info how to handle communication in case of vulnerability

Posted by lu...@apache.org.
Adds info how to handle communication in case of vulnerability


Project: http://git-wip-us.apache.org/repos/asf/struts-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts-site/commit/55ee0667
Tree: http://git-wip-us.apache.org/repos/asf/struts-site/tree/55ee0667
Diff: http://git-wip-us.apache.org/repos/asf/struts-site/diff/55ee0667

Branch: refs/heads/master
Commit: 55ee0667a64e1722cab2b438025fbc64feafbece
Parents: ff1e0f8
Author: Lukasz Lenart <lu...@gmail.com>
Authored: Wed Jun 28 17:12:52 2017 +0200
Committer: Lukasz Lenart <lu...@gmail.com>
Committed: Wed Jun 28 17:12:52 2017 +0200

----------------------------------------------------------------------
 source/submitting-patches.md | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/struts-site/blob/55ee0667/source/submitting-patches.md
----------------------------------------------------------------------
diff --git a/source/submitting-patches.md b/source/submitting-patches.md
index 09510bd..a971c90 100644
--- a/source/submitting-patches.md
+++ b/source/submitting-patches.md
@@ -165,9 +165,13 @@ you can get a bounty :-) You will find more details on
 [the Google's blog](http://googleonlinesecurity.blogspot.com/2013/10/going-beyond-vulnerability-rewards.html)
  or under the link above, just to give you a quick guideline how does it work:
 
-- prepare a patch and submit it to our [JIRA](https://issues.apache.org/jira/browse/WW),
-  it can be a Pull Request on GitHub as well, but must reference the JIRA ticket.
-- let us know that you did something great, post a message to [Struts Dev mailing list](dev-mail.html)
+- if you found a way to improve security of the framework but this isn't a vulnerability: 
+  - prepare a patch and submit it to our [JIRA](https://issues.apache.org/jira/browse/WW),
+    it can be a Pull Request on GitHub as well, but must reference the JIRA ticket.
+  - let us know that you did something great, post a message to [Struts Dev mailing list](dev-mail.html)
+- if you found a vulnerability and prepared a patch that fixes the vulnerability:
+  - please contact us using the Security Mailing list [security@struts.apache.org](mailto:security@struts.apache.org)
+  - keep all information in secret, do not publish any data about the vulnerability nor Proof-of-Concept, etc.
 - we will review the patch and if it's a real great thing then we will merge it into our code base
 - just wait on official release of the Apache Struts and now you can request the reward from Google :-)