date:20130705

svn commit: r1499933 - /struts/struts2/branches/STRUTS_2_3_15_X/

2013-07-05 Thread rgielen

Author: rgielen
Date: Fri Jul  5 08:21:41 2013
New Revision: 1499933

URL: http://svn.apache.org/r1499933
Log:
Fix release branch for 2.3.15

Added:
struts/struts2/branches/STRUTS_2_3_15_X/   (props changed)
  - copied from r1499932, struts/struts2/tags/STRUTS_2_3_15/

Propchange: struts/struts2/branches/STRUTS_2_3_15_X/
--
reviewboard:url = https://reviews.apache.org

Propchange: struts/struts2/branches/STRUTS_2_3_15_X/
--
--- svn:ignore (added)
+++ svn:ignore Fri Jul  5 08:21:41 2013
@@ -0,0 +1,10 @@
+.classpath
+.project
+.settings
+*.ipr
+*.iml
+*.iws
+target
+.idea
+
+test-output

Propchange: struts/struts2/branches/STRUTS_2_3_15_X/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Jul  5 08:21:41 2013
@@ -0,0 +1,4 @@
+/struts/struts2/branches/STRUTS_2_2_1_1:1037870-1053416
+/struts/struts2/branches/STRUTS_2_3_14_2_X:1488895,1488897,1488899-1488900
+/struts/struts2/branches/STRUTS_2_3_14_X:1469249,1486054,1486076,1486164,1486576
+/struts/struts2/tags/STRUTS_2_2_1:965062-1037869

svn commit: r1499937 - /struts/struts2/branches/STRUTS_2_3_15_X/

2013-07-05 Thread rgielen

Author: rgielen
Date: Fri Jul  5 08:33:50 2013
New Revision: 1499937

URL: http://svn.apache.org/r1499937
Log:
removed branch again, since it should be created with maven release:branch

Removed:
struts/struts2/branches/STRUTS_2_3_15_X/

svn commit: r1499942 - in /struts/struts2/tags/STRUTS_2_3_15/plugins: convention/pom.xml gxp/pom.xml

2013-07-05 Thread rgielen

Author: rgielen
Date: Fri Jul  5 08:46:08 2013
New Revision: 1499942

URL: http://svn.apache.org/r1499942
Log:
[maven-release-plugin] prepare branch STRUTS_2_3_15_X

Modified:
struts/struts2/tags/STRUTS_2_3_15/plugins/convention/pom.xml
struts/struts2/tags/STRUTS_2_3_15/plugins/gxp/pom.xml

Modified: struts/struts2/tags/STRUTS_2_3_15/plugins/convention/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/tags/STRUTS_2_3_15/plugins/convention/pom.xml?rev=1499942&r1=1499941&r2=1499942&view=diff
==
--- struts/struts2/tags/STRUTS_2_3_15/plugins/convention/pom.xml (original)
+++ struts/struts2/tags/STRUTS_2_3_15/plugins/convention/pom.xml Fri Jul  5 
08:46:08 2013
@@ -11,9 +11,9 @@
 Struts 2 Convention Plugin
 
 
-
scm:svn:http://svn.apache.org/repos/asf/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/trunk/struts2-convention-plugin
-
scm:svn:https://svn.apache.org/repos/asf/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/trunk/struts2-convention-plugin
-
http://svn.apache.org/viewcvs.cgi/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/trunk/struts2-convention-plugin
+
scm:svn:http://svn.apache.org/repos/asf/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-convention-plugin
+
scm:svn:https://svn.apache.org/repos/asf/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-convention-plugin
+
http://svn.apache.org/viewcvs.cgi/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-convention-plugin
 
 
 

Modified: struts/struts2/tags/STRUTS_2_3_15/plugins/gxp/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/tags/STRUTS_2_3_15/plugins/gxp/pom.xml?rev=1499942&r1=1499941&r2=1499942&view=diff
==
--- struts/struts2/tags/STRUTS_2_3_15/plugins/gxp/pom.xml (original)
+++ struts/struts2/tags/STRUTS_2_3_15/plugins/gxp/pom.xml Fri Jul  5 08:46:08 
2013
@@ -11,9 +11,9 @@
 Struts 2 GXP Plugin
 
 
-
scm:svn:http://svn.apache.org/repos/asf/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/trunk/struts2-gxp-plugin
-
scm:svn:https://svn.apache.org/repos/asf/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/trunk/struts2-gxp-plugin
-
http://svn.apache.org/viewcvs.cgi/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/trunk/struts2-gxp-plugin
+
scm:svn:http://svn.apache.org/repos/asf/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-gxp-plugin
+
scm:svn:https://svn.apache.org/repos/asf/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-gxp-plugin
+
http://svn.apache.org/viewcvs.cgi/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-gxp-plugin

svn commit: r1499943 - in /struts/struts2/tags/STRUTS_2_3_15/plugins: convention/pom.xml gxp/pom.xml

2013-07-05 Thread rgielen

Author: rgielen
Date: Fri Jul  5 08:46:50 2013
New Revision: 1499943

URL: http://svn.apache.org/r1499943
Log:
[maven-release-plugin] prepare branch STRUTS_2_3_15_X

Modified:
struts/struts2/tags/STRUTS_2_3_15/plugins/convention/pom.xml
struts/struts2/tags/STRUTS_2_3_15/plugins/gxp/pom.xml

Modified: struts/struts2/tags/STRUTS_2_3_15/plugins/convention/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/tags/STRUTS_2_3_15/plugins/convention/pom.xml?rev=1499943&r1=1499942&r2=1499943&view=diff
==
--- struts/struts2/tags/STRUTS_2_3_15/plugins/convention/pom.xml (original)
+++ struts/struts2/tags/STRUTS_2_3_15/plugins/convention/pom.xml Fri Jul  5 
08:46:50 2013
@@ -11,9 +11,9 @@
 Struts 2 Convention Plugin
 
 
-
scm:svn:http://svn.apache.org/repos/asf/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-convention-plugin
-
scm:svn:https://svn.apache.org/repos/asf/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-convention-plugin
-
http://svn.apache.org/viewcvs.cgi/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-convention-plugin
+
scm:svn:http://svn.apache.org/repos/asf/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-convention-plugin
+
scm:svn:https://svn.apache.org/repos/asf/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-convention-plugin
+
http://svn.apache.org/viewcvs.cgi/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-convention-plugin
 
 
 

Modified: struts/struts2/tags/STRUTS_2_3_15/plugins/gxp/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/tags/STRUTS_2_3_15/plugins/gxp/pom.xml?rev=1499943&r1=1499942&r2=1499943&view=diff
==
--- struts/struts2/tags/STRUTS_2_3_15/plugins/gxp/pom.xml (original)
+++ struts/struts2/tags/STRUTS_2_3_15/plugins/gxp/pom.xml Fri Jul  5 08:46:50 
2013
@@ -11,9 +11,9 @@
 Struts 2 GXP Plugin
 
 
-
scm:svn:http://svn.apache.org/repos/asf/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-gxp-plugin
-
scm:svn:https://svn.apache.org/repos/asf/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-gxp-plugin
-
http://svn.apache.org/viewcvs.cgi/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-gxp-plugin
+
scm:svn:http://svn.apache.org/repos/asf/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-gxp-plugin
+
scm:svn:https://svn.apache.org/repos/asf/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-gxp-plugin
+
http://svn.apache.org/viewcvs.cgi/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-gxp-plugin

svn commit: r1499944 - in /struts/struts2/tags/STRUTS_2_3_15/plugins: convention/pom.xml gxp/pom.xml

2013-07-05 Thread rgielen

Author: rgielen
Date: Fri Jul  5 08:48:50 2013
New Revision: 1499944

URL: http://svn.apache.org/r1499944
Log:
[maven-release-plugin] prepare branch STRUTS_2_3_15_X

Modified:
struts/struts2/tags/STRUTS_2_3_15/plugins/convention/pom.xml
struts/struts2/tags/STRUTS_2_3_15/plugins/gxp/pom.xml

Modified: struts/struts2/tags/STRUTS_2_3_15/plugins/convention/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/tags/STRUTS_2_3_15/plugins/convention/pom.xml?rev=1499944&r1=1499943&r2=1499944&view=diff
==
--- struts/struts2/tags/STRUTS_2_3_15/plugins/convention/pom.xml (original)
+++ struts/struts2/tags/STRUTS_2_3_15/plugins/convention/pom.xml Fri Jul  5 
08:48:50 2013
@@ -11,9 +11,9 @@
 Struts 2 Convention Plugin
 
 
-
scm:svn:http://svn.apache.org/repos/asf/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-convention-plugin
-
scm:svn:https://svn.apache.org/repos/asf/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-convention-plugin
-
http://svn.apache.org/viewcvs.cgi/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-convention-plugin
+
scm:svn:http://svn.apache.org/repos/asf/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-convention-plugin
+
scm:svn:https://svn.apache.org/repos/asf/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-convention-plugin
+
http://svn.apache.org/viewcvs.cgi/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-convention-plugin
 
 
 

Modified: struts/struts2/tags/STRUTS_2_3_15/plugins/gxp/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/tags/STRUTS_2_3_15/plugins/gxp/pom.xml?rev=1499944&r1=1499943&r2=1499944&view=diff
==
--- struts/struts2/tags/STRUTS_2_3_15/plugins/gxp/pom.xml (original)
+++ struts/struts2/tags/STRUTS_2_3_15/plugins/gxp/pom.xml Fri Jul  5 08:48:50 
2013
@@ -11,9 +11,9 @@
 Struts 2 GXP Plugin
 
 
-
scm:svn:http://svn.apache.org/repos/asf/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-gxp-plugin
-
scm:svn:https://svn.apache.org/repos/asf/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-gxp-plugin
-
http://svn.apache.org/viewcvs.cgi/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-gxp-plugin
+
scm:svn:http://svn.apache.org/repos/asf/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-gxp-plugin
+
scm:svn:https://svn.apache.org/repos/asf/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-gxp-plugin
+
http://svn.apache.org/viewcvs.cgi/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-gxp-plugin

svn commit: r1499945 - in /struts/struts2/tags/STRUTS_2_3_15/plugins: convention/pom.xml gxp/pom.xml

2013-07-05 Thread rgielen

Author: rgielen
Date: Fri Jul  5 08:49:17 2013
New Revision: 1499945

URL: http://svn.apache.org/r1499945
Log:
[maven-release-plugin] prepare branch STRUTS_2_3_15_X

Modified:
struts/struts2/tags/STRUTS_2_3_15/plugins/convention/pom.xml
struts/struts2/tags/STRUTS_2_3_15/plugins/gxp/pom.xml

Modified: struts/struts2/tags/STRUTS_2_3_15/plugins/convention/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/tags/STRUTS_2_3_15/plugins/convention/pom.xml?rev=1499945&r1=1499944&r2=1499945&view=diff
==
--- struts/struts2/tags/STRUTS_2_3_15/plugins/convention/pom.xml (original)
+++ struts/struts2/tags/STRUTS_2_3_15/plugins/convention/pom.xml Fri Jul  5 
08:49:17 2013
@@ -11,9 +11,9 @@
 Struts 2 Convention Plugin
 
 
-
scm:svn:http://svn.apache.org/repos/asf/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-convention-plugin
-
scm:svn:https://svn.apache.org/repos/asf/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-convention-plugin
-
http://svn.apache.org/viewcvs.cgi/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-convention-plugin
+
scm:svn:http://svn.apache.org/repos/asf/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-convention-plugin
+
scm:svn:https://svn.apache.org/repos/asf/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-convention-plugin
+
http://svn.apache.org/viewcvs.cgi/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-convention-plugin
 
 
 

Modified: struts/struts2/tags/STRUTS_2_3_15/plugins/gxp/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/tags/STRUTS_2_3_15/plugins/gxp/pom.xml?rev=1499945&r1=1499944&r2=1499945&view=diff
==
--- struts/struts2/tags/STRUTS_2_3_15/plugins/gxp/pom.xml (original)
+++ struts/struts2/tags/STRUTS_2_3_15/plugins/gxp/pom.xml Fri Jul  5 08:49:17 
2013
@@ -11,9 +11,9 @@
 Struts 2 GXP Plugin
 
 
-
scm:svn:http://svn.apache.org/repos/asf/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-gxp-plugin
-
scm:svn:https://svn.apache.org/repos/asf/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-gxp-plugin
-
http://svn.apache.org/viewcvs.cgi/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-gxp-plugin
+
scm:svn:http://svn.apache.org/repos/asf/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-gxp-plugin
+
scm:svn:https://svn.apache.org/repos/asf/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-gxp-plugin
+
http://svn.apache.org/viewcvs.cgi/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-gxp-plugin

svn commit: r1499950 - in /struts/struts2/tags/STRUTS_2_3_15/plugins: convention/pom.xml gxp/pom.xml

2013-07-05 Thread rgielen

Author: rgielen
Date: Fri Jul  5 08:59:51 2013
New Revision: 1499950

URL: http://svn.apache.org/r1499950
Log:
[maven-release-plugin] prepare branch STRUTS_2_3_15_X

Modified:
struts/struts2/tags/STRUTS_2_3_15/plugins/convention/pom.xml
struts/struts2/tags/STRUTS_2_3_15/plugins/gxp/pom.xml

Modified: struts/struts2/tags/STRUTS_2_3_15/plugins/convention/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/tags/STRUTS_2_3_15/plugins/convention/pom.xml?rev=1499950&r1=1499949&r2=1499950&view=diff
==
--- struts/struts2/tags/STRUTS_2_3_15/plugins/convention/pom.xml (original)
+++ struts/struts2/tags/STRUTS_2_3_15/plugins/convention/pom.xml Fri Jul  5 
08:59:51 2013
@@ -11,9 +11,9 @@
 Struts 2 Convention Plugin
 
 
-
scm:svn:http://svn.apache.org/repos/asf/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-convention-plugin
-
scm:svn:https://svn.apache.org/repos/asf/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-convention-plugin
-
http://svn.apache.org/viewcvs.cgi/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-convention-plugin
+
scm:svn:http://svn.apache.org/repos/asf/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-convention-plugin
+
scm:svn:https://svn.apache.org/repos/asf/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-convention-plugin
+
http://svn.apache.org/viewcvs.cgi/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-convention-plugin
 
 
 

Modified: struts/struts2/tags/STRUTS_2_3_15/plugins/gxp/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/tags/STRUTS_2_3_15/plugins/gxp/pom.xml?rev=1499950&r1=1499949&r2=1499950&view=diff
==
--- struts/struts2/tags/STRUTS_2_3_15/plugins/gxp/pom.xml (original)
+++ struts/struts2/tags/STRUTS_2_3_15/plugins/gxp/pom.xml Fri Jul  5 08:59:51 
2013
@@ -11,9 +11,9 @@
 Struts 2 GXP Plugin
 
 
-
scm:svn:http://svn.apache.org/repos/asf/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-gxp-plugin
-
scm:svn:https://svn.apache.org/repos/asf/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-gxp-plugin
-
http://svn.apache.org/viewcvs.cgi/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-gxp-plugin
+
scm:svn:http://svn.apache.org/repos/asf/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-gxp-plugin
+
scm:svn:https://svn.apache.org/repos/asf/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-gxp-plugin
+
http://svn.apache.org/viewcvs.cgi/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-gxp-plugin

svn commit: r1499982 - in /struts/struts2/tags/STRUTS_2_3_15: ./ apps/ apps/blank/ apps/jboss-blank/ apps/mailreader/ apps/portlet/ apps/rest-showcase/ apps/showcase/ archetypes/ archetypes/struts2-ar

2013-07-05 Thread rgielen

Author: rgielen
Date: Fri Jul  5 12:18:45 2013
New Revision: 1499982

URL: http://svn.apache.org/r1499982
Log:
[maven-release-plugin] prepare branch STRUTS_2_3_15_X

Modified:
struts/struts2/tags/STRUTS_2_3_15/apps/blank/pom.xml
struts/struts2/tags/STRUTS_2_3_15/apps/jboss-blank/pom.xml
struts/struts2/tags/STRUTS_2_3_15/apps/mailreader/pom.xml
struts/struts2/tags/STRUTS_2_3_15/apps/pom.xml
struts/struts2/tags/STRUTS_2_3_15/apps/portlet/pom.xml
struts/struts2/tags/STRUTS_2_3_15/apps/rest-showcase/pom.xml
struts/struts2/tags/STRUTS_2_3_15/apps/showcase/pom.xml
struts/struts2/tags/STRUTS_2_3_15/archetypes/pom.xml
struts/struts2/tags/STRUTS_2_3_15/archetypes/struts2-archetype-blank/pom.xml

struts/struts2/tags/STRUTS_2_3_15/archetypes/struts2-archetype-convention/pom.xml

struts/struts2/tags/STRUTS_2_3_15/archetypes/struts2-archetype-dbportlet/pom.xml

struts/struts2/tags/STRUTS_2_3_15/archetypes/struts2-archetype-plugin/pom.xml

struts/struts2/tags/STRUTS_2_3_15/archetypes/struts2-archetype-portlet/pom.xml

struts/struts2/tags/STRUTS_2_3_15/archetypes/struts2-archetype-starter/pom.xml
struts/struts2/tags/STRUTS_2_3_15/assembly/pom.xml
struts/struts2/tags/STRUTS_2_3_15/bundles/admin/pom.xml
struts/struts2/tags/STRUTS_2_3_15/bundles/demo/pom.xml
struts/struts2/tags/STRUTS_2_3_15/bundles/pom.xml
struts/struts2/tags/STRUTS_2_3_15/core/pom.xml
struts/struts2/tags/STRUTS_2_3_15/plugins/cdi/pom.xml
struts/struts2/tags/STRUTS_2_3_15/plugins/codebehind/pom.xml
struts/struts2/tags/STRUTS_2_3_15/plugins/config-browser/pom.xml
struts/struts2/tags/STRUTS_2_3_15/plugins/convention/pom.xml
struts/struts2/tags/STRUTS_2_3_15/plugins/dojo/pom.xml
struts/struts2/tags/STRUTS_2_3_15/plugins/dwr/pom.xml
struts/struts2/tags/STRUTS_2_3_15/plugins/embeddedjsp/pom.xml
struts/struts2/tags/STRUTS_2_3_15/plugins/gxp/pom.xml
struts/struts2/tags/STRUTS_2_3_15/plugins/jasperreports/pom.xml
struts/struts2/tags/STRUTS_2_3_15/plugins/javatemplates/pom.xml
struts/struts2/tags/STRUTS_2_3_15/plugins/jfreechart/pom.xml
struts/struts2/tags/STRUTS_2_3_15/plugins/jsf/pom.xml
struts/struts2/tags/STRUTS_2_3_15/plugins/json/pom.xml
struts/struts2/tags/STRUTS_2_3_15/plugins/junit/pom.xml
struts/struts2/tags/STRUTS_2_3_15/plugins/osgi/pom.xml
struts/struts2/tags/STRUTS_2_3_15/plugins/oval/pom.xml
struts/struts2/tags/STRUTS_2_3_15/plugins/pell-multipart/pom.xml
struts/struts2/tags/STRUTS_2_3_15/plugins/plexus/pom.xml
struts/struts2/tags/STRUTS_2_3_15/plugins/pom.xml
struts/struts2/tags/STRUTS_2_3_15/plugins/portlet-tiles/pom.xml
struts/struts2/tags/STRUTS_2_3_15/plugins/portlet/pom.xml
struts/struts2/tags/STRUTS_2_3_15/plugins/rest/pom.xml
struts/struts2/tags/STRUTS_2_3_15/plugins/sitegraph/pom.xml
struts/struts2/tags/STRUTS_2_3_15/plugins/sitemesh/pom.xml
struts/struts2/tags/STRUTS_2_3_15/plugins/spring/pom.xml
struts/struts2/tags/STRUTS_2_3_15/plugins/struts1/pom.xml
struts/struts2/tags/STRUTS_2_3_15/plugins/testng/pom.xml
struts/struts2/tags/STRUTS_2_3_15/plugins/tiles/pom.xml
struts/struts2/tags/STRUTS_2_3_15/plugins/tiles3/pom.xml
struts/struts2/tags/STRUTS_2_3_15/pom.xml
struts/struts2/tags/STRUTS_2_3_15/xwork-core/pom.xml

Modified: struts/struts2/tags/STRUTS_2_3_15/apps/blank/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/tags/STRUTS_2_3_15/apps/blank/pom.xml?rev=1499982&r1=1499981&r2=1499982&view=diff
==
--- struts/struts2/tags/STRUTS_2_3_15/apps/blank/pom.xml (original)
+++ struts/struts2/tags/STRUTS_2_3_15/apps/blank/pom.xml Fri Jul  5 12:18:45 
2013
@@ -26,7 +26,7 @@
 
 org.apache.struts
 struts2-apps
-2.3.15
+2.3.15-SNAPSHOT
 
 
 struts2-blank

Modified: struts/struts2/tags/STRUTS_2_3_15/apps/jboss-blank/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/tags/STRUTS_2_3_15/apps/jboss-blank/pom.xml?rev=1499982&r1=1499981&r2=1499982&view=diff
==
--- struts/struts2/tags/STRUTS_2_3_15/apps/jboss-blank/pom.xml (original)
+++ struts/struts2/tags/STRUTS_2_3_15/apps/jboss-blank/pom.xml Fri Jul  5 
12:18:45 2013
@@ -26,7 +26,7 @@
 
 org.apache.struts
 struts2-apps
-2.3.15
+2.3.15-SNAPSHOT
 
 
 struts2-jboss-blank

Modified: struts/struts2/tags/STRUTS_2_3_15/apps/mailreader/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/tags/STRUTS_2_3_15/apps/mailreader/pom.xml?rev=1499982&r1=1499981&r2=1499982&view=diff
==
--- struts/struts2/tags/STRUTS_2_3_15/apps/mailreader/pom.xml (original)
+++ struts/struts2/tags/STRUTS_2_3_15/apps/mailreader/pom.xml Fri Jul  5 
12:18:45 2013
@@ -26,7 +26,7 @@
 
   org.apache.struts

svn commit: r1499983 - in /struts/struts2/tags/STRUTS_2_3_15/plugins: convention/pom.xml gxp/pom.xml

2013-07-05 Thread rgielen

Author: rgielen
Date: Fri Jul  5 12:19:54 2013
New Revision: 1499983

URL: http://svn.apache.org/r1499983
Log:
[maven-release-plugin] prepare branch STRUTS_2_3_15_X

Modified:
struts/struts2/tags/STRUTS_2_3_15/plugins/convention/pom.xml
struts/struts2/tags/STRUTS_2_3_15/plugins/gxp/pom.xml

Modified: struts/struts2/tags/STRUTS_2_3_15/plugins/convention/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/tags/STRUTS_2_3_15/plugins/convention/pom.xml?rev=1499983&r1=1499982&r2=1499983&view=diff
==
--- struts/struts2/tags/STRUTS_2_3_15/plugins/convention/pom.xml (original)
+++ struts/struts2/tags/STRUTS_2_3_15/plugins/convention/pom.xml Fri Jul  5 
12:19:54 2013
@@ -11,9 +11,9 @@
 Struts 2 Convention Plugin
 
 
-
scm:svn:http://svn.apache.org/repos/asf/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-convention-plugin
-
scm:svn:https://svn.apache.org/repos/asf/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-convention-plugin
-
http://svn.apache.org/viewcvs.cgi/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-convention-plugin
+
scm:svn:http://svn.apache.org/repos/asf/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-convention-plugin
+
scm:svn:https://svn.apache.org/repos/asf/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-convention-plugin
+
http://svn.apache.org/viewcvs.cgi/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-convention-plugin
 
 
 

Modified: struts/struts2/tags/STRUTS_2_3_15/plugins/gxp/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/tags/STRUTS_2_3_15/plugins/gxp/pom.xml?rev=1499983&r1=1499982&r2=1499983&view=diff
==
--- struts/struts2/tags/STRUTS_2_3_15/plugins/gxp/pom.xml (original)
+++ struts/struts2/tags/STRUTS_2_3_15/plugins/gxp/pom.xml Fri Jul  5 12:19:54 
2013
@@ -11,9 +11,9 @@
 Struts 2 GXP Plugin
 
 
-
scm:svn:http://svn.apache.org/repos/asf/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-gxp-plugin
-
scm:svn:https://svn.apache.org/repos/asf/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-gxp-plugin
-
http://svn.apache.org/viewcvs.cgi/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-gxp-plugin
+
scm:svn:http://svn.apache.org/repos/asf/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-gxp-plugin
+
scm:svn:https://svn.apache.org/repos/asf/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-gxp-plugin
+
http://svn.apache.org/viewcvs.cgi/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-gxp-plugin

svn commit: r1499986 - in /struts/struts2/tags/STRUTS_2_3_15/plugins: convention/pom.xml gxp/pom.xml

2013-07-05 Thread rgielen

Author: rgielen
Date: Fri Jul  5 12:29:43 2013
New Revision: 1499986

URL: http://svn.apache.org/r1499986
Log:
[maven-release-plugin] prepare branch STRUTS_2_3_15_X

Modified:
struts/struts2/tags/STRUTS_2_3_15/plugins/convention/pom.xml
struts/struts2/tags/STRUTS_2_3_15/plugins/gxp/pom.xml

Modified: struts/struts2/tags/STRUTS_2_3_15/plugins/convention/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/tags/STRUTS_2_3_15/plugins/convention/pom.xml?rev=1499986&r1=1499985&r2=1499986&view=diff
==
--- struts/struts2/tags/STRUTS_2_3_15/plugins/convention/pom.xml (original)
+++ struts/struts2/tags/STRUTS_2_3_15/plugins/convention/pom.xml Fri Jul  5 
12:29:43 2013
@@ -11,9 +11,9 @@
 Struts 2 Convention Plugin
 
 
-
scm:svn:http://svn.apache.org/repos/asf/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-convention-plugin
-
scm:svn:https://svn.apache.org/repos/asf/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-convention-plugin
-
http://svn.apache.org/viewcvs.cgi/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-convention-plugin
+
scm:svn:http://svn.apache.org/repos/asf/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-convention-plugin
+
scm:svn:https://svn.apache.org/repos/asf/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-convention-plugin
+
http://svn.apache.org/viewcvs.cgi/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-convention-plugin
 
 
 

Modified: struts/struts2/tags/STRUTS_2_3_15/plugins/gxp/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/tags/STRUTS_2_3_15/plugins/gxp/pom.xml?rev=1499986&r1=1499985&r2=1499986&view=diff
==
--- struts/struts2/tags/STRUTS_2_3_15/plugins/gxp/pom.xml (original)
+++ struts/struts2/tags/STRUTS_2_3_15/plugins/gxp/pom.xml Fri Jul  5 12:29:43 
2013
@@ -11,9 +11,9 @@
 Struts 2 GXP Plugin
 
 
-
scm:svn:http://svn.apache.org/repos/asf/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-gxp-plugin
-
scm:svn:https://svn.apache.org/repos/asf/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-gxp-plugin
-
http://svn.apache.org/viewcvs.cgi/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-gxp-plugin
+
scm:svn:http://svn.apache.org/repos/asf/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-gxp-plugin
+
scm:svn:https://svn.apache.org/repos/asf/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-gxp-plugin
+
http://svn.apache.org/viewcvs.cgi/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/

svn commit: r1499990 - in /struts/struts2/tags/STRUTS_2_3_15/plugins: convention/pom.xml gxp/pom.xml

2013-07-05 Thread rgielen

Author: rgielen
Date: Fri Jul  5 12:50:53 2013
New Revision: 140

URL: http://svn.apache.org/r140
Log:
[maven-release-plugin] prepare branch STRUTS_2_3_15_X

Modified:
struts/struts2/tags/STRUTS_2_3_15/plugins/convention/pom.xml
struts/struts2/tags/STRUTS_2_3_15/plugins/gxp/pom.xml

Modified: struts/struts2/tags/STRUTS_2_3_15/plugins/convention/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/tags/STRUTS_2_3_15/plugins/convention/pom.xml?rev=140&r1=1499989&r2=140&view=diff
==
--- struts/struts2/tags/STRUTS_2_3_15/plugins/convention/pom.xml (original)
+++ struts/struts2/tags/STRUTS_2_3_15/plugins/convention/pom.xml Fri Jul  5 
12:50:53 2013
@@ -11,9 +11,9 @@
 Struts 2 Convention Plugin
 
 
-
scm:svn:http://svn.apache.org/repos/asf/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-convention-plugin
-
scm:svn:https://svn.apache.org/repos/asf/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-convention-plugin
-
http://svn.apache.org/viewcvs.cgi/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-convention-plugin
+
scm:svn:http://svn.apache.org/repos/asf/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-convention-plugin
+
scm:svn:https://svn.apache.org/repos/asf/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-convention-plugin
+
http://svn.apache.org/viewcvs.cgi/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-convention-plugin
 
 
 

Modified: struts/struts2/tags/STRUTS_2_3_15/plugins/gxp/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/tags/STRUTS_2_3_15/plugins/gxp/pom.xml?rev=140&r1=1499989&r2=140&view=diff
==
--- struts/struts2/tags/STRUTS_2_3_15/plugins/gxp/pom.xml (original)
+++ struts/struts2/tags/STRUTS_2_3_15/plugins/gxp/pom.xml Fri Jul  5 12:50:53 
2013
@@ -11,9 +11,9 @@
 Struts 2 GXP Plugin
 
 
-
scm:svn:http://svn.apache.org/repos/asf/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-gxp-plugin
-
scm:svn:https://svn.apache.org/repos/asf/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-gxp-plugin
-
http://svn.apache.org/viewcvs.cgi/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-gxp-plugin
+
scm:svn:http://svn.apache.org/repos/asf/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-gxp-plugin
+
scm:svn:https://svn.apache.org/repos/asf/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/branches/STR

svn commit: r1499991 - /struts/struts2/branches/STRUTS_2_3_15_X/

2013-07-05 Thread rgielen

Author: rgielen
Date: Fri Jul  5 13:00:29 2013
New Revision: 141

URL: http://svn.apache.org/r141
Log:
mvn release:branch not working, branching manually again

Added:
struts/struts2/branches/STRUTS_2_3_15_X/   (props changed)
  - copied from r140, struts/struts2/tags/STRUTS_2_3_15/

Propchange: struts/struts2/branches/STRUTS_2_3_15_X/
--
reviewboard:url = https://reviews.apache.org

Propchange: struts/struts2/branches/STRUTS_2_3_15_X/
--
--- svn:ignore (added)
+++ svn:ignore Fri Jul  5 13:00:29 2013
@@ -0,0 +1,10 @@
+.classpath
+.project
+.settings
+*.ipr
+*.iml
+*.iws
+target
+.idea
+
+test-output

Propchange: struts/struts2/branches/STRUTS_2_3_15_X/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Jul  5 13:00:29 2013
@@ -0,0 +1,4 @@
+/struts/struts2/branches/STRUTS_2_2_1_1:1037870-1053416
+/struts/struts2/branches/STRUTS_2_3_14_2_X:1488895,1488897,1488899-1488900
+/struts/struts2/branches/STRUTS_2_3_14_X:1469249,1486054,1486076,1486164,1486576
+/struts/struts2/tags/STRUTS_2_2_1:965062-1037869

svn commit: r1499997 - /struts/struts2/branches/STRUTS_2_3_15_X/

2013-07-05 Thread rgielen

Author: rgielen
Date: Fri Jul  5 13:26:15 2013
New Revision: 147

URL: http://svn.apache.org/r147
Log:
reverting manual branch to give release:branch a last try after cleaning up the 
mess in 2.3.15 tag

Removed:
struts/struts2/branches/STRUTS_2_3_15_X/

svn commit: r1500002 - in /struts/struts2/tags/STRUTS_2_3_15/plugins: convention/pom.xml gxp/pom.xml

2013-07-05 Thread rgielen

Author: rgielen
Date: Fri Jul  5 13:30:53 2013
New Revision: 152

URL: http://svn.apache.org/r152
Log:
[maven-release-plugin] prepare branch STRUTS_2_3_15_X

Modified:
struts/struts2/tags/STRUTS_2_3_15/plugins/convention/pom.xml
struts/struts2/tags/STRUTS_2_3_15/plugins/gxp/pom.xml

Modified: struts/struts2/tags/STRUTS_2_3_15/plugins/convention/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/tags/STRUTS_2_3_15/plugins/convention/pom.xml?rev=152&r1=151&r2=152&view=diff
==
--- struts/struts2/tags/STRUTS_2_3_15/plugins/convention/pom.xml (original)
+++ struts/struts2/tags/STRUTS_2_3_15/plugins/convention/pom.xml Fri Jul  5 
13:30:53 2013
@@ -11,9 +11,9 @@
 Struts 2 Convention Plugin
 
 
-
scm:svn:http://svn.apache.org/repos/asf/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/trunk/struts2-convention-plugin
-
scm:svn:https://svn.apache.org/repos/asf/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/trunk/struts2-convention-plugin
-
http://svn.apache.org/viewcvs.cgi/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/trunk/struts2-convention-plugin
+
scm:svn:http://svn.apache.org/repos/asf/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-convention-plugin
+
scm:svn:https://svn.apache.org/repos/asf/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-convention-plugin
+
http://svn.apache.org/viewcvs.cgi/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-convention-plugin
 
 
 

Modified: struts/struts2/tags/STRUTS_2_3_15/plugins/gxp/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/tags/STRUTS_2_3_15/plugins/gxp/pom.xml?rev=152&r1=151&r2=152&view=diff
==
--- struts/struts2/tags/STRUTS_2_3_15/plugins/gxp/pom.xml (original)
+++ struts/struts2/tags/STRUTS_2_3_15/plugins/gxp/pom.xml Fri Jul  5 13:30:53 
2013
@@ -11,9 +11,9 @@
 Struts 2 GXP Plugin
 
 
-
scm:svn:http://svn.apache.org/repos/asf/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/trunk/struts2-gxp-plugin
-
scm:svn:https://svn.apache.org/repos/asf/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/trunk/struts2-gxp-plugin
-
http://svn.apache.org/viewcvs.cgi/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/trunk/struts2-gxp-plugin
+
scm:svn:http://svn.apache.org/repos/asf/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-gxp-plugin
+
scm:svn:https://svn.apache.org/repos/asf/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-gxp-plugin
+
http://svn.apache.org/viewcvs.cgi/struts/sandbox/tags/STRUTS_2_3_15/branches/STRUTS_2_3_15_X/branches/STRUTS_2_3_15_X/trunk/struts2-gxp-plugin

svn commit: r1500010 - in /struts/sandbox/trunk/struts2examples: ./ unit_testing/ unit_testing/src/ unit_testing/src/main/ unit_testing/src/main/java/ unit_testing/src/main/java/org/ unit_testing/src/

2013-07-05 Thread bphillips

Author: bphillips
Date: Fri Jul  5 13:55:56 2013
New Revision: 1500010

URL: http://svn.apache.org/r1500010
Log:
added unit testing example application

Added:
struts/sandbox/trunk/struts2examples/unit_testing/   (with props)
struts/sandbox/trunk/struts2examples/unit_testing/README.txt
struts/sandbox/trunk/struts2examples/unit_testing/pom.xml
struts/sandbox/trunk/struts2examples/unit_testing/src/
struts/sandbox/trunk/struts2examples/unit_testing/src/main/
struts/sandbox/trunk/struts2examples/unit_testing/src/main/java/
struts/sandbox/trunk/struts2examples/unit_testing/src/main/java/org/
struts/sandbox/trunk/struts2examples/unit_testing/src/main/java/org/apache/

struts/sandbox/trunk/struts2examples/unit_testing/src/main/java/org/apache/struts/

struts/sandbox/trunk/struts2examples/unit_testing/src/main/java/org/apache/struts/register/

struts/sandbox/trunk/struts2examples/unit_testing/src/main/java/org/apache/struts/register/action/

struts/sandbox/trunk/struts2examples/unit_testing/src/main/java/org/apache/struts/register/action/Register.java

struts/sandbox/trunk/struts2examples/unit_testing/src/main/java/org/apache/struts/register/model/

struts/sandbox/trunk/struts2examples/unit_testing/src/main/java/org/apache/struts/register/model/Person.java
struts/sandbox/trunk/struts2examples/unit_testing/src/main/resources/

struts/sandbox/trunk/struts2examples/unit_testing/src/main/resources/log4j.dtd

struts/sandbox/trunk/struts2examples/unit_testing/src/main/resources/log4j.xml

struts/sandbox/trunk/struts2examples/unit_testing/src/main/resources/struts.xml
struts/sandbox/trunk/struts2examples/unit_testing/src/main/webapp/
struts/sandbox/trunk/struts2examples/unit_testing/src/main/webapp/META-INF/

struts/sandbox/trunk/struts2examples/unit_testing/src/main/webapp/META-INF/MANIFEST.MF
struts/sandbox/trunk/struts2examples/unit_testing/src/main/webapp/WEB-INF/

struts/sandbox/trunk/struts2examples/unit_testing/src/main/webapp/WEB-INF/web.xml
struts/sandbox/trunk/struts2examples/unit_testing/src/main/webapp/index.jsp

struts/sandbox/trunk/struts2examples/unit_testing/src/main/webapp/register.jsp

struts/sandbox/trunk/struts2examples/unit_testing/src/main/webapp/thankyou.jsp
struts/sandbox/trunk/struts2examples/unit_testing/src/test/
struts/sandbox/trunk/struts2examples/unit_testing/src/test/java/
struts/sandbox/trunk/struts2examples/unit_testing/src/test/java/org/
struts/sandbox/trunk/struts2examples/unit_testing/src/test/java/org/apache/

struts/sandbox/trunk/struts2examples/unit_testing/src/test/java/org/apache/struts/

struts/sandbox/trunk/struts2examples/unit_testing/src/test/java/org/apache/struts/register/

struts/sandbox/trunk/struts2examples/unit_testing/src/test/java/org/apache/struts/register/action/

struts/sandbox/trunk/struts2examples/unit_testing/src/test/java/org/apache/struts/register/action/RegisterTest.java
Modified:
struts/sandbox/trunk/struts2examples/pom.xml

Modified: struts/sandbox/trunk/struts2examples/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2examples/pom.xml?rev=1500010&r1=159&r2=1500010&view=diff
==
--- struts/sandbox/trunk/struts2examples/pom.xml (original)
+++ struts/sandbox/trunk/struts2examples/pom.xml Fri Jul  5 13:55:56 2013
@@ -46,6 +46,7 @@
 spring_struts
 annotations
 interceptors
+unit_testing
   
   


Propchange: struts/sandbox/trunk/struts2examples/unit_testing/
--
--- svn:ignore (added)
+++ svn:ignore Fri Jul  5 13:55:56 2013
@@ -0,0 +1,4 @@
+.settings
+target
+.classpath
+.project

Added: struts/sandbox/trunk/struts2examples/unit_testing/README.txt
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2examples/unit_testing/README.txt?rev=1500010&view=auto
==
--- struts/sandbox/trunk/struts2examples/unit_testing/README.txt (added)
+++ struts/sandbox/trunk/struts2examples/unit_testing/README.txt Fri Jul  5 
13:55:56 2013
@@ -0,0 +1,18 @@
+This is the example project referred to in the
+Struts 2 documentation, Unit Testing tutorial.
+See:  http://struts.apache.org.
+
+To build the application's war file run mvn clean package
+from the project's root folder.
+
+As part of packaging the war file, Maven will run the unit test.
+
+The war file is created in the target sub-folder.
+
+Copy the war file to your Servlet container (e.g. Tomcat, GlassFish) and 
+then startup the Servlet container.
+
+In a web browser go to:  http://localhost:8080/unit_testing/index.action.
+
+You should see a web page with Welcome to Struts 2!
+

Added: struts/sandbox/trunk/struts2examples/unit_testing/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2exam

svn commit: r1500021 - /struts/struts2/branches/STRUTS_2_3_15_X/

2013-07-05 Thread rgielen

Author: rgielen
Date: Fri Jul  5 14:32:51 2013
New Revision: 1500021

URL: http://svn.apache.org/r1500021
Log:
Can't get mvn relase:branch to work - giving up, branching manually

Added:
struts/struts2/branches/STRUTS_2_3_15_X/   (props changed)
  - copied from r1493006, struts/struts2/tags/STRUTS_2_3_15/

Propchange: struts/struts2/branches/STRUTS_2_3_15_X/
--
reviewboard:url = https://reviews.apache.org

Propchange: struts/struts2/branches/STRUTS_2_3_15_X/
--
--- svn:ignore (added)
+++ svn:ignore Fri Jul  5 14:32:51 2013
@@ -0,0 +1,10 @@
+.classpath
+.project
+.settings
+*.ipr
+*.iml
+*.iws
+target
+.idea
+
+test-output

Propchange: struts/struts2/branches/STRUTS_2_3_15_X/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Jul  5 14:32:51 2013
@@ -0,0 +1,4 @@
+/struts/struts2/branches/STRUTS_2_2_1_1:1037870-1053416
+/struts/struts2/branches/STRUTS_2_3_14_2_X:1488895,1488897,1488899-1488900
+/struts/struts2/branches/STRUTS_2_3_14_X:1469249,1486054,1486076,1486164,1486576
+/struts/struts2/tags/STRUTS_2_2_1:965062-1037869

svn commit: r1500082 - in /struts/struts2/branches/STRUTS_2_3_15_X/apps/showcase/src: main/java/org/apache/struts2/showcase/filedownload/ test/java/org/apache/struts2/showcase/filedownload/

2013-07-05 Thread rgielen

Author: rgielen
Date: Fri Jul  5 17:44:09 2013
New Revision: 1500082

URL: http://svn.apache.org/r1500082
Log:
WW-4136 - Demonstrate proper input sanitizing for file download showcase example
- added demo code to prevent input paths containing "WEB-INF"

Added:

struts/struts2/branches/STRUTS_2_3_15_X/apps/showcase/src/test/java/org/apache/struts2/showcase/filedownload/

struts/struts2/branches/STRUTS_2_3_15_X/apps/showcase/src/test/java/org/apache/struts2/showcase/filedownload/FileDownloadActionTest.java
Modified:

struts/struts2/branches/STRUTS_2_3_15_X/apps/showcase/src/main/java/org/apache/struts2/showcase/filedownload/FileDownloadAction.java

Modified: 
struts/struts2/branches/STRUTS_2_3_15_X/apps/showcase/src/main/java/org/apache/struts2/showcase/filedownload/FileDownloadAction.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_3_15_X/apps/showcase/src/main/java/org/apache/struts2/showcase/filedownload/FileDownloadAction.java?rev=1500082&r1=1500081&r2=1500082&view=diff
==
--- 
struts/struts2/branches/STRUTS_2_3_15_X/apps/showcase/src/main/java/org/apache/struts2/showcase/filedownload/FileDownloadAction.java
 (original)
+++ 
struts/struts2/branches/STRUTS_2_3_15_X/apps/showcase/src/main/java/org/apache/struts2/showcase/filedownload/FileDownloadAction.java
 Fri Jul  5 17:44:09 2013
@@ -39,7 +39,23 @@ public class FileDownloadAction implemen
}
 
public void setInputPath(String value) {
-   inputPath = value;
+   inputPath = sanitizeInputPath(value);
+   }
+
+   /**
+* As the user modifiable parameter inputPath will be used to access 
server side resources, we want the path to be
+* sanitized - in this case it is demonstrated to disallow inputPath 
parameter values containing "WEB-INF". Consider to
+* use even stricter rules in production environments.
+*
+* @param value the raw parameter input value to sanitize
+*
+* @return the sanitized value; null if value contains an 
invalid path segment like WEB-INF
+*/
+   String sanitizeInputPath( String value ) {
+   if (value != null && value.toUpperCase().contains("WEB-INF")) {
+   return null;
+   }
+   return value;
}
 
public InputStream getInputStream() throws Exception {

Added: 
struts/struts2/branches/STRUTS_2_3_15_X/apps/showcase/src/test/java/org/apache/struts2/showcase/filedownload/FileDownloadActionTest.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_3_15_X/apps/showcase/src/test/java/org/apache/struts2/showcase/filedownload/FileDownloadActionTest.java?rev=1500082&view=auto
==
--- 
struts/struts2/branches/STRUTS_2_3_15_X/apps/showcase/src/test/java/org/apache/struts2/showcase/filedownload/FileDownloadActionTest.java
 (added)
+++ 
struts/struts2/branches/STRUTS_2_3_15_X/apps/showcase/src/test/java/org/apache/struts2/showcase/filedownload/FileDownloadActionTest.java
 Fri Jul  5 17:44:09 2013
@@ -0,0 +1,42 @@
+package org.apache.struts2.showcase.filedownload;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertNull;
+
+public class FileDownloadActionTest {
+
+   private FileDownloadAction fileDownloadAction;
+
+   @Before
+   public void setUp() {
+   this.fileDownloadAction = new FileDownloadAction();
+   }
+
+   @Test
+   public void testSanitizeInputPathShouldAllowSimpleParameter() throws 
Exception {
+   assertEquals("foo", 
fileDownloadAction.sanitizeInputPath("foo"));
+   }
+
+   @Test
+   public void testSanitizeInputPathShouldReturnNullForNullInput() throws 
Exception {
+   assertNull(fileDownloadAction.sanitizeInputPath(null));
+   }
+
+   @Test
+   public void testSanitizeInputPathShouldReturnNullForLeadingWebInf() 
throws Exception {
+   assertNull(fileDownloadAction.sanitizeInputPath("WEB-INF/foo"));
+   }
+
+   @Test
+   public void testSanitizeInputPathShouldReturnNullForNonLeadingWebInf() 
throws Exception {
+   
assertNull(fileDownloadAction.sanitizeInputPath("./WEB-INF/foo"));
+   }
+
+   @Test
+   public void 
testSanitizeInputPathShouldReturnNullForNonUppercaseWebInf() throws Exception {
+   
assertNull(fileDownloadAction.sanitizeInputPath("./wEB-Inf/foo"));
+   }
+}

svn commit: r1500083 - in /struts/struts2/trunk: ./ apps/showcase/src/main/java/org/apache/struts2/showcase/filedownload/FileDownloadAction.java apps/showcase/src/test/java/org/apache/struts2/showcase

2013-07-05 Thread rgielen

Author: rgielen
Date: Fri Jul  5 17:47:42 2013
New Revision: 1500083

URL: http://svn.apache.org/r1500083
Log:
Merged from STRUTS_2_3_15_X
WW-4136 - Demonstrate proper input sanitizing for file download showcase example
- added demo code to prevent input paths containing "WEB-INF" [from revision 
1500082]

Added:

struts/struts2/trunk/apps/showcase/src/test/java/org/apache/struts2/showcase/filedownload/
  - copied from r1500082, 
struts/struts2/branches/STRUTS_2_3_15_X/apps/showcase/src/test/java/org/apache/struts2/showcase/filedownload/
Modified:
struts/struts2/trunk/   (props changed)

struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/filedownload/FileDownloadAction.java

Propchange: struts/struts2/trunk/
--
  Merged /struts/struts2/branches/STRUTS_2_3_15_X:r1500082

Modified: 
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/filedownload/FileDownloadAction.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/filedownload/FileDownloadAction.java?rev=1500083&r1=1500082&r2=1500083&view=diff
==
--- 
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/filedownload/FileDownloadAction.java
 (original)
+++ 
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/filedownload/FileDownloadAction.java
 Fri Jul  5 17:47:42 2013
@@ -39,7 +39,23 @@ public class FileDownloadAction implemen
}
 
public void setInputPath(String value) {
-   inputPath = value;
+   inputPath = sanitizeInputPath(value);
+   }
+
+   /**
+* As the user modifiable parameter inputPath will be used to access 
server side resources, we want the path to be
+* sanitized - in this case it is demonstrated to disallow inputPath 
parameter values containing "WEB-INF". Consider to
+* use even stricter rules in production environments.
+*
+* @param value the raw parameter input value to sanitize
+*
+* @return the sanitized value; null if value contains an 
invalid path segment like WEB-INF
+*/
+   String sanitizeInputPath( String value ) {
+   if (value != null && value.toUpperCase().contains("WEB-INF")) {
+   return null;
+   }
+   return value;
}
 
public InputStream getInputStream() throws Exception {

[CONF] Confluence Changes in the last 24 hours

2013-07-05 Thread Anonymous (Confluence)








   Apache Abdera



Comments

 Page:
 Abdera2
has a new comment
[ Eugen Paraschiv]


   Apache ActiveMQ


Pages

 Page:
 WebSockets
edited by Dejan Bosanac[10:23 AM]
(view changes)



   Apache Camel


Pages

 Page:
 ICal
created by Christian Mueller[09:38 PM]

 Page:
 Data Format List
edited by Christian Mueller[09:40 PM]
(view changes)

 Page:
 FTP2
edited by Christian Mueller[09:06 PM]
(view changes)

 Page:
 Download
edited by Christian Mueller[05:19 PM]
(view changes)

 Page:
 MongoDB
edited by willem jiang[01:49 AM]
(view changes)



   Apache Cloudstack


Pages

 Page:
 Dynamic scaling of CPU and RAM
edited by Nitin Mehta[09:25 AM]
(view changes)




Comments

 Page:
 Dynamic scaling of CPU and RAM
has a new comment
[ Nitin Mehta]


   Apache CXF


Pages

 Home page:
 Index
edited by Christian Schneider[07:09 AM]
(view changes)

 Page:
 DOSGi Releases
edited by Christian Schneider[07:04 AM]
(view changes)



   Apache OpenOffice Community


Pages

 Page:
 Localization Volunteers
edited by Trần Đình Ngọc Anh[02:34 PM]
(view changes)

 Page:
 AOO4 - Desktop Icons
edited by Samer Mansour[02:01 PM]
(view changes)

 Page:
 4.0 Release Dashboard
edited by Stuart Swales[09:37 AM]
(view changes)

 Page:
 Committers native languages
edited by Stuart Swales[09:33 AM]
(view changes)

 Page:
 Product Logo Use
edited by Juergen Schmidt[09:19 AM]
(view changes)




Comments

 Page:
 AOO4 - Desktop Icons
has a new comment
[ Kay Schenk]


   Apache Solr Reference Guide


Pages

 Page:
 Up

svn commit: r1499933 - /struts/struts2/branches/STRUTS_2_3_15_X/

svn commit: r1499937 - /struts/struts2/branches/STRUTS_2_3_15_X/

svn commit: r1499942 - in /struts/struts2/tags/STRUTS_2_3_15/plugins: convention/pom.xml gxp/pom.xml

svn commit: r1499943 - in /struts/struts2/tags/STRUTS_2_3_15/plugins: convention/pom.xml gxp/pom.xml

svn commit: r1499944 - in /struts/struts2/tags/STRUTS_2_3_15/plugins: convention/pom.xml gxp/pom.xml

svn commit: r1499945 - in /struts/struts2/tags/STRUTS_2_3_15/plugins: convention/pom.xml gxp/pom.xml

svn commit: r1499950 - in /struts/struts2/tags/STRUTS_2_3_15/plugins: convention/pom.xml gxp/pom.xml

svn commit: r1499982 - in /struts/struts2/tags/STRUTS_2_3_15: ./ apps/ apps/blank/ apps/jboss-blank/ apps/mailreader/ apps/portlet/ apps/rest-showcase/ apps/showcase/ archetypes/ archetypes/struts2-ar

svn commit: r1499983 - in /struts/struts2/tags/STRUTS_2_3_15/plugins: convention/pom.xml gxp/pom.xml

svn commit: r1499986 - in /struts/struts2/tags/STRUTS_2_3_15/plugins: convention/pom.xml gxp/pom.xml

svn commit: r1499990 - in /struts/struts2/tags/STRUTS_2_3_15/plugins: convention/pom.xml gxp/pom.xml

svn commit: r1499991 - /struts/struts2/branches/STRUTS_2_3_15_X/

svn commit: r1499997 - /struts/struts2/branches/STRUTS_2_3_15_X/

svn commit: r1500002 - in /struts/struts2/tags/STRUTS_2_3_15/plugins: convention/pom.xml gxp/pom.xml

svn commit: r1500010 - in /struts/sandbox/trunk/struts2examples: ./ unit_testing/ unit_testing/src/ unit_testing/src/main/ unit_testing/src/main/java/ unit_testing/src/main/java/org/ unit_testing/src/

svn commit: r1500021 - /struts/struts2/branches/STRUTS_2_3_15_X/

svn commit: r1500082 - in /struts/struts2/branches/STRUTS_2_3_15_X/apps/showcase/src: main/java/org/apache/struts2/showcase/filedownload/ test/java/org/apache/struts2/showcase/filedownload/

svn commit: r1500083 - in /struts/struts2/trunk: ./ apps/showcase/src/main/java/org/apache/struts2/showcase/filedownload/FileDownloadAction.java apps/showcase/src/test/java/org/apache/struts2/showcase

[CONF] Confluence Changes in the last 24 hours

19 matches

Site Navigation

Mail list logo

Footer information