[struts-site] branch asf-site updated: Updates production by Jenkins

[git-site-role]

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 38b429c  Updates production by Jenkins
38b429c is described below

commit 38b429c2e617ca7509b9c8d2b9491ae1ba7d0d14
Author: jenkins 
AuthorDate: Thu Nov 30 06:11:36 2017 +

Updates production by Jenkins
---
 content/getting-started/control-tags.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/getting-started/control-tags.html 
b/content/getting-started/control-tags.html
index 4ba91ae..33bba9c 100644
--- a/content/getting-started/control-tags.html
+++ b/content/getting-started/control-tags.html
@@ -175,7 +175,7 @@
 
 
 
-The purpose of the above markup is to use either “Car model” or “Car 
models” depending on how many car models the user selected on the edit page. So 
the value for the test attribute of this iterator tag gets the length of the 
carModels String array and compares that to 1. If it’s greater then 1, the 
correct grammar is “Car models” else the correct grammar is “Car model”.
+The purpose of the above markup is to use either “Car model” or “Car 
models” depending on how many car models the user selected on the edit page. So 
the value for the test attribute of this iterator tag gets the length of the 
carModels String array and compares that to 1. If it’s greater than 1, the 
correct grammar is “Car models” else the correct grammar is “Car model”.
 
 Struts iterator Tag
 

-- 
To stop receiving notification emails like this one, please contact
['"commits@struts.apache.org" '].

[struts-site] 01/01: Merge pull request #43 from fanofxiaofeng/patch-10

[lukaszlenart]

This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/struts-site.git

commit d95404942b178878c106d1f04291bcda2cf8c515
Merge: acb9079 64a4aad
Author: Lukasz Lenart 
AuthorDate: Thu Nov 30 07:10:56 2017 +0100

Merge pull request #43 from fanofxiaofeng/patch-10

Replace "then" with "than"

 source/getting-started/control-tags.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
To stop receiving notification emails like this one, please contact
"commits@struts.apache.org" .

[struts-site] branch master updated (acb9079 -> d954049)

[lukaszlenart]

This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/struts-site.git.


from acb9079  Updates info about using Jackson handler
 add 64a4aad  Replace "then" with "than"
 new d954049  Merge pull request #43 from fanofxiaofeng/patch-10

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 source/getting-started/control-tags.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
To stop receiving notification emails like this one, please contact
['"commits@struts.apache.org" '].

[struts-examples] 01/01: Merge pull request #22 from fanofxiaofeng/patch-2

[lukaszlenart]

This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/struts-examples.git

commit 41bfd82646d95209301383817286d8dc7bd9835f
Merge: 20ac206 1575ac5
Author: Lukasz Lenart 
AuthorDate: Wed Nov 29 12:56:09 2017 +0100

Merge pull request #22 from fanofxiaofeng/patch-2

The two links in comment seem to be unavailable

 interceptors/src/main/resources/struts.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
"commits@struts.apache.org" .

[struts-examples] branch master updated (20ac206 -> 41bfd82)

[lukaszlenart]

This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/struts-examples.git.


from 20ac206  Merge pull request #21 from fanofxiaofeng/patch-1
 add 1575ac5  The two links in comment seem to be unavailable
 new 41bfd82  Merge pull request #22 from fanofxiaofeng/patch-2

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 interceptors/src/main/resources/struts.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
['"commits@struts.apache.org" '].

[struts] branch support-2-3 updated: Uses Java 6 in the pom

[lukaszlenart]

This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a commit to branch support-2-3
in repository https://gitbox.apache.org/repos/asf/struts.git


The following commit(s) were added to refs/heads/support-2-3 by this push:
 new 75d7bf4  Uses Java 6 in the pom
75d7bf4 is described below

commit 75d7bf481cb032641a0b602aa4032dc788f86132
Author: Lukasz Lenart 
AuthorDate: Wed Nov 29 11:22:48 2017 +0100

Uses Java 6 in the pom
---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3de13c5..ccce626 100644
--- a/pom.xml
+++ b/pom.xml
@@ -166,8 +166,8 @@
 
 maven-compiler-plugin
 
-1.5
-1.5
+1.6
+1.6
 
 
 

-- 
To stop receiving notification emails like this one, please contact
['"commits@struts.apache.org" '].

[struts-site] branch asf-site updated: Updates production by Jenkins

[git-site-role]

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 22846ee  Updates production by Jenkins
22846ee is described below

commit 22846eec50cd82c7e35095cd39d8fbe7638d0b9c
Author: jenkins 
AuthorDate: Wed Nov 29 08:11:09 2017 +

