struts-site git commit: updated using-tags page

[sdutry]

Repository: struts-site
Updated Branches:
  refs/heads/master b93572c86 -> 9c807f143


updated using-tags page


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

Branch: refs/heads/master
Commit: 9c807f143cbcdf64a99a067759a59e028b4ec13f
Parents: b93572c
Author: Stefaan Dutry 
Authored: Sun Apr 23 14:50:37 2017 +0200
Committer: Stefaan Dutry 
Committed: Sun Apr 23 14:50:37 2017 +0200

--
 source/getting-started/using-tags.md | 95 ++-
 1 file changed, 43 insertions(+), 52 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts-site/blob/9c807f14/source/getting-started/using-tags.md
--
diff --git a/source/getting-started/using-tags.md 
b/source/getting-started/using-tags.md
index 1723017..19c6710 100644
--- a/source/getting-started/using-tags.md
+++ b/source/getting-started/using-tags.md
@@ -6,30 +6,30 @@ title: Using tags
 
 This tutorial assumes you've completed the [Hello 
World](hello-world-using-struts2.html) tutorial and have a working helloworld 
project. The example code for this tutorial, using_tags, is available for 
checkout from the Struts 2 GitHub repository at 
[https://github.com/apache/struts-examples](https://github.com/apache/struts-examples).
 The example projects use Maven to manage the artifact dependencies and to 
build the .war files.
 
-In the [Hello World](hello-world-using-struts2.html) lesson, we added to the 
index.jsp a Struts 2 url tag to create a hyperlink to the hello.action. This 
tutorial will explore the url and other Struts 2 tags further.
+In the [Hello World](hello-world-using-struts2.html) lesson, we added a Struts 
2 url tag to the `index.jsp` to create a hyperlink to the `hello.action`. This 
tutorial will explore the url and other Struts 2 tags further.
 
 Web applications differ from conventional websites in that web applications 
can create a dynamic response. To make it easier to reference dynamic data from 
a page, the Struts 2 framework offers a set of tags. Some of the tags mimic 
standard HTML tag while providing added value. Other tags create non-standard, 
but useful controls.
 
 To use the Struts 2 tags on the view page, you must include a tag library 
directive. Typically, the taglib directive is `<%@ taglib prefix="s" 
uri="/struts-tags" %\>`. So the prefix for all the Struts 2 tags will be "s". 
-If you want to actually read the Struts 2 tag TLD file, you'll find it in the 
META-INF folder of the Struts 2 core jar.
+If you want to actually read the Struts 2 tag TLD file, you'll find it in the 
`META-INF folder of the Struts 2 core jar.
 
-__Struts 2 url Tag__
+### Struts 2 url Tag
 
 One use of the Struts 2 Tags is to create links to other web resources, 
especially to other resources in the local application.
 
 While HTML provides a simple a tag for creating hyperlinks, the HTML tag often 
requires us to include redundant information. Also the HTML tag cannot easily 
access dynamic data provided by the framework.
 
-A very common use case in web applications is linking to other pages. In the 
[Hello World](hello-world-using-struts2.html) tutorial we added to index.jsp a 
link to the hello.action using the Struts 2 url tag. Please refer to the _url 
documentation_  for more information about the url tag.
+A very common use case in web applications is linking to other pages. In the 
[Hello World](hello-world-using-struts2.html) tutorial we added a link to 
`hello.action` inside the `index.jsp` using the Struts 2 url tag. Please refer 
to the [url documentation](https://struts.apache.org/docs/url.html) for more 
information about the url tag.
 
 **index.jsp**
 
 ```html
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1" 
pageEncoding="ISO-8859-1"%>
+
+<%@ page language="java" contentType="text/html; charset=UTF-8" 
pageEncoding="UTF-8" %>
 <%@ taglib prefix="s" uri="/struts-tags" %>
-http://www.w3.org/TR/html4/loose.dtd";>
 
   
-
+
 Basic Struts 2 Application - Welcome
   
   
@@ -39,94 +39,89 @@ A very common use case in web applications is linking to 
other pages. In the [He
 
 ```
 
-When you run the Hello World tutorial in your Servlet container and then mouse 
over the Hello World hyperlink created by the Struts 2 url tag you'll see that 
the URL created is hello.action (relative to the web context's root folder).
+When you run the Hello World tutorial in your Servlet container and then mouse 
over the Hello World hyperlink created by the Struts 2 url tag you'll see that 
the URL created is `hello.action` (relative to the web context's root folder).
 
-Ex

struts-site git commit: removed no longer used attachments

[sdutry]

Repository: struts-site
Updated Branches:
  refs/heads/master 9c807f143 -> 565b2489a


removed no longer used attachments


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

Branch: refs/heads/master
Commit: 565b2489ad843c0e09beedf05cc371140b3bc6ea
Parents: 9c807f1
Author: Stefaan Dutry 
Authored: Sun Apr 23 14:58:57 2017 +0200
Committer: Stefaan Dutry 
Committed: Sun Apr 23 14:58:57 2017 +0200

--
 .../att14974995_displaymessagestore.png| Bin 19502 -> 0 bytes
 .../attachments/att14974996_Struts Form.png| Bin 30091 -> 0 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts-site/blob/565b2489/source/getting-started/attachments/att14974995_displaymessagestore.png
--
diff --git 
a/source/getting-started/attachments/att14974995_displaymessagestore.png 
b/source/getting-started/attachments/att14974995_displaymessagestore.png
deleted file mode 100644
index c1f3064..000
Binary files 
a/source/getting-started/attachments/att14974995_displaymessagestore.png and 
/dev/null differ

http://git-wip-us.apache.org/repos/asf/struts-site/blob/565b2489/source/getting-started/attachments/att14974996_Struts
 Form.png
--
diff --git a/source/getting-started/attachments/att14974996_Struts Form.png 
b/source/getting-started/attachments/att14974996_Struts Form.png
deleted file mode 100644
index 8aad998..000
Binary files a/source/getting-started/attachments/att14974996_Struts Form.png 
and /dev/null differ

struts-site git commit: added new attachments

[sdutry]

Repository: struts-site
Updated Branches:
  refs/heads/master 565b2489a -> 5b8747929


added new attachments


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

Branch: refs/heads/master
Commit: 5b8747929bff2b3f57d0b20b038faf64d4e4ba87
Parents: 565b248
Author: Stefaan Dutry 
Authored: Sun Apr 23 15:12:18 2017 +0200
Committer: Stefaan Dutry 
Committed: Sun Apr 23 15:12:18 2017 +0200

--
 .../attachments/using_tags_form.png| Bin 0 -> 15576 bytes
 .../attachments/using_tags_hello.png   | Bin 0 -> 9965 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts-site/blob/5b874792/source/getting-started/attachments/using_tags_form.png
--
diff --git a/source/getting-started/attachments/using_tags_form.png 
b/source/getting-started/attachments/using_tags_form.png
new file mode 100644
index 000..5f2efd4
Binary files /dev/null and 
b/source/getting-started/attachments/using_tags_form.png differ

http://git-wip-us.apache.org/repos/asf/struts-site/blob/5b874792/source/getting-started/attachments/using_tags_hello.png
--
diff --git a/source/getting-started/attachments/using_tags_hello.png 
b/source/getting-started/attachments/using_tags_hello.png
new file mode 100644
index 000..6a44a3f
Binary files /dev/null and 
b/source/getting-started/attachments/using_tags_hello.png differ

[1/2] struts-examples git commit: removed unnecessary setter

[sdutry]

Repository: struts-examples
Updated Branches:
  refs/heads/master dae06d15a -> 6711d4381


removed unnecessary setter


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

Branch: refs/heads/master
Commit: 784b33986629d67ed094d23fd8c70141bb792bc0
Parents: dae06d1
Author: Stefaan Dutry 
Authored: Sun Apr 23 15:23:21 2017 +0200
Committer: Stefaan Dutry 
Committed: Sun Apr 23 15:23:21 2017 +0200

--
 .../struts/using_tags/helloworld/action/HelloWorldAction.java| 4 
 1 file changed, 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts-examples/blob/784b3398/using-tags/src/main/java/org/apache/struts/using_tags/helloworld/action/HelloWorldAction.java
--
diff --git 
a/using-tags/src/main/java/org/apache/struts/using_tags/helloworld/action/HelloWorldAction.java
 
b/using-tags/src/main/java/org/apache/struts/using_tags/helloworld/action/HelloWorldAction.java
index 835dc56..6111deb 100644
--- 
a/using-tags/src/main/java/org/apache/struts/using_tags/helloworld/action/HelloWorldAction.java
+++ 
b/using-tags/src/main/java/org/apache/struts/using_tags/helloworld/action/HelloWorldAction.java
@@ -28,10 +28,6 @@ public class HelloWorldAction extends ActionSupport {
 return helloCount;
 }
 
-public void setHelloCount(int helloCount) {
-HelloWorldAction.helloCount = helloCount;
-}
-
 /*
  * Creates the MessageStore model object, 
  * increase helloCount by 1 and 

[2/2] struts-examples git commit: removed sessionid from urls

[sdutry]

removed sessionid from urls


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

Branch: refs/heads/master
Commit: 6711d43812179b4479e02f22ef7a91f67e042e8d
Parents: 784b339
Author: Stefaan Dutry 
Authored: Sun Apr 23 15:32:39 2017 +0200
Committer: Stefaan Dutry 
Committed: Sun Apr 23 15:32:39 2017 +0200

--
 using-tags/src/main/webapp/WEB-INF/web.xml | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/struts-examples/blob/6711d438/using-tags/src/main/webapp/WEB-INF/web.xml
--
diff --git a/using-tags/src/main/webapp/WEB-INF/web.xml 
b/using-tags/src/main/webapp/WEB-INF/web.xml
index 57c9b48..a7752df 100644
--- a/using-tags/src/main/webapp/WEB-INF/web.xml
+++ b/using-tags/src/main/webapp/WEB-INF/web.xml
@@ -15,5 +15,9 @@
 struts2
 /*
 
+
+
+COOKIE
+
 
 

struts-examples git commit: updated log4j2 to version 2.8.2 (WW-4780)

[sdutry]

Repository: struts-examples
Updated Branches:
  refs/heads/master 6711d4381 -> 51a2f1874


updated log4j2 to version 2.8.2 (WW-4780)


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

Branch: refs/heads/master
Commit: 51a2f18740c496424c5456bec417958d86fefe7f
Parents: 6711d43
Author: Stefaan Dutry 
Authored: Sun Apr 23 15:38:32 2017 +0200
Committer: Stefaan Dutry 
Committed: Sun Apr 23 15:38:32 2017 +0200

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/struts-examples/blob/51a2f187/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 1e40f3d..16778d5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,7 +41,7 @@
 
 UTF-8
 2.5.11-SNAPSHOT
-2.8
+2.8.2
 
 
 

svn commit: r1010979 [1/2] - in /websites/production/struts/content: docs/ getting-started/ getting-started/attachments/

[lukaszlenart]

Author: lukaszlenart
Date: Sun Apr 23 18:10:14 2017
New Revision: 1010979

Log:
Updates production

Added:

websites/production/struts/content/getting-started/attachments/using_tags_form.png
   (with props)

websites/production/struts/content/getting-started/attachments/using_tags_hello.png
   (with props)
Modified:
websites/production/struts/content/docs/actionmapper.html
websites/production/struts/content/docs/ajax-head-template.html
websites/production/struts/content/docs/div.html
websites/production/struts/content/docs/file-upload.html
websites/production/struts/content/docs/freemarker.html
websites/production/struts/content/docs/interceptors.html
websites/production/struts/content/docs/localization.html
websites/production/struts/content/docs/plugin-developers-guide.html
websites/production/struts/content/docs/plugins.html
websites/production/struts/content/docs/s2-041.html
websites/production/struts/content/docs/sitegraph-plugin.html
websites/production/struts/content/docs/struts-23-to-25-migration.html
websites/production/struts/content/docs/struts-defaultxml.html
websites/production/struts/content/docs/struts-next.html
websites/production/struts/content/docs/tiles-plugin.html
websites/production/struts/content/docs/tree.html
websites/production/struts/content/docs/type-conversion.html
websites/production/struts/content/docs/typeconversion-annotation.html
websites/production/struts/content/docs/validation.html
websites/production/struts/content/docs/velocity-result.html
websites/production/struts/content/getting-started/using-tags.html

Modified: websites/production/struts/content/docs/actionmapper.html
==
--- websites/production/struts/content/docs/actionmapper.html (original)
+++ websites/production/struts/content/docs/actionmapper.html Sun Apr 23 
18:10:14 2017
@@ -140,11 +140,11 @@ under the License.
 
 
 /**/
+/*]]>*/
 DescriptionDefaultActionMapper
 Method prefixAction prefixAllowed action name 
RegExAllowed method name 
RegEx
 Custom 
ActionMapperCompositeActionMapperPrefixBasedActionMapperActionMapper and 
ActionMapping objects

Modified: websites/production/struts/content/docs/ajax-head-template.html
==
--- websites/production/struts/content/docs/ajax-head-template.html (original)
+++ websites/production/struts/content/docs/ajax-head-template.html Sun Apr 23 
18:10:14 2017
@@ -140,13 +140,13 @@ under the License.
 
 
 The ajax head template builds upon the xhtml head template by providing additional 
JavaScript includes for the http://dojotoolkit.org"; rel="nofollow">Dojo Toolkit, which is used by 
the ajax a template, ajax div template , and the ajax tabbedPanel 
template. It is required to use this tag, , in your HTML  block if you 
wish to use AJAX feature. The contents of head.ftl are:
-An error occurred: Unable to retrieve the URL: 
https://git-wip-us.apache.org/repos/asf?p=struts.git;a=blob_plain;hb=HEAD;f=plugins/dojo/src/main/resources/template/ajax/head.ftl
 status code: 404. The error has been recorded.
+Error formatting macro: snippet: 
java.lang.IndexOutOfBoundsException: Index: 20, Size: 20 
 
 
 If you are having trouble getting the AJAX theme to work, you should 
include the above JavaScript in your page manually, changing "isDebug: false" 
to "isDebug: true".  This will log out debugging information directly to the 
screen.
 
 Note that Dojo is configured to use the same character encoding specified 
in struts.properties, 
typically UTF-8. For a simple example of how to use the head tag with the AJAX theme, simply do the following in 
your HTML:
-An error occurred: Unable to retrieve the URL: 
https://git-wip-us.apache.org/repos/asf?p=struts.git;a=blob_plain;hb=HEAD;f=apps/showcase/src/main/webapp/ajax/commonInclude.jsp
 status code: 404. The error has been recorded.
+Error formatting macro: snippet: 
java.lang.IndexOutOfBoundsException: Index: 20, Size: 20 
 
 
 The above sample is from Struts trunk; for 2.0.6 you should use 
.

Modified: websites/production/struts/content/docs/div.html
==
--- websites/production/struts/content/docs/div.html (original)
+++ websites/production/struts/content/docs/div.html Sun Apr 23 18:10:14 2017
@@ -141,7 +141,7 @@ under the License.
 
 Description
 
-An err

svn commit: r1010979 [2/2] - in /websites/production/struts/content: docs/ getting-started/ getting-started/attachments/

[lukaszlenart]

Modified: websites/production/struts/content/docs/tree.html
==
--- websites/production/struts/content/docs/tree.html (original)
+++ websites/production/struts/content/docs/tree.html Sun Apr 23 18:10:14 2017
@@ -148,18 +148,18 @@ under the License.
 For more examples see Ajax and JavaScript 
Recipes
 
 Description
-An error occurred: Unable to retrieve the URL: 
https://git-wip-us.apache.org/repos/asf?p=struts.git;a=blob_plain;hb=HEAD;f=plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Tree.java
 status code: 404. The error has been recorded.
+Error formatting macro: snippet: 
java.lang.IndexOutOfBoundsException: Index: 20, Size: 20 
 
 Parameters
 Dynamic Attributes 
Allowed: false NameRequiredDefaultEvaluatedTypeDescriptionaccesskeyfalsefalseStringSet 
 the html accesskey attribute on rendered html elementblankIconSrcfalsefalseStringBlank icon image source.childCollectionPropertyfalsefalseStringThe childCollectionProperty property.collapsedNotifyTopics<
 /td>falsefalseStringComma separated lis of topics to be published when a node is 
collapsed. An object with a 'node' property will be passed as parameter to the 
topics.cssClassfalsefalseStringThe css class to use for elementcssErrorClassfalsefalseStringThe css error class to use for elementcssErrorStylefalsefalseStringThe css error style definitions for element to 
usecssStylefalsefalseStringThe css style to use for elementdisabledfalsefalseStringSet the html disabled attribute on rendered html 
elementerrorNotifyTopicsfalsefalseStringComma delimmited list of topics that will published after the 
request(if the request fails).Only valid if 'href' is seterrorPositionfalsefalseStringDefine error position of form element 
(top|bottom)expandIconSrcMinusfalsefalseStringExpand icon  image source.expandIconSrcPlusfalsefalseStringExpand Icon  
image source.expandedNotifyTopicsfalsefalseString<
 /td>Comma separated lis 
of topics to be published when a node is expanded. An object with a 'node' 
property will be passed as parameter to the topics.gridIconSrcCfalsefalseStringImage source for under child item child icons.gridIconSrcLfalsefalseString Image source for last child 
grid.gridIconSrcPfalsefalseStringImage source for under parent item child icons.gridIconSrcVfalsefalseStringImage source for vertical line.
 gridIconSrcXfalsefalseStringImage source for grid for sole root item.gridIconSrcYfalsefalseStringImage source for grid for last root item.hreffalse<
 td align="left" colspan="1" rowspan="1" valign="top">falseStringUrl used to load the list of children 
nodes for an specific node, whose id will be passed as a parameter named 
'nodeId' (empty for root)iconHeightfalse18pxfalseStringIcon heighticonWidthfalse19pxfalseStringIcon widthidfalsefalseStringThe id to use for the elementjavascriptTooltipfalsefalsefalseBooleanUse JavaScript to generate tooltipskeyfalsefalseStringSet the key (name, value, label) for this particular 
componentlabelfalsefalseStringLabel expression used for rendering an element specific 
labellabelSeparatorfalse:falseStringString that will be appended to the labellabelpositionfalsefalseStringDefine label position of form element (top/left)namefalsefalsevalign="top">Stringvalign="top">The name to set for elementcolspan="1" rowspan="1" valign="top">nodeIdPropertycolspan="1" rowspan="1" valign="top">falserowspan="1" valign="top">valign="top">falsevalign="top">Stringvalign="top">The nodeIdProperty property.colspan="1" rowspan="1" valign="top">nodeTitlePropertycolspan="1" rowspan="1" valign="top">falserowspan="1" valign="top">valign="top">falsevalign="top">Stringvalign="top">The nodeTitleProperty p
 roperty.onblurfalsefalseString 
Set the html onblur attribute on rendered html elementonchangefalsefalseStringSet the html onchange attribute on rendered html 
elementonclickfalsefalseStringSet the html onclick attribute on rendered html 
elementondblclickfalsefalseStringSet the html ondblclick attribute on rendered html 
elementonfocusfalsefalseStringSet the html onfocus attribute on rendered html 
elementonkeydownfalsefalseStringSet the html onkeydown attribute on rendered html 
elementonkeypressfalsefalseSt
 ringSet the html 
onkeypress attribute on rendered html elementonkeyupfalsefalseStringSet the html onkeyup attribute on rendered html 
elementonmousedownfalsefalseStringSet the html onmousedown attribute on rendere
 d html elementonmousemovefalsefalseStringSet the html onmousemove attribute on rendered html 
elementonmouseoutfalsefalseStringSet the html onmouseout attribute on rendered html 
elementonmouseoverfalsefalseStringSet the html onmouseover attribute on rendered html 
elementonmouseupfalsefalseStringSet the html onmouseup attribute on rendered html 
elementonselectfalsefalseStringSet the html onselect attribute on rendered html 
elementopenTemplatefalsefalseStringSet template to use for opening the rendered 
html.requiredLabelfalsefalsefalseBoolea

svn commit: r1010983 - in /websites/production/struts/content/getting-started/attachments: att14974995_displaymessagestore.png att14974996_Struts Form.png

[lukaszlenart]

Author: lukaszlenart
Date: Sun Apr 23 18:15:20 2017
New Revision: 1010983

Log:
Updates production

Removed:

websites/production/struts/content/getting-started/attachments/att14974995_displaymessagestore.png

websites/production/struts/content/getting-started/attachments/att14974996_Struts
 Form.png

[8/8] struts-examples git commit: changed deprecated artifactId to project.artifactId

[sdutry]

changed deprecated artifactId to project.artifactId


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

Branch: refs/heads/master
Commit: 15c545e0d197c7650888f3117ab853bfed7bd4fe
Parents: df82ce5
Author: Stefaan Dutry 
Authored: Sun Apr 23 23:47:53 2017 +0200
Committer: Stefaan Dutry 
Committed: Sun Apr 23 23:47:53 2017 +0200

--
 coding-actions/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/struts-examples/blob/15c545e0/coding-actions/pom.xml
--
diff --git a/coding-actions/pom.xml b/coding-actions/pom.xml
index 098ce98..c7e027f 100644
--- a/coding-actions/pom.xml
+++ b/coding-actions/pom.xml
@@ -25,7 +25,7 @@
 8.1.16.v20140903
 
 
-/${artifactId}
+/${project.artifactId}
 
 CTRL+C
 8999

[6/8] struts-examples git commit: added indentation to jsp files

[sdutry]

added indentation to jsp files


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

Branch: refs/heads/master
Commit: 65ebbae1e592d3454244dca2df62460a1f266640
Parents: b3715b9
Author: Stefaan Dutry 
Authored: Sun Apr 23 18:12:25 2017 +0200
Committer: Stefaan Dutry 
Committed: Sun Apr 23 18:12:25 2017 +0200

--
 coding-actions/src/main/webapp/HelloWorld.jsp | 20 +---
 coding-actions/src/main/webapp/index.jsp  | 38 ++
 2 files changed, 25 insertions(+), 33 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts-examples/blob/65ebbae1/coding-actions/src/main/webapp/HelloWorld.jsp
--
diff --git a/coding-actions/src/main/webapp/HelloWorld.jsp 
b/coding-actions/src/main/webapp/HelloWorld.jsp
index 4e19ac9..b15b53c 100644
--- a/coding-actions/src/main/webapp/HelloWorld.jsp
+++ b/coding-actions/src/main/webapp/HelloWorld.jsp
@@ -2,19 +2,15 @@
 <%@ taglib prefix="s" uri="/struts-tags" %>
 <%@ page language="java" contentType="text/html; charset=UTF-8" 
pageEncoding="UTF-8" %>
 
-
+  
 
 Hello World!
-
-
-
-
-
-I've said hello  times!
-
-
-
-Home Page
-
+  
 
+  
+
+I've said hello  times!
+
+Home Page
+  
 

http://git-wip-us.apache.org/repos/asf/struts-examples/blob/65ebbae1/coding-actions/src/main/webapp/index.jsp
--
diff --git a/coding-actions/src/main/webapp/index.jsp 
b/coding-actions/src/main/webapp/index.jsp
index f96ec7f..bc167d4 100644
--- a/coding-actions/src/main/webapp/index.jsp
+++ b/coding-actions/src/main/webapp/index.jsp
@@ -2,29 +2,25 @@
 <%@ taglib prefix="s" uri="/struts-tags" %>
 <%@ page language="java" contentType="text/html; charset=UTF-8" 
pageEncoding="UTF-8" %>
 
-
+  
 
 Basic Struts 2 Application - Welcome
-
+  
 
-
-Welcome To Struts 2!
-
-
-Hello World
-
-
-Bruce Phillips
-
-Hello Bruce Phillips
-
-Get your own personal hello by filling out and submitting this form.
-
-
-
-
-
-
-
+  
+Welcome To Struts 2!
+
+  Hello World
+
+
+  Bruce Phillips
+
+Hello Bruce Phillips
 
+Get your own personal hello by filling out and submitting this form.
+
+  
+  
+
+  
 

[7/8] struts-examples git commit: removed sessionid from url

[sdutry]

removed sessionid from url


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

Branch: refs/heads/master
Commit: df82ce5ae11af3641f5d05e0193fc50cdc9453f7
Parents: 65ebbae
Author: Stefaan Dutry 
Authored: Sun Apr 23 23:07:24 2017 +0200
Committer: Stefaan Dutry 
Committed: Sun Apr 23 23:07:24 2017 +0200

--
 coding-actions/src/main/webapp/WEB-INF/web.xml | 12 +++-
 1 file changed, 7 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts-examples/blob/df82ce5a/coding-actions/src/main/webapp/WEB-INF/web.xml
--
diff --git a/coding-actions/src/main/webapp/WEB-INF/web.xml 
b/coding-actions/src/main/webapp/WEB-INF/web.xml
index 4241d94..c698d2b 100644
--- a/coding-actions/src/main/webapp/WEB-INF/web.xml
+++ b/coding-actions/src/main/webapp/WEB-INF/web.xml
@@ -1,10 +1,9 @@
 
 http://java.sun.com/xml/ns/j2ee"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee 
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd";>
 Coding Actions
-  
-index.jsp
-  
-  
+
+index.jsp
+
 
 
 struts2
@@ -15,5 +14,8 @@
 struts2
 /*
 
-
+
+
+COOKIE
+
 

[5/8] struts-examples git commit: unified indentation

[sdutry]

unified indentation


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

Branch: refs/heads/master
Commit: b3715b9dda5511311bf928b916397ac87b624c37
Parents: 8e09299
Author: Stefaan Dutry 
Authored: Sun Apr 23 18:07:06 2017 +0200
Committer: Stefaan Dutry 
Committed: Sun Apr 23 18:07:06 2017 +0200

--
 coding-actions/src/main/resources/struts.xml | 34 ++-
 1 file changed, 15 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts-examples/blob/b3715b9d/coding-actions/src/main/resources/struts.xml
--
diff --git a/coding-actions/src/main/resources/struts.xml 
b/coding-actions/src/main/resources/struts.xml
index fb4c41f..567e274 100644
--- a/coding-actions/src/main/resources/struts.xml
+++ b/coding-actions/src/main/resources/struts.xml
@@ -1,26 +1,22 @@
 
 http://struts.apache.org/dtds/struts-2.5.dtd";>
+"-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
+"http://struts.apache.org/dtds/struts-2.5.dtd";>
 
+
 
-   
-
-   
-
+
 
 
-   
-   /index.jsp
-   
-   
-   
-   
-   /HelloWorld.jsp
-   
-
-   
-
-
\ No newline at end of file
+
+/index.jsp
+
+
+
+
+/HelloWorld.jsp
+
+
+

[4/8] struts-examples git commit: removed unnecessary setter

[sdutry]

removed unnecessary setter


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

Branch: refs/heads/master
Commit: 8e09299f253e946eac0c86aec2139b754cc2a9cc
Parents: 60035c0
Author: Stefaan Dutry 
Authored: Sun Apr 23 18:01:30 2017 +0200
Committer: Stefaan Dutry 
Committed: Sun Apr 23 18:01:30 2017 +0200

--
 .../org/apache/struts/helloworld/action/HelloWorldAction.java| 4 
 1 file changed, 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts-examples/blob/8e09299f/coding-actions/src/main/java/org/apache/struts/helloworld/action/HelloWorldAction.java
--
diff --git 
a/coding-actions/src/main/java/org/apache/struts/helloworld/action/HelloWorldAction.java
 
b/coding-actions/src/main/java/org/apache/struts/helloworld/action/HelloWorldAction.java
index c847cec..ffcf6e2 100644
--- 
a/coding-actions/src/main/java/org/apache/struts/helloworld/action/HelloWorldAction.java
+++ 
b/coding-actions/src/main/java/org/apache/struts/helloworld/action/HelloWorldAction.java
@@ -63,8 +63,4 @@ public class HelloWorldAction extends ActionSupport {
 return messageStore;
 }
 
-public void setMessageStore(MessageStore messageStore) {
-this.messageStore = messageStore;
-}
-
 }

[3/8] struts-examples git commit: fixed comment

[sdutry]

fixed comment


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

Branch: refs/heads/master
Commit: 60035c0a3089d0c243329120e10a47abddd90d87
Parents: c98d0fc
Author: Stefaan Dutry 
Authored: Sun Apr 23 17:59:32 2017 +0200
Committer: Stefaan Dutry 
Committed: Sun Apr 23 17:59:32 2017 +0200

--
 .../java/org/apache/struts/helloworld/action/HelloWorldAction.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/struts-examples/blob/60035c0a/coding-actions/src/main/java/org/apache/struts/helloworld/action/HelloWorldAction.java
--
diff --git 
a/coding-actions/src/main/java/org/apache/struts/helloworld/action/HelloWorldAction.java
 
b/coding-actions/src/main/java/org/apache/struts/helloworld/action/HelloWorldAction.java
index 71eea4b..c847cec 100644
--- 
a/coding-actions/src/main/java/org/apache/struts/helloworld/action/HelloWorldAction.java
+++ 
b/coding-actions/src/main/java/org/apache/struts/helloworld/action/HelloWorldAction.java
@@ -6,7 +6,7 @@ import org.apache.struts.helloworld.model.MessageStore;
 /**
  * Acts as a Struts 2 controller that responds
  * to a user action by setting the value
- * of the Message model class, and returns a String 
+ * of the MessageStore model class, and returns a String 
  * result.
  * @author Bruce Phillips
  *

[2/8] struts-examples git commit: removed unnecessary setter

[sdutry]

removed unnecessary setter


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

Branch: refs/heads/master
Commit: c98d0fc383a3320ea0f658bcb023787fc64dfc19
Parents: 7f6f7c8
Author: Stefaan Dutry 
Authored: Sun Apr 23 17:57:55 2017 +0200
Committer: Stefaan Dutry 
Committed: Sun Apr 23 17:57:55 2017 +0200

--
 .../org/apache/struts/helloworld/action/HelloWorldAction.java| 4 
 1 file changed, 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts-examples/blob/c98d0fc3/coding-actions/src/main/java/org/apache/struts/helloworld/action/HelloWorldAction.java
--
diff --git 
a/coding-actions/src/main/java/org/apache/struts/helloworld/action/HelloWorldAction.java
 
b/coding-actions/src/main/java/org/apache/struts/helloworld/action/HelloWorldAction.java
index 95b7408..71eea4b 100644
--- 
a/coding-actions/src/main/java/org/apache/struts/helloworld/action/HelloWorldAction.java
+++ 
b/coding-actions/src/main/java/org/apache/struts/helloworld/action/HelloWorldAction.java
@@ -27,10 +27,6 @@ public class HelloWorldAction extends ActionSupport {
 return helloCount;
 }
 
-public void setHelloCount(int helloCount) {
-HelloWorldAction.helloCount = helloCount;
-}
-
 private String userName;
 
 public String getUserName() {

[1/8] struts-examples git commit: changed indentation in java files

[sdutry]

Repository: struts-examples
Updated Branches:
  refs/heads/master 51a2f1874 -> 15c545e0d


changed indentation in java files


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

Branch: refs/heads/master
Commit: 7f6f7c8c3ab05704c87a96e863124c42a47263f6
Parents: 51a2f18
Author: Stefaan Dutry 
Authored: Sun Apr 23 17:52:51 2017 +0200
Committer: Stefaan Dutry 
Committed: Sun Apr 23 17:52:51 2017 +0200

--
 .../helloworld/action/HelloWorldAction.java | 107 +--
 .../struts/helloworld/model/MessageStore.java   |  35 +++---
 2 files changed, 67 insertions(+), 75 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts-examples/blob/7f6f7c8c/coding-actions/src/main/java/org/apache/struts/helloworld/action/HelloWorldAction.java
--
diff --git 
a/coding-actions/src/main/java/org/apache/struts/helloworld/action/HelloWorldAction.java
 
b/coding-actions/src/main/java/org/apache/struts/helloworld/action/HelloWorldAction.java
index 1285010..95b7408 100644
--- 
a/coding-actions/src/main/java/org/apache/struts/helloworld/action/HelloWorldAction.java
+++ 
b/coding-actions/src/main/java/org/apache/struts/helloworld/action/HelloWorldAction.java
@@ -13,67 +13,62 @@ import org.apache.struts.helloworld.model.MessageStore;
  */
 public class HelloWorldAction extends ActionSupport {
 
-   private static final long serialVersionUID = 1L;
-   
-   /**
-* The model class that stores the message
-* to display in the view.
-*/
-   private MessageStore messageStore;
-   
-   private static int helloCount = 0;
-   
-   public int getHelloCount() {
-   return helloCount;
-   }
+private static final long serialVersionUID = 1L;
+
+/**
+ * The model class that stores the message
+ * to display in the view.
+ */
+private MessageStore messageStore;
+
+private static int helloCount = 0;
+
+public int getHelloCount() {
+return helloCount;
+}
 
-   public void setHelloCount(int helloCount) {
-   HelloWorldAction.helloCount = helloCount;
-   }
-   
-   private String userName;
+public void setHelloCount(int helloCount) {
+HelloWorldAction.helloCount = helloCount;
+}
+
+private String userName;
 
-   public String getUserName() {
-   return userName;
-   }
+public String getUserName() {
+return userName;
+}
 
-   public void setUserName(String userName) {
-   this.userName = userName;
-   }
+public void setUserName(String userName) {
+this.userName = userName;
+}
 
-   /*
-* Creates the MessageStore model object, 
-* increase helloCount by 1 and 
-* returns success.  The MessageStore model
-* object will be available to the view.
-* (non-Javadoc)
-* @see com.opensymphony.xwork2.ActionSupport#execute()
-*/
-   public String execute() throws Exception {
-   
-   messageStore = new MessageStore() ;
-   
-   //Action included a query string parameter of userName
-   //or a form field with name of userName
-   if (userName != null) {
-   
-   messageStore.setMessage( messageStore.getMessage() + " 
" + userName);
-   
-   }
-   
-   helloCount++;
-   
-   return SUCCESS;
-   }
+/*
+ * Creates the MessageStore model object, 
+ * increase helloCount by 1 and 
+ * returns success.  The MessageStore model
+ * object will be available to the view.
+ * (non-Javadoc)
+ * @see com.opensymphony.xwork2.ActionSupport#execute()
+ */
+public String execute() throws Exception {
+messageStore = new MessageStore() ;
+
+//Action included a query string parameter of userName
+//or a form field with name of userName
+if (userName != null) {
+messageStore.setMessage( messageStore.getMessage() + " " + 
userName);
+}
+
+helloCount++;
+
+return SUCCESS;
+}
 
-   public MessageStore getMessageStore() {
-   return messageStore;
-   }
+public MessageStore getMessageStore() {
+return messageStore;
+}
 
-   public void setMessageStore(MessageStore messageStore) {
-   this.messageStore = messageStore;
-   }
-   
-   
+