diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml index 53d0dfa9c..973348c56 100644 --- a/apps/blank/pom.xml +++ b/apps/blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps - 2.3.1.2-SNAPSHOT + 2.3.1.2 org.apache.struts struts2-blank @@ -34,9 +34,9 @@ Blank Webapp - scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/apps/blank - scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/apps/blank - http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_1/apps/blank + scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/apps/blank + scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/apps/blank + http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/struts2-parent-2.3.1.2/apps/blank diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml index ee03b8cfe..411ec4499 100644 --- a/apps/jboss-blank/pom.xml +++ b/apps/jboss-blank/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps - 2.3.1.2-SNAPSHOT + 2.3.1.2 org.apache.struts struts2-jboss-blank @@ -34,9 +34,9 @@ JBoss Blank Webapp - scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/apps/jboss-blank - scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/apps/jboss-blank - http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_1/apps/jboss-blank + scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/apps/jboss-blank + scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/apps/jboss-blank + http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/struts2-parent-2.3.1.2/apps/jboss-blank diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml index 3b950cd0c..1916810c0 100644 --- a/apps/mailreader/pom.xml +++ b/apps/mailreader/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps - 2.3.1.2-SNAPSHOT + 2.3.1.2 org.apache.struts struts2-mailreader @@ -34,9 +34,9 @@ Mail Reader Webapp - scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/apps/mailreader - scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/apps/mailreader - http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_1/apps/mailreader + scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/apps/mailreader + scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/apps/mailreader + http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/struts2-parent-2.3.1.2/apps/mailreader diff --git a/apps/pom.xml b/apps/pom.xml index e0edf34cc..3d07c5629 100644 --- a/apps/pom.xml +++ b/apps/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-parent - 2.3.1.2-SNAPSHOT + 2.3.1.2 org.apache.struts struts2-apps @@ -42,9 +42,9 @@ - scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/apps - scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/apps - http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_1/apps + scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/apps + scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/apps + http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/struts2-parent-2.3.1.2/apps diff --git a/apps/portlet/pom.xml b/apps/portlet/pom.xml index 41cf09914..113dd84e1 100644 --- a/apps/portlet/pom.xml +++ b/apps/portlet/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps - 2.3.1.2-SNAPSHOT + 2.3.1.2 org.apache.struts struts2-portlet @@ -34,9 +34,9 @@ Portlet Webapp - scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/apps/portlet - scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/apps/portlet - http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_1/apps/portlet + scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/apps/portlet + scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/apps/portlet + http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/struts2-parent-2.3.1.2/apps/portlet diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml index 26fa38e79..7d5350342 100644 --- a/apps/rest-showcase/pom.xml +++ b/apps/rest-showcase/pom.xml @@ -26,13 +26,13 @@ org.apache.struts struts2-apps - 2.3.1.2-SNAPSHOT + 2.3.1.2 org.apache.struts struts2-rest-showcase war - 2.3.1.2-SNAPSHOT + 2.3.1.2 Struts 2 Rest Showcase Example Struts 2 Rest Showcase Example diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml index fd99843f1..ba8d5fca5 100644 --- a/apps/showcase/pom.xml +++ b/apps/showcase/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-apps - 2.3.1.2-SNAPSHOT + 2.3.1.2 org.apache.struts struts2-showcase @@ -34,9 +34,9 @@ Showcase Webapp - scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/apps/showcase - scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/apps/showcase - http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_1/apps/showcase + scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/apps/showcase + scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/apps/showcase + http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/struts2-parent-2.3.1.2/apps/showcase diff --git a/archetypes/pom.xml b/archetypes/pom.xml index 36cc74e0b..72581488f 100644 --- a/archetypes/pom.xml +++ b/archetypes/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-parent - 2.3.1.2-SNAPSHOT + 2.3.1.2 org.apache.struts struts2-archetypes @@ -34,9 +34,9 @@ Struts 2 Maven Archetypes - scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/archetypes - scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/archetypes - http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/archetypes + scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/archetypes + scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/archetypes + http://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/archetypes diff --git a/archetypes/struts2-archetype-blank/pom.xml b/archetypes/struts2-archetype-blank/pom.xml index a455a3219..3b4be314a 100644 --- a/archetypes/struts2-archetype-blank/pom.xml +++ b/archetypes/struts2-archetype-blank/pom.xml @@ -3,18 +3,18 @@ org.apache.struts struts2-archetypes - 2.3.1.2-SNAPSHOT + 2.3.1.2 4.0.0 struts2-archetype-blank - 2.3.1.2-SNAPSHOT + 2.3.1.2 Struts 2 Archetypes - Blank - scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/archetypes/struts2-archetype-blank - scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/archetypes/struts2-archetype-blank - http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/archetypes/struts2-archetype-blank + scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/archetypes/struts2-archetype-blank + scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/archetypes/struts2-archetype-blank + http://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/archetypes/struts2-archetype-blank diff --git a/archetypes/struts2-archetype-convention/pom.xml b/archetypes/struts2-archetype-convention/pom.xml index eab9a88f9..92fb5f31e 100644 --- a/archetypes/struts2-archetype-convention/pom.xml +++ b/archetypes/struts2-archetype-convention/pom.xml @@ -2,18 +2,18 @@ org.apache.struts struts2-archetypes - 2.3.1.2-SNAPSHOT + 2.3.1.2 4.0.0 struts2-archetype-convention - 2.3.1.2-SNAPSHOT + 2.3.1.2 Struts 2 Archetypes - Blank Convention - scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/archetypes/struts2-archetype-convention - scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/archetypes/struts2-archetype-convention - http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/archetypes/struts2-archetype-convention + scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/archetypes/struts2-archetype-convention + scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/archetypes/struts2-archetype-convention + http://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/archetypes/struts2-archetype-convention diff --git a/archetypes/struts2-archetype-dbportlet/pom.xml b/archetypes/struts2-archetype-dbportlet/pom.xml index fc36ff896..6c16286e1 100644 --- a/archetypes/struts2-archetype-dbportlet/pom.xml +++ b/archetypes/struts2-archetype-dbportlet/pom.xml @@ -2,18 +2,18 @@ org.apache.struts struts2-archetypes - 2.3.1.2-SNAPSHOT + 2.3.1.2 4.0.0 struts2-archetype-dbportlet - 2.3.1.2-SNAPSHOT + 2.3.1.2 Struts 2 Archetypes - Database Portlet - scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/archetypes/struts2-archetype-dbportlet - scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/archetypes/struts2-archetype-dbportlet - svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/archetypes/struts2-archetype-dbportlet + scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/archetypes/struts2-archetype-dbportlet + scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/archetypes/struts2-archetype-dbportlet + svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/archetypes/struts2-archetype-dbportlet diff --git a/archetypes/struts2-archetype-plugin/pom.xml b/archetypes/struts2-archetype-plugin/pom.xml index 7c2e0bcc9..11b7666c6 100644 --- a/archetypes/struts2-archetype-plugin/pom.xml +++ b/archetypes/struts2-archetype-plugin/pom.xml @@ -2,19 +2,19 @@ org.apache.struts struts2-archetypes - 2.3.1.2-SNAPSHOT + 2.3.1.2 4.0.0 struts2-archetype-plugin - 2.3.1.2-SNAPSHOT + 2.3.1.2 jar Struts 2 Archetypes - Plugin - scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/archetypes/struts2-archetype-plugin - scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/archetypes/struts2-archetype-plugin - http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/archetypes/struts2-archetype-plugin + scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/archetypes/struts2-archetype-plugin + scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/archetypes/struts2-archetype-plugin + http://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/archetypes/struts2-archetype-plugin diff --git a/archetypes/struts2-archetype-portlet/pom.xml b/archetypes/struts2-archetype-portlet/pom.xml index c56d02480..c141f2c99 100644 --- a/archetypes/struts2-archetype-portlet/pom.xml +++ b/archetypes/struts2-archetype-portlet/pom.xml @@ -2,19 +2,19 @@ org.apache.struts struts2-archetypes - 2.3.1.2-SNAPSHOT + 2.3.1.2 4.0.0 struts2-archetype-portlet - 2.3.1.2-SNAPSHOT + 2.3.1.2 jar Struts 2 Archetypes - Portlet - scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/archetypes/struts2-archetype-portlet - scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/archetypes/struts2-archetype-portlet - http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/archetypes/struts2-archetype-portlet + scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/archetypes/struts2-archetype-portlet + scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/archetypes/struts2-archetype-portlet + http://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/archetypes/struts2-archetype-portlet diff --git a/archetypes/struts2-archetype-starter/pom.xml b/archetypes/struts2-archetype-starter/pom.xml index 8eaefd778..8a68453f8 100644 --- a/archetypes/struts2-archetype-starter/pom.xml +++ b/archetypes/struts2-archetype-starter/pom.xml @@ -4,19 +4,19 @@ org.apache.struts struts2-archetypes - 2.3.1.2-SNAPSHOT + 2.3.1.2 4.0.0 struts2-archetype-starter - 2.3.1.2-SNAPSHOT + 2.3.1.2 jar Struts 2 Archetypes - Starter - scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/archetypes/struts2-archetype-starter - scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/archetypes/struts2-archetype-starter - http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/archetypes/struts2-archetype-starter + scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/archetypes/struts2-archetype-starter + scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/archetypes/struts2-archetype-starter + http://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/archetypes/struts2-archetype-starter diff --git a/assembly/pom.xml b/assembly/pom.xml index cad86311d..81ab92e1a 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -11,13 +11,13 @@ org.apache.struts struts2-parent - 2.3.1.2-SNAPSHOT + 2.3.1.2 - scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/assembly - scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/assembly - http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_1/assembly + scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/assembly + scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/assembly + http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/struts2-parent-2.3.1.2/assembly diff --git a/bundles/admin/pom.xml b/bundles/admin/pom.xml index 55af67f23..09b613116 100644 --- a/bundles/admin/pom.xml +++ b/bundles/admin/pom.xml @@ -4,7 +4,7 @@ org.apache.struts struts2-osgi-bundles - 2.3.1.2-SNAPSHOT + 2.3.1.2 org.apache.struts struts2-osgi-admin-bundle @@ -12,9 +12,9 @@ Struts 2 OSGi Admin Bundle - scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/bundles/admin - scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/bundles/admin - http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_1/bundles/admin + scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/bundles/admin + scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/bundles/admin + http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/struts2-parent-2.3.1.2/bundles/admin diff --git a/bundles/demo/pom.xml b/bundles/demo/pom.xml index 7c1133ce9..0064b742e 100644 --- a/bundles/demo/pom.xml +++ b/bundles/demo/pom.xml @@ -4,7 +4,7 @@ org.apache.struts struts2-osgi-bundles - 2.3.1.2-SNAPSHOT + 2.3.1.2 org.apache.struts struts2-osgi-demo-bundle @@ -12,9 +12,9 @@ Struts 2 OSGi Demo Bundle - scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/bundles/demo - scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/bundles/demo - http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_1/bundles/demo + scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/bundles/demo + scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/bundles/demo + http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/struts2-parent-2.3.1.2/bundles/demo diff --git a/bundles/pom.xml b/bundles/pom.xml index 8aaa98240..6fce59ef8 100755 --- a/bundles/pom.xml +++ b/bundles/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-parent - 2.3.1.2-SNAPSHOT + 2.3.1.2 org.apache.struts struts2-osgi-bundles @@ -34,9 +34,9 @@ Struts OSGi Bundles - scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/bundles - scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/bundles - http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/bundles + scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/bundles + scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/bundles + http://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/bundles diff --git a/core/pom.xml b/core/pom.xml index da51616a9..02ab9cf14 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-parent - 2.3.1.2-SNAPSHOT + 2.3.1.2 org.apache.struts struts2-core @@ -34,9 +34,9 @@ Struts 2 Core - scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/core - scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/core - http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_1/core + scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/core + scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/core + http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/struts2-parent-2.3.1.2/core diff --git a/plugins/cdi/pom.xml b/plugins/cdi/pom.xml index 9a27c6d71..f2b99ee1a 100644 --- a/plugins/cdi/pom.xml +++ b/plugins/cdi/pom.xml @@ -25,7 +25,7 @@ org.apache.struts struts2-plugins - 2.3.1.2-SNAPSHOT + 2.3.1.2 org.apache.struts diff --git a/plugins/codebehind/pom.xml b/plugins/codebehind/pom.xml index 817a08948..d32a4e667 100644 --- a/plugins/codebehind/pom.xml +++ b/plugins/codebehind/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.1.2-SNAPSHOT + 2.3.1.2 org.apache.struts struts2-codebehind-plugin @@ -34,9 +34,9 @@ Struts 2 Codebehind Plugin - scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/plugins/codebehind - scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/plugins/codebehind - http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_1/plugins/codebehind + scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/plugins/codebehind + scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/plugins/codebehind + http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/struts2-parent-2.3.1.2/plugins/codebehind diff --git a/plugins/config-browser/pom.xml b/plugins/config-browser/pom.xml index 0ca4cb383..0fcc2b11b 100644 --- a/plugins/config-browser/pom.xml +++ b/plugins/config-browser/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.1.2-SNAPSHOT + 2.3.1.2 org.apache.struts struts2-config-browser-plugin @@ -34,9 +34,9 @@ Struts 2 Configuration Browser Plugin - scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/plugins/config-browser - scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/plugins/config-browser - http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_1/plugins/config-browser + scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/plugins/config-browser + scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/plugins/config-browser + http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/struts2-parent-2.3.1.2/plugins/config-browser diff --git a/plugins/convention/pom.xml b/plugins/convention/pom.xml index 5ad2dcca9..59c22697c 100644 --- a/plugins/convention/pom.xml +++ b/plugins/convention/pom.xml @@ -3,7 +3,7 @@ org.apache.struts struts2-plugins - 2.3.1.2-SNAPSHOT + 2.3.1.2 org.apache.struts struts2-convention-plugin @@ -11,9 +11,9 @@ Struts 2 Convention Plugin - scm:svn:http://svn.apache.org/repos/asf/struts/sandbox/tags/STRUTS_2_3_1 - scm:svn:https://svn.apache.org/repos/asf/struts/sandbox/tags/STRUTS_2_3_1 - http://svn.apache.org/viewcvs.cgi/struts/sandbox/tags/STRUTS_2_3_1 + scm:svn:http://svn.apache.org/repos/asf/struts/sandbox/tags/struts2-parent-2.3.1.2 + scm:svn:https://svn.apache.org/repos/asf/struts/sandbox/tags/struts2-parent-2.3.1.2 + http://svn.apache.org/viewcvs.cgi/struts/sandbox/tags/struts2-parent-2.3.1.2 diff --git a/plugins/dojo/pom.xml b/plugins/dojo/pom.xml index 944e4520f..da567a9b2 100644 --- a/plugins/dojo/pom.xml +++ b/plugins/dojo/pom.xml @@ -25,7 +25,7 @@ struts2-plugins org.apache.struts - 2.3.1.2-SNAPSHOT + 2.3.1.2 4.0.0 org.apache.struts @@ -33,9 +33,9 @@ Struts 2 Dojo Plugin - scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/plugins/dojo - scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/plugins/dojo - http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_1/plugins/dojo + scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/plugins/dojo + scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/plugins/dojo + http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/struts2-parent-2.3.1.2/plugins/dojo diff --git a/plugins/dwr/pom.xml b/plugins/dwr/pom.xml index b69c6b9f8..c3d8c3599 100644 --- a/plugins/dwr/pom.xml +++ b/plugins/dwr/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.1.2-SNAPSHOT + 2.3.1.2 org.apache.struts struts2-dwr-plugin @@ -34,9 +34,9 @@ Struts 2 DWR Plugin - scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/plugins/dwr - scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/plugins/dwr - http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_1/plugins/dwr + scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/plugins/dwr + scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/plugins/dwr + http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/struts2-parent-2.3.1.2/plugins/dwr diff --git a/plugins/embeddedjsp/pom.xml b/plugins/embeddedjsp/pom.xml index 4aeb61ae0..0d032a433 100644 --- a/plugins/embeddedjsp/pom.xml +++ b/plugins/embeddedjsp/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.1.2-SNAPSHOT + 2.3.1.2 org.apache.struts @@ -35,9 +35,9 @@ Struts 2 Embedded JSP Plugin - scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/plugins/embeddedjsp - scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/plugins/embeddedjsp - http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_1/plugins/embeddedjsp + scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/plugins/embeddedjsp + scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/plugins/embeddedjsp + http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/struts2-parent-2.3.1.2/plugins/embeddedjsp diff --git a/plugins/gxp/pom.xml b/plugins/gxp/pom.xml index f69325f35..a8faa188f 100644 --- a/plugins/gxp/pom.xml +++ b/plugins/gxp/pom.xml @@ -3,7 +3,7 @@ org.apache.struts struts2-plugins - 2.3.1.2-SNAPSHOT + 2.3.1.2 org.apache.struts @@ -13,9 +13,9 @@ http://struts.apache.org - scm:svn:http://svn.apache.org/repos/asf/struts/sandbox/tags/STRUTS_2_3_1 - scm:svn:https://svn.apache.org/repos/asf/struts/sandbox/tags/STRUTS_2_3_1 - http://svn.apache.org/viewcvs.cgi/struts/sandbox/tags/STRUTS_2_3_1 + scm:svn:http://svn.apache.org/repos/asf/struts/sandbox/tags/struts2-parent-2.3.1.2 + scm:svn:https://svn.apache.org/repos/asf/struts/sandbox/tags/struts2-parent-2.3.1.2 + http://svn.apache.org/viewcvs.cgi/struts/sandbox/tags/struts2-parent-2.3.1.2 diff --git a/plugins/jasperreports/pom.xml b/plugins/jasperreports/pom.xml index 5334ae894..f16b153e4 100644 --- a/plugins/jasperreports/pom.xml +++ b/plugins/jasperreports/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.1.2-SNAPSHOT + 2.3.1.2 org.apache.struts struts2-jasperreports-plugin @@ -34,9 +34,9 @@ Struts 2 Jasper Reports Plugin - scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/plugins/jasperreports - scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/plugins/jasperreports - http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_1/plugins/jasperreports + scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/plugins/jasperreports + scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/plugins/jasperreports + http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/struts2-parent-2.3.1.2/plugins/jasperreports diff --git a/plugins/javatemplates/pom.xml b/plugins/javatemplates/pom.xml index f48cbda69..dbd50e39d 100644 --- a/plugins/javatemplates/pom.xml +++ b/plugins/javatemplates/pom.xml @@ -25,7 +25,7 @@ org.apache.struts struts2-plugins - 2.3.1.2-SNAPSHOT + 2.3.1.2 org.apache.struts struts2-javatemplates-plugin @@ -33,9 +33,9 @@ Struts 2 Java Templates Plugin - scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/plugins/javatemplates - scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/plugins/javatemplates - http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_1/plugins/javatemplates + scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/plugins/javatemplates + scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/plugins/javatemplates + http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/struts2-parent-2.3.1.2/plugins/javatemplates diff --git a/plugins/jfreechart/pom.xml b/plugins/jfreechart/pom.xml index 202b48dd5..bbd95028f 100644 --- a/plugins/jfreechart/pom.xml +++ b/plugins/jfreechart/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.1.2-SNAPSHOT + 2.3.1.2 org.apache.struts struts2-jfreechart-plugin @@ -34,9 +34,9 @@ Struts 2 JFreeChart Plugin - scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/plugins/jfreechart - scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/plugins/jfreechart - http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_1/plugins/jfreechart + scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/plugins/jfreechart + scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/plugins/jfreechart + http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/struts2-parent-2.3.1.2/plugins/jfreechart diff --git a/plugins/jsf/pom.xml b/plugins/jsf/pom.xml index 02538ebb3..68b6bc203 100644 --- a/plugins/jsf/pom.xml +++ b/plugins/jsf/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.1.2-SNAPSHOT + 2.3.1.2 org.apache.struts struts2-jsf-plugin @@ -34,9 +34,9 @@ Struts 2 JSF Plugin - scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/plugins/jsf - scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/plugins/jsf - http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_1/plugins/jsf + scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/plugins/jsf + scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/plugins/jsf + http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/struts2-parent-2.3.1.2/plugins/jsf diff --git a/plugins/json/pom.xml b/plugins/json/pom.xml index ea1fe362a..9fd2db108 100644 --- a/plugins/json/pom.xml +++ b/plugins/json/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.1.2-SNAPSHOT + 2.3.1.2 org.apache.struts struts2-json-plugin @@ -34,9 +34,9 @@ Struts 2 JSON Plugin - scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/plugins/json - scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/plugins/json - http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_1/plugins/json + scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/plugins/json + scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/plugins/json + http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/struts2-parent-2.3.1.2/plugins/json diff --git a/plugins/junit/pom.xml b/plugins/junit/pom.xml index bd3b92cd7..d1a556aef 100644 --- a/plugins/junit/pom.xml +++ b/plugins/junit/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.1.2-SNAPSHOT + 2.3.1.2 org.apache.struts struts2-junit-plugin @@ -34,9 +34,9 @@ Struts 2 JUnit Plugin - scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/plugins/junit - scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/plugins/junit - http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_1/plugins/junit + scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/plugins/junit + scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/plugins/junit + http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/struts2-parent-2.3.1.2/plugins/junit diff --git a/plugins/osgi/pom.xml b/plugins/osgi/pom.xml index a57476d1e..d7708bc8d 100644 --- a/plugins/osgi/pom.xml +++ b/plugins/osgi/pom.xml @@ -4,7 +4,7 @@ org.apache.struts struts2-plugins - 2.3.1.2-SNAPSHOT + 2.3.1.2 org.apache.struts struts2-osgi-plugin @@ -12,9 +12,9 @@ Struts 2 OSGi Plugin - scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/plugins/osgi - scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/plugins/osgi - http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_1/plugins/osgi + scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/plugins/osgi + scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/plugins/osgi + http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/struts2-parent-2.3.1.2/plugins/osgi diff --git a/plugins/oval/pom.xml b/plugins/oval/pom.xml index 0e035bc1b..4eb86714e 100644 --- a/plugins/oval/pom.xml +++ b/plugins/oval/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.1.2-SNAPSHOT + 2.3.1.2 org.apache.struts struts2-oval-plugin @@ -34,9 +34,9 @@ Struts 2 OVal Plugin - scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/plugins/oval - scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/plugins/oval - http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_1/plugins/oval + scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/plugins/oval + scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/plugins/oval + http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/struts2-parent-2.3.1.2/plugins/oval diff --git a/plugins/pell-multipart/pom.xml b/plugins/pell-multipart/pom.xml index f188d0604..6f3c5fefd 100644 --- a/plugins/pell-multipart/pom.xml +++ b/plugins/pell-multipart/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.1.2-SNAPSHOT + 2.3.1.2 org.apache.struts struts2-pell-multipart-plugin @@ -34,9 +34,9 @@ Struts 2 Pell Multipart Plugin - scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/plugins/pell-multipart - scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/plugins/pell-multipart - http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_1/plugins/pell-multipart + scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/plugins/pell-multipart + scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/plugins/pell-multipart + http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/struts2-parent-2.3.1.2/plugins/pell-multipart diff --git a/plugins/plexus/pom.xml b/plugins/plexus/pom.xml index 317b7343d..6afc9d3ac 100644 --- a/plugins/plexus/pom.xml +++ b/plugins/plexus/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.1.2-SNAPSHOT + 2.3.1.2 org.apache.struts struts2-plexus-plugin @@ -34,9 +34,9 @@ Struts 2 Plexus Plugin - scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/plugins/plexus - scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/plugins/plexus - http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_1/plugins/plexus + scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/plugins/plexus + scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/plugins/plexus + http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/struts2-parent-2.3.1.2/plugins/plexus diff --git a/plugins/pom.xml b/plugins/pom.xml index 8a92b1c3c..cdd0fce81 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-parent - 2.3.1.2-SNAPSHOT + 2.3.1.2 org.apache.struts struts2-plugins @@ -34,9 +34,9 @@ Struts Plugins - scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/plugins - scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/plugins - http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/plugins + scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/plugins + scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/plugins + http://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/plugins diff --git a/plugins/portlet/pom.xml b/plugins/portlet/pom.xml index a7b22b41b..1407c82bd 100644 --- a/plugins/portlet/pom.xml +++ b/plugins/portlet/pom.xml @@ -3,7 +3,7 @@ org.apache.struts struts2-plugins - 2.3.1.2-SNAPSHOT + 2.3.1.2 org.apache.struts struts2-portlet-plugin @@ -11,9 +11,9 @@ Struts 2 Portlet Plugin - scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/plugins/portlet - scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/plugins/portlet - http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_1/plugins/portlet + scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/plugins/portlet + scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/plugins/portlet + http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/struts2-parent-2.3.1.2/plugins/portlet diff --git a/plugins/rest/pom.xml b/plugins/rest/pom.xml index f589d73f8..4c65772f9 100644 --- a/plugins/rest/pom.xml +++ b/plugins/rest/pom.xml @@ -26,11 +26,11 @@ org.apache.struts struts2-plugins - 2.3.1.2-SNAPSHOT + 2.3.1.2 org.apache.struts struts2-rest-plugin - 2.3.1.2-SNAPSHOT + 2.3.1.2 Struts 2 REST Plugin diff --git a/plugins/sitegraph/pom.xml b/plugins/sitegraph/pom.xml index ed8b5ab2c..5a68862fd 100644 --- a/plugins/sitegraph/pom.xml +++ b/plugins/sitegraph/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.1.2-SNAPSHOT + 2.3.1.2 org.apache.struts struts2-sitegraph-plugin @@ -34,9 +34,9 @@ Struts 2 Sitegraph Plugin - scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/plugins/sitegraph - scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/plugins/sitegraph - http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_1/plugins/sitegraph + scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/plugins/sitegraph + scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/plugins/sitegraph + http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/struts2-parent-2.3.1.2/plugins/sitegraph diff --git a/plugins/sitemesh/pom.xml b/plugins/sitemesh/pom.xml index 7483a05fe..82cd14804 100644 --- a/plugins/sitemesh/pom.xml +++ b/plugins/sitemesh/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.1.2-SNAPSHOT + 2.3.1.2 org.apache.struts struts2-sitemesh-plugin @@ -34,9 +34,9 @@ Struts 2 Sitemesh Plugin - scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/plugins/sitemesh - scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/plugins/sitemesh - http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_1/plugins/sitemesh + scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/plugins/sitemesh + scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/plugins/sitemesh + http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/struts2-parent-2.3.1.2/plugins/sitemesh diff --git a/plugins/spring/pom.xml b/plugins/spring/pom.xml index 235b6d4cf..454ec0126 100644 --- a/plugins/spring/pom.xml +++ b/plugins/spring/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.1.2-SNAPSHOT + 2.3.1.2 org.apache.struts struts2-spring-plugin @@ -34,9 +34,9 @@ Struts 2 Spring Plugin - scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/plugins/spring - scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/plugins/spring - http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_1/plugins/spring + scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/plugins/spring + scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/plugins/spring + http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/struts2-parent-2.3.1.2/plugins/spring diff --git a/plugins/struts1/pom.xml b/plugins/struts1/pom.xml index da85360f6..c6ae4c1a3 100644 --- a/plugins/struts1/pom.xml +++ b/plugins/struts1/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.1.2-SNAPSHOT + 2.3.1.2 org.apache.struts struts2-struts1-plugin @@ -34,9 +34,9 @@ Struts 2 Struts 1 Plugin - scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/plugins/struts1 - scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/plugins/struts1 - http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_1/plugins/struts1 + scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/plugins/struts1 + scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/plugins/struts1 + http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/struts2-parent-2.3.1.2/plugins/struts1 diff --git a/plugins/testng/pom.xml b/plugins/testng/pom.xml index aba4e4d8e..913e88e7a 100644 --- a/plugins/testng/pom.xml +++ b/plugins/testng/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.1.2-SNAPSHOT + 2.3.1.2 org.apache.struts struts2-testng-plugin @@ -34,9 +34,9 @@ Struts 2 TestNG Plugin - scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/plugins/testng - scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/plugins/testng - http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_1/plugins/testng + scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/plugins/testng + scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/plugins/testng + http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/struts2-parent-2.3.1.2/plugins/testng diff --git a/plugins/tiles/pom.xml b/plugins/tiles/pom.xml index 0e0697245..3efd9dc44 100644 --- a/plugins/tiles/pom.xml +++ b/plugins/tiles/pom.xml @@ -26,7 +26,7 @@ org.apache.struts struts2-plugins - 2.3.1.2-SNAPSHOT + 2.3.1.2 org.apache.struts struts2-tiles-plugin @@ -34,9 +34,9 @@ Struts 2 Tiles Plugin - scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/plugins/tiles - scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/plugins/tiles - http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_1/plugins/tiles + scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/plugins/tiles + scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/plugins/tiles + http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/struts2-parent-2.3.1.2/plugins/tiles diff --git a/pom.xml b/pom.xml index 11207258c..b9ba630b3 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ 4.0.0 org.apache.struts struts2-parent - 2.3.1.2-SNAPSHOT + 2.3.1.2 pom Struts 2 http://struts.apache.org/struts2 @@ -29,9 +29,9 @@ --> - scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1 - scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1 - http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_3_1 + scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2 + scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2 + http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/struts2-parent-2.3.1.2 @@ -55,7 +55,7 @@ apache-site - scp://people.apache.org/www/struts.apache.org/2.3.1.1/ + scp://people.apache.org/www/struts.apache.org/2.x/ @@ -85,7 +85,7 @@ ${project.version} 3.0.5.RELEASE - 3.0.3 + 3.0.4 3.3 2.0.6 diff --git a/xwork-core/pom.xml b/xwork-core/pom.xml index 09525717e..2f8f50941 100644 --- a/xwork-core/pom.xml +++ b/xwork-core/pom.xml @@ -5,7 +5,7 @@ org.apache.struts struts2-parent - 2.3.1.2-SNAPSHOT + 2.3.1.2 org.apache.struts.xwork @@ -15,9 +15,9 @@ - scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/xwork-core - scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/xwork-core - http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_3_1/xwork-core + scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/xwork-core + scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/xwork-core + http://svn.apache.org/repos/asf/struts/struts2/tags/struts2-parent-2.3.1.2/xwork-core diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java b/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java index 5b94a79ac..d10451b56 100644 --- a/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java +++ b/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java @@ -135,7 +135,7 @@ public class ParametersInterceptor extends MethodFilterInterceptor { static boolean devMode = false; // Allowed names of parameters - private String acceptedParamNames = "[a-zA-Z0-9\\.\\]\\[\\(\\)_']+"; + private String acceptedParamNames = "\\w+((\\.\\w+)|(\\[\\d+\\])|(\\(\\d+\\))|(\\['\\w+'\\])|(\\('\\w+'\\)))*"; private Pattern acceptedPattern = Pattern.compile(acceptedParamNames); private ValueStackFactory valueStackFactory; @@ -289,7 +289,7 @@ public class ParametersInterceptor extends MethodFilterInterceptor { String name = entry.getKey(); Object value = entry.getValue(); try { - newStack.setValue(name, value); + newStack.setParameter(name, value); } catch (RuntimeException e) { if (devMode) { String developerNotification = LocalizedTextUtil.findText(ParametersInterceptor.class, "devmode.notification", ActionContext.getContext().getLocale(), "Developer Notification:\n{0}", new Object[]{ diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java b/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java index 539410f8c..b4ae6d9c8 100644 --- a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java +++ b/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java @@ -206,7 +206,23 @@ public class OgnlUtil { * Ideally, this should be handled by OGNL directly. */ public void setValue(String name, Map context, Object root, Object value) throws OgnlException { - Ognl.setValue(compile(name), context, root, value); + setValue(name, context, root, value, true); + } + + protected void setValue(String name, Map context, Object root, Object value, boolean evalName) throws OgnlException { + Object tree = compile(name); + if (!evalName && isEvalExpression(tree, context)) { + throw new OgnlException("Eval expression cannot be used as parameter name"); + } + Ognl.setValue(tree, context, root, value); + } + + private boolean isEvalExpression(Object tree, Map context) throws OgnlException { + if (tree instanceof SimpleNode) { + SimpleNode node = (SimpleNode) tree; + return node.isEvalChain((OgnlContext) context); + } + return false; } public Object getValue(String name, Map context, Object root) throws OgnlException { @@ -245,7 +261,7 @@ public class OgnlUtil { public void copy(Object from, Object to, Map context, Collection exclusions, Collection inclusions) { if (from == null || to == null) { if (LOG.isWarnEnabled()) { - LOG.warn("Attempting to copy from or to a null source. This is illegal and is bein skipped. This may be due to an error in an OGNL expression, action chaining, or some other event."); + LOG.warn("Attempting to copy from or to a null source. This is illegal and is bein skipped. This may be due to an error in an OGNL expression, action chaining, or some other event."); } return; @@ -284,7 +300,7 @@ public class OgnlUtil { copy = false; } - if (copy == true) { + if (copy) { PropertyDescriptor toPd = toPdHash.get(fromPd.getName()); if ((toPd != null) && (toPd.getWriteMethod() != null)) { try { diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStack.java b/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStack.java index 7e66683b7..bf6ee9351 100644 --- a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStack.java +++ b/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStack.java @@ -144,6 +144,15 @@ public class OgnlValueStack implements Serializable, ValueStack, ClearableValueS return root; } + /** + * @see com.opensymphony.xwork2.util.ValueStack#setParameter(String, Object) + */ + public void setParameter(String expr, Object value) { + setValue(expr, value, devMode, false); + } + + /** + /** * @see com.opensymphony.xwork2.util.ValueStack#setValue(java.lang.String, java.lang.Object) */ @@ -155,9 +164,13 @@ public class OgnlValueStack implements Serializable, ValueStack, ClearableValueS * @see com.opensymphony.xwork2.util.ValueStack#setValue(java.lang.String, java.lang.Object, boolean) */ public void setValue(String expr, Object value, boolean throwExceptionOnFailure) { + setValue(expr, value, throwExceptionOnFailure, true); + } + + private void setValue(String expr, Object value, boolean throwExceptionOnFailure, boolean evalExpression) { Map context = getContext(); try { - trySetValue(expr, value, throwExceptionOnFailure, context); + trySetValue(expr, value, throwExceptionOnFailure, context, evalExpression); } catch (OgnlException e) { handleOgnlException(expr, value, throwExceptionOnFailure, e); } catch (RuntimeException re) { //XW-281 @@ -167,10 +180,10 @@ public class OgnlValueStack implements Serializable, ValueStack, ClearableValueS } } - private void trySetValue(String expr, Object value, boolean throwExceptionOnFailure, Map context) throws OgnlException { + private void trySetValue(String expr, Object value, boolean throwExceptionOnFailure, Map context, boolean evalExpression) throws OgnlException { context.put(XWorkConverter.CONVERSION_PROPERTY_FULLNAME, expr); context.put(REPORT_ERRORS_ON_NO_PROP, (throwExceptionOnFailure) ? Boolean.TRUE : Boolean.FALSE); - ognlUtil.setValue(expr, context, root, value); + ognlUtil.setValue(expr, context, root, value, evalExpression); } private void cleanUpContext(Map context) { diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/ValueStack.java b/xwork-core/src/main/java/com/opensymphony/xwork2/util/ValueStack.java index c2a208634..b59bceedb 100644 --- a/xwork-core/src/main/java/com/opensymphony/xwork2/util/ValueStack.java +++ b/xwork-core/src/main/java/com/opensymphony/xwork2/util/ValueStack.java @@ -74,6 +74,14 @@ public interface ValueStack { */ public abstract void setValue(String expr, Object value); + /** + * Attempts to set a property on a bean in the stack with the given expression using the default search order. + * N.B.: unlike #setValue(String,Object) it doesn't allow eval expression. + * @param expr the expression defining the path to the property to be set. + * @param value the value to be set into the named property + */ + void setParameter(String expr, Object value); + /** * Attempts to set a property on a bean in the stack with the given expression using the default search order. * diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/StubValueStack.java b/xwork-core/src/test/java/com/opensymphony/xwork2/StubValueStack.java index 563cf5b39..8432f2af8 100644 --- a/xwork-core/src/test/java/com/opensymphony/xwork2/StubValueStack.java +++ b/xwork-core/src/test/java/com/opensymphony/xwork2/StubValueStack.java @@ -50,6 +50,10 @@ public class StubValueStack implements ValueStack { ctx.put(expr, value); } + public void setParameter(String expr, Object value) { + throw new UnsupportedOperationException("not implemented"); + } + public void setValue(String expr, Object value, boolean throwExceptionOnFailure) { ctx.put(expr, value); } diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java index c6fe41db8..5e9a9d683 100644 --- a/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java +++ b/xwork-core/src/test/java/com/opensymphony/xwork2/interceptor/ParametersInterceptorTest.java @@ -509,6 +509,10 @@ public class ParametersInterceptorTest extends XWorkTestCase { public void setValue(String expr, Object value) { actual.put(expr, value); } + @Override + public void setParameter(String expr, Object value) { + actual.put(expr, value); + } }; container.inject(stack); return stack;