Updates production by Jenkins
---
 content/plugins/rest/index.html | 17 ++---
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/content/plugins/rest/index.html b/content/plugins/rest/index.html
index 7d6d2ab..6ce42fd 100644
--- a/content/plugins/rest/index.html
+++ b/content/plugins/rest/index.html
@@ -510,14 +510,20 @@ http://my.company.com/myapp/movies/superman.json
 First you need to add the jackson dependency to your web application by 
downloading the jar file and put it under WEB-INF/lib or by adding following 
xml snippet to your dependencies section in the pom.xml when you are using 
maven as build system.
 
 dependency
-groupIdorg.codehaus.jackson/groupId
-artifactIdjackson-jaxrs/artifactId
-version1.9.13/version
+groupIdcom.fasterxml.jackson.core/groupId
+artifactIdjackson-core/artifactId
+version${jackson.version}/version
+/dependency
+dependency
+groupIdcom.fasterxml.jackson.core/groupId
+artifactIdjackson-databind/artifactId
+version${jackson.version}/version
 /dependency
-
 
 
 
+where ${jackson.version} is the 
latest available version of the libs, right now it is 2.9.2.
+
 Now you can overwrite the Content Handler with the Jackson Content Handler 
in the struts.xml:
 
 bean type="org.apache.struts2.rest.handler.ContentTypeHandler" name="jackson" class="org.apache.struts2.rest.handler.JacksonLibHandler"/
@@ -529,12 +535,9 @@ http://my.company.com/myapp/movies/superman.json
 !-- Set encoding to UTF-8, default is ISO-8859-1 
--
 constant name="struts.i18n.encoding" value="UTF-8"/ 
 
-
 
 
 
- 
-
 Settings
 
 The following settings can be customized. See the developer guide.

-- 
To stop receiving notification emails like this one, please contact
['"commits@struts.apache.org" '].

[struts-site] branch master updated: Updates info about using Jackson handler

[lukaszlenart]

This is an automated email from the ASF dual-hosted git repository.

lukaszlenart 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 acb9079  Updates info about using Jackson handler
acb9079 is described below

commit acb90794550b9913f145873ddf863211af061086
Author: Lukasz Lenart 
AuthorDate: Wed Nov 29 09:10:00 2017 +0100

Updates info about using Jackson handler
---
 source/plugins/rest/index.md | 19 ++-
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/source/plugins/rest/index.md b/source/plugins/rest/index.md
index fa5c816..a6f676d 100644
--- a/source/plugins/rest/index.md
+++ b/source/plugins/rest/index.md
@@ -283,18 +283,22 @@ The default JSON Content Handler is build on top of the 
[JSON-lib](http://json-l
 
 First you need to add the jackson dependency to your web application by 
downloading the jar file and put it under WEB-INF/lib or by adding following 
xml snippet to your dependencies section in the pom.xml when you are using 
maven as build system.
 
-
 ```xml
 
-org.codehaus.jackson
-jackson-jaxrs
-1.9.13
+com.fasterxml.jackson.core
+jackson-core
+${jackson.version}
+
+
+com.fasterxml.jackson.core
+jackson-databind
+${jackson.version}
 
-
 ```
 
-Now you can overwrite the Content Handler with the Jackson Content Handler in 
the struts.xml:
+where `${jackson.version}` is the latest available version of the libs, right 
now it is `2.9.2`.
 
+Now you can overwrite the Content Handler with the Jackson Content Handler in 
the struts.xml:
 
 ```xml
 
@@ -306,11 +310,8 @@ Now you can overwrite the Content Handler with the Jackson 
Content Handler in th
 
  
 
-
 ```
 
- 
-
 ### Settings
 
 The following settings can be customized. See the [developer 
guide](/core-developers/configuration-files.html).

-- 
To stop receiving notification emails like this one, please contact
['"commits@struts.apache.org" '].

svn commit: r23320 - /dev/struts/2.5.14.1/

[lukaszlenart]

Author: lukaszlenart
Date: Wed Nov 29 08:06:37 2017
New Revision: 23320

Log:
Updates test release 2.5.14.1

Added:
dev/struts/2.5.14.1/
dev/struts/2.5.14.1/struts-2.5.14.1-all.zip   (with props)
dev/struts/2.5.14.1/struts-2.5.14.1-all.zip.asc   (with props)
dev/struts/2.5.14.1/struts-2.5.14.1-all.zip.md5
dev/struts/2.5.14.1/struts-2.5.14.1-all.zip.sha1
dev/struts/2.5.14.1/struts-2.5.14.1-apps.zip   (with props)
dev/struts/2.5.14.1/struts-2.5.14.1-apps.zip.asc   (with props)
dev/struts/2.5.14.1/struts-2.5.14.1-apps.zip.md5
dev/struts/2.5.14.1/struts-2.5.14.1-apps.zip.sha1
dev/struts/2.5.14.1/struts-2.5.14.1-docs.zip   (with props)
dev/struts/2.5.14.1/struts-2.5.14.1-docs.zip.asc   (with props)
dev/struts/2.5.14.1/struts-2.5.14.1-docs.zip.md5
dev/struts/2.5.14.1/struts-2.5.14.1-docs.zip.sha1
dev/struts/2.5.14.1/struts-2.5.14.1-lib.zip   (with props)
dev/struts/2.5.14.1/struts-2.5.14.1-lib.zip.asc   (with props)
dev/struts/2.5.14.1/struts-2.5.14.1-lib.zip.md5
dev/struts/2.5.14.1/struts-2.5.14.1-lib.zip.sha1
dev/struts/2.5.14.1/struts-2.5.14.1-min-lib.zip   (with props)
dev/struts/2.5.14.1/struts-2.5.14.1-min-lib.zip.asc   (with props)
dev/struts/2.5.14.1/struts-2.5.14.1-min-lib.zip.md5
dev/struts/2.5.14.1/struts-2.5.14.1-min-lib.zip.sha1
dev/struts/2.5.14.1/struts-2.5.14.1-src.zip   (with props)
dev/struts/2.5.14.1/struts-2.5.14.1-src.zip.asc   (with props)
dev/struts/2.5.14.1/struts-2.5.14.1-src.zip.md5
dev/struts/2.5.14.1/struts-2.5.14.1-src.zip.sha1

Added: dev/struts/2.5.14.1/struts-2.5.14.1-all.zip
==
Binary file - no diff available.

Propchange: dev/struts/2.5.14.1/struts-2.5.14.1-all.zip
--
svn:mime-type = application/zip

Added: dev/struts/2.5.14.1/struts-2.5.14.1-all.zip.asc
==
Binary file - no diff available.

Propchange: dev/struts/2.5.14.1/struts-2.5.14.1-all.zip.asc
--
svn:mime-type = application/pgp-signature

Added: dev/struts/2.5.14.1/struts-2.5.14.1-all.zip.md5
==
--- dev/struts/2.5.14.1/struts-2.5.14.1-all.zip.md5 (added)
+++ dev/struts/2.5.14.1/struts-2.5.14.1-all.zip.md5 Wed Nov 29 08:06:37 2017
@@ -0,0 +1 @@
+2d7bd90465a6b0b8ca5b381db2a764cd
\ No newline at end of file

Added: dev/struts/2.5.14.1/struts-2.5.14.1-all.zip.sha1
==
--- dev/struts/2.5.14.1/struts-2.5.14.1-all.zip.sha1 (added)
+++ dev/struts/2.5.14.1/struts-2.5.14.1-all.zip.sha1 Wed Nov 29 08:06:37 2017
@@ -0,0 +1 @@
+cab18d0e955ac847de45d07b2d42a635fb998780
\ No newline at end of file

Added: dev/struts/2.5.14.1/struts-2.5.14.1-apps.zip
==
Binary file - no diff available.

Propchange: dev/struts/2.5.14.1/struts-2.5.14.1-apps.zip
--
svn:mime-type = application/zip

Added: dev/struts/2.5.14.1/struts-2.5.14.1-apps.zip.asc
==
Binary file - no diff available.

Propchange: dev/struts/2.5.14.1/struts-2.5.14.1-apps.zip.asc
--
svn:mime-type = application/pgp-signature

Added: dev/struts/2.5.14.1/struts-2.5.14.1-apps.zip.md5
==
--- dev/struts/2.5.14.1/struts-2.5.14.1-apps.zip.md5 (added)
+++ dev/struts/2.5.14.1/struts-2.5.14.1-apps.zip.md5 Wed Nov 29 08:06:37 2017
@@ -0,0 +1 @@
+d8d55a6c65831fb05b27c9074c247909
\ No newline at end of file

Added: dev/struts/2.5.14.1/struts-2.5.14.1-apps.zip.sha1
==
--- dev/struts/2.5.14.1/struts-2.5.14.1-apps.zip.sha1 (added)
+++ dev/struts/2.5.14.1/struts-2.5.14.1-apps.zip.sha1 Wed Nov 29 08:06:37 2017
@@ -0,0 +1 @@
+6aced8836b38eb363fa2dd7cda96a35f678cb570
\ No newline at end of file

Added: dev/struts/2.5.14.1/struts-2.5.14.1-docs.zip
==
Binary file - no diff available.

Propchange: dev/struts/2.5.14.1/struts-2.5.14.1-docs.zip
--
svn:mime-type = application/zip

Added: dev/struts/2.5.14.1/struts-2.5.14.1-docs.zip.asc
==
Binary file - no diff available.

Propchange: dev/struts/2.5.14.1/struts-2.5.14.1-docs.zip.asc