Fixing versions that didn't get set by maven for some reason

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_1@649086 13f79535-47bb-0310-9956-ffa450edef68
Fixing version
2026-08-08 08:07:17 +00:00 · 2008-04-17 13:24:25 +00:00 · 2008-04-17 13:17:33 +00:00 · 2008-04-17 10:00:40 +00:00
802 changed files with 1651 additions and 3301 deletions
@@ -21,12 +21,13 @@
 * under the License.
 */
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>org.apache.struts</groupId>
        <artifactId>struts2-apps</artifactId>
-        <version>2.1.2</version>
+        <version>2.1.1</version>
    </parent>
    <groupId>org.apache.struts</groupId>
    <artifactId>struts2-blank</artifactId>
@@ -34,9 +35,9 @@
    <name>Blank Webapp</name>

    <scm>
-       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_2/apps/blank</connection>
-       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_2/apps/blank</developerConnection>
-       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_2/apps/blank</url>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/apps/blank/</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/apps/blank/</developerConnection>
+       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/apps/blank/</url>
    </scm>

    <dependencies>
@@ -21,12 +21,13 @@
 * under the License.
 */
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
      <groupId>org.apache.struts</groupId>
      <artifactId>struts2-apps</artifactId>
-      <version>2.1.2</version>
+      <version>2.1.1</version>
    </parent>
    <groupId>org.apache.struts</groupId>
    <artifactId>struts2-mailreader</artifactId>
@@ -34,9 +35,9 @@
    <name>Starter Webapp</name>

    <scm>
-       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_2/apps/mailreader</connection>
-       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_2/apps/mailreader</developerConnection>
-       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_2/apps/mailreader</url>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/apps/mailreader/</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/apps/mailreader/</developerConnection>
+       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/apps/mailreader/</url>
    </scm>

    <dependencies>
@@ -21,12 +21,14 @@
 * under the License.
 */
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>org.apache.struts</groupId>
        <artifactId>struts2-parent</artifactId>
-        <version>2.1.2</version>
+        <version>2.1.1</version>
    </parent>
    <groupId>org.apache.struts</groupId>
    <artifactId>struts2-apps</artifactId>
@@ -41,9 +43,9 @@
    </modules>

    <scm>
-       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_2/apps</connection>
-       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_2/apps</developerConnection>
-       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_2/apps</url>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/apps/</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/apps/</developerConnection>
+       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/apps/</url>
    </scm>

     <distributionManagement>
@@ -107,10 +109,14 @@
                                </goals>
                                <configuration>
                                    <tasks>
-                                        <taskdef resource="hostedqatasks" classpathref="maven.plugin.classpath" />
-                                        <upload file="${project.build.directory}/${project.build.finalName}.war" account="struts" email="${email}" password="${password}" resourceId="${resourceId}" />
+                                        <taskdef resource="hostedqatasks" classpathref="maven.plugin.classpath"/>
+                                        <upload file="${project.build.directory}/${project.build.finalName}.war"
+                                                account="struts" email="${email}"
+                                                password="${password}" resourceId="${resourceId}"/>

-                                        <playsuite suiteId="${suiteId}" clientConfigs="${clientConfigs}" appConfigs="${appConfigs}" account="struts" email="${email}" password="${password}" />
+                                        <playsuite suiteId="${suiteId}" clientConfigs="${clientConfigs}" appConfigs="${appConfigs}" account="struts"
+                                                   email="${email}"
+                                                   password="${password}"/>
                                    </tasks>
                                </configuration>
                            </execution>
@@ -135,10 +141,11 @@
            </activation>
            <build>
                <plugins>
+                    <!--
                    <plugin>
-                        <inherited>true</inherited>
                        <groupId>org.codehaus.mojo</groupId>
                        <artifactId>rat-maven-plugin</artifactId>
+                        <version>1.0-alpha-2</version>
                        <executions>
                            <execution>
                                <phase>verify</phase>
@@ -162,6 +169,7 @@
                            </execution>
                        </executions>
                    </plugin>
+                    -->
                </plugins>
            </build>
        </profile>
@@ -194,11 +202,13 @@
                        <phase>process-sources</phase>
                        <configuration>
                            <tasks>
-                                <copy todir="${project.build.directory}/${pom.artifactId}/WEB-INF/src/java" failonerror="false">
-                                    <fileset dir="${basedir}/src/main/java" />
+                                <copy todir="${project.build.directory}/${pom.artifactId}/WEB-INF/src/java"
+                                      failonerror="false">
+                                    <fileset dir="${basedir}/src/main/java"/>
                                </copy>
-                                <copy todir="${project.build.directory}/${pom.artifactId}/WEB-INF/src/java" failonerror="false">
-                                    <fileset dir="${basedir}/src/main/resources" />
+                                <copy todir="${project.build.directory}/${pom.artifactId}/WEB-INF/src/java"
+                                      failonerror="false">
+                                    <fileset dir="${basedir}/src/main/resources"/>
                                </copy>
                            </tasks>
                        </configuration>
@@ -247,4 +257,4 @@
        </dependency>
    </dependencies>

-</project>
+</project>
@@ -21,12 +21,13 @@
 * under the License.
 */
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
      <groupId>org.apache.struts</groupId>
      <artifactId>struts2-apps</artifactId>
-      <version>2.1.2</version>
+      <version>2.1.1</version>
    </parent>
    <groupId>org.apache.struts</groupId>
    <artifactId>struts2-portlet</artifactId>
@@ -34,9 +35,9 @@
    <name>Portlet Webapp</name>

    <scm>
-       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_2/apps/portlet</connection>
-       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_2/apps/portlet</developerConnection>
-       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_2/apps/portlet</url>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/apps/portlet/</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/apps/portlet/</developerConnection>
+       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/apps/portlet/</url>
    </scm>

 	<profiles>
@@ -1,38 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
- * $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.
- */
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+<project>
 	<modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>org.apache.struts</groupId>
        <artifactId>struts2-apps</artifactId>
-        <version>2.1.2</version>
+        <version>2.1.1</version>
    </parent>

 	<groupId>org.apache.struts</groupId>
 	<artifactId>struts2-rest-showcase</artifactId>
 	<packaging>war</packaging>
-	<version>2.1.2</version>
+	<version>2.1.1</version>
 	<name>Struts 2 Rest Showcase Example</name>
 	<description>Struts 2 Rest Showcase Example</description>
 	
@@ -21,12 +21,13 @@
 * under the License.
 */
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>org.apache.struts</groupId>
        <artifactId>struts2-apps</artifactId>
-        <version>2.1.2</version>
+        <version>2.1.1</version>
    </parent>
    <groupId>org.apache.struts</groupId>
    <artifactId>struts2-showcase</artifactId>
@@ -34,9 +35,9 @@
    <name>Showcase Webapp</name>

    <scm>
-       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_2/apps/showcase</connection>
-       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_2/apps/showcase</developerConnection>
-       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_2/apps/showcase</url>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/apps/showcase/</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/apps/showcase/</developerConnection>
+       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/apps/showcase/</url>
    </scm>


@@ -16,8 +16,8 @@
        <li><s:url var="url" namespace="/tags/ui" action="showDynamicTreeAction"/><s:a href="%{url}">Tree Example (dynamic)</s:a>
        <li><s:url var="url" namespace="/tags/ui" action="showDynamicAjaxTreeAction"/><s:a href="%{url}">Tree Example (dynamic ajax loading)</s:a>
        <li><s:url var="url" value="componentTagExample.jsp"/><s:a href="%{#url}">Component Tag Example</s:a>
-        <li><a href="datepicker/index.jsp">DateTime picker tag - Pick a date</a></li>
-        <li><a href="timepicker/index.jsp">DateTime picker tag - Pick a time</a></li>
+        <li><a href="datepicker">DateTime picker tag - Pick a date</a></li>
+        <li><a href="timepicker">DateTime picker tag - Pick a time</a></li>
        <%--li><s:url var="url" namespace="/tags/ui" action="populateUsingIterator" method="input" /><s:a href="%{url}">UI population using iterator tag</s:a></li--%>
    </ul>
 </body>
@@ -33,7 +33,7 @@
    <parent>
        <groupId>org.apache.struts</groupId>
        <artifactId>struts2-parent</artifactId>
-        <version>2.1.2</version>
+        <version>2.1.1</version>
    </parent>

    <scm>
@@ -161,11 +161,6 @@

    <dependencies>

-        <dependency>
-            <groupId>org.apache.struts</groupId>
-            <artifactId>struts2-codebehind-plugin</artifactId>
-            <version>${version}</version>
-        </dependency>

        <dependency>
            <groupId>org.apache.struts</groupId>
@@ -173,18 +168,6 @@
            <version>${version}</version>
        </dependency>

-        <dependency>
-            <groupId>org.apache.struts</groupId>
-            <artifactId>struts2-dojo-plugin</artifactId>
-            <version>${version}</version>
-        </dependency>
- 
-        <dependency>
-            <groupId>org.apache.struts</groupId>
-            <artifactId>struts2-dwr-plugin</artifactId>
-            <version>${version}</version>
-        </dependency>
-
        <dependency>
            <groupId>org.apache.struts</groupId>
            <artifactId>struts2-jasperreports-plugin</artifactId>
@@ -203,12 +186,6 @@
            <version>${version}</version>
        </dependency>

-        <dependency>
-            <groupId>org.apache.struts</groupId>
-            <artifactId>struts2-junit-plugin</artifactId>
-            <version>${version}</version>
-        </dependency>
-
        <dependency>
            <groupId>org.apache.struts</groupId>
            <artifactId>struts2-pell-multipart-plugin</artifactId>
@@ -221,34 +198,17 @@
            <version>${version}</version>
        </dependency>

-        <dependency>
-            <groupId>org.apache.struts</groupId>
-            <artifactId>struts2-portlet-plugin</artifactId>
-            <version>${version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.struts</groupId>
-            <artifactId>struts2-rest-plugin</artifactId>
-            <version>${version}</version>
-        </dependency>
-
        <dependency>
            <groupId>org.apache.struts</groupId>
            <artifactId>struts2-sitegraph-plugin</artifactId>
            <version>${version}</version>
        </dependency>

-         <dependency>
+        <dependency>
            <groupId>org.apache.struts</groupId>
            <artifactId>struts2-sitemesh-plugin</artifactId>
            <version>${version}</version>
        </dependency>
-       <dependency>
-            <groupId>org.apache.struts</groupId>
-            <artifactId>struts2-spring-plugin</artifactId>
-            <version>${version}</version>
-        </dependency>

        <dependency>
            <groupId>org.apache.struts</groupId>
@@ -258,13 +218,13 @@

        <dependency>
            <groupId>org.apache.struts</groupId>
-            <artifactId>struts2-testng-plugin</artifactId>
+            <artifactId>struts2-tiles-plugin</artifactId>
            <version>${version}</version>
        </dependency>

        <dependency>
            <groupId>org.apache.struts</groupId>
-            <artifactId>struts2-tiles-plugin</artifactId>
+            <artifactId>struts2-rest-plugin</artifactId>
            <version>${version}</version>
        </dependency>

@@ -135,10 +135,6 @@
        <directory>../plugins/dojo/target/site</directory>
        <outputDirectory>docs/struts2-plugins/struts2-dojo-plugin</outputDirectory>
      </fileSet>
-      <fileSet>
-        <directory>../plugins/dojo/target/site</directory>
-        <outputDirectory>docs/struts2-plugins/struts2-dwr-plugin</outputDirectory>
-      </fileSet>
      <fileSet>
        <directory>../plugins/jasperreports/target/site</directory>
        <outputDirectory>docs/struts2-plugins/struts2-jasperreports-plugin</outputDirectory>
@@ -151,10 +147,6 @@
        <directory>../plugins/jsf/target/site</directory>
        <outputDirectory>docs/struts2-plugins/struts2-jsf-plugin</outputDirectory>
      </fileSet>
-      <fileSet>
-        <directory>../plugins/jsf/target/site</directory>
-        <outputDirectory>docs/struts2-plugins/struts2-junit-plugin</outputDirectory>
-      </fileSet>
      <fileSet>
        <directory>../plugins/pell-multipart/target/site</directory>
        <outputDirectory>docs/struts2-plugins/struts2-pell-multipart-plugin</outputDirectory>
@@ -187,10 +179,6 @@
        <directory>../plugins/sitemesh/target/site</directory>
        <outputDirectory>docs/struts2-plugins/struts2-sitemesh-plugin</outputDirectory>
      </fileSet>
-      <fileSet>
-        <directory>../plugins/tiles/target/site</directory>
-        <outputDirectory>docs/struts2-plugins/struts2-testng-plugin</outputDirectory>
-      </fileSet>
      <fileSet>
        <directory>../plugins/tiles/target/site</directory>
        <outputDirectory>docs/struts2-plugins/struts2-tiles-plugin</outputDirectory>
@@ -67,10 +67,6 @@
        <directory>../plugins/dojo/target/site</directory>
        <outputDirectory>docs/struts2-plugins/struts2-dojo-plugin</outputDirectory>
      </fileSet>
-      <fileSet>
-        <directory>../plugins/dojo/target/site</directory>
-        <outputDirectory>docs/struts2-plugins/struts2-dwr-plugin</outputDirectory>
-      </fileSet>
      <fileSet>
        <directory>../plugins/jasperreports/target/site</directory>
        <outputDirectory>docs/struts2-plugins/struts2-jasperreports-plugin</outputDirectory>
@@ -83,10 +79,6 @@
        <directory>../plugins/jsf/target/site</directory>
        <outputDirectory>docs/struts2-plugins/struts2-jsf-plugin</outputDirectory>
      </fileSet>
-      <fileSet>
-        <directory>../plugins/jsf/target/site</directory>
-        <outputDirectory>docs/struts2-plugins/struts2-junit-plugin</outputDirectory>
-      </fileSet>
      <fileSet>
        <directory>../plugins/pell-multipart/target/site</directory>
        <outputDirectory>docs/struts2-plugins/struts2-pell-multipart-plugin</outputDirectory>
@@ -119,10 +111,6 @@
        <directory>../plugins/sitemesh/target/site</directory>
        <outputDirectory>docs/struts2-plugins/struts2-sitemesh-plugin</outputDirectory>
      </fileSet>
-      <fileSet>
-        <directory>../plugins/tiles/target/site</directory>
-        <outputDirectory>docs/struts2-plugins/struts2-testng-plugin</outputDirectory>
-      </fileSet>
      <fileSet>
        <directory>../plugins/tiles/target/site</directory>
        <outputDirectory>docs/struts2-plugins/struts2-tiles-plugin</outputDirectory>
@@ -21,12 +21,13 @@
 * under the License.
 */
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>org.apache.struts</groupId>
        <artifactId>struts2-parent</artifactId>
-        <version>2.1.2</version>
+        <version>2.1.1</version>
    </parent>
    <groupId>org.apache.struts</groupId>
    <artifactId>struts2-core</artifactId>
@@ -34,9 +35,9 @@
    <name>Struts 2 Core</name>

    <scm>
-       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_2/core</connection>
-       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/tags/STRUTS_2_1_2/core</developerConnection>
-       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/tags/STRUTS_2_1_2/core</url>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/core/</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/core/</developerConnection>
+       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/core/</url>
    </scm>

    <build>
@@ -129,6 +130,7 @@
                    </links>
                </configuration>
            </plugin>
+            <!--
            <plugin>
                <groupId>org.codehaus.mojo</groupId>
                <artifactId>rat-maven-plugin</artifactId>
@@ -143,10 +145,10 @@
                        <exclude>src/main/resources/org/apache/struts2/static/domTT.js</exclude>
                        <exclude>src/test/resources/org/apache/struts2/interceptor/validation/*</exclude>
                        <exclude>src/site/resources/tags/**</exclude>
-                        <exclude>src/main/resources/*LICENSE.txt</exclude>
                    </excludes>
                </configuration>
            </plugin>
+            -->
        </plugins>
    </reporting>

@@ -18,7 +18,6 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-
 package org.apache.struts2;

 import javax.servlet.http.HttpServletRequest;
@@ -18,7 +18,6 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-
 package org.apache.struts2;

 import java.util.Map;
@@ -18,7 +18,6 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-
 package org.apache.struts2;

 import org.apache.struts2.dispatcher.mapper.CompositeActionMapper;
@@ -100,7 +99,7 @@ public final class StrutsConstants {
    /** List of Velocity context names */
    public static final String STRUTS_VELOCITY_CONTEXTS = "struts.velocity.contexts";

-    /** The directory containing UI templates.  All templates must reside in this directory. */
+    /** The directory containing UI templates */
    public static final String STRUTS_UI_TEMPLATEDIR = "struts.ui.templateDir";

    /** The default UI template theme */
@@ -18,7 +18,6 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-
 package org.apache.struts2;

 import com.opensymphony.xwork2.XWorkException;
@@ -18,7 +18,6 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-
 package org.apache.struts2;


@@ -18,7 +18,6 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-
 package org.apache.struts2.components;

 import java.io.IOException;
@@ -18,7 +18,6 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-
 package org.apache.struts2.components;

 import javax.servlet.http.HttpServletRequest;
@@ -18,7 +18,6 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-
 package org.apache.struts2.components;

 import javax.servlet.http.HttpServletRequest;
@@ -18,7 +18,6 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-
 package org.apache.struts2.components;

 import javax.servlet.http.HttpServletRequest;
@@ -18,7 +18,6 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-
 package org.apache.struts2.components;

 import java.io.Writer;
@@ -18,7 +18,6 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-
 package org.apache.struts2.components;

 import java.io.Writer;
@@ -18,7 +18,6 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-
 package org.apache.struts2.components;

 import javax.servlet.http.HttpServletRequest;
@@ -18,7 +18,6 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-
 package org.apache.struts2.components;

 import javax.servlet.http.HttpServletRequest;
@@ -18,7 +18,6 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-
 package org.apache.struts2.components;

 import java.io.Writer;
@@ -18,7 +18,6 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-
 package org.apache.struts2.components;

 import java.util.Collection;
@@ -18,7 +18,6 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-
 package org.apache.struts2.components;

 import java.io.IOException;
@@ -18,7 +18,6 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-
 package org.apache.struts2.components;

 import org.apache.struts2.views.annotations.StrutsTagAttribute;
@@ -18,7 +18,6 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-
 package org.apache.struts2.components;

 import java.io.IOException;
@@ -18,7 +18,6 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-
 package org.apache.struts2.components;

 import com.opensymphony.xwork2.inject.Inject;
@@ -18,7 +18,6 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-
 package org.apache.struts2.components;

 import javax.servlet.http.HttpServletRequest;
@@ -18,7 +18,6 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-
 package org.apache.struts2.components;

 import java.util.Map;
@@ -18,7 +18,6 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-
 package org.apache.struts2.components;

 import javax.servlet.http.HttpServletRequest;
@@ -18,7 +18,6 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-
 package org.apache.struts2.components;

 import java.io.Writer;
@@ -18,7 +18,6 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-
 package org.apache.struts2.components;

 import java.io.Writer;
@@ -18,7 +18,6 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-
 package org.apache.struts2.components;

 import java.util.ArrayList;
@@ -18,7 +18,6 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-
 package org.apache.struts2.components;

 import javax.servlet.http.HttpServletRequest;
@@ -18,7 +18,6 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-
 package org.apache.struts2.components;

 import com.opensymphony.xwork2.ObjectFactory;
@@ -18,7 +18,6 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-
 package org.apache.struts2.components;

 import javax.servlet.http.HttpServletRequest;
@@ -18,7 +18,6 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-
 package org.apache.struts2.components;

 import javax.servlet.http.HttpServletRequest;
@@ -18,7 +18,6 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-
 package org.apache.struts2.components;

 import javax.servlet.http.HttpServletRequest;
@@ -18,7 +18,6 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-
 package org.apache.struts2.components;

 import javax.servlet.http.HttpServletRequest;
@@ -18,7 +18,6 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-
 package org.apache.struts2.components;

 import java.io.Writer;
@@ -18,7 +18,6 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-
 package org.apache.struts2.components;

 import java.io.Writer;
@@ -18,7 +18,6 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-
 package org.apache.struts2.components;

 import java.io.IOException;
@@ -18,7 +18,6 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-
 package org.apache.struts2.components;

 import java.util.LinkedHashMap;
@@ -18,7 +18,6 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-
 package org.apache.struts2.components;

 import java.io.Writer;
@@ -18,7 +18,6 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-
 package org.apache.struts2.components;

 import javax.servlet.http.HttpServletRequest;
@@ -18,7 +18,6 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-
 package org.apache.struts2.components;

 import java.lang.reflect.Array;
@@ -18,7 +18,6 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-
 package org.apache.struts2.components;

 import java.io.Writer;
@@ -18,7 +18,6 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-
 package org.apache.struts2.components;

 import java.io.Writer;
@@ -18,7 +18,6 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-
 package org.apache.struts2.components;

 import java.util.LinkedHashMap;
@@ -18,7 +18,6 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-
 package org.apache.struts2.components;

 import java.io.Writer;
@@ -18,7 +18,6 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-
 package org.apache.struts2.components;

 import javax.servlet.http.HttpServletRequest;
@@ -18,7 +18,6 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-
 package org.apache.struts2.components;

 import java.io.IOException;
@@ -18,7 +18,6 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-
 package org.apache.struts2.components;

 import java.io.Writer;
@@ -18,7 +18,6 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-
 package org.apache.struts2.components;

 import javax.servlet.http.HttpServletRequest;
@@ -18,7 +18,6 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-
 package org.apache.struts2.components;

 import javax.servlet.http.HttpServletRequest;
@@ -18,7 +18,6 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-
 package org.apache.struts2.components;

 import javax.servlet.http.HttpServletRequest;
@@ -18,15 +18,10 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-
 package org.apache.struts2.components;

 import java.io.IOException;
 import java.io.Writer;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.Map;

 import org.apache.struts2.StrutsException;
 import org.apache.struts2.dispatcher.mapper.ActionMapping;
@@ -202,126 +197,4 @@ public class ServletUrlRenderer implements UrlRenderer {
 		// interceptor does allow validation eg. method is not filtered out)
 		formComponent.evaluateClientSideJsEnablement(actionName, namespace, actionMethod);
 	}
-
-
-	public void beforeRenderUrl(URL urlComponent) {
-		if (urlComponent.value != null) {
-            urlComponent.value = urlComponent.findString(urlComponent.value);
-        }
-
-        // no explicit url set so attach params from current url, do
-        // this at start so body params can override any of these they wish.
-        try {
-            // ww-1266
-            String includeParams = (urlComponent.urlIncludeParams != null ? urlComponent.urlIncludeParams.toLowerCase() : URL.GET);
-
-            if (urlComponent.includeParams != null) {
-                includeParams = urlComponent.findString(urlComponent.includeParams);
-            }
-
-            if (URL.NONE.equalsIgnoreCase(includeParams)) {
-                mergeRequestParameters(urlComponent.value, urlComponent.parameters, Collections.EMPTY_MAP);
-            } else if (URL.ALL.equalsIgnoreCase(includeParams)) {
-                mergeRequestParameters(urlComponent.value, urlComponent.parameters, urlComponent.req.getParameterMap());
-
-                // for ALL also include GET parameters
-                includeGetParameters(urlComponent);
-                includeExtraParameters(urlComponent);
-            } else if (URL.GET.equalsIgnoreCase(includeParams) || (includeParams == null && urlComponent.value == null && urlComponent.action == null)) {
-                includeGetParameters(urlComponent);
-                includeExtraParameters(urlComponent);
-            } else if (includeParams != null) {
-                LOG.warn("Unknown value for includeParams parameter to URL tag: " + includeParams);
-            }
-        } catch (Exception e) {
-            LOG.warn("Unable to put request parameters (" + urlComponent.req.getQueryString() + ") into parameter map.", e);
-        }
-
-		
-	}
-	
-    private void includeExtraParameters(URL urlComponent) {
-        if (urlComponent.extraParameterProvider != null) {
-            mergeRequestParameters(urlComponent.value, urlComponent.parameters, urlComponent.extraParameterProvider.getExtraParameters());
-        }
-    }
-    private void includeGetParameters(URL urlComponent) {
-    	String query = extractQueryString(urlComponent);
-    	mergeRequestParameters(urlComponent.value, urlComponent.parameters, UrlHelper.parseQueryString(query));
-    }
-
-    private String extractQueryString(URL urlComponent) {
-        // Parse the query string to make sure that the parameters come from the query, and not some posted data
-        String query = urlComponent.req.getQueryString();
-        if (query == null) {
-            query = (String) urlComponent.req.getAttribute("javax.servlet.forward.query_string");
-        }
-
-        if (query != null) {
-            // Remove possible #foobar suffix
-            int idx = query.lastIndexOf('#');
-
-            if (idx != -1) {
-                query = query.substring(0, idx);
-            }
-        }
-        return query;
-    }
-    
-    /**
-     * Merge request parameters into current parameters. If a parameter is
-     * already present, than the request parameter in the current request and value atrribute
-     * will not override its value.
-     *
-     * The priority is as follows:-
-     * <ul>
-     *  <li>parameter from the current request (least priority)</li>
-     *  <li>parameter form the value attribute (more priority)</li>
-     *  <li>parameter from the param tag (most priority)</li>
-     * </ul>
-     *
-     * @param value the value attribute (url to be generated by this component)
-     * @param parameters component parameters
-     * @param contextParameters request parameters
-     */
-    protected void mergeRequestParameters(String value, Map parameters, Map contextParameters){
-
-        Map mergedParams = new LinkedHashMap(contextParameters);
-
-        // Merge contextParameters (from current request) with parameters specified in value attribute
-        // eg. value="someAction.action?id=someId&venue=someVenue"
-        // where the parameters specified in value attribute takes priority.
-
-        if (value != null && value.trim().length() > 0 && value.indexOf("?") > 0) {
-            mergedParams = new LinkedHashMap();
-
-            String queryString = value.substring(value.indexOf("?")+1);
-
-            mergedParams = UrlHelper.parseQueryString(queryString);
-            for (Iterator iterator = contextParameters.entrySet().iterator(); iterator.hasNext();) {
-                Map.Entry entry = (Map.Entry) iterator.next();
-                Object key = entry.getKey();
-
-                if (!mergedParams.containsKey(key)) {
-                    mergedParams.put(key, entry.getValue());
-                }
-            }
-        }
-
-
-        // Merge parameters specified in value attribute
-        // eg. value="someAction.action?id=someId&venue=someVenue"
-        // with parameters specified though param tag
-        // eg. <param name="id" value="%{'someId'}" />
-        // where parameters specified through param tag takes priority.
-
-        for (Iterator iterator = mergedParams.entrySet().iterator(); iterator.hasNext();) {
-            Map.Entry entry = (Map.Entry) iterator.next();
-            Object key = entry.getKey();
-
-            if (!parameters.containsKey(key)) {
-                parameters.put(key, entry.getValue());
-            }
-        }
-    }
 }
@@ -18,7 +18,6 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-
 package org.apache.struts2.components;

 import java.io.Writer;
@@ -18,7 +18,6 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-
 package org.apache.struts2.components;

 import java.io.Writer;
@@ -18,7 +18,6 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-
 package org.apache.struts2.components;

 import java.io.IOException;
@@ -18,7 +18,6 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-
 package org.apache.struts2.components;

 import javax.servlet.http.HttpServletRequest;
@@ -18,7 +18,6 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-
 package org.apache.struts2.components;

 import javax.servlet.http.HttpServletRequest;
@@ -18,7 +18,6 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-
 package org.apache.struts2.components;

 import java.util.Map;
@@ -18,7 +18,6 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-
 package org.apache.struts2.components;

 import java.io.Writer;
@@ -18,7 +18,6 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-
 package org.apache.struts2.components;

 import java.io.Writer;
@@ -176,10 +175,71 @@ public class URL extends ContextBean {

    public boolean start(Writer writer) {
        boolean result = super.start(writer);
-        urlRenderer.beforeRenderUrl(this);
+
+        if (value != null) {
+            value = findString(value);
+        }
+
+        // no explicit url set so attach params from current url, do
+        // this at start so body params can override any of these they wish.
+        try {
+            // ww-1266
+            String includeParams = (urlIncludeParams != null ? urlIncludeParams.toLowerCase() : GET);
+
+            if (this.includeParams != null) {
+                includeParams = findString(this.includeParams);
+            }
+
+            if (NONE.equalsIgnoreCase(includeParams)) {
+                mergeRequestParameters(value, parameters, Collections.EMPTY_MAP);
+            } else if (ALL.equalsIgnoreCase(includeParams)) {
+                mergeRequestParameters(value, parameters, req.getParameterMap());
+
+                // for ALL also include GET parameters
+                includeGetParameters();
+                includeExtraParameters();
+            } else if (GET.equalsIgnoreCase(includeParams) || (includeParams == null && value == null && action == null)) {
+                includeGetParameters();
+                includeExtraParameters();
+            } else if (includeParams != null) {
+                LOG.warn("Unknown value for includeParams parameter to URL tag: " + includeParams);
+            }
+        } catch (Exception e) {
+            LOG.warn("Unable to put request parameters (" + req.getQueryString() + ") into parameter map.", e);
+        }
+
+
        return result;
    }

+    private void includeExtraParameters() {
+        if (extraParameterProvider != null) {
+            mergeRequestParameters(value, parameters, extraParameterProvider.getExtraParameters());
+        }
+    }
+    private void includeGetParameters() {
+    	String query = extractQueryString();
+    	mergeRequestParameters(value, parameters, UrlHelper.parseQueryString(query));
+    }
+
+    private String extractQueryString() {
+        // Parse the query string to make sure that the parameters come from the query, and not some posted data
+        String query = req.getQueryString();
+        if (query == null) {
+            query = (String) req.getAttribute("javax.servlet.forward.query_string");
+        }
+
+        if (query != null) {
+            // Remove possible #foobar suffix
+            int idx = query.lastIndexOf('#');
+
+            if (idx != -1) {
+                query = query.substring(0, idx);
+            }
+        }
+        return query;
+    }
+
    public boolean end(Writer writer, String body) {
    	urlRenderer.renderUrl(writer, this);
        return super.end(writer, body);
@@ -255,6 +315,64 @@ public class URL extends ContextBean {
        this.forceAddSchemeHostAndPort = forceAddSchemeHostAndPort;
    }

+
+    /**
+     * Merge request parameters into current parameters. If a parameter is
+     * already present, than the request parameter in the current request and value atrribute
+     * will not override its value.
+     *
+     * The priority is as follows:-
+     * <ul>
+     *  <li>parameter from the current request (least priority)</li>
+     *  <li>parameter form the value attribute (more priority)</li>
+     *  <li>parameter from the param tag (most priority)</li>
+     * </ul>
+     *
+     * @param value the value attribute (url to be generated by this component)
+     * @param parameters component parameters
+     * @param contextParameters request parameters
+     */
+    protected void mergeRequestParameters(String value, Map parameters, Map contextParameters){
+
+        Map mergedParams = new LinkedHashMap(contextParameters);
+
+        // Merge contextParameters (from current request) with parameters specified in value attribute
+        // eg. value="someAction.action?id=someId&venue=someVenue"
+        // where the parameters specified in value attribute takes priority.
+
+        if (value != null && value.trim().length() > 0 && value.indexOf("?") > 0) {
+            mergedParams = new LinkedHashMap();
+
+            String queryString = value.substring(value.indexOf("?")+1);
+
+            mergedParams = UrlHelper.parseQueryString(queryString);
+            for (Iterator iterator = contextParameters.entrySet().iterator(); iterator.hasNext();) {
+                Map.Entry entry = (Map.Entry) iterator.next();
+                Object key = entry.getKey();
+
+                if (!mergedParams.containsKey(key)) {
+                    mergedParams.put(key, entry.getValue());
+                }
+            }
+        }
+
+
+        // Merge parameters specified in value attribute
+        // eg. value="someAction.action?id=someId&venue=someVenue"
+        // with parameters specified though param tag
+        // eg. <param name="id" value="%{'someId'}" />
+        // where parameters specified through param tag takes priority.
+
+        for (Iterator iterator = mergedParams.entrySet().iterator(); iterator.hasNext();) {
+            Map.Entry entry = (Map.Entry) iterator.next();
+            Object key = entry.getKey();
+
+            if (!parameters.containsKey(key)) {
+                parameters.put(key, entry.getValue());
+            }
+        }
+    }
+
    public static interface ExtraParameterProvider {
        public Map getExtraParameters();
    }
@@ -18,7 +18,6 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-
 package org.apache.struts2.components;

 import java.util.LinkedHashMap;
@@ -18,7 +18,6 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-
 package org.apache.struts2.components;

 import java.io.Writer;
@@ -29,13 +28,6 @@ import java.io.Writer;
 *
 */
 public interface UrlRenderer {
-	
-	/**
-	 * Preprocessing step
-	 * @param urlComponent
-	 */
-	void beforeRenderUrl(URL urlComponent);
-	
 	/**
 	 * Render a URL.
 	 * @param writer A writer that the implementation can use to write the result to.
@@ -48,5 +40,4 @@ public interface UrlRenderer {
 	 * @param formComponent The {@link Form} component that "owns" this renderer.
 	 */
 	void renderFormUrl(Form formComponent);
-
 }
@@ -18,7 +18,6 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-
 package org.apache.struts2.components.template;

 import java.io.File;
@@ -18,7 +18,6 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-
 package org.apache.struts2.components.template;

 import java.io.IOException;
@@ -46,7 +45,6 @@ import com.opensymphony.xwork2.util.logging.LoggerFactory;

 import freemarker.template.Configuration;
 import freemarker.template.SimpleHash;
-import freemarker.core.ParseException;

 /**
 * Freemarker based template engine.
@@ -120,12 +118,7 @@ public class FreemarkerTemplateEngine extends BaseTemplateEngine {
                    // try to load, and if it works, stop at the first one
                    template = config.getTemplate(templateName);
                    break;
-                } catch (ParseException e) {
-                    // template was found but was invalid - always report this.
-                    exception = e;
-                    break;
                } catch (IOException e) {
-                    // FileNotFoundException is anticipated - report the first IOException if no template found
                    if (exception == null) {
                        exception = e;
                    }
@@ -134,13 +127,7 @@ public class FreemarkerTemplateEngine extends BaseTemplateEngine {
        }

        if (template == null) {
-            if (LOG.isErrorEnabled()) {
-                LOG.error("Could not load the FreeMarker template named '" + templateContext.getTemplate().getName() +"':");
-                for (Template t : templates) {
-                    LOG.error("Attempted: " + getFinalTemplateName(t));
-                }
-                LOG.error("The TemplateLoader provided by the FreeMarker Configuration was a: "+config.getTemplateLoader().getClass().getName());
-            }
+            LOG.error("Could not load template " + templateContext.getTemplate());
            if (exception != null) {
                throw exception;
            } else {
@@ -18,7 +18,6 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-
 package org.apache.struts2.components.template;

 import java.util.List;
@@ -18,7 +18,6 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-
 package org.apache.struts2.components.template;

 import java.util.ArrayList;
@@ -18,7 +18,6 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-
 package org.apache.struts2.components.template;

 import java.util.Map;
@@ -18,7 +18,6 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-
 package org.apache.struts2.components.template;

 import java.util.Collections;
@@ -18,7 +18,6 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-
 package org.apache.struts2.components.template;

 import java.io.Writer;
@@ -18,7 +18,6 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-
 package org.apache.struts2.components.template;

 import java.io.IOException;
@@ -18,7 +18,6 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-
 package org.apache.struts2.config;

 import java.util.Properties;
@@ -18,7 +18,6 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-
 package org.apache.struts2.config;

 import com.opensymphony.xwork2.config.Configuration;
@@ -18,7 +18,6 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-
 package org.apache.struts2.config;

 import java.util.ArrayList;
@@ -18,7 +18,6 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-
 package org.apache.struts2.config;

 import java.util.HashSet;
@@ -18,12 +18,10 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-
 package org.apache.struts2.config;

 import java.util.Iterator;
 import java.util.Locale;
-import java.util.StringTokenizer;

 import com.opensymphony.xwork2.config.Configuration;
 import com.opensymphony.xwork2.config.ConfigurationException;
@@ -31,19 +29,10 @@ import com.opensymphony.xwork2.config.ConfigurationProvider;
 import com.opensymphony.xwork2.inject.ContainerBuilder;
 import com.opensymphony.xwork2.inject.Context;
 import com.opensymphony.xwork2.inject.Factory;
-import com.opensymphony.xwork2.inject.Inject;
 import com.opensymphony.xwork2.util.location.LocatableProperties;
-import com.opensymphony.xwork2.util.logging.Logger;
-import com.opensymphony.xwork2.util.logging.LoggerFactory;
-import org.apache.struts2.StrutsConstants;

 public class LegacyPropertiesConfigurationProvider implements ConfigurationProvider {

-    /**
-     * The Logging instance for this class.
-     */
-    private static final Logger LOG = LoggerFactory.getLogger(LegacyPropertiesConfigurationProvider.class);
-
    public void destroy() {
        Settings.reset();
    }
@@ -68,31 +57,10 @@ public class LegacyPropertiesConfigurationProvider implements ConfigurationProvi
        
        loadSettings(props, settings);
        
-        // Set default locale by lazily resolving the locale property as needed into a Locale object
+        // Set default locale
+        final Locale locale = settings.getLocale();
        builder.factory(Locale.class, new Factory() {
-            private Locale locale;
-
-            public synchronized Object create(Context context) throws Exception {
-                if (locale == null) {
-                    String loc = context.getContainer().getInstance(String.class, StrutsConstants.STRUTS_LOCALE);
-                    if (loc != null) {
-                        StringTokenizer localeTokens = new StringTokenizer(loc, "_");
-                        String lang = null;
-                        String country = null;
-
-                        if (localeTokens.hasMoreTokens()) {
-                            lang = localeTokens.nextToken();
-                        }
-
-                        if (localeTokens.hasMoreTokens()) {
-                            country = localeTokens.nextToken();
-                        }
-                        locale = new Locale(lang, country);
-                    } else {
-                        LOG.info("No locale define, substituting the default VM locale");
-                        locale = Locale.getDefault();
-                    }
-                }
+            public Object create(Context context) throws Exception {
                return locale;
            }
        });
@@ -18,7 +18,6 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-
 package org.apache.struts2.config;

 import com.opensymphony.xwork2.ActionInvocation;
@@ -18,7 +18,6 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-
 package org.apache.struts2.config;

 import java.io.IOException;
@@ -18,7 +18,6 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-
 package org.apache.struts2.config;

 import javax.servlet.ServletContext;
@@ -18,7 +18,6 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-
 package org.apache.struts2.config;

 import java.util.Iterator;
@@ -57,7 +56,6 @@ import com.opensymphony.xwork2.util.logging.LoggerFactory;
 * <li>{@link #listImpl()}</li>
 * <li>{@link #isSetImpl(String)}</li>
 * </ul>
- * @deprecated Since Struts 2.1.2
 */
 class Settings {

@@ -125,7 +123,27 @@ class Settings {
     * @see java.util.Locale#getDefault()
     */
    public static Locale getLocale() {
-        // Locale processing has been moved to the LegacyPropertiesConfigurationProvider
+        if (locale == null) {
+            try {
+                StringTokenizer localeTokens = new StringTokenizer(get(StrutsConstants.STRUTS_LOCALE), "_");
+                String lang = null;
+                String country = null;
+
+                if (localeTokens.hasMoreTokens()) {
+                    lang = localeTokens.nextToken();
+                }
+
+                if (localeTokens.hasMoreTokens()) {
+                    country = localeTokens.nextToken();
+                }
+
+                locale = new Locale(lang, country);
+            } catch (Throwable t) {
+                // Default
+                LOG.warn("Settings: Could not parse struts.locale setting, substituting default VM locale");
+                locale = Locale.getDefault();
+            }
+        }

        return locale;
    }
@@ -18,7 +18,6 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-
 package org.apache.struts2.config;

 import java.io.File;
@@ -18,7 +18,6 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-
 package org.apache.struts2.dispatcher;

 import java.io.IOException;
@@ -18,7 +18,6 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-
 package org.apache.struts2.dispatcher;

 import java.io.Serializable;
@@ -18,7 +18,6 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-
 package org.apache.struts2.dispatcher;


@@ -18,7 +18,6 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-
 package org.apache.struts2.dispatcher;

 import java.io.File;
@@ -18,7 +18,6 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-
 package org.apache.struts2.dispatcher;

 /**
@@ -18,7 +18,6 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-
 package org.apache.struts2.dispatcher;

 import java.io.IOException;
@@ -204,24 +203,20 @@ public class FilterDispatcher implements StrutsStatics, Filter {
     * @param filterConfig The filter configuration
     */
    public void init(FilterConfig filterConfig) throws ServletException {
-        try {
-            this.filterConfig = filterConfig;
+        this.filterConfig = filterConfig;
+       
+        initLogging();
+        
+        dispatcher = createDispatcher(filterConfig);
+        dispatcher.init();
+        dispatcher.getContainer().inject(this);

-            initLogging();
-
-            dispatcher = createDispatcher(filterConfig);
-            dispatcher.init();
-            dispatcher.getContainer().inject(this);
-
-            String param = filterConfig.getInitParameter("packages");
-            String packages = "org.apache.struts2.static template org.apache.struts2.interceptor.debugging";
-            if (param != null) {
-                packages = param + " " + packages;
-            }
-            this.pathPrefixes = parse(packages);
-        } finally {
-            ActionContext.setContext(null);
+        String param = filterConfig.getInitParameter("packages");
+        String packages = "org.apache.struts2.static template org.apache.struts2.interceptor.debugging";
+        if (param != null) {
+            packages = param + " " + packages;
        }
+        this.pathPrefixes = parse(packages);
    }

    private void initLogging() {
@@ -257,11 +252,7 @@ public class FilterDispatcher implements StrutsStatics, Filter {
        if (dispatcher == null) {
            log.warn("something is seriously wrong, Dispatcher is not initialized (null) ");
        } else {
-            try {
-                dispatcher.cleanup();
-            } finally {
-                ActionContext.setContext(null);
-            }
+            dispatcher.cleanup();
        }
    }

@@ -18,7 +18,6 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-
 package org.apache.struts2.dispatcher;

 import javax.servlet.Filter;
@@ -18,7 +18,6 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-
 package org.apache.struts2.dispatcher;

 import java.util.HashMap;
@@ -18,7 +18,6 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-
 package org.apache.struts2.dispatcher;

 import java.io.InputStreamReader;
@@ -18,7 +18,6 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-
 package org.apache.struts2.dispatcher;

 import java.io.Serializable;
@@ -18,7 +18,6 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-
 package org.apache.struts2.dispatcher;

 import java.util.Arrays;
@@ -18,7 +18,6 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-
 package org.apache.struts2.dispatcher;

 import javax.servlet.RequestDispatcher;
--- a/Show More
+++ b/Show More