[maven-release-plugin] copy for tag STRUTS_2_1_6

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6@731669 13f79535-47bb-0310-9956-ffa450edef68

apps/blank/pom.xml

@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-apps</artifactId>
-        <version>2.1.3</version>
+        <version>2.1.6</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-blank</artifactId>
@@ -34,9 +34,9 @@
     <name>Blank Webapp</name>
 
     <scm>
-       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_3/apps/blank</connection>
-       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_3/apps/blank</developerConnection>
-       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_3/apps/blank</url>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/apps/blank</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/apps/blank</developerConnection>
+       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_6/apps/blank</url>
     </scm>
 
     <dependencies>

apps/mailreader/pom.xml

@@ -26,7 +26,7 @@
     <parent>
       <groupId>org.apache.struts</groupId>
       <artifactId>struts2-apps</artifactId>
-      <version>2.1.3</version>
+      <version>2.1.6</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-mailreader</artifactId>
@@ -34,9 +34,9 @@
     <name>Starter Webapp</name>
 
     <scm>
-       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_3/apps/mailreader</connection>
-       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_3/apps/mailreader</developerConnection>
-       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_3/apps/mailreader</url>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/apps/mailreader</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/apps/mailreader</developerConnection>
+       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_6/apps/mailreader</url>
     </scm>
 
     <dependencies>

apps/pom.xml

@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>2.1.3</version>
+        <version>2.1.6</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-apps</artifactId>
@@ -41,9 +41,9 @@
     </modules>
 
     <scm>
-       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_3/apps</connection>
-       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_3/apps</developerConnection>
-       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_3/apps</url>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/apps</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/apps</developerConnection>
+       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_6/apps</url>
     </scm>
 
      <distributionManagement>

apps/portlet/pom.xml

@@ -26,7 +26,7 @@
     <parent>
       <groupId>org.apache.struts</groupId>
       <artifactId>struts2-apps</artifactId>
-      <version>2.1.3</version>
+      <version>2.1.6</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-portlet</artifactId>
@@ -34,9 +34,9 @@
     <name>Portlet Webapp</name>
 
     <scm>
-       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_3/apps/portlet</connection>
-       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_3/apps/portlet</developerConnection>
-       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_3/apps/portlet</url>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/apps/portlet</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/apps/portlet</developerConnection>
+       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_6/apps/portlet</url>
     </scm>
 
 	<profiles>

apps/rest-showcase/pom.xml

@@ -26,13 +26,13 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-apps</artifactId>
-        <version>2.1.3</version>
+        <version>2.1.6</version>
     </parent>
 
 	<groupId>org.apache.struts</groupId>
 	<artifactId>struts2-rest-showcase</artifactId>
 	<packaging>war</packaging>
-	<version>2.1.3</version>
+	<version>2.1.6</version>
 	<name>Struts 2 Rest Showcase Example</name>
 	<description>Struts 2 Rest Showcase Example</description>
 

apps/showcase/pom.xml

@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-apps</artifactId>
-        <version>2.1.3</version>
+        <version>2.1.6</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-showcase</artifactId>
@@ -34,9 +34,9 @@
     <name>Showcase Webapp</name>
 
     <scm>
-       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_3/apps/showcase</connection>
-       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_3/apps/showcase</developerConnection>
-       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_3/apps/showcase</url>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/apps/showcase</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/apps/showcase</developerConnection>
+       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_6/apps/showcase</url>
     </scm>
 
 

apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp

@@ -95,6 +95,7 @@
 	</div>
     <div id="footer" class="clearfix">
         <p>Copyright &copy; 2003-<s:property value="#dateAction.now.year + 1900" /> The Apache Software Foundation.</p>
+        <s:hidden name="project-name" value="Struts 2" />
     </div><!-- end footer -->
     <p/>
 

apps/showcase/src/main/webapp/freemarker/customFreemarkerManagerUsage.ftl

@@ -18,8 +18,8 @@
 		<li>$ { customFreemarkerManagerUtil.timeNow } - to get the time now</li>
 	</ul>
 	 
-	 Today's Date = ${customFreemarkerManagerUtil.todayDate}<br/>
-	 Time now = ${customFreemarkerManagerUtil.getTimeNow()}<br/>
+	 Today's Date = <span id="todaysDate">${customFreemarkerManagerUtil.todayDate}</span><br/>
+	 Time now =  <span id="timeNow">${customFreemarkerManagerUtil.getTimeNow()}</span><br/>
 
 </body>
 </html>

apps/showcase/src/test/java/it/org/apache/struts2/showcase/ActionChainingTest.java

@@ -0,0 +1,30 @@
+/*
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package it.org.apache.struts2.showcase;
+
+public class ActionChainingTest extends ITBaseTest {
+    public void test() {
+        beginAt("/actionchaining/actionChain1!input");
+        assertTextPresent("Action Chain 1 Property 1: Property Set In Action Chain 1");
+        assertTextPresent("Action Chain 2 Property 1: Property Set in Action Chain 2");
+        assertTextPresent("Action Chain 3 Property 1: Property set in Action Chain 3");
+    }
+}

apps/showcase/src/test/java/it/org/apache/struts2/showcase/ActionTagExampleTest.java

@@ -1,29 +1,29 @@
-/*
- * $Id$
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package it.org.apache.struts2.showcase;
-
-public class ActionTagExampleTest extends ITBaseTest {
-    public void test() {
-        beginAt("/tags/ui/actionTagExample!input.action");
-        assertTextPresent("This text is from the called class");
-    }
-
-}
+/*
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package it.org.apache.struts2.showcase;
+
+public class ActionTagExampleTest extends ITBaseTest {
+    public void test() {
+        beginAt("/tags/ui/actionTagExample!input.action");
+        assertTextPresent("This text is from the called class");
+    }
+
+}

apps/showcase/src/test/java/it/org/apache/struts2/showcase/CRUDTest.java

@@ -0,0 +1,36 @@
+/*
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package it.org.apache.struts2.showcase;
+
+public class CRUDTest extends ITBaseTest {
+    public void testCreate() {
+        beginAt("/skill/edit.action");
+
+        setTextField("currentSkill.name", "somename1");
+        setTextField("currentSkill.description", "somedescription1");
+
+        submit();
+
+        beginAt("/skill/list.action");
+        assertTextPresent("somename1");
+        assertTextPresent("somedescription1");
+    }
+}

apps/showcase/src/test/java/it/org/apache/struts2/showcase/ComponentTagExampleTest.java

@@ -1,31 +1,31 @@
-/*
- * $Id$
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package it.org.apache.struts2.showcase;
-
-public class ComponentTagExampleTest extends ITBaseTest {
-    public void test() {
-        beginAt("/tags/ui/componentTagExample.jsp");
-        assertTextPresent("Freemarker Custom Template - parameter 'paramName' - paramValue1");
-        assertTextPresent("Freemarker Custom Template - parameter 'paramName' - paramValue4");
-        assertTextPresent("JSP Custom Template - parameter 'paramName' - paramValue2");
-        assertTextPresent("JSP Custom Template - parameter 'paramName' - paramValue3");
-    }
-}
+/*
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package it.org.apache.struts2.showcase;
+
+public class ComponentTagExampleTest extends ITBaseTest {
+    public void test() {
+        beginAt("/tags/ui/componentTagExample.jsp");
+        assertTextPresent("Freemarker Custom Template - parameter 'paramName' - paramValue1");
+        assertTextPresent("Freemarker Custom Template - parameter 'paramName' - paramValue4");
+        assertTextPresent("JSP Custom Template - parameter 'paramName' - paramValue2");
+        assertTextPresent("JSP Custom Template - parameter 'paramName' - paramValue3");
+    }
+}

apps/showcase/src/test/java/it/org/apache/struts2/showcase/ConversionTest.java

@@ -0,0 +1,67 @@
+/*
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package it.org.apache.struts2.showcase;
+
+public class ConversionTest extends ITBaseTest {
+    public void testList() {
+        beginAt("/conversion/enterPersonsInfo.action");
+        setTextField("persons[0].name", "name0");
+        setTextField("persons[0].age", "0");
+        setTextField("persons[1].name", "name1");
+        setTextField("persons[1].age", "1");
+        setTextField("persons[2].name", "name2");
+        setTextField("persons[2].age", "2");
+
+        submit();
+
+        assertTextPresent("SET 0 Name: name0");
+        assertTextPresent("SET 0 Age: 0");
+        assertTextPresent("SET 1 Name: name1");
+        assertTextPresent("SET 1 Age: 1");
+        assertTextPresent("SET 2 Name: name2");
+        assertTextPresent("SET 2 Age: 2");
+    }
+
+    public void testSet() {
+        beginAt("/conversion/enterAddressesInfo.action");
+        setTextField("addresses('id0').address", "address0");
+        setTextField("addresses('id1').address", "address1");
+        setTextField("addresses('id2').address", "address2");
+
+        submit();
+
+        assertTextPresent("id0 -> address0");
+        assertTextPresent("id1 -> address1");
+        assertTextPresent("id2 -> address2");
+    }
+
+    public void testEnum() {
+        beginAt("/conversion/enterOperationEnumInfo.action");
+        checkCheckbox("selectedOperations", "ADD");
+        checkCheckbox("selectedOperations", "MINUS");
+
+        submit();
+
+        assertTextPresent("ADD");
+        assertTextPresent("MINUS");        
+    }
+}
+

apps/showcase/src/test/java/it/org/apache/struts2/showcase/ExecAndWaitTest.java

@@ -0,0 +1,35 @@
+/*
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package it.org.apache.struts2.showcase;
+
+public class ExecAndWaitTest extends ITBaseTest {
+    public void testNodelay() throws InterruptedException {
+        beginAt("/wait/example1.jsp");
+
+        setTextField("time", "7000");
+        submit();
+        assertTextPresent("We are processing your request. Please wait.");
+
+        //hit it again
+        beginAt("/wait/longProcess1.action?time=1000");
+        assertTextPresent("We are processing your request. Please wait.");
+    }
+}

apps/showcase/src/test/java/it/org/apache/struts2/showcase/FileDownloadTest.java

@@ -0,0 +1,40 @@
+/*
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package it.org.apache.struts2.showcase;
+
+import java.net.URL;
+import java.net.MalformedURLException;
+
+public class FileDownloadTest extends ITBaseTest {
+    public void testImage() throws InterruptedException, MalformedURLException {
+        beginAt("/filedownload/download.action");
+
+        URL url = new URL("http://svn.apache.org/repos/asf/struts/struts2/trunk/apps/showcase/src/main/webapp/images/struts.gif");
+        assertDownloadedFileEquals(url);
+    }
+
+     public void testZip() throws InterruptedException, MalformedURLException {
+        beginAt("/filedownload/download2.action");
+
+        URL url = new URL("http://svn.apache.org/repos/asf/struts/struts2/trunk/apps/showcase/src/main/webapp/images/struts-gif.zip");
+        assertDownloadedFileEquals(url);
+    }
+}

apps/showcase/src/test/java/it/org/apache/struts2/showcase/FreeMarkerManagerTest.java

@@ -0,0 +1,44 @@
+/*
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package it.org.apache.struts2.showcase;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+
+public class FreeMarkerManagerTest extends ITBaseTest {
+    public void testCustomManager() {
+        beginAt("/freemarker/customFreemarkerManagerDemo.action");
+
+        String date = getElementTextByXPath("//*[@id='todaysDate']");
+        assertNotNull(date);
+        assertTrue(date.length() > 0);
+
+        String time = getElementTextByXPath("//*[@id='timeNow']");
+        assertNotNull(time);
+        assertTrue(time.length() > 0);
+    }
+
+    public void testTags() {
+        beginAt("/freemarker/standardTags.action");
+        assertElementPresent("test_name");
+        assertElementPresent("test_");
+    }
+}

apps/showcase/src/test/java/it/org/apache/struts2/showcase/ITBaseTest.java

@@ -1,30 +1,30 @@
-/*
- * $Id$
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package it.org.apache.struts2.showcase;
-
-import net.sourceforge.jwebunit.junit.WebTestCase;
-
-public abstract class ITBaseTest extends WebTestCase {
-
-    public void setUp() throws Exception {
-        getTestContext().setBaseUrl(ParameterUtils.getBaseUrl());
-    }
-}
+/*
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package it.org.apache.struts2.showcase;
+
+import net.sourceforge.jwebunit.junit.WebTestCase;
+
+public abstract class ITBaseTest extends WebTestCase {
+
+    public void setUp() throws Exception {
+        getTestContext().setBaseUrl(ParameterUtils.getBaseUrl());
+    }
+}

apps/showcase/src/test/java/it/org/apache/struts2/showcase/UITagExampleTest.java

@@ -1,55 +1,55 @@
-/*
- * $Id$
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package it.org.apache.struts2.showcase;
-
-public class UITagExampleTest extends ITBaseTest {
-    public void testInputForm() {
-        setScriptingEnabled(false);
-        beginAt("/tags/ui/example!input.action");
-        assertFormPresent("exampleSubmit");
-        // text box
-        assertFormElementPresent("name");
-        // textarea
-        assertFormElementPresent("bio");
-        // select
-        assertFormElementPresent("favouriteColor");
-        // checkbox list
-        assertFormElementPresent("friends");
-        // checkbox
-        assertFormElementPresent("legalAge");
-
-        // set fields
-        setTextField("name", "name");
-        setTextField("bio", "bio");
-        selectOption("favouriteColor", "Red");
-        checkCheckbox("friends", "Patrick");
-        checkCheckbox("friends", "Jason");
-        checkCheckbox("legalAge");
-
-        submit();
-
-        assertTextInElement("name", "name");
-        assertTextInElement("bio", "bio");
-        assertTextInElement("favouriteColor", "Red");
-        assertTextInElement("friends", "[Patrick, Jason]");
-        assertTextInElement("legalAge", "true");
-    }
-}
+/*
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package it.org.apache.struts2.showcase;
+
+public class UITagExampleTest extends ITBaseTest {
+    public void testInputForm() {
+        setScriptingEnabled(false);
+        beginAt("/tags/ui/example!input.action");
+        assertFormPresent("exampleSubmit");
+        // text box
+        assertFormElementPresent("name");
+        // textarea
+        assertFormElementPresent("bio");
+        // select
+        assertFormElementPresent("favouriteColor");
+        // checkbox list
+        assertFormElementPresent("friends");
+        // checkbox
+        assertFormElementPresent("legalAge");
+
+        // set fields
+        setTextField("name", "name");
+        setTextField("bio", "bio");
+        selectOption("favouriteColor", "Red");
+        checkCheckbox("friends", "Patrick");
+        checkCheckbox("friends", "Jason");
+        checkCheckbox("legalAge");
+
+        submit();
+
+        assertTextInElement("name", "name");
+        assertTextInElement("bio", "bio");
+        assertTextInElement("favouriteColor", "Red");
+        assertTextInElement("friends", "[Patrick, Jason]");
+        assertTextInElement("legalAge", "true");
+    }
+}

apps/showcase/src/test/java/it/org/apache/struts2/showcase/ValidationTest.java

@@ -0,0 +1,46 @@
+/*
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package it.org.apache.struts2.showcase;
+
+public class ValidationTest extends ITBaseTest {
+    public void testFieldValidators() {
+        beginAt("/validation/showFieldValidatorsExamples.action");
+
+        setTextField("integerValidatorField", "nonint");
+        setTextField("dateValidatorField", "nondate");
+        setTextField("emailValidatorField", "!@@#%");
+        setTextField("urlValidatorField", "!@@#%");
+        setTextField("stringLengthValidatorField", "a");
+        setTextField("regexValidatorField", "abc");
+        setTextField("fieldExpressionValidatorField", "abc");
+
+        submit();
+
+        assertTextPresent("Invalid field value for field \"dateValidatorField\"");
+        assertTextPresent("Invalid field value for field \"integerValidatorField\"");
+        assertTextPresent("required and must be string");
+        assertTextPresent("must be a valid email if supplied");
+        assertTextPresent("must be a valid url if supplied ");
+        assertTextPresent("must be a String of a specific greater than 1 less than 5 if specified ");
+        assertTextPresent("regexValidatorField must match a regexp (.*\\.txt) if specified ");
+        assertTextPresent("must be the same as the Required Validator Field if specified ");
+    }
+}

apps/showcase/src/test/java/it/org/apache/struts2/showcase/staticcontent/StaticContentTest.java

@@ -1,37 +1,37 @@
-package it.org.apache.struts2.showcase.staticcontent;
-
-import it.org.apache.struts2.showcase.ITBaseTest;
-
-import java.io.IOException;
-
-import net.sourceforge.jwebunit.exception.TestingEngineResponseException;
-
-public class StaticContentTest extends ITBaseTest {
-
-    public void testInvalidRersources1() throws IOException {
-        try {
-            beginAt("/struts..");
-            fail("Previous request should have failed");
-        } catch (TestingEngineResponseException ex) {
-            // ok
-        }
-    }
-
-    public void testInvalidRersources2() throws IOException {
-        try {
-            beginAt("/struts/..%252f");
-            fail("Previous request should have failed");
-        } catch (TestingEngineResponseException ex) {
-            // ok
-        }
-    }
-
-    /*public void testInvalidRersources3() throws IOException {
-        try {
-            beginAt("/struts/..%252f..%252f..%252fWEB-INF/classes/org/apache/struts2/showcase/action/EmployeeAction.class/");
-            fail("Previous request should have failed");
-        } catch (TestingEngineResponseException ex) {
-            // ok
-        }
-    }*/
-}
+package it.org.apache.struts2.showcase.staticcontent;
+
+import it.org.apache.struts2.showcase.ITBaseTest;
+
+import java.io.IOException;
+
+import net.sourceforge.jwebunit.exception.TestingEngineResponseException;
+
+public class StaticContentTest extends ITBaseTest {
+
+    public void testInvalidRersources1() throws IOException {
+        try {
+            beginAt("/struts..");
+            fail("Previous request should have failed");
+        } catch (TestingEngineResponseException ex) {
+            // ok
+        }
+    }
+
+    public void testInvalidRersources2() throws IOException {
+        try {
+            beginAt("/struts/..%252f");
+            fail("Previous request should have failed");
+        } catch (TestingEngineResponseException ex) {
+            // ok
+        }
+    }
+
+    /*public void testInvalidRersources3() throws IOException {
+        try {
+            beginAt("/struts/..%252f..%252f..%252fWEB-INF/classes/org/apache/struts2/showcase/action/EmployeeAction.class/");
+            fail("Previous request should have failed");
+        } catch (TestingEngineResponseException ex) {
+            // ok
+        }
+    }*/
+}

assembly/pom.xml

@@ -11,13 +11,13 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>2.1.3</version>
+        <version>2.1.6</version>
     </parent>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_3/assembly</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_3/assembly</developerConnection>
-        <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_3/assembly</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/assembly</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/assembly</developerConnection>
+        <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_6/assembly</url>
     </scm>
     
     <profiles>

core/pom.xml

@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>2.1.3</version>
+        <version>2.1.6</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-core</artifactId>
@@ -34,9 +34,9 @@
     <name>Struts 2 Core</name>
 
     <scm>
-       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_3/core</connection>
-       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_3/core</developerConnection>
-       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_3/core</url>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/core</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/core</developerConnection>
+       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_6/core</url>
     </scm>
 
     <build>

core/src/main/java/org/apache/struts2/components/ServletUrlRenderer.java

@@ -21,6 +21,17 @@
 
 package org.apache.struts2.components;
 
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.config.entities.ActionConfig;
+import com.opensymphony.xwork2.inject.Inject;
+import com.opensymphony.xwork2.util.logging.Logger;
+import com.opensymphony.xwork2.util.logging.LoggerFactory;
+import org.apache.struts2.StrutsException;
+import org.apache.struts2.dispatcher.mapper.ActionMapper;
+import org.apache.struts2.dispatcher.mapper.ActionMapping;
+import org.apache.struts2.views.util.UrlHelper;
+
 import java.io.IOException;
 import java.io.Writer;
 import java.util.Collections;
@@ -28,18 +39,6 @@ import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.apache.struts2.StrutsException;
-import org.apache.struts2.dispatcher.mapper.ActionMapping;
-import org.apache.struts2.dispatcher.mapper.ActionMapper;
-import org.apache.struts2.views.util.UrlHelper;
-
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.inject.Inject;
-import com.opensymphony.xwork2.config.entities.ActionConfig;
-import com.opensymphony.xwork2.util.logging.Logger;
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
-
 /**
  * Implementation of the {@link UrlRenderer} interface that creates URLs suitable in a servlet environment.
  * 
@@ -160,7 +159,7 @@ public class ServletUrlRenderer implements UrlRenderer {
 			if (formComponent.getId() == null  && actionName!=null ) {
 				formComponent.addParameter("id", formComponent.escape(actionName));
 			}
-		} else if (actionName != null) {
+		} else if (action != null) {
 			// Since we can't find an action alias in the configuration, we just
 			// assume the action attribute supplied is the path to be used as
 			// the URI this form is submitting to.
@@ -171,7 +170,7 @@ public class ServletUrlRenderer implements UrlRenderer {
               LOG.warn("No configuration found for the specified action: '" + actionName + "' in namespace: '" + namespace + "'. Form action defaulting to 'action' attribute's literal value.");
             }
 
-			String result = UrlHelper.buildUrl(actionName, formComponent.request, formComponent.response, null);
+			String result = UrlHelper.buildUrl(action, formComponent.request, formComponent.response, null);
 			formComponent.addParameter("action", result);
 
 			// namespace: cut out anything between the start and the last /

core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java

@@ -436,7 +436,8 @@ public class Dispatcher {
 
         // If there was a previous value stack, then create a new copy and pass it in to be used by the new Action
         ValueStack stack = (ValueStack) request.getAttribute(ServletActionContext.STRUTS_VALUESTACK_KEY);
-        if (stack == null) {
+        boolean nullStack = stack == null;
+        if (nullStack) {
             ActionContext ctx = ActionContext.getContext();
             if (ctx != null) {
                 stack = ctx.getValueStack();
@@ -468,7 +469,7 @@ public class Dispatcher {
             }
 
             // If there was a previous value stack then set it back onto the request
-            if (stack != null) {
+            if (!nullStack) {
                 request.setAttribute(ServletActionContext.STRUTS_VALUESTACK_KEY, stack);
             }
         } catch (ConfigurationException e) {

plugins/codebehind/pom.xml

@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.1.3</version>
+        <version>2.1.6</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-codebehind-plugin</artifactId>
@@ -34,9 +34,9 @@
     <name>Struts 2 Codebehind Plugin</name>
 
     <scm>
-       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_3/plugins/codebehind</connection>
-       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_3/plugins/codebehind</developerConnection>
-       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_3/plugins/codebehind</url>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/plugins/codebehind</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/plugins/codebehind</developerConnection>
+       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_6/plugins/codebehind</url>
     </scm>
 
     <dependencies>

plugins/config-browser/pom.xml

@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.1.3</version>
+        <version>2.1.6</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-config-browser-plugin</artifactId>
@@ -34,9 +34,9 @@
     <name>Struts 2 Configuration Browser Plugin</name>
 
     <scm>
-       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_3/plugins/config-browser</connection>
-       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_3/plugins/config-browser</developerConnection>
-       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_3/plugins/config-browser</url>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/plugins/config-browser</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/plugins/config-browser</developerConnection>
+       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_6/plugins/config-browser</url>
     </scm>
 
 </project>

plugins/convention/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.1.3</version>
+        <version>2.1.6</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-convention-plugin</artifactId>
@@ -11,9 +11,9 @@
     <name>Struts 2 Convention Plugin</name>
 
     <scm>
-       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/sandbox/tags/STRUTS_2_1_3</connection>
-       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/sandbox/tags/STRUTS_2_1_3</developerConnection>
-       <url>http://svn.apache.org/viewcvs.cgi/struts/sandbox/tags/STRUTS_2_1_3</url>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/sandbox/tags/STRUTS_2_1_6</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/sandbox/tags/STRUTS_2_1_6</developerConnection>
+       <url>http://svn.apache.org/viewcvs.cgi/struts/sandbox/tags/STRUTS_2_1_6</url>
     </scm>
 
     <build>
@@ -37,7 +37,7 @@
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-core</artifactId>
-            <version>2.1.3</version>
+            <version>2.1.6</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>

plugins/convention/src/main/java/org/apache/struts2/convention/DefaultResultMapBuilder.java

@@ -398,9 +398,6 @@ public class DefaultResultMapBuilder implements ResultMapBuilder {
             if (!params.containsKey(defaultParamName)) {
                 params.put(defaultParamName, info.location);
             }
-        } else if (LOG.isWarnEnabled()){
-            LOG.warn("Result [#0] for action class [#1] is missing the location", info.name,
-                    actionClass.getSimpleName());
         }
 
         return new ResultConfig.Builder(info.name, resultTypeConfig.getClassName()).addParams(params).build();

plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java

@@ -31,6 +31,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.regex.Pattern;
 import java.net.URL;
 
 import org.apache.struts2.convention.annotation.Action;
@@ -60,6 +61,7 @@ import com.opensymphony.xwork2.util.finder.UrlSet;
 import com.opensymphony.xwork2.util.logging.Logger;
 import com.opensymphony.xwork2.util.logging.LoggerFactory;
 import com.opensymphony.xwork2.util.FileManager;
+import com.opensymphony.xwork2.util.TextUtils;
 
 /**
  * <p>
@@ -78,9 +80,8 @@ public class PackageBasedActionConfigBuilder implements ActionConfigBuilder {
     private String[] actionPackages;
     private String[] excludePackages;
     private String[] packageLocators;
-    private String[] excludeJars;
+    private String[] includeJars;
     private String packageLocatorsBasePackage;
-    private boolean disableJarScanning = true;
     private boolean disableActionScanning = false;
     private boolean disablePackageLocatorsScanning = false;
     private String actionSuffix = "Action";
@@ -149,20 +150,12 @@ public class PackageBasedActionConfigBuilder implements ActionConfigBuilder {
     }
 
     /**
-     * @param exlcudeJars Comma separated list of regular expressions of jars to be exluded.
-     *                    Ignored if "struts.convention.action.disableJarScanning" is true
+     * @param includeJars Comma separated list of regular expressions of jars to be included.                         
      */
-    @Inject(value = "struts.convention.action.excludeJars", required = false)
-    public void setExcludeJars(String excludeJars) {
-        this.excludeJars = excludeJars.split("\\s*[,]\\s*");
-    }
-
-    /**
-     * @param disableJarScanning Disable scanning jar files for actions
-     */
-    @Inject(value = "struts.convention.action.disableJarScanning", required = false)
-    public void setDisableJarScanning(String disableJarScanning) {
-        this.disableJarScanning = "true".equals(disableJarScanning);
+    @Inject(value = "struts.convention.action.includeJars", required = false)
+    public void setIncludeJars(String includeJars) {
+        if (TextUtils.stringSet(includeJars))
+            this.includeJars = includeJars.split("\\s*[,]\\s*");
     }
 
     /**
@@ -335,12 +328,39 @@ public class PackageBasedActionConfigBuilder implements ActionConfigBuilder {
         urlSet = urlSet.excludePaths(System.getProperty("sun.boot.class.path", ""));
         urlSet = urlSet.exclude(".*/JavaVM.framework/.*");
 
-        if (disableJarScanning) {
+        if (includeJars == null) {
             urlSet = urlSet.exclude(".*?jar(!/)?");
-        } else if (excludeJars != null) {
-            for (String pattern : excludeJars) {
-                urlSet = urlSet.exclude(pattern.trim());
+        } else {
+            //jar urls regexes were specified
+            List<URL> rawIncludedUrls = urlSet.getUrls();
+            Set<URL> includeUrls = new HashSet<URL>();
+            boolean[] patternUsed = new boolean[includeJars.length];
+
+            for (URL url : rawIncludedUrls) {
+                if ("jar".equalsIgnoreCase(url.getProtocol())) {
+                    //it is a jar file, make sure it macthes at least a url regex
+                    for (int i = 0; i < includeJars.length; i++) {
+                        String includeJar = includeJars[i];
+                        if (Pattern.matches(includeJar, url.toExternalForm())) {
+                            includeUrls.add(url);
+                            patternUsed[i] = true;
+                            break;
+                        }
+                    }
+                } else {
+                    //it is not a jar
+                    includeUrls.add(url);
+                }
             }
+
+            if (LOG.isWarnEnabled()) {
+                for (int i = 0; i < patternUsed.length; i++) {
+                    if (!patternUsed[i]) {
+                        LOG.warn("The includeJars pattern [#0] did not match any jars in the classpath", includeJars[i]);
+                    }
+                }
+            }
+            return new UrlSet(includeUrls);
         }
 
         return urlSet;

plugins/convention/src/main/resources/struts-plugin.xml

@@ -42,7 +42,6 @@
   <constant name="struts.convention.result.flatLayout" value="true"/>
   <constant name="struts.convention.action.suffix" value="Action"/>
   <constant name="struts.convention.action.disableScanning" value="false"/>
-  <constant name="struts.convention.action.disableJarScanning" value="true"/>
   <constant name="struts.convention.action.mapAllMatches" value="false"/>
   <constant name="struts.convention.action.checkImplementsAction" value="true"/>
   <constant name="struts.convention.default.parent.package" value="convention-default"/>
@@ -55,6 +54,7 @@
   <constant name="struts.convention.relative.result.types" value="dispatcher,velocity,freemarker"/>
   <constant name="struts.convention.redirect.to.slash" value="true"/>
   <constant name="struts.mapper.alwaysSelectFullNamespace" value="true"/>
+  <constant name="struts.convention.action.includeJars" value="" />  
 
   <constant name="struts.convention.classes.reload" value="false" />  
 

plugins/convention/src/main/resources/struts.properties

@@ -1,18 +0,0 @@
-struts.convention.action.excludeJars = .*/activemq-(core|ra)-[\\d.]+.jar(!/)?, \
-            .*/catalina.*?jar(!/)?, \
-            .*/tomcat.*?jar(!/)?, \
-            .*/junit-[\\d.]+.jar(!/)?, \
-            .*/log4j-[\\d.]+.jar(!/)?, \
-            .*/xwork-[\\d.]+.jar(!/)?, \
-            .*/ognl-[\\d.]+.jar(!/)?, \
-            .*/aopalliance-[\\d.]+.jar(!/)?, \
-            .*/jstl-[\\d.]+.jar(!/)?, \
-            .*/dwr-[\\d.]+.jar(!/)?, \
-            .*/freemarker-[\\d.]+.jar(!/)?, \
-            .*/servlet-api-[\\d.]+.jar(!/)?, \
-            .*/sitemesh-[\\d.]+.jar(!/)?, \
-            .*/commons-(beanutils|el|digester|fileupload|codec|chain|logging|cli|pool|lang|collections|dbcp)-[\\d.]+.jar(!/)?, \
-            .*/spring-(beans|context|core|mock|web|jdbc)-[\\d.]+.jar(!/)?, \
-            .*/velocity-[\\d.]+.jar(!/)?, \
-            .*/velocity-(dep|tools)-[\\d.]+.jar(!/)?, \
-            .*/struts2-(config-browser-plugin|core|dojo-plugin|dwr-plugin|jsf-plugin|sitemesh-plugin|spring-plugin|struts1-plugin|tiles-plugin)-[\\d.]+.jar(!/)?

plugins/convention/src/test/java/org/apache/struts2/convention/PackageBasedActionConfigBuilderTest.java

@@ -279,7 +279,6 @@ public class PackageBasedActionConfigBuilderTest extends TestCase {
         interceptorBuilder.setConfiguration(configuration);
         PackageBasedActionConfigBuilder builder = new PackageBasedActionConfigBuilder(configuration,
             actionNameBuilder, resultMapBuilder, interceptorBuilder ,of, "false", "struts-default");
-        builder.setDisableJarScanning("true");
         if (actionPackages != null) {
             builder.setActionPackages(actionPackages);
         }

plugins/dojo/pom.xml

@@ -25,7 +25,7 @@
     <parent>
         <artifactId>struts2-plugins</artifactId>
         <groupId>org.apache.struts</groupId>
-        <version>2.1.3</version>
+        <version>2.1.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.struts</groupId>
@@ -33,9 +33,9 @@
     <name>Struts 2 Dojo Plugin</name>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_3/plugins/dojo</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_3/plugins/dojo</developerConnection>
-        <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_3/plugins/dojo</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/plugins/dojo</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/plugins/dojo</developerConnection>
+        <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_6/plugins/dojo</url>
     </scm>
     <profiles>
         <profile>

plugins/dwr/pom.xml

@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.1.3</version>
+        <version>2.1.6</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-dwr-plugin</artifactId>
@@ -34,9 +34,9 @@
     <name>Struts 2 DWR Plugin</name>
 
     <scm>
-       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_3/plugins/dwr</connection>
-       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_3/plugins/dwr</developerConnection>
-       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_3/plugins/dwr</url>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/plugins/dwr</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/plugins/dwr</developerConnection>
+       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_6/plugins/dwr</url>
     </scm>
 
     <dependencies>

plugins/jasperreports/pom.xml

@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.1.3</version>
+        <version>2.1.6</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-jasperreports-plugin</artifactId>
@@ -34,9 +34,9 @@
     <name>Struts 2 Jasper Reports Plugin</name>
 
     <scm>
-       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_3/plugins/jasperreports</connection>
-       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_3/plugins/jasperreports</developerConnection>
-       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_3/plugins/jasperreports</url>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/plugins/jasperreports</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/plugins/jasperreports</developerConnection>
+       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_6/plugins/jasperreports</url>
     </scm>
 
     <dependencies>

plugins/javatemplates/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.1.3</version>
+        <version>2.1.6</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-javatemplates-plugin</artifactId>
@@ -12,9 +12,9 @@
     <name>Struts 2 Java Templates Plugin</name>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_3/plugins/javatemplates</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_3/plugins/javatemplates</developerConnection>
-        <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_3/plugins/javatemplates</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/plugins/javatemplates</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/plugins/javatemplates</developerConnection>
+        <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_6/plugins/javatemplates</url>
     </scm>
 
     <dependencies>

plugins/jfreechart/pom.xml

@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.1.3</version>
+        <version>2.1.6</version>
    </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-jfreechart-plugin</artifactId>
@@ -34,9 +34,9 @@
     <name>Struts 2 JFreeChart Plugin</name>
 
     <scm>
-       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_3/plugins/jfreechart</connection>
-       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_3/plugins/jfreechart</developerConnection>
-       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_3/plugins/jfreechart</url>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/plugins/jfreechart</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/plugins/jfreechart</developerConnection>
+       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_6/plugins/jfreechart</url>
     </scm>
 
     <dependencies>

plugins/jsf/pom.xml

@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.1.3</version>
+        <version>2.1.6</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-jsf-plugin</artifactId>
@@ -34,9 +34,9 @@
     <name>Struts 2 JSF Plugin</name>
 
     <scm>
-       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_3/plugins/jsf</connection>
-       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_3/plugins/jsf</developerConnection>
-       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_3/plugins/jsf</url>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/plugins/jsf</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/plugins/jsf</developerConnection>
+       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_6/plugins/jsf</url>
     </scm>
 
     <dependencies>

plugins/junit/pom.xml

@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.1.3</version>
+        <version>2.1.6</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-junit-plugin</artifactId>
@@ -34,9 +34,9 @@
     <name>Struts 2 JUnit Plugin</name>
 
     <scm>
-       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_3/plugins/junit</connection>
-       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_3/plugins/junit</developerConnection>
-       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_3/plugins/junit</url>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/plugins/junit</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/plugins/junit</developerConnection>
+       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_6/plugins/junit</url>
     </scm>
 
     <dependencies>

plugins/pell-multipart/pom.xml

@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.1.3</version>
+        <version>2.1.6</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-pell-multipart-plugin</artifactId>
@@ -34,9 +34,9 @@
     <name>Struts 2 Pell Multipart Plugin</name>
 
     <scm>
-       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_3/plugins/pell-multipart</connection>
-       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_3/plugins/pell-multipart</developerConnection>
-       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_3/plugins/pell-multipart</url>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/plugins/pell-multipart</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/plugins/pell-multipart</developerConnection>
+       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_6/plugins/pell-multipart</url>
     </scm>
 
     <dependencies>

plugins/plexus/pom.xml

@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.1.3</version>
+        <version>2.1.6</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-plexus-plugin</artifactId>
@@ -34,9 +34,9 @@
     <name>Struts 2 Plexus Plugin</name>
 
     <scm>
-       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_3/plugins/plexus</connection>
-       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_3/plugins/plexus</developerConnection>
-       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_3/plugins/plexus</url>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/plugins/plexus</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/plugins/plexus</developerConnection>
+       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_6/plugins/plexus</url>
     </scm>
 
     <dependencies>

plugins/pom.xml

@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>2.1.3</version>
+        <version>2.1.6</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-plugins</artifactId>
@@ -34,9 +34,9 @@
     <name>Struts Plugins</name>
 
    <scm>
-     <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_3/plugins</connection>
-     <developerConnection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_3/plugins</developerConnection>
-     <url>http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_3/plugins</url>
+     <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/plugins</connection>
+     <developerConnection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/plugins</developerConnection>
+     <url>http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/plugins</url>
    </scm>
 
     <modules>

plugins/portlet/pom.xml

@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.1.3</version>
+        <version>2.1.6</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-portlet-plugin</artifactId>
@@ -34,9 +34,9 @@
     <name>Struts 2 Portlet Plugin</name>
 
     <scm>
-       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_3/plugins/portlet</connection>
-       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_3/plugins/portlet</developerConnection>
-       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_3/plugins/portlet</url>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/plugins/portlet</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/plugins/portlet</developerConnection>
+       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_6/plugins/portlet</url>
     </scm>
 
     <dependencies>

plugins/rest/pom.xml

@@ -26,11 +26,11 @@
 	<parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.1.3</version>
+        <version>2.1.6</version>
     </parent>
    <groupId>org.apache.struts</groupId>
    <artifactId>struts2-rest-plugin</artifactId>
-   <version>2.1.3</version>
+   <version>2.1.6</version>
    <name>Struts 2 REST Plugin</name>
 
     <dependencies>

plugins/sitegraph/pom.xml

@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.1.3</version>
+        <version>2.1.6</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-sitegraph-plugin</artifactId>
@@ -34,9 +34,9 @@
     <name>Struts 2 Sitegraph Plugin</name>
 
     <scm>
-       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_3/plugins/sitegraph</connection>
-       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_3/plugins/sitegraph</developerConnection>
-       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_3/plugins/sitegraph</url>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/plugins/sitegraph</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/plugins/sitegraph</developerConnection>
+       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_6/plugins/sitegraph</url>
     </scm>
 
     <build>

plugins/sitemesh/pom.xml

@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.1.3</version>
+        <version>2.1.6</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-sitemesh-plugin</artifactId>
@@ -34,9 +34,9 @@
     <name>Struts 2 Sitemesh Plugin</name>
 
     <scm>
-       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_3/plugins/sitemesh</connection>
-       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_3/plugins/sitemesh</developerConnection>
-       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_3/plugins/sitemesh</url>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/plugins/sitemesh</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/plugins/sitemesh</developerConnection>
+       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_6/plugins/sitemesh</url>
     </scm>
 
     <dependencies>

plugins/spring/pom.xml

@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.1.3</version>
+        <version>2.1.6</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-spring-plugin</artifactId>
@@ -34,9 +34,9 @@
     <name>Struts 2 Spring Plugin</name>
 
     <scm>
-       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_3/plugins/spring</connection>
-       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_3/plugins/spring</developerConnection>
-       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_3/plugins/spring</url>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/plugins/spring</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/plugins/spring</developerConnection>
+       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_6/plugins/spring</url>
     </scm>
    
    <properties>

plugins/struts1/pom.xml

@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.1.3</version>
+        <version>2.1.6</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-struts1-plugin</artifactId>
@@ -34,16 +34,16 @@
     <name>Struts 2 Struts 1 Plugin</name>
 
     <scm>
-       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_3/plugins/struts1</connection>
-       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_3/plugins/struts1</developerConnection>
-       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_3/plugins/struts1</url>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/plugins/struts1</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/plugins/struts1</developerConnection>
+       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_6/plugins/struts1</url>
     </scm>
 
     <dependencies>
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts-core</artifactId>
-            <version>1.3.9</version>
+            <version>1.3.10</version>
         </dependency>
         <dependency>
             <groupId>${pom.groupId}</groupId>

plugins/testng/pom.xml

@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.1.3</version>
+        <version>2.1.6</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-testng-plugin</artifactId>
@@ -34,9 +34,9 @@
     <name>Struts 2 TestNG Plugin</name>
 
     <scm>
-       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_3/plugins/testng</connection>
-       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_3/plugins/testng</developerConnection>
-       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_3/plugins/testng</url>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/plugins/testng</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/plugins/testng</developerConnection>
+       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_6/plugins/testng</url>
     </scm>
 
     <dependencies>

plugins/tiles/pom.xml

@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.1.3</version>
+        <version>2.1.6</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-tiles-plugin</artifactId>
@@ -34,9 +34,9 @@
     <name>Struts 2 Tiles Plugin</name>
 
     <scm>
-       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_3/plugins/tiles</connection>
-       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_3/plugins/tiles</developerConnection>
-       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_3/plugins/tiles</url>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/plugins/tiles</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6/plugins/tiles</developerConnection>
+       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_6/plugins/tiles</url>
     </scm>
 
     <dependencies>

pom.xml

@@ -9,7 +9,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-parent</artifactId>
-    <version>2.1.3</version>
+    <version>2.1.6</version>
     <packaging>pom</packaging>
     <name>Struts 2</name>
     <url>http://struts.apache.org/struts2</url>
@@ -28,9 +28,9 @@
     -->
 
     <scm>
-       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_3</connection>
-       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_3</developerConnection>
-       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_3</url>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_6</developerConnection>
+       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_6</url>
     </scm>
 
     <issueManagement>
@@ -78,6 +78,10 @@
         <url>http://www.apache.org</url>
     </organization>
 
+    <properties>
+        <currentVersion>${pom.version}</currentVersion>
+    </properties>
+
     <profiles>
         <profile>
             <id>xwork</id>
@@ -190,7 +194,7 @@
                 </plugin>
                 <plugin>
                     <artifactId>maven-site-plugin</artifactId>
-                    <version>2.0-beta-5</version>
+                    <version>2.0-beta-7</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-compiler-plugin</artifactId>

src/site/xdoc/index.xml.vm

@@ -36,7 +36,9 @@
             <a name="Welcome"/>
 
         <div style="text-align:left;height:200px">
-        <a href="docs/home.html"><img src="images/struts2-merger2.png" alt="Struts 2 and WebWork merger" hspace="16" align="left"/></a>
+            <div style="float:left;margin-left:16px;margin-right:16px">
+                <a href="docs/home.html"><img src="images/struts2-merger2.png" alt="Struts 2 and WebWork merger"/></a>
+            </div>
 
         <p>
          <strong>Apache Struts 2 is an elegant, extensible framework</strong> for creating enterprise-ready Java web applications.
@@ -54,10 +56,11 @@
         </div>
         <div>
         <table><tr><td>
-        <a href="http://struts.apache.org/download.cgi#struts213">
+        #set($aname=$currentVersion.replaceAll('\.', "")) 
+        <a href="http://struts.apache.org/download.cgi#struts${aname}">
           <div style="background:url(images/download.gif) no-repeat scroll 0%; width:200px; height:80px; float:left;position:relative;margin:5px">
             <span style="top:15px;position:absolute;color:white;padding-left:10px">
-              <small>version 2.1.3</small>
+              <small>version ${currentVersion}</small>
               <br />
               <span style="font-weight: bold; font-size:140%">Download Now</span>
             </span>