WW-1685 Tag r503710 as Struts 2.0.5

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

api/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>2.0.3</version>
+        <version>2.0.5</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-api</artifactId>

api/src/main/java/org/apache/struts2/Action.java

@@ -1,3 +1,23 @@
+/*
+ * $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 org.apache.struts2;
 
 /**

api/src/main/java/org/apache/struts2/MessageAware.java

@@ -1,3 +1,23 @@
+/*
+ * $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 org.apache.struts2;
 
 /**

api/src/main/java/org/apache/struts2/Messages.java

@@ -1,3 +1,23 @@
+/*
+ * $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 org.apache.struts2;
 
 import java.util.List;

api/src/main/java/org/apache/struts2/ResultNames.java

@@ -1,3 +1,23 @@
+/*
+ * $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 org.apache.struts2;
 
 /**

api/src/main/java/org/apache/struts2/Validatable.java

@@ -1,3 +1,23 @@
+/*
+ * $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 org.apache.struts2;
 
 import org.apache.struts2.MessageAware;

api/src/main/java/org/apache/struts2/servlet/ParameterAware.java

@@ -1,3 +1,23 @@
+/*
+ * $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 org.apache.struts2.servlet;
 
 import java.util.Map;

api/src/main/java/org/apache/struts2/servlet/ServletRequestAware.java

@@ -1,3 +1,23 @@
+/*
+ * $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 org.apache.struts2.servlet;
 
 import javax.servlet.http.HttpServletRequest;

api/src/main/java/org/apache/struts2/servlet/ServletResponseAware.java

@@ -1,3 +1,23 @@
+/*
+ * $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 org.apache.struts2.servlet;
 
 import javax.servlet.http.HttpServletResponse;

api/src/main/java/org/apache/struts2/spi/ActionContext.java

@@ -1,3 +1,23 @@
+/*
+ * $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 org.apache.struts2.spi;
 
 import java.lang.reflect.Method;

api/src/main/java/org/apache/struts2/spi/Interceptor.java

@@ -1,3 +1,23 @@
+/*
+ * $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 org.apache.struts2.spi;
 
 /**

api/src/main/java/org/apache/struts2/spi/RequestContext.java

@@ -1,3 +1,23 @@
+/*
+ * $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 org.apache.struts2.spi;
 
 import org.apache.struts2.Messages;

api/src/main/java/org/apache/struts2/spi/RequestContextAware.java

@@ -1,3 +1,23 @@
+/*
+ * $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 org.apache.struts2.spi;
 
 import org.apache.struts2.spi.RequestContext;

api/src/main/java/org/apache/struts2/spi/Result.java

@@ -1,3 +1,23 @@
+/*
+ * $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 org.apache.struts2.spi;
 
 import org.apache.struts2.spi.RequestContext;

api/src/main/java/org/apache/struts2/spi/ValueStack.java

@@ -1,3 +1,23 @@
+/*
+ * $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 org.apache.struts2.spi;
 
 /**

api/src/main/resources/LICENSE.txt

@@ -0,0 +1,174 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.

api/src/main/resources/NOTICE.txt

@@ -0,0 +1,5 @@
+Apache Struts
+Copyright 2000-2007 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).

apps/blank/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-apps</artifactId>
-        <version>2.0.3</version>
+        <version>2.0.5</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-blank</artifactId>

apps/blank/src/main/resources/LICENSE.txt

@@ -0,0 +1,174 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.

apps/blank/src/main/resources/NOTICE.txt

@@ -0,0 +1,5 @@
+Apache Struts
+Copyright 2000-2007 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).

apps/mailreader/pom.xml

@@ -5,7 +5,7 @@
     <parent>
       <groupId>org.apache.struts</groupId>
       <artifactId>struts2-apps</artifactId>
-      <version>2.0.3</version>
+      <version>2.0.5</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-mailreader</artifactId>

apps/mailreader/src/main/resources/LICENSE.txt

@@ -0,0 +1,174 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.

apps/mailreader/src/main/resources/NOTICE.txt

@@ -0,0 +1,5 @@
+Apache Struts
+Copyright 2000-2007 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).

apps/pom.xml

@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>2.0.3</version>
+        <version>2.0.5</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-apps</artifactId>

apps/portlet/pom.xml

@@ -5,7 +5,7 @@
     <parent>
       <groupId>org.apache.struts</groupId>
       <artifactId>struts2-apps</artifactId>
-      <version>2.0.3</version>
+      <version>2.0.5</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-portlet</artifactId>

apps/portlet/src/main/resources/LICENSE.txt

@@ -0,0 +1,174 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.

apps/portlet/src/main/resources/NOTICE.txt

@@ -0,0 +1,5 @@
+Apache Struts
+Copyright 2000-2007 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).

apps/showcase/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-apps</artifactId>
-        <version>2.0.3</version>
+        <version>2.0.5</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-showcase</artifactId>

apps/showcase/src/main/java/org/apache/struts2/showcase/freemarker/StandardTagsAction.java

@@ -1,3 +1,23 @@
+/*
+ * $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 org.apache.struts2.showcase.freemarker;
 
 import com.opensymphony.xwork2.ActionSupport;

apps/showcase/src/main/resources/LICENSE.txt

@@ -0,0 +1,174 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.

apps/showcase/src/main/resources/NOTICE.txt

@@ -0,0 +1,5 @@
+Apache Struts
+Copyright 2000-2007 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).

assembly/pom.xml

@@ -33,7 +33,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>2.0.3</version>
+        <version>2.0.5</version>
     </parent>
 
     <scm>

backport/LICENSE.txt

@@ -1,7 +1,7 @@
  Retrotranslator: a Java bytecode transformer that translates Java classes
  compiled with JDK 5.0 into classes that can be run on JVM 1.4.
 
- Copyright (c) 2005, 2006 Taras Puchko
+ Copyright (c) 2005 - 2007 Taras Puchko
  All rights reserved.
 
  Redistribution and use in source and binary forms, with or without

backport/readme.html

@@ -64,15 +64,15 @@ and concurrency utilities
         Compile your classes with JDK 5.0 and put them into some directory, e.g. <code>myclasses</code>.
     </li>
     <li>
-        Go to the unzipped directory <code>Retrotranslator-<i>n.n.n</i>-bin</code> and execute:<br>
+        Go to the unzipped directory and execute:<br>
         <code>java -jar retrotranslator-transformer-<i>n.n.n</i>.jar -srcdir myclasses</code>
     </li>
     <li>
         If you use Java 5 API put <code>retrotranslator-runtime-<i>n.n.n</i>.jar</code> and
-        <code>backport-util-concurrent.jar</code> into the classpath of your application.
+        <code>backport-util-concurrent-<i>n.n</i>.jar</code> into the classpath of your application.
     </li>
     <li>
-        Run or debug the application as usual on any JVM 1.4, preferably JRE 1.4.2.
+        Run or debug the application as usual on J2SE 1.4.x, preferably 1.4.2.
     </li>
 </ol>
 
@@ -84,24 +84,74 @@ and concurrency utilities
     <tr><th>Option</th><th>Description</th><th>Default</th></tr>
     <tr>
         <td nowrap><code>-srcdir</code></td>
-        <td>Directory with classes compiled using JDK 5.0 (may be specified several times).</td>
+        <td>The directory with classes that should be translated (may be specified several times).</td>
         <td>-</td>
     </tr>
     <tr>
         <td nowrap><code>-srcjar</code></td>
-        <td>JAR file with classes compiled using JDK 5.0 (may be specified several times).</td>
+        <td>The directory with classes that should be translated (may be specified several times).</td>
         <td>-</td>
     </tr>
     <tr>
         <td nowrap><code>-destdir</code></td>
-        <td>Directory to place classes compatible with J2SE 1.4.</td>
+        <td>The directory to place translated classes.</td>
         <td>Location of sources</td>
     </tr>
     <tr>
         <td nowrap><code>-destjar</code></td>
-        <td>JAR file to place classes compatible with J2SE 1.4.</td>
+        <td>The JAR file to place translated classes.</td>
         <td>Location of sources</td>
     </tr>
+    <tr>
+        <td nowrap><a name="option_advanced"><code>-advanced</code></a></td>
+        <td>Whether to use alternative implementations of Java 1.4 classes and methods for better Java 5 compatibility.</td>
+        <td>Off</td>
+    </tr>
+    <tr>
+        <td nowrap><code>-verify</code></td>
+        <td>Asks the translator to examine translated bytecode for references to classes, methods, or fields
+            that cannot be found in the provided classpath.</td>
+        <td>Off</td>
+    </tr>
+    <tr>
+        <td nowrap><code>-classpath</code></td>
+        <td>The classpath for verification including <code>rt.jar</code>, <code>jce.jar</code>,
+            <code>jsse.jar</code> (from JRE 1.4), <code>retrotranslator-runtime-<i>n.n.n</i>.jar</code>,
+            and <code>backport-util-concurrent-<i>n.n</i>.jar</code>.</td>
+        <td>Current classpath</td>
+    </tr>
+    <tr>
+        <td nowrap><code>-srcmask</code></td>
+        <td>The wildcard pattern specifying files that should be translated (either bytecode or UTF-8 text),
+            e.g. "<code>*.class;*.tld</code>". There are three special characters: "<code>*?;</code>".
+        </td>
+        <td>*.class</td>
+    </tr>
+    <tr>
+        <td nowrap><code>-embed</code></td>
+        <td>Package name for a private copy of <code>retrotranslator-runtime-<i>n.n.n</i>.jar</code> and
+            <code>backport-util-concurrent-<i>n.n</i>.jar</code> to be put into <code>-destdir</code> or <code>-destjar</code>.
+            This makes your application independent of other versions of Retrotranslator present in the classpath.
+            </td>
+        <td>-</td>
+    </tr>
+    <tr>
+        <td nowrap><a name="option_backport"><code>-backport</code></a></td>
+        <td>Informs the translator about <a href="#extension">user-defined</a> backport packages.
+            Package names should be separated by semicolons.</td>
+        <td>-</td>
+    </tr>
+    <tr>
+        <td nowrap><code>-target</code></td>
+        <td>To make Java 6 classes compatible with Java 5 set this option to 1.5 and supply
+            <a href="#extension">user-defined</a> backport packages via the <code>backport</code> option.</td>
+        <td>1.4</td>
+    </tr>
+    <tr>
+        <td nowrap><code>-lazy</code></td>
+        <td>Asks the translator to only transform classes compiled with a <code>target</code> greater than the current one.</td>
+        <td>Off</td>
+    </tr>
     <tr>
         <td nowrap><code>-stripsign</code></td>
         <td>Asks the translator to strip signature (generics) information.</td>
@@ -112,42 +162,6 @@ and concurrency utilities
         <td>Asks the translator for verbose output.</td>
         <td>Off</td>
     </tr>
-    <tr>
-        <td nowrap><code>-lazy</code></td>
-        <td>Asks the translator to transform only Java 5 classes.</td>
-        <td>Off</td>
-    </tr>
-    <tr>
-        <td nowrap><a name="option_advanced"><code>-advanced</code></a></td>
-        <td>Allows to override Java 1.4 methods for better Java 5 compatibility.</td>
-        <td>Off</td>
-    </tr>
-    <tr>
-        <td nowrap><code>-verify</code></td>
-        <td>Asks the translator for warnings when references to unknown classes, methods, or fields are found.</td>
-        <td>Off</td>
-    </tr>
-    <tr>
-        <td nowrap><code>-classpath</code></td>
-        <td>The classpath to use for verification including <code>rt.jar</code>, <code>jce.jar</code>,
-            <code>jsse.jar</code> (from JRE 1.4), <code>retrotranslator-runtime-<i>n.n.n</i>.jar</code>,
-            and <code>backport-util-concurrent.jar</code>.</td>
-        <td>Current classpath</td>
-    </tr>
-    <tr>
-        <td nowrap><code>-srcmask</code></td>
-        <td>Files to translate (either bytecode or UTF-8 text) , e.g. "<code>*.class;*.tld</code>".
-            Only three special characters are supported: "<code>*?;</code>".</td>
-        <td>*.class</td>
-    </tr>
-    <tr>
-        <td nowrap><code>-embed</code></td>
-        <td>Package name for a private copy of <code>retrotranslator-runtime-<i>n.n.n</i>.jar</code> and
-            <code>backport-util-concurrent.jar</code> to be put into <code>-destdir</code> or <code>-destjar</code>.
-            This makes your application independent of other versions of Retrotranslator present in the classpath.
-            </td>
-        <td>-</td>
-    </tr>
     <tr>
         <td nowrap><code>-retainapi</code></td>
         <td>Asks the translator to modify classes for JVM 1.4 compatibility but keep use of Java 5 API.
@@ -161,12 +175,6 @@ and concurrency utilities
         <td>Asks the translator to keep Java 5 specific access modifiers.</td>
         <td>Off</td>
     </tr>
-    <tr>
-        <td nowrap><a name="option_backport"><code>-backport</code></a></td>
-        <td>Informs the translator about <a href="#extension">user-defined</a> backport packages.
-            Package names should be separated by semicolons.</td>
-        <td>-</td>
-    </tr>
 </table>
 <p>
     For example, if you have a Java 5 application <code>myapplication5.jar</code> you can use the following command
@@ -186,24 +194,81 @@ and concurrency utilities
     <tr><th>Attribute</th><th>Description</th><th>Default</th></tr>
     <tr>
         <td><code>srcdir</code></td>
-        <td>Directory with classes compiled using JDK 5.0.</td>
+        <td>The directory with classes that should be translated.</td>
         <td>-</td>
     </tr>
     <tr>
         <td><code>srcjar</code></td>
-        <td>JAR file with classes compiled using JDK 5.0.</td>
+        <td>The directory with classes that should be translated.</td>
         <td>-</td>
     </tr>
     <tr>
         <td><code>destdir</code></td>
-        <td>Directory to place classes compatible with J2SE 1.4.</td>
+        <td>The directory to place translated classes.</td>
         <td>Location of sources</td>
     </tr>
     <tr>
         <td><code>destjar</code></td>
-        <td>JAR file to place classes compatible with J2SE 1.4.</td>
+        <td>The JAR file to place translated classes.</td>
         <td>Location of sources</td>
     </tr>
+    <tr>
+        <td><code>advanced</code></td>
+        <td>Whether to use alternative implementations of Java 1.4 classes and methods for better Java 5 compatibility.</td>
+        <td>Off</td>
+    </tr>
+    <tr>
+        <td><code>verify</code></td>
+        <td>Asks the translator to examine translated bytecode for references to classes, methods, or fields
+            that cannot be found in the provided classpath.</td>
+        <td>Off</td>
+    </tr>
+    <tr>
+        <td><code>classpath</code></td>
+        <td>The classpath for the verification, including <code>rt.jar</code>, <code>jce.jar</code>,
+            <code>jsse.jar</code> (from JRE 1.4), <code>retrotranslator-runtime-<i>n.n.n</i>.jar</code>,
+            and <code>backport-util-concurrent-<i>n.n</i>.jar</code>.
+        </td>
+        <td>Current classpath</td>
+    </tr>
+    <tr>
+        <td><code>classpathref</code></td>
+        <td>The classpath for the verification, given as a reference to a path defined elsewhere.
+        </td>
+        <td>Current classpath</td>
+    </tr>
+    <tr>
+        <td><code>srcmask</code></td>
+        <td>The wildcard pattern specifying files that should be translated (either bytecode or UTF-8 text),
+            e.g. "<code>*.class;*.tld</code>". There are three special characters: "<code>*?;</code>".
+        </td>
+        <td>*.class</td>
+    </tr>
+    <tr>
+        <td><code>embed</code></td>
+        <td>Package name for a private copy of <code>retrotranslator-runtime-<i>n.n.n</i>.jar</code> and
+            <code>backport-util-concurrent-<i>n.n</i>.jar</code> to be put into <code>-destdir</code> or <code>-destjar</code>.
+            This makes your application independent of other versions of Retrotranslator present in the classpath.
+            </td>
+        <td>-</td>
+    </tr>
+    <tr>
+        <td><code>backport</code></td>
+        <td>Informs the translator about <a href="#extension">user-defined</a> backport packages.
+            Package names should be separated by semicolons.</td>
+        <td>-</td>
+    </tr>
+    <tr>
+        <td><code>target</code></td>
+        <td>Set this option to 1.5 and supply <a href="#extension">user-defined</a> backport packages via
+            the <code>backport</code> option to make Java 6 classes compatible with Java 5.</td>
+        <td>1.4</td>
+    </tr>
+    <tr>
+        <td><code>lazy</code></td>
+        <td>Asks the translator to only transform classes compiled with a <code>target</code> greater than the current one.</td>
+        <td>Off</td>
+    </tr>
     <tr>
         <td><code>stripsign</code></td>
         <td>Asks the translator to strip signature (generics) information.</td>
@@ -214,43 +279,6 @@ and concurrency utilities
         <td>Asks the translator for verbose output.</td>
         <td>Off</td>
     </tr>
-    <tr>
-        <td><code>lazy</code></td>
-        <td>Asks the translator to transform only Java 5 classes.</td>
-        <td>Off</td>
-    </tr>
-    <tr>
-        <td><code>advanced</code></td>
-        <td>Allows to override Java 1.4 methods for better Java 5 compatibility.</td>
-        <td>Off</td>
-    </tr>
-    <tr>
-        <td><code>verify</code></td>
-        <td>Asks the translator for warnings when references to unknown classes, methods, or fields are found.</td>
-        <td>Off</td>
-    </tr>
-    <tr>
-        <td><code>classpath</code></td>
-        <td>The classpath to use for verification including <code>rt.jar</code>, <code>jce.jar</code>,
-            <code>jsse.jar</code> (from JRE 1.4), <code>retrotranslator-runtime-<i>n.n.n</i>.jar</code>,
-            and <code>backport-util-concurrent.jar</code>.
-        </td>
-        <td>Current classpath</td>
-    </tr>
-    <tr>
-        <td><code>srcmask</code></td>
-        <td>Files to translate (either bytecode or UTF-8 text) , e.g. "<code>*.class;*.tld</code>".
-            Only three special characters are supported: "<code>*?;</code>".</td>
-        <td>*.class</td>
-    </tr>
-    <tr>
-        <td><code>embed</code></td>
-        <td>Package name for a private copy of <code>retrotranslator-runtime-<i>n.n.n</i>.jar</code> and
-            <code>backport-util-concurrent.jar</code> to be put into <code>-destdir</code> or <code>-destjar</code>.
-            This makes your application independent of other versions of Retrotranslator present in the classpath.
-            </td>
-        <td>-</td>
-    </tr>
     <tr>
         <td><code>retainapi</code></td>
         <td>Asks the translator to modify classes for JVM 1.4 compatibility but keep use of Java 5 API.
@@ -264,12 +292,6 @@ and concurrency utilities
         <td>Asks the translator to keep Java 5 specific access modifiers.</td>
         <td>Off</td>
     </tr>
-    <tr>
-        <td><code>backport</code></td>
-        <td>Informs the translator about <a href="#extension">user-defined</a> backport packages.
-            Package names should be separated by semicolons.</td>
-        <td>-</td>
-    </tr>
     <tr>
         <td><code>failonwarning</code></td>
         <td>Indicates whether the build will fail when there are verification warnings.</td>
@@ -277,8 +299,8 @@ and concurrency utilities
     </tr>
 </table>
 <p>
-    You may use nested <code>src</code> elements to specify source directories or JAR files, and nested
-    <code>classpath</code> elements to specify classpath for verification. For example:
+    You may use nested <code>fileset</code>, <code>jarfileset</code>, and <code>dirset</code> elements to specify
+    source files and <code>classpath</code> elements to specify classpath. For example:
 </p>
 <pre>
     &lt;path id="classpath"&gt;
@@ -287,7 +309,8 @@ and concurrency utilities
     &lt;taskdef name="retrotranslator" classpathref="classpath"
              classname="net.sf.retrotranslator.transformer.RetrotranslatorTask" /&gt;
     &lt;retrotranslator destdir="build/classes14" verify="true"&gt;
-        &lt;src path="build/classes15"/&gt;
+        &lt;fileset dir="build/classes15" includes="**/*.class"&gt;
+        &lt;jarfileset dir="build/lib15" includes="**/*.jar"&gt;
         &lt;classpath location="${java14_home}/jre/lib/rt.jar"/&gt;
         &lt;classpath refid="classpath"/&gt;
     &lt;/retrotranslator&gt;
@@ -299,16 +322,16 @@ and concurrency utilities
 </p>
 <h4><a name="idea">How to use Retrotranslator from IntelliJ IDEA?</a></h4>
 <p>
-    To automatically translate and verify classes compiled by <a href="http://www.jetbrains.com/idea/">IntelliJ IDEA</a>
-    you may <a href="http://plugins.intellij.net/plugin/?id=145">download a plugin</a>
-    that generates classes compatible with 1.4 virtual machines from your Java 5 source code.
+    There is a <a href="http://plugins.intellij.net/plugin/?id=145">plugin</a> to automatically translate and verify
+    classes compiled by <a href="http://www.jetbrains.com/idea/">IntelliJ IDEA</a>, so you can develop in Java 5 but
+    run and debug on JRE 1.4.
 </p>
 
 <h4><a name="jit">How to use Just-in-Time Retrotranslator?</a></h4>
 
 <p>
     JIT Retrotranslator is able to translate at runtime Java classes loaded with any classloader.
-    It works on J2SE 1.4 from Sun, IBM, BEA, and Apple, but does nothing on J2SE 5.0 and other platforms.
+    It works on J2SE 1.4 from most JVM vendors like Sun, IBM, BEA, and Apple, but does nothing on J2SE 5.0.
     However translation at runtime consumes additional memory and processing resources and it will not
 	work if your classes make use of Java 5 API but were compiled with "<code>-target 1.4</code>".
 </p>
@@ -329,29 +352,25 @@ and concurrency utilities
     </li>
 </ul>
 <p>
-    JIT Retrotranslator can accept <code>-<a href="#option_advanced">advanced</a></code>
-    and <code>-<a href="#option_backport">backport</a></code> options.
+    JIT Retrotranslator can accept the <code><a href="#option_advanced">advanced</a></code>
+    and <code><a href="#option_backport">backport</a></code> options.
 </p>
 
 <h4><a name="supported">What Java 5 classes and methods are supported?</a></h4>
 <table border="1" cellspacing="0" cellpadding="5">
     <tr><th>Package</th><th>Class</th><th>Methods and fields</th><th>Compatibility notes</th></tr>
     <tr><td><code>java.lang.annotation</code></td><td>* (all classes)</td><td>* (all methods)</td><td>&nbsp;</td></tr>
+    <tr><td><code>java.lang.instrument</code></td><td>* (all classes)</td><td>* (all methods)</td><td>
+        Bytecode instrumentation is not implemented.</td></tr>
     <tr><td><code>java.util.concurrent,<br>java.util.concurrent.atomic,<br>java.util.concurrent.locks</code></td>
-        <td>almost all classes</td><td>almost all methods</td>
-        <td>
-            Supported via the <a href="http://dcl.mathcs.emory.edu/util/backport-util-concurrent/index.php">
-            Backport of JSR 166</a>.<br>
-            The <code>Condition.awaitNanos(long)</code> method is supported with
+        <td>almost all classes<sup><a href="#1">1</a></sup></td><td>almost all methods</td>
+        <td>The <code>LockSupport</code> class may be unusable due to poor efficiency.
+            The <code>Condition.awaitNanos(long)</code> method has
         <a href="http://dcl.mathcs.emory.edu/util/backport-util-concurrent/doc/api/edu/emory/mathcs/backport/java/util/concurrent/helpers/Utils.html#awaitNanos(edu.emory.mathcs.backport.java.util.concurrent.locks.Condition, long)">
-        very little</a> accuracy guarantees.
-        </td></tr>
-    <tr><td rowspan="6"><code>java.io</code></td><td><code>Closeable</code></td><td><code>*</code></td><td>
-            <code>new Closeable[...]</code> is replaced with <code>new Object[...]</code>
-        </td></tr>
-    <tr><td><code>Flushable</code></td><td><code>*</code></td><td>
-            <code>new Flushable[...]</code> is replaced with <code>new Object[...]</code>
-        </td></tr>
+        little</a> accuracy guarantees.</td></tr>
+    <tr><td rowspan="6"><code>java.io</code></td><td><code>Closeable<sup><a href="#2">2</a></sup></code>
+    </td><td><code>*</code></td><td>&nbsp;</td></tr>
+    <tr><td><code>Flushable<sup><a href="#2">2</a></sup></code></td><td><code>*</code></td><td>&nbsp;</td></tr>
     <tr><td><code>PrintStream</code></td><td>
         * (11 new methods and constructors)
         </td><td>&nbsp;</td></tr>
@@ -366,17 +385,16 @@ and concurrency utilities
             append(CharSequence, int, int),<br>
             append(char)</code>
         </td><td>&nbsp;</td></tr>
-    <tr><td rowspan="24"><code>java.lang</code></td><td><code>Appendable</code></td><td>*
-    </td><td>
-        <code>new Appendable[...]</code> is replaced with <code>new Object[...]</code>
-    </td></tr>
+    <tr><td rowspan="26"><code>java.lang</code></td><td><code>Appendable<sup><a href="#2">2</a></sup></code></td><td>*
+    </td><td>&nbsp;</td></tr>
     <tr><td><code>Boolean</code></td><td><code>parseBoolean(String),<br>
         compareTo(Boolean)</code></td><td>&nbsp;</td></tr>
     <tr><td><code>Byte</code></td><td><code>valueOf(byte)</code></td><td>&nbsp;</td></tr>
     <tr><td><code>Character</code></td><td><code>valueOf(char)</code></td><td>&nbsp;</td></tr>
     <tr><td><code>Class</code></td><td>* (21 new methods)</td><td>
-        <code>Class.getMethod(String, Class...)</code> and <code>Class.getDeclaredMethod(String, Class...)</code> are
-        intercepted in advanced mode to better support generics and covariant return types on several JVM implementations.
+        <code>Class.getMethod(String, Class...)</code> and <code>Class.getDeclaredMethod(String, Class...)</code>
+        are intercepted to better support generics and covariant return types
+        on several platforms<sup><a href="#3">3</a></sup>.
     </td></tr>
     <tr><td><code>Deprecated</code></td><td>*</td><td>&nbsp;</td></tr>
     <tr><td><code>Double</code></td><td><code>valueOf(double)</code></td><td>&nbsp;</td></tr>
@@ -387,20 +405,17 @@ and concurrency utilities
     <tr><td><code>IllegalStateException</code></td><td><code>IllegalStateException(String, Throwable),<br>
         IllegalStateException(Throwable)</code></td><td>&nbsp;</td></tr>
     <tr><td><code>Integer</code></td><td><code>valueOf(int), signum(int)</code></td><td>&nbsp;</td></tr>
-    <tr><td><code>Iterable</code></td><td>*</td><td>
-        <code>new Iterable[...]</code> is replaced with <code>new Object[...]</code>
-    </td></tr>
+    <tr><td><code>Iterable<sup><a href="#2">2</a></sup></code></td><td>*</td><td>&nbsp;</td></tr>
     <tr><td><code>Long</code></td><td><code>valueOf(long), signum(long)</code></td><td>&nbsp;</td></tr>
     <tr><td><code>Package</code></td><td>* (4 new methods)</td><td>&nbsp;</td></tr>
-    <tr><td><code>Readable</code></td><td>*</td><td>
-        <code>new Readable[...]</code> is replaced with <code>new Object[...]</code>
-    </td></tr>
+    <tr><td><code>Readable<sup><a href="#2">2</a></sup></code></td><td>*</td><td>&nbsp;</td></tr>
     <tr><td><code>Short</code></td><td><code>valueOf(short)</code></td><td>&nbsp;</td></tr>
     <tr><td><code>String</code></td><td><code>contains(CharSequence),<br>
         contentEquals(CharSequence),<br>
         format(Locale, String, Object...),<br>
         format(String, Object...),<br>
-        replace(CharSequence, CharSequence)
+        replace(CharSequence, CharSequence),<br>
+        isEmpty()<sup><a href="#4">4</a></sup>
     </code></td><td>&nbsp;</td></tr>
     <tr><td><code>StringBuffer</code></td><td><code>
         StringBuffer(CharSequence),<br>
@@ -411,12 +426,10 @@ and concurrency utilities
     </code></td><td>&nbsp;</td></tr>
     <tr><td><code>StringBuilder</code></td><td>
         All methods supported in <code>StringBuffer</code>
-    </td><td><code>StringBuilder</code> is replaced with <code>StringBuffer</code></td></tr>
+    </td><td><code>StringBuilder</code> is replaced with <code>StringBuffer</code>.</td></tr>
     <tr><td><code>SuppressWarnings</code></td><td>*</td><td>&nbsp;</td></tr>
-    <tr><td><code>System</code></td><td><code>nanoTime(),<br> clearProperty(String)</code></td><td>
-        The <code>System.nanoTime()</code> method is supported via the
-        <a href="http://dcl.mathcs.emory.edu/util/backport-util-concurrent/index.php">Backport of JSR 166</a>
-        and its precision
+    <tr><td><code>System</code></td><td><code>nanoTime()<sup><a href="#1">1</a></sup>,<br> clearProperty(String)</code></td><td>
+        The <code>System.nanoTime()</code> method precision
         <a href="http://dcl.mathcs.emory.edu/util/backport-util-concurrent/doc/api/edu/emory/mathcs/backport/java/util/concurrent/helpers/Utils.html#nanoTime()">
             may vary</a> on different platforms.
     </td></tr>
@@ -424,26 +437,35 @@ and concurrency utilities
     </code></td><td>The <code>Thread.getStackTrace()</code>
         method returns non-empty stack trace only for the current thread.<br>
         The <code>Thread.getId()</code> method does not reflect the order in which threads are created.</td></tr>
+    <tr><td><code>Thread.State</code></td><td>*</td><td>&nbsp;</td></tr>
+    <tr><td><code>ThreadLocal</code></td><td><code>remove()<sup><a href="#3">3</a></sup></code></td>
+        <td><code>ThreadLocal</code> and <code>InheritableThreadLocal</code>
+            are replaced by corresponding classes from the runtime library.<sup><a href="#3">3</a></sup>.</td></tr>
     <tr><td><code>TypeNotPresentException</code></td><td>*</td><td>&nbsp;</td></tr>
+    <tr><td rowspan="2"><code>java.lang.ref</code></td>
+        <td><code>SoftReference</code></td><td>*</td><td>
+        <code>SoftReference(Object,ReferenceQueue)</code>
+        supports <code>null</code> for the second parameter
+        on all platforms<sup><a href="#3">3</a></sup>.
+        </td></tr>
+    <tr><td><code>WeakReference</code></td><td>*</td><td>
+        <code>WeakReference(Object,ReferenceQueue)</code>
+        supports <code>null</code> for the second parameter
+        on all platforms<sup><a href="#3">3</a></sup>.
+        </td></tr>
 
     <tr><td rowspan="13"><code>java.lang.reflect</code></td>
         <td><code>AccessibleObject</code></td><td>*</td><td>&nbsp;</td></tr>
-    <tr><td><code>AnnotatedElement</code></td><td>*</td><td>
-        <code>new AnnotatedElement[...]</code> is replaced with <code>new Object[...]</code>
-    </td></tr>
+    <tr><td><code>AnnotatedElement<sup><a href="#2">2</a></sup></code></td><td>*</td><td>&nbsp;</td></tr>
     <tr><td><code>Constructor</code></td><td>* (11 new methods)</td><td>&nbsp;</td></tr>
     <tr><td><code>Field</code></td><td>* (8 new methods)</td><td>&nbsp;</td></tr>
     <tr><td><code>GenericArrayType</code></td><td>*</td><td>&nbsp;</td></tr>
-    <tr><td><code>GenericDeclaration</code></td><td>*</td><td>
-        <code>new GenericDeclaration[...]</code> is replaced with <code>new Object[...]</code>
-    </td></tr>
+    <tr><td><code>GenericDeclaration<sup><a href="#2">2</a></sup></code></td><td>*</td><td>&nbsp;</td></tr>
     <tr><td><code>GenericSignatureFormatError</code></td><td>*</td><td>&nbsp;</td></tr>
     <tr><td><code>MalformedParameterizedTypeException</code></td><td>*</td><td>&nbsp;</td></tr>
     <tr><td><code>Method</code></td><td>* (14 new methods)</td><td>&nbsp;</td></tr>
     <tr><td><code>ParameterizedType</code></td><td>*</td><td>&nbsp;</td></tr>
-    <tr><td><code>Type</code></td><td>*</td><td>
-        <code>new Type[...]</code> is replaced with <code>new Object[...]</code>
-    </td></tr>
+    <tr><td><code>Type<sup><a href="#2">2</a></sup></code></td><td>*</td><td>&nbsp;</td></tr>
     <tr><td><code>TypeVariable</code></td><td>*</td><td>&nbsp;</td></tr>
     <tr><td><code>WildcardType</code></td><td>*</td><td>&nbsp;</td></tr>
 
@@ -452,48 +474,57 @@ and concurrency utilities
             divideToIntegralValue(BigDecimal),<br> pow(int),<br> remainder(BigDecimal),<br>
             toPlainString(),<br> valueOf(double),<br>
             valueOf(long)</code></td><td>The <code>BigDecimal.setScale(int, int)</code>
-        method supports negative scales in advanced mode.</td></tr>
+        method supports negative scales<sup><a href="#3">3</a></sup>.</td></tr>
+
+    <tr><td rowspan="3"><code>java.net</code></td><td><code>URL</code></td>
+        <td><code>openConnection(Proxy)</code>,<br>
+            <code>toURI()</code>
+        </td><td>The <code>Proxy</code> is ignored by the <code>openConnection(Proxy)</code> method.</td></tr>
+    <tr><td><code>Proxy</code></td><td>*</td><td>&nbsp;</td></tr>
+    <tr><td><code>ProxySelector</code></td><td>*</td><td>&nbsp;</td></tr>
+
     <tr><td ><code>java.rmi.server</code></td><td><code>RemoteObjectInvocationHandler</code></td>
         <td>*</td><td>&nbsp;</td></tr>
 
-    <tr><td ><code>java.net</code></td><td><code>URL</code></td>
-        <td><code>toURI()</code></td><td>&nbsp;</td></tr>
+    <tr><td ><code>java.text</code></td><td><code>DecimalFormat</code></td>
+        <td><code>isParseBigDecimal()<sup><a href="#3">3</a></sup>,<br>
+            setParseBigDecimal(boolean)<sup><a href="#3">3</a></sup></code></td><td>
+        <code>BigDecimal</code> parsing and formatting precision is limited by
+        <code>java.lang.Double</code> or <code>java.lang.Long</code> precision.
+        </td></tr>
 
     <tr><td><code>java.util.nio</code></td><td><code>CharBuffer</code></td><td>
         <code>append(CharSequence),<br> append(CharSequence, int, int),<br> append(char),<br> read(CharBuffer)</code>
         </td><td>&nbsp;</td></tr>
 
-    <tr><td rowspan="10"><code>java.util</code></td><td><code>AbstractQueue</code></td><td>*</td><td>
-        Supported via the <a href="http://dcl.mathcs.emory.edu/util/backport-util-concurrent/index.php">
-        Backport of JSR 166</a>.
-        </td></tr>
+    <tr><td rowspan="10"><code>java.util</code></td><td><code>AbstractQueue<sup><a href="#1">1</a></sup></code></td>
+        <td>*</td><td>&nbsp;</td></tr>
     <tr><td><code>Arrays</code></td><td>* (21 new methods)</td><td>&nbsp;</td></tr>
-    <tr><td><code>Collections</code></td><td>* (13 new methods)</td><td>
-        Supported via the <a href="http://dcl.mathcs.emory.edu/util/backport-util-concurrent/index.php">
-        Backport of JSR 166</a>.
-    </td></tr>
+    <tr><td><code>Collections<sup><a href="#1">1</a></sup></code></td><td>* (13 new methods)<br>
+        newSetFromMap(Map)<sup><a href="#4">4</a></sup>
+
+    </td><td>&nbsp;</td></tr>
     <tr><td><code>EnumMap</code></td><td>*</td><td>&nbsp;</td></tr>
     <tr><td><code>EnumSet</code></td><td>*</td><td>&nbsp;</td></tr>
     <tr><td><code>Formatter</code></td><td>*</td><td>&nbsp;</td></tr>
     <tr><td><code>LinkedList</code></td><td>* (5 new methods)</td><td>&nbsp;</td></tr>
-    <tr><td><code>PriorityQueue</code></td><td>*</td><td>
-        Supported via the <a href="http://dcl.mathcs.emory.edu/util/backport-util-concurrent/index.php">
-        Backport of JSR 166</a>.
-        </td></tr>
-    <tr><td><code>Queue</code></td><td>*</td><td>
-        Supported via the <a href="http://dcl.mathcs.emory.edu/util/backport-util-concurrent/index.php">
-        Backport of JSR 166</a>.<br>
-        <code>new Queue[...]</code> is replaced with <code>new Object[...]</code>
-    </td></tr>
+    <tr><td><code>PriorityQueue<sup><a href="#1">1</a></sup></code></td><td>*</td><td>&nbsp;</td></tr>
+    <tr><td><code>Queue<sup><a href="#1">1</a>,<a href="#2">2</a></sup></code></td><td>*</td><td>&nbsp;</td></tr>
     <tr><td><code>UUID</code></td><td>*</td><td>&nbsp;</td></tr>
 
     <tr><td rowspan="3"><code>java.util.regex</code></td><td><code>Matcher</code></td><td>
         <code>quoteReplacement(String),<br> toMatchResult()</code></td><td>&nbsp;</td></tr>
-    <tr><td><code>MatchResult</code></td><td>*</td><td>
-        <code>new MatchResult[...]</code> is replaced with <code>new Object[...]</code>
-    </td></tr>
+    <tr><td><code>MatchResult<sup><a href="#2">2</a></sup></code></td><td>*</td><td>&nbsp;</td></tr>
     <tr><td><code>Pattern</code></td><td><code>quote(String)</code></td><td>&nbsp;</td></tr>
 </table>
+<p>
+    <a name="1"><sup>1</sup></a> Supported via the
+        <a href="http://dcl.mathcs.emory.edu/util/backport-util-concurrent/index.php"> Backport of JSR 166</a>.<br>
+    <a name="2"><sup>2</sup></a> In most cases this type is being replaced with it's base type.<br>
+    <a name="3"><sup>3</sup></a> Supported only in advanced mode, i.e. when
+    the <code><a href="#option_advanced">advanced</a></code> option is specified.<br>
+    <a name="4"><sup>4</sup></a> Introduced in Java 6, but available only for 1.4 target.<br>
+</p>
 
 <h4><a name="extension">How to write an extension for Retrotranslator?</a></h4>
 
@@ -504,7 +535,7 @@ and concurrency utilities
     <a href="http://java.sun.com/j2se/1.5.0/docs/api/java/util/EnumSet.html"><code>java.util.EnumSet</code></a>
     are replaced with references to
     <a href="http://retrotranslator.cvs.sourceforge.net/retrotranslator/Retrotranslator/src/net/sf/retrotranslator/runtime/java/util/EnumSet_.java?view=markup">
-    <code>net.sf.retrotranslator.runtime.java.util.EnumSet<b>_</b></code></a> (trailing underscore) if the latter can be found.
+    <code>net.sf.retrotranslator.runtime.java.util.EnumSet<b>_</b></code></a> (optional trailing underscore) if the latter can be found.
     But if you replace a whole class that exists in J2SE 1.4 you may encounter interoperability issues with other libraries.
     So, for example, support for Java 5 fields, methods, and constructors of
     <a href="http://java.sun.com/j2se/1.5.0/docs/api/java/math/BigDecimal.html"><code>java.math.BigDecimal</code></a> is placed into
@@ -540,8 +571,12 @@ and concurrency utilities
 </p>
 <p>
     You can put your extensions into packages other than <code>net.sf.retrotranslator.runtime</code>.
-    For example, to make Retrotranslator use <code>com.mycompany.internal.java.lang._String</code>
-    just specify <code>-backport com.mycompany.internal</code> at the command line.
+    For example, specify the following at the command line to make Retrotranslator use
+    <code>com.mycompany.internal.java.lang._String</code> and to rewrite all references to
+    <code>com.sun.org.apache.xerces.internal.*</code> with <code>org.apache.xerces.*</code>:<br>
+    <code>-backport&nbsp;com.mycompany.internal;com.sun.org.apache.xerces.internal:org.apache.xerces</code>
+</p>
+<p>
     If you have written an extension that does not contain copyrighted code, you may send
     a <a href="http://sourceforge.net/tracker/?group_id=153566&atid=788281">patch</a>
     under the <a href="#license">Retrotranslator license</a>.
@@ -590,7 +625,7 @@ and concurrency utilities
     Retrotranslator: a Java bytecode transformer that translates Java classes
     compiled with JDK 5.0 into classes that can be run on JVM 1.4.
 
-    Copyright (c) 2005, 2006 Taras Puchko
+    Copyright (c) 2005 - 2007 Taras Puchko
     All rights reserved.
 
     Redistribution and use in source and binary forms, with or without

backport/translate.bat

@@ -1,4 +1,3 @@
-java -jar retrotranslator-transformer-1.1.0.jar -srcjar ../lib/struts2-core-2.0.3.jar -destjar struts2-core-j4-2.0.3.jar 
-java -jar retrotranslator-transformer-1.1.0.jar -srcjar ../lib/struts2-api-2.0.3.jar -destjar struts2-api-j4-2.0.3.jar 
-java -jar retrotranslator-transformer-1.1.0.jar -srcjar ../lib/struts2-extras-2.0.3.jar -destjar struts2-extras-j4-2.0.3.jar 
-java -jar retrotranslator-transformer-1.1.0.jar -srcjar ../lib/xwork-2.0.0.jar -destjar xwork-j4-2.0.0-RC1.jar 
+java -jar retrotranslator-transformer-1.2.0.jar -advanced -srcjar ../lib/struts2-core-2.0.4.jar -destjar struts2-core-j4-2.0.4.jar 
+java -jar retrotranslator-transformer-1.2.0.jar -advanced -srcjar ../lib/struts2-api-2.0.4.jar -destjar struts2-api-j4-2.0.4.jar 
+java -jar retrotranslator-transformer-1.2.0.jar -advanced -srcjar ../lib/xwork-2.0.0.jar -destjar xwork-j4-2.0.0.jar 

core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>2.0.3</version>
+        <version>2.0.5</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-core</artifactId>
@@ -264,7 +264,7 @@
         <dependency>
             <groupId>freemarker</groupId>
             <artifactId>freemarker</artifactId>
-            <version>2.3.4</version>
+            <version>2.3.8</version>
         </dependency>
 
         <dependency>
@@ -461,12 +461,16 @@
             <scope>test</scope>
         </dependency>
 
+        <!-- struts-annotations must be in compile scope for maven-apt-plugin to
+        function correctly. Marking it optional to exclude it from transitive
+        dependency resolution -->
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts-annotations</artifactId>
             <version>1.0-SNAPSHOT</version>
-            <scope>compile</scope>
+            <optional>true</optional>
         </dependency>
 
+        
     </dependencies>
 </project>

core/src/main/java/org/apache/struts2/StrutsConstants.java

@@ -145,4 +145,6 @@ public final class StrutsConstants {
 
     /** The name of the xwork converter implementation */
     public static final String STRUTS_XWORKCONVERTER = "struts.xworkConverter";
+
+    public static final String STRUTS_ALWAYS_SELECT_FULL_NAMESPACE = "struts.mapper.alwaysSelectFullNamespace";
 }

core/src/main/java/org/apache/struts2/TestNGStrutsTestCase.java

@@ -1,5 +1,5 @@
 /*
- * $Id: StrutsTestCase.java 476696 2006-11-19 03:56:18Z tmjee $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

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

@@ -60,6 +60,6 @@ public class DoubleSelect extends DoubleListUIBean {
         super.evaluateExtraParams();
 
         // force the onchange parameter
-        addParameter("onchange", getParameters().get("name") + "Redirect(this.options.selectedIndex)");
+        addParameter("onchange", getParameters().get("id") + "Redirect(this.options.selectedIndex)");
     }
 }

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

@@ -32,6 +32,8 @@ import org.apache.commons.logging.LogFactory;
 import org.apache.struts2.views.annotations.StrutsTag;
 import org.apache.struts2.views.annotations.StrutsTagAttribute;
 
+import com.opensymphony.xwork2.inject.Container;
+import com.opensymphony.xwork2.inject.Inject;
 import com.opensymphony.xwork2.util.ValueStack;
 
 /**
@@ -90,6 +92,11 @@ public class OptGroup extends Component {
             }
         };
     }
+    
+    @Inject
+    public void setContainer(Container container) {
+        container.inject(internalUiBean);
+    }
 
     public boolean end(Writer writer, String body) {
         Select select = (Select) findAncestor(Select.class);

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

@@ -1,3 +1,23 @@
+/*
+ * $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 org.apache.struts2.components;
 
 

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

@@ -20,9 +20,13 @@
  */
 package org.apache.struts2.components;
 
+import java.io.Writer;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.struts2.views.annotations.StrutsTag;
 import org.apache.struts2.views.annotations.StrutsTagAttribute;
 
@@ -133,6 +137,9 @@ import com.opensymphony.xwork2.util.ValueStack;
  */
 @StrutsTag(name="submit", tldTagClass="org.apache.struts2.views.jsp.ui.SubmitTag", description="Render a submit button")
 public class Submit extends FormButton implements RemoteUICallBean{
+    
+    private static final Log LOG = LogFactory.getLog(Submit.class);
+    
     final public static String TEMPLATE = "submit";
 
     protected String href;
@@ -217,6 +224,25 @@ public class Submit extends FormButton implements RemoteUICallBean{
     protected boolean supportsImageType() {
         return true;
     }
+    
+    /**
+     * Overrides to be able to render body in a template rather than always before the template
+     */
+    public boolean end(Writer writer, String body) {
+        evaluateParams();
+        try {
+            addParameter("body", body);
+            
+            mergeTemplate(writer, buildTemplateName(template, getDefaultTemplate()));
+        } catch (Exception e) {
+            LOG.error("error when rendering", e);
+        }
+        finally {
+            popComponentStack();
+        }
+
+        return false;
+    }
 
     @StrutsTagAttribute(description="Topic that will trigger the remote call")
     public void setListenTopics(String listenTopics) {

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

@@ -872,9 +872,10 @@ public abstract class UIBean extends Component {
                 addParameter("id", id);
             }
         } else if (form != null) {
-            addParameter("id", form.getParameters().get("id") + "_" + escape(name));
+            addParameter("id", form.getParameters().get("id") + "_" 
+                    + escape(name != null ? findString(name) : null));
         } else {
-            addParameter("id", escape(name));
+            addParameter("id", escape(name != null ? findString(name) : null));
         }
     }
 

core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java

@@ -21,6 +21,7 @@
 package org.apache.struts2.config;
 
 import java.util.Properties;
+import java.util.StringTokenizer;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -43,6 +44,7 @@ import com.opensymphony.xwork2.inject.Factory;
 import com.opensymphony.xwork2.inject.Inject;
 import com.opensymphony.xwork2.inject.Scope;
 import com.opensymphony.xwork2.util.ClassLoaderUtil;
+import com.opensymphony.xwork2.util.LocalizedTextUtil;
 import com.opensymphony.xwork2.util.ObjectTypeDeterminer;
 import com.opensymphony.xwork2.util.ObjectTypeDeterminerFactory;
 import com.opensymphony.xwork2.util.XWorkConverter;
@@ -162,6 +164,30 @@ public class BeanSelectionProvider implements ConfigurationProvider {
         if ("true".equalsIgnoreCase(props.getProperty(StrutsConstants.STRUTS_DEVMODE))) {
             props.setProperty(StrutsConstants.STRUTS_I18N_RELOAD, "true");
             props.setProperty(StrutsConstants.STRUTS_CONFIGURATION_XML_RELOAD, "true");
+            // Convert struts properties into ones that xwork expects
+            props.setProperty("devMode", "true");
+        } else {
+            props.setProperty("devMode", "false");
+        }
+        
+        // TODO: This should be moved to XWork after 2.0.4
+        // struts.custom.i18n.resources
+
+        LocalizedTextUtil.addDefaultResourceBundle("org/apache/struts2/struts-messages");
+        
+        String bundles = props.getProperty(StrutsConstants.STRUTS_CUSTOM_I18N_RESOURCES);
+        if (bundles != null && bundles.length() > 0) { 
+            StringTokenizer customBundles = new StringTokenizer(props.getProperty(StrutsConstants.STRUTS_CUSTOM_I18N_RESOURCES), ", ");
+            
+            while (customBundles.hasMoreTokens()) {
+                String name = customBundles.nextToken();
+                try {
+                    LOG.info("Loading global messages from " + name);
+                    LocalizedTextUtil.addDefaultResourceBundle(name);
+                } catch (Exception e) {
+                    LOG.error("Could not find messages file " + name + ".properties. Skipping");
+                }
+            } 
         }
     }
     

core/src/main/java/org/apache/struts2/config/ClasspathConfigurationProvider.java

@@ -39,6 +39,7 @@ import com.opensymphony.xwork2.config.entities.PackageConfig;
 import com.opensymphony.xwork2.config.entities.ResultConfig;
 import com.opensymphony.xwork2.config.entities.ResultTypeConfig;
 import com.opensymphony.xwork2.inject.ContainerBuilder;
+import com.opensymphony.xwork2.inject.Inject;
 import com.opensymphony.xwork2.util.ClassLoaderUtil;
 import com.opensymphony.xwork2.util.ResolverUtil;
 import com.opensymphony.xwork2.util.TextUtils;
@@ -150,22 +151,6 @@ public class ClasspathConfigurationProvider implements ConfigurationProvider {
      */
     public ClasspathConfigurationProvider(String[] pkgs) {
         this.packages = pkgs;
-
-        if (Settings.isSet(DEFAULT_PARENT_PACKAGE)) {
-            defaultParentPackage = Settings.get(DEFAULT_PARENT_PACKAGE);
-        }
-
-        if (Settings.isSet(DEFAULT_PAGE_EXTENSION)) {
-            defaultPageExtension = Settings.get(DEFAULT_PAGE_EXTENSION);
-        }
-
-        if (Settings.isSet(DEFAULT_PAGE_PREFIX)) {
-            defaultPagePrefix = Settings.get(DEFAULT_PAGE_PREFIX);
-        }
-
-        if (Settings.isSet(FORCE_LOWER_CASE)) {
-            forceLowerCase = Settings.get(FORCE_LOWER_CASE).equalsIgnoreCase("true");
-        }
     }
 
     /**
@@ -189,6 +174,7 @@ public class ClasspathConfigurationProvider implements ConfigurationProvider {
      *
      * @param defaultParentPackage the new defaultParentPackage
      */
+    @Inject(value=DEFAULT_PARENT_PACKAGE, required=false)
     public void setDefaultParentPackage(String defaultParentPackage) {
         this.defaultParentPackage = defaultParentPackage;
     }
@@ -198,6 +184,7 @@ public class ClasspathConfigurationProvider implements ConfigurationProvider {
      *
      * @param defaultPageExtension the new defaultPageExtension
      */
+    @Inject(value=DEFAULT_PAGE_EXTENSION, required=false)
     public void setDefaultPageExtension(String defaultPageExtension) {
         this.defaultPageExtension = defaultPageExtension;
     }
@@ -207,9 +194,21 @@ public class ClasspathConfigurationProvider implements ConfigurationProvider {
      *
      * @param defaultPagePrefix the defaultPagePrefix to set
      */
+    @Inject(value=DEFAULT_PAGE_PREFIX, required=false)
     public void setDefaultPagePrefix(String defaultPagePrefix) {
         this.defaultPagePrefix = defaultPagePrefix;
     }
+    
+    /**
+     * Whether to use a lowercase letter as the initial letter of an action.
+     * 
+     * @param force If false, actions will retain the initial uppercase letter from the Action class.
+     * (<code>view.action</code> (true) versus <code>View.action</code> (false)).
+     */
+    @Inject(value=FORCE_LOWER_CASE, required=false)
+    public void setForceLowerCase(String force) {
+        this.forceLowerCase = "true".equals(force);
+    }
 
     /**
      * Register a PageLocation to use to scan for server pages.
@@ -290,6 +289,11 @@ public class ClasspathConfigurationProvider implements ConfigurationProvider {
 
         PackageConfig pkgConfig = loadPackageConfig(actionNamespace, actionPackage, cls);
 
+        // In case the package changed due to namespace annotation processing
+        if (!actionPackage.equals(pkgConfig.getName())) {
+            actionPackage = pkgConfig.getName();
+        }
+
         Annotation annotation = cls.getAnnotation(ParentPackage.class);
         if (annotation != null) {
             String parent = ((ParentPackage)annotation).value();
@@ -324,7 +328,6 @@ public class ClasspathConfigurationProvider implements ConfigurationProvider {
         actionConfig.setPackageName(actionPackage);
 
         actionConfig.setResults(new ResultMap<String,ResultConfig>(cls, actionName, pkgConfig));
-
         pkgConfig.addActionConfig(actionName, actionConfig);
     }
 
@@ -478,33 +481,6 @@ public class ClasspathConfigurationProvider implements ConfigurationProvider {
             return map;
         }
 
-        /**
-         * Retrieve ResultConfig from cache.
-         *
-         * @param key Name of ResultConfig
-         * @return ResultConfig correspnding to key
-         */
-        public V get(Object key) {
-
-            V result = super.get(key);
-            if (result != null) {
-                return result;
-            } else {
-
-                //  This code should never actually be called,
-                // due to how the runtime configuration is created.
-                String actionPath = pkgConfig.getNamespace() + "/" + actionName;
-
-                String fileName = actionPath + "-" + key + defaultPageExtension;
-                if (pageLocator.locate(defaultPagePrefix + fileName) == null) {
-                    fileName = actionPath + defaultPageExtension;
-                }
-
-                String location = defaultPagePrefix + fileName;
-                return (V) createResultConfig(key, null, location, null);
-            }
-        }
-
         /**
          * Creates a default ResultConfig,
          * using either the resultClass or the default ResultType for configuration package

core/src/main/java/org/apache/struts2/config/DefaultPropertiesProvider.java

@@ -0,0 +1,52 @@
+/*
+ * $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 org.apache.struts2.config;
+
+import com.opensymphony.xwork2.config.Configuration;
+import com.opensymphony.xwork2.config.ConfigurationException;
+import com.opensymphony.xwork2.inject.ContainerBuilder;
+import com.opensymphony.xwork2.util.location.LocatableProperties;
+
+/**
+ * Loads the default properties, separate from the usual struts.properties loading
+ */
+public class DefaultPropertiesProvider extends LegacyPropertiesConfigurationProvider {
+
+    public void destroy() {
+    }
+
+    public void init(Configuration configuration) throws ConfigurationException {
+    }
+
+    public void register(ContainerBuilder builder, LocatableProperties props)
+            throws ConfigurationException {
+        
+        Settings defaultSettings = null;
+        try {
+            defaultSettings = new PropertiesSettings("org/apache/struts2/default");
+        } catch (Exception e) {
+            throw new ConfigurationException("Could not find or error in org/apache/struts2/default.properties", e);
+        }
+        
+        loadSettings(props, defaultSettings);
+    }
+
+}

core/src/main/java/org/apache/struts2/config/DefaultSettings.java

@@ -69,12 +69,6 @@ public class DefaultSettings extends Settings {
             log.warn("DefaultSettings: Could not find or error in struts.properties", e);
         }
 
-        try {
-            list.add(new PropertiesSettings("org/apache/struts2/default"));
-        } catch (Exception e) {
-            log.error("DefaultSettings: Could not find or error in org/apache/struts2/default.properties", e);
-        }
-
         Settings[] settings = new Settings[list.size()];
         delegate = new DelegatingSettings(list.toArray(settings));
 
@@ -100,24 +94,6 @@ public class DefaultSettings extends Settings {
             // like the struts.custom.properties, which is commented out
         }
 
-        // struts.custom.i18n.resources
-        try {
-
-            LocalizedTextUtil.addDefaultResourceBundle("org/apache/struts2/struts-messages");
-            StringTokenizer customBundles = new StringTokenizer(delegate.getImpl(StrutsConstants.STRUTS_CUSTOM_I18N_RESOURCES), ", ");
-
-            while (customBundles.hasMoreTokens()) {
-                String name = customBundles.nextToken();
-                try {
-                    log.info("DefaultSettings: Loading global messages from " + name);
-                    LocalizedTextUtil.addDefaultResourceBundle(name);
-                } catch (Exception e) {
-                    log.error("DefaultSettings: Could not find " + name + ".properties. Skipping");
-                }
-            }
-        } catch (IllegalArgumentException e) {
-            // Assume it's OK, since many applications do not provide custom resource bundles. 
-        }
     }
 
     // See superclass for Javadoc

core/src/main/java/org/apache/struts2/config/LegacyPropertiesConfigurationProvider.java

@@ -66,15 +66,7 @@ public class LegacyPropertiesConfigurationProvider implements ConfigurationProvi
         
         final Settings settings = Settings.getInstance();
         
-        for (Iterator i = settings.list(); i.hasNext(); ) {
-            String name = (String) i.next();
-            props.setProperty(name, settings.get(name), settings.getLocation(name));
-            
-            // Convert struts properties into ones that xwork expects
-            if (StrutsConstants.STRUTS_DEVMODE.equals(name)) {
-                props.setProperty("devMode", settings.get(name), settings.getLocation(name));
-            }
-        }
+        loadSettings(props, settings);
         
         // Set default locale
         final Locale locale = settings.getLocale();
@@ -84,4 +76,16 @@ public class LegacyPropertiesConfigurationProvider implements ConfigurationProvi
             }
         });
     }
+
+    /**
+     * @param props
+     * @param settings
+     */
+    protected void loadSettings(LocatableProperties props, final Settings settings) {
+        // We are calling the impl methods to get around the single instance of Settings that is expected
+        for (Iterator i = settings.listImpl(); i.hasNext(); ) {
+            String name = (String) i.next();
+            props.setProperty(name, settings.getImpl(name), settings.getLocationImpl(name));
+        }
+    }
 }

core/src/main/java/org/apache/struts2/config/MethodConfigurationProvider.java

@@ -1,239 +1,259 @@
-package org.apache.struts2.config;
-
-import com.opensymphony.xwork2.config.ConfigurationProvider;
-import com.opensymphony.xwork2.config.Configuration;
-import com.opensymphony.xwork2.config.ConfigurationException;
-import com.opensymphony.xwork2.config.RuntimeConfiguration;
-import com.opensymphony.xwork2.config.entities.ActionConfig;
-import com.opensymphony.xwork2.config.entities.PackageConfig;
-import com.opensymphony.xwork2.inject.ContainerBuilder;
-import com.opensymphony.xwork2.util.location.LocatableProperties;
-import com.opensymphony.xwork2.ObjectFactory;
-
-import java.util.*;
-import java.lang.reflect.Method;
-
-/**
- * MethodConfigurationProvider creates ActionConfigs for potential action
- * methods that lack a corresponding action mapping,
- * so that these methods can be invoked without extra or redundant configuration.
- * <p/>
- * As a dynamic method, the behavior of this class could be represented as:
- * <p/>
- * <code>
- * int bang = name.indexOf('!');
- * if (bang != -1) {
- * String method = name.substring(bang + 1);
- * mapping.setMethod(method);
- * name = name.substring(0, bang);
- * }
- * </code>
- * <p/>
- * If the action URL is "foo!bar", the the "foo" action is invoked,
- * calling "bar" instead of "execute".
- * <p/>
- * Instead of scanning each request at runtime, the provider creates action mappings
- * for each method that could be matched using a dynamic approach.
- * Advantages over a dynamic approach are that:
- * <p/>
- * <ul>
- * <ol>The "dynamic" methods are not a special case, but just another action mapping,
- * with all the features of a hardcoded mapping.
- * <ol>When needed, a manual action can be provided for a method and invoked with the same
- * syntax as an automatic action.
- * <ol>The ConfigBrowser can display all potential actions.
- * </ul>
- */
-public class MethodConfigurationProvider implements ConfigurationProvider {
-
-    /**
-     * Stores configuration property.
-     */
-    private Configuration configuration;
-
-    /**
-     * Updates configuration property.
-     * @param configuration New configuration
-     */
-    public void setConfiguration(Configuration configuration) {
-        this.configuration = configuration;
-    }
-
-    // See superclass for Javadoc
-    public void destroy() {
-        // Override to provide functionality
-    }
-
-    // See superclass for Javadoc
-    public void init(Configuration configuration) throws ConfigurationException {
-        setConfiguration(configuration);
-        configuration.rebuildRuntimeConfiguration();
-    }
-
-    // See superclass for Javadoc
-    public void register(ContainerBuilder containerBuilder, LocatableProperties locatableProperties) throws ConfigurationException {
-        // Override to provide functionality
-    }
-
-    // See superclass for Javadoc
-    public void loadPackages() throws ConfigurationException {
-
-        Set namespaces = Collections.EMPTY_SET;
-        RuntimeConfiguration rc = configuration.getRuntimeConfiguration();
-        Map allActionConfigs = rc.getActionConfigs();
-        if (allActionConfigs != null) {
-            namespaces = allActionConfigs.keySet();
-        }
-
-        if (namespaces.size() == 0) {
-            throw new ConfigurationException("MethodConfigurationProvider.loadPackages: namespaces.size == 0");
-        }
-
-        boolean added = false;
-        for (Object namespace : namespaces) {
-            Map actions = (Map) allActionConfigs.get(namespace);
-            Set actionNames = actions.keySet();
-            for (Object actionName : actionNames) {
-                ActionConfig actionConfig = (ActionConfig) actions.get(actionName);
-                added = added | addDynamicMethods(actions, (String) actionName, actionConfig);
-            }
-        }
-
-        reload = added;
-    }
-
-    /**
-     * Store needsReload property.
-     */
-    boolean reload;
-
-    // See superclass for Javadoc
-    public boolean needsReload() {
-        return reload;
-    }
-
-    /**
-     * Stores ObjectFactory property.
-     */
-    ObjectFactory factory;
-
-    /**
-     * Updates ObjectFactory property.
-     * @param factory
-     */
-    public void setObjectFactory(ObjectFactory factory) {
-        this.factory = factory;
-    }
-
-    /**
-     * Provides ObjectFactory property.
-     * @return
-     * @throws ConfigurationException if ObjectFactory has not been set.
-     */
-    private ObjectFactory getObjectFactory() throws ConfigurationException {
-        if (factory == null) {
-            factory = ObjectFactory.getObjectFactory();
-            if (factory == null) throw new
-                    ConfigurationException("MethodConfigurationProvider.getObjectFactory: ObjectFactory==null");
-        }
-        return factory;
-    }
-
-    /**
-     * Verifies that character at a String position is upper case.
-     * @param pos Position to test
-     * @param string Text containing position
-     * @return True if character at a String position is upper case
-     */
-    private boolean upperAt(int pos, String string) {
-        int len = string.length();
-        if (len < pos) return false;
-        String ch = string.substring(pos, pos+1);
-        return ch.equals(ch.toUpperCase());
-    }
-
-   /**
-    * Scans class for potential Action mehods,
-    * automatically generating and registering ActionConfigs as needed.
-    * <p/>
-    * The system iterates over the set of namespaces and the set of actionNames
-    * in a Configuration and retrieves each ActionConfig.
-    * For each ActionConfig that invokes the default "execute" method,
-    * the provider inspects the className class for other non-void,
-    * no-argument methods that do not begin with "getX" or "isX".
-    * For each qualifying method, the provider looks for another actionName in
-    * the same namespace that equals action.name + "!" + method.name.
-    * If that actionName is not found, System copies the ActionConfig,
-    * changes the method property, and adds it to the package configuration
-    * under the new actionName (action!method).
-    * <p/>
-    * The system ignores ActionConfigs with a method property set so as to
-    * avoid creating alias methods for alias methods.
-    * The system ignores "getX" and "isX" methods since these would appear to be
-    * JavaBeans property and would not be intended as action methods.
-    * (The X represents any upper character or non-letter.)
-    * @param actions All ActionConfigs in namespace
-    * @param actionName Name of ActionConfig to analyze
-    * @param actionConfig ActionConfig corresponding to actionName
-    */
-    protected boolean addDynamicMethods(Map actions, String actionName, ActionConfig actionConfig) throws ConfigurationException {
-
-        String configMethod = actionConfig.getMethodName();
-        boolean hasMethod = (configMethod != null) && (configMethod.length() > 0);
-        if (hasMethod) return false;
-
-        String className = actionConfig.getClassName();
-        Set actionMethods = new HashSet();
-        Class actionClass;
-        ObjectFactory factory = getObjectFactory();
-        try {
-            actionClass = factory.getClassInstance(className);
-        } catch (ClassNotFoundException e) {
-            throw new ConfigurationException(e);
-        }
-
-        Method[] methods = actionClass.getMethods();
-        for (Method method : methods) {
-            String returnString = method.getReturnType().getName();
-            boolean isString = "java.lang.String".equals(returnString);
-            if (isString) {
-                Class[] parameterTypes = method.getParameterTypes();
-                boolean noParameters = (parameterTypes.length == 0);
-                String methodString = method.getName();
-                boolean notGetMethod = !((methodString.startsWith("get")) && upperAt(3, methodString));
-                boolean notIsMethod = !((methodString.startsWith("is")) && upperAt(2, methodString));
-                boolean notToString = !("toString".equals(methodString));
-                boolean notExecute = !("execute".equals(methodString));
-                boolean qualifies = noParameters && notGetMethod && notIsMethod && notToString && notExecute;
-                if (qualifies) {
-                    actionMethods.add(methodString);
-                }
-            }
-        }
-
-        for (Object actionMethod : actionMethods) {
-            String methodName = (String) actionMethod;
-            StringBuilder sb = new StringBuilder();
-            sb.append(actionName);
-            sb.append("!"); // TODO: Make "!" a configurable character
-            sb.append(methodName);
-            String newActionName = sb.toString();
-            boolean haveAction = actions.containsKey(newActionName);
-            if (haveAction) continue;
-            ActionConfig newActionConfig = new ActionConfig(
-                    newActionName,
-                    actionConfig.getClassName(),
-                    actionConfig.getParams(),
-                    actionConfig.getResults(),
-                    actionConfig.getInterceptors(),
-                    actionConfig.getExceptionMappings());
-            newActionConfig.setMethodName(methodName);
-            String packageName = actionConfig.getPackageName();
-            newActionConfig.setPackageName(packageName);
-            PackageConfig packageConfig = configuration.getPackageConfig(packageName);
-            packageConfig.addActionConfig(newActionName, actionConfig);
-        }
-
-        return (actionMethods.size() > 0);
-    }
-}
+/*
+ * $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 org.apache.struts2.config;
+
+import com.opensymphony.xwork2.config.ConfigurationProvider;
+import com.opensymphony.xwork2.config.Configuration;
+import com.opensymphony.xwork2.config.ConfigurationException;
+import com.opensymphony.xwork2.config.RuntimeConfiguration;
+import com.opensymphony.xwork2.config.entities.ActionConfig;
+import com.opensymphony.xwork2.config.entities.PackageConfig;
+import com.opensymphony.xwork2.inject.ContainerBuilder;
+import com.opensymphony.xwork2.util.location.LocatableProperties;
+import com.opensymphony.xwork2.ObjectFactory;
+
+import java.util.*;
+import java.lang.reflect.Method;
+
+/**
+ * MethodConfigurationProvider creates ActionConfigs for potential action
+ * methods that lack a corresponding action mapping,
+ * so that these methods can be invoked without extra or redundant configuration.
+ * <p/>
+ * As a dynamic method, the behavior of this class could be represented as:
+ * <p/>
+ * <code>
+ * int bang = name.indexOf('!');
+ * if (bang != -1) {
+ * String method = name.substring(bang + 1);
+ * mapping.setMethod(method);
+ * name = name.substring(0, bang);
+ * }
+ * </code>
+ * <p/>
+ * If the action URL is "foo!bar", the the "foo" action is invoked,
+ * calling "bar" instead of "execute".
+ * <p/>
+ * Instead of scanning each request at runtime, the provider creates action mappings
+ * for each method that could be matched using a dynamic approach.
+ * Advantages over a dynamic approach are that:
+ * <p/>
+ * <ul>
+ * <ol>The "dynamic" methods are not a special case, but just another action mapping,
+ * with all the features of a hardcoded mapping.
+ * <ol>When needed, a manual action can be provided for a method and invoked with the same
+ * syntax as an automatic action.
+ * <ol>The ConfigBrowser can display all potential actions.
+ * </ul>
+ */
+public class MethodConfigurationProvider implements ConfigurationProvider {
+
+    /**
+     * Stores configuration property.
+     */
+    private Configuration configuration;
+
+    /**
+     * Updates configuration property.
+     * @param configuration New configuration
+     */
+    public void setConfiguration(Configuration configuration) {
+        this.configuration = configuration;
+    }
+
+    // See superclass for Javadoc
+    public void destroy() {
+        // Override to provide functionality
+    }
+
+    // See superclass for Javadoc
+    public void init(Configuration configuration) throws ConfigurationException {
+        setConfiguration(configuration);
+        configuration.rebuildRuntimeConfiguration();
+    }
+
+    // See superclass for Javadoc
+    public void register(ContainerBuilder containerBuilder, LocatableProperties locatableProperties) throws ConfigurationException {
+        // Override to provide functionality
+    }
+
+    // See superclass for Javadoc
+    public void loadPackages() throws ConfigurationException {
+
+        Set namespaces = Collections.EMPTY_SET;
+        RuntimeConfiguration rc = configuration.getRuntimeConfiguration();
+        Map allActionConfigs = rc.getActionConfigs();
+        if (allActionConfigs != null) {
+            namespaces = allActionConfigs.keySet();
+        }
+
+        if (namespaces.size() == 0) {
+            throw new ConfigurationException("MethodConfigurationProvider.loadPackages: namespaces.size == 0");
+        }
+
+        boolean added = false;
+        for (Object namespace : namespaces) {
+            Map actions = (Map) allActionConfigs.get(namespace);
+            Set actionNames = actions.keySet();
+            for (Object actionName : actionNames) {
+                ActionConfig actionConfig = (ActionConfig) actions.get(actionName);
+                added = added | addDynamicMethods(actions, (String) actionName, actionConfig);
+            }
+        }
+
+        reload = added;
+    }
+
+    /**
+     * Store needsReload property.
+     */
+    boolean reload;
+
+    // See superclass for Javadoc
+    public boolean needsReload() {
+        return reload;
+    }
+
+    /**
+     * Stores ObjectFactory property.
+     */
+    ObjectFactory factory;
+
+    /**
+     * Updates ObjectFactory property.
+     * @param factory
+     */
+    public void setObjectFactory(ObjectFactory factory) {
+        this.factory = factory;
+    }
+
+    /**
+     * Provides ObjectFactory property.
+     * @return
+     * @throws ConfigurationException if ObjectFactory has not been set.
+     */
+    private ObjectFactory getObjectFactory() throws ConfigurationException {
+        if (factory == null) {
+            factory = ObjectFactory.getObjectFactory();
+            if (factory == null) throw new
+                    ConfigurationException("MethodConfigurationProvider.getObjectFactory: ObjectFactory==null");
+        }
+        return factory;
+    }
+
+    /**
+     * Verifies that character at a String position is upper case.
+     * @param pos Position to test
+     * @param string Text containing position
+     * @return True if character at a String position is upper case
+     */
+    private boolean upperAt(int pos, String string) {
+        int len = string.length();
+        if (len < pos) return false;
+        String ch = string.substring(pos, pos+1);
+        return ch.equals(ch.toUpperCase());
+    }
+
+   /**
+    * Scans class for potential Action mehods,
+    * automatically generating and registering ActionConfigs as needed.
+    * <p/>
+    * The system iterates over the set of namespaces and the set of actionNames
+    * in a Configuration and retrieves each ActionConfig.
+    * For each ActionConfig that invokes the default "execute" method,
+    * the provider inspects the className class for other non-void,
+    * no-argument methods that do not begin with "getX" or "isX".
+    * For each qualifying method, the provider looks for another actionName in
+    * the same namespace that equals action.name + "!" + method.name.
+    * If that actionName is not found, System copies the ActionConfig,
+    * changes the method property, and adds it to the package configuration
+    * under the new actionName (action!method).
+    * <p/>
+    * The system ignores ActionConfigs with a method property set so as to
+    * avoid creating alias methods for alias methods.
+    * The system ignores "getX" and "isX" methods since these would appear to be
+    * JavaBeans property and would not be intended as action methods.
+    * (The X represents any upper character or non-letter.)
+    * @param actions All ActionConfigs in namespace
+    * @param actionName Name of ActionConfig to analyze
+    * @param actionConfig ActionConfig corresponding to actionName
+    */
+    protected boolean addDynamicMethods(Map actions, String actionName, ActionConfig actionConfig) throws ConfigurationException {
+
+        String configMethod = actionConfig.getMethodName();
+        boolean hasMethod = (configMethod != null) && (configMethod.length() > 0);
+        if (hasMethod) return false;
+
+        String className = actionConfig.getClassName();
+        Set actionMethods = new HashSet();
+        Class actionClass;
+        ObjectFactory factory = getObjectFactory();
+        try {
+            actionClass = factory.getClassInstance(className);
+        } catch (ClassNotFoundException e) {
+            throw new ConfigurationException(e);
+        }
+
+        Method[] methods = actionClass.getMethods();
+        for (Method method : methods) {
+            String returnString = method.getReturnType().getName();
+            boolean isString = "java.lang.String".equals(returnString);
+            if (isString) {
+                Class[] parameterTypes = method.getParameterTypes();
+                boolean noParameters = (parameterTypes.length == 0);
+                String methodString = method.getName();
+                boolean notGetMethod = !((methodString.startsWith("get")) && upperAt(3, methodString));
+                boolean notIsMethod = !((methodString.startsWith("is")) && upperAt(2, methodString));
+                boolean notToString = !("toString".equals(methodString));
+                boolean notExecute = !("execute".equals(methodString));
+                boolean qualifies = noParameters && notGetMethod && notIsMethod && notToString && notExecute;
+                if (qualifies) {
+                    actionMethods.add(methodString);
+                }
+            }
+        }
+
+        for (Object actionMethod : actionMethods) {
+            String methodName = (String) actionMethod;
+            StringBuilder sb = new StringBuilder();
+            sb.append(actionName);
+            sb.append("!"); // TODO: Make "!" a configurable character
+            sb.append(methodName);
+            String newActionName = sb.toString();
+            boolean haveAction = actions.containsKey(newActionName);
+            if (haveAction) continue;
+            ActionConfig newActionConfig = new ActionConfig(
+                    newActionName,
+                    actionConfig.getClassName(),
+                    actionConfig.getParams(),
+                    actionConfig.getResults(),
+                    actionConfig.getInterceptors(),
+                    actionConfig.getExceptionMappings());
+            newActionConfig.setMethodName(methodName);
+            String packageName = actionConfig.getPackageName();
+            newActionConfig.setPackageName(packageName);
+            PackageConfig packageConfig = configuration.getPackageConfig(packageName);
+            packageConfig.addActionConfig(newActionName, actionConfig);
+        }
+
+        return (actionMethods.size() > 0);
+    }
+}

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

@@ -284,6 +284,10 @@ public class Dispatcher {
     	configurationManager = null;
     }
 
+    private void init_DefaultProperties() {
+        configurationManager.addConfigurationProvider(new DefaultPropertiesProvider());
+    }
+    
     private void init_LegacyStrutsProperties() {
         configurationManager.addConfigurationProvider(new LegacyPropertiesConfigurationProvider());
     }
@@ -439,13 +443,14 @@ Caused by: com.opensymphony.xwork2.inject.ContainerImpl$MissingDependencyExcepti
     		configurationManager = new ConfigurationManager(BeanSelectionProvider.DEFAULT_BEAN_NAME);
     	}
 
-    	init_LegacyStrutsProperties(); // [1]
+    	init_DefaultProperties(); // [1]
         init_TraditionalXmlConfigurations(); // [2]
-        init_ZeroConfiguration(); // [3]
-        init_CustomConfigurationProviders(); // [4]
+        init_LegacyStrutsProperties(); // [3]
+        init_ZeroConfiguration(); // [4]
+        init_CustomConfigurationProviders(); // [5]
         init_MethodConfigurationProvider();
-        init_FilterInitParameters() ; // [5]
-        init_AliasStandardObjects() ; // [6]
+        init_FilterInitParameters() ; // [6]
+        init_AliasStandardObjects() ; // [7]
 
         Container container = init_PreloadConfiguration();
         init_CheckConfigurationReloading(container);

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

@@ -135,7 +135,6 @@ public class ServletActionRedirectResult extends ServletRedirectResult {
     protected String actionName;
     protected String namespace;
     protected String method;
-    protected ActionMapper actionMapper;
 
     private Map<String, String> requestParameters = new HashMap<String, String>();
 
@@ -158,11 +157,6 @@ public class ServletActionRedirectResult extends ServletRedirectResult {
         this.method = method;
     }
     
-    @Inject
-    public void setActionMapper(ActionMapper mapper) {
-        this.actionMapper = mapper;
-    }
-
     protected List<String> prohibitedResultParam = Arrays.asList(new String[] {
             DEFAULT_PARAM, "namespace", "method", "encode", "parse", "location",
             "prependServletContext" });

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

@@ -27,6 +27,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.struts2.ServletActionContext;
 import org.apache.struts2.dispatcher.mapper.ActionMapper;
+import org.apache.struts2.dispatcher.mapper.ActionMapping;
 
 import com.opensymphony.xwork2.ActionContext;
 import com.opensymphony.xwork2.ActionInvocation;
@@ -84,7 +85,7 @@ public class ServletRedirectResult extends StrutsResultSupport {
 
     protected boolean prependServletContext = true;
 
-    private ActionMapper actionMapper;
+    protected ActionMapper actionMapper;
 
     public ServletRedirectResult() {
         super();
@@ -123,8 +124,12 @@ public class ServletRedirectResult extends StrutsResultSupport {
 
         if (isPathUrl(finalLocation)) {
             if (!finalLocation.startsWith("/")) {
-                String namespace = actionMapper.getMapping(
-                        request, Dispatcher.getInstance().getConfigurationManager()).getNamespace();
+                ActionMapping mapping = actionMapper.getMapping(
+                        request, Dispatcher.getInstance().getConfigurationManager()); 
+                String namespace = null;
+                if (mapping != null) {
+                    namespace = mapping.getNamespace();
+                }
 
                 if ((namespace != null) && (namespace.length() > 0) && (!"/".equals(namespace))) {
                     finalLocation = namespace + "/" + finalLocation;

core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java

@@ -173,6 +173,8 @@ public class DefaultActionMapper implements ActionMapper {
     private boolean allowDynamicMethodCalls = true;
 
     private boolean allowSlashesInActionNames = false;
+    
+    private boolean alwaysSelectFullNamespace = false;
 
     private PrefixTrie prefixTrie = null;
     
@@ -243,6 +245,11 @@ public class DefaultActionMapper implements ActionMapper {
     public void setSlashesInActionNames(String allow) {
         allowSlashesInActionNames = "true".equals(allow);
     }
+    
+    @Inject(StrutsConstants.STRUTS_ALWAYS_SELECT_FULL_NAMESPACE)
+    public void setAlwaysSelectFullNamespace(String val) {
+        this.alwaysSelectFullNamespace = "true".equals(val);
+    }
 
     @Inject
     public void setContainer(Container container) {
@@ -264,7 +271,7 @@ public class DefaultActionMapper implements ActionMapper {
             return null;
         }
 
-        parseNameAndNamespace(uri, mapping, configManager.getConfiguration());
+        parseNameAndNamespace(uri, mapping, configManager);
 
         handleSpecialParameters(request, mapping);
 
@@ -330,7 +337,7 @@ public class DefaultActionMapper implements ActionMapper {
      *            The action mapping to populate
      */
     void parseNameAndNamespace(String uri, ActionMapping mapping,
-            Configuration config) {
+            ConfigurationManager configManager) {
         String namespace, name;
         int lastSlash = uri.lastIndexOf("/");
         if (lastSlash == -1) {
@@ -342,7 +349,13 @@ public class DefaultActionMapper implements ActionMapper {
             // namespace anyway if not found in root namespace.
             namespace = "/";
             name = uri.substring(lastSlash + 1);
+        } else if (alwaysSelectFullNamespace) {
+            // Simply select the namespace as everything before the last slash
+            namespace = uri.substring(0, lastSlash);
+            name = uri.substring(lastSlash + 1);
         } else {
+            // Try to find the namespace in those defined, defaulting to ""
+            Configuration config = configManager.getConfiguration();
             String prefix = uri.substring(0, lastSlash);
             namespace = "";
             // Find the longest matching namespace, defaulting to the default

core/src/main/java/org/apache/struts2/interceptor/PrincipalProxy.java

@@ -25,21 +25,10 @@ import java.security.Principal;
 import javax.servlet.http.HttpServletRequest;
 
 /**
- * Proxy class used together with PrincipalAware interface. It allows to get indirect access to
- * HttpServletRequest Principal related methods.
- *
+ * Proxy interface used together with PrincipalAware interface. It allows to get indirect access to
+ * HttpServletRequest or PortletRequest Principal related methods.
  */
-public class PrincipalProxy {
-    private HttpServletRequest request;
-
-    /**
-     * Constructs a proxy
-     *
-     * @param request The underlying request
-     */
-    public PrincipalProxy(HttpServletRequest request) {
-        this.request = request;
-    }
+public interface PrincipalProxy {
 
     /**
      * True if the user is in the given role
@@ -47,43 +36,35 @@ public class PrincipalProxy {
      * @param role The role
      * @return True if the user is in that role
      */
-    public boolean isUserInRole(String role) {
-        return request.isUserInRole(role);
-    }
+    boolean isUserInRole(String role);
 
     /**
      * Gets the user principal
      *
      * @return The principal
      */
-    public Principal getUserPrincipal() {
-        return request.getUserPrincipal();
-    }
+    Principal getUserPrincipal();
 
     /**
      * Gets the user id
      *
      * @return The user id
      */
-    public String getRemoteUser() {
-        return request.getRemoteUser();
-    }
+    String getRemoteUser();
 
     /**
      * Is the request using https?
      *
      * @return True if using https
      */
-    public boolean isRequestSecure() {
-        return request.isSecure();
-    }
+    boolean isRequestSecure();
 
     /**
-     * Gets the request
+     * Gets the request.
      *
      * @return The request
+     * @deprecated To obtain the HttpServletRequest in your action, use
+     *             {@link org.apache.struts2.servlet.ServletRequestAware}, since this method will be dropped in future.
      */
-    public HttpServletRequest getRequest() {
-        return request;
-    }
+    HttpServletRequest getRequest();
 }

core/src/main/java/org/apache/struts2/interceptor/ServletConfigInterceptor.java

@@ -25,8 +25,12 @@ import java.util.Map;
 import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import javax.portlet.PortletRequest;
 
 import org.apache.struts2.StrutsStatics;
+import org.apache.struts2.servlet.interceptor.ServletPrincipalProxy;
+import org.apache.struts2.portlet.PortletActionConstants;
+import org.apache.struts2.portlet.interceptor.PortletPrincipalProxy;
 import org.apache.struts2.util.ServletContextAware;
 
 import com.opensymphony.xwork2.ActionContext;
@@ -150,7 +154,14 @@ public class ServletConfigInterceptor extends AbstractInterceptor implements Str
 
         if (action instanceof PrincipalAware) {
             HttpServletRequest request = (HttpServletRequest) context.get(HTTP_REQUEST);
-            ((PrincipalAware) action).setPrincipalProxy(new PrincipalProxy(request));
+            Object portletRequest = context.get(PortletActionConstants.REQUEST);
+            if (portletRequest != null) {
+                // We are in portlet environment, so principal information resides in PortletRequest
+                ((PrincipalAware) action).setPrincipalProxy(new PortletPrincipalProxy((PortletRequest) portletRequest));
+            } else {
+                // We are in servtlet environment, so principal information resides in HttpServletRequest
+                ((PrincipalAware) action).setPrincipalProxy(new ServletPrincipalProxy(request));
+            }
         }
         if (action instanceof ServletContextAware) {
             ServletContext servletContext = (ServletContext) context.get(SERVLET_CONTEXT);

core/src/main/java/org/apache/struts2/interceptor/validation/AnnotationValidationInterceptor.java

@@ -0,0 +1,68 @@
+/*
+ * $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 org.apache.struts2.interceptor.validation;
+
+import java.lang.reflect.Method;
+
+import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.validator.ValidationInterceptor;
+
+/**
+ * Extends the xwork validation interceptor to also check for a @SkipValidation
+ * annotation, and if found, don't validate this action method
+ */
+public class AnnotationValidationInterceptor extends ValidationInterceptor {
+    
+    /** Auto-generated serialization id */
+    private static final long serialVersionUID = 1813272797367431184L;
+
+    protected String doIntercept(ActionInvocation invocation) throws Exception {
+        
+        Object action = invocation.getAction();
+        if (action != null) {
+            Method method = getActionMethod(action.getClass(), invocation.getProxy().getMethod());
+            SkipValidation skip = (SkipValidation) method.getAnnotation(SkipValidation.class);
+            if (skip != null) {
+                return invocation.invoke();
+            }
+        }
+        
+        return super.doIntercept(invocation);
+    }
+    
+    // FIXME: This is copied from DefaultActionInvocation but should be exposed through the interface
+    protected Method getActionMethod(Class actionClass, String methodName) throws NoSuchMethodException {
+        Method method;
+        try {
+            method = actionClass.getMethod(methodName, new Class[0]);
+        } catch (NoSuchMethodException e) {
+            // hmm -- OK, try doXxx instead
+            try {
+                String altMethodName = "do" + methodName.substring(0, 1).toUpperCase() + methodName.substring(1);
+                method = actionClass.getMethod(altMethodName, new Class[0]);
+            } catch (NoSuchMethodException e1) {
+                // throw the original one
+                throw e;
+            }
+        }
+        return method;
+    }
+}

core/src/main/java/org/apache/struts2/interceptor/validation/SkipValidation.java

@@ -0,0 +1,38 @@
+/*
+ * $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 org.apache.struts2.interceptor.validation;
+
+import static java.lang.annotation.ElementType.METHOD;
+
+import com.opensymphony.xwork2.Action;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Marks an Action method to not be validated
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(METHOD)
+public @interface SkipValidation {
+}
+

core/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java

@@ -40,11 +40,13 @@ import javax.portlet.RenderResponse;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.struts2.StrutsConstants;
+import org.apache.struts2.StrutsException;
 import org.apache.struts2.StrutsStatics;
 import org.apache.struts2.dispatcher.ApplicationMap;
 import org.apache.struts2.dispatcher.Dispatcher;
 import org.apache.struts2.dispatcher.RequestMap;
 import org.apache.struts2.dispatcher.SessionMap;
+import org.apache.struts2.dispatcher.mapper.ActionMapper;
 import org.apache.struts2.dispatcher.mapper.ActionMapping;
 import org.apache.struts2.portlet.PortletActionConstants;
 import org.apache.struts2.portlet.PortletApplicationMap;
@@ -52,6 +54,7 @@ import org.apache.struts2.portlet.PortletRequestMap;
 import org.apache.struts2.portlet.PortletSessionMap;
 import org.apache.struts2.portlet.context.PortletActionContext;
 import org.apache.struts2.portlet.context.ServletContextHolderListener;
+import org.apache.struts2.portlet.util.HttpServletRequestMock;
 import org.apache.struts2.util.AttributeMap;
 
 import com.opensymphony.xwork2.util.FileManager;
@@ -168,6 +171,8 @@ public class Jsr168Dispatcher extends GenericPortlet implements StrutsStatics,
     private String portletNamespace = null;
 
     private Dispatcher dispatcherUtils;
+    
+    private ActionMapper actionMapper;
 
     /**
      * Initialize the portlet with the init parameters from <tt>portlet.xml</tt>
@@ -220,6 +225,8 @@ public class Jsr168Dispatcher extends GenericPortlet implements StrutsStatics,
         if ("true".equalsIgnoreCase(container.getInstance(String.class, StrutsConstants.STRUTS_CONFIGURATION_XML_RELOAD))) {
             FileManager.setReloadingConfigs(true);
         }
+        
+        actionMapper = container.getInstance(ActionMapper.class);
     }
 
     /**
@@ -246,10 +253,12 @@ public class Jsr168Dispatcher extends GenericPortlet implements StrutsStatics,
         }
         StringBuffer fullPath = new StringBuffer();
         if (TextUtils.stringSet(portletNamespace)) {
-            fullPath.append(portletNamespace + "/");
+            fullPath.append(portletNamespace);
         }
         if (TextUtils.stringSet(namespace)) {
-            fullPath.append(namespace + "/");
+            fullPath.append(namespace).append("/");
+        } else {
+            fullPath.append("/");
         }
         fullPath.append(defaultAction);
         ActionMapping mapping = new ActionMapping();
@@ -399,6 +408,7 @@ public class Jsr168Dispatcher extends GenericPortlet implements StrutsStatics,
                     + ", namespace = " + namespace);
             ActionProxy proxy = factory.createActionProxy(namespace,
                     actionName, extraContext);
+            proxy.setMethod(mapping.getMethod());
             request.setAttribute("struts.valueStack", proxy.getInvocation()
                     .getStack());
             if (PortletActionConstants.RENDER_PHASE.equals(phase)
@@ -453,27 +463,32 @@ public class Jsr168Dispatcher extends GenericPortlet implements StrutsStatics,
      * @param request the PortletRequest object.
      * @return the namespace of the action.
      */
-    protected ActionMapping getActionMapping(PortletRequest request) {
-        ActionMapping mapping = new ActionMapping();
+    protected ActionMapping getActionMapping(final PortletRequest request) {
+        ActionMapping mapping = null;
+        String actionPath = null;
         if (resetAction(request)) {
             mapping = (ActionMapping) actionMap.get(request.getPortletMode());
         } else {
-            String actionPath = request.getParameter(ACTION_PARAM);
+            actionPath = request.getParameter(ACTION_PARAM);
             if (!TextUtils.stringSet(actionPath)) {
                 mapping = (ActionMapping) actionMap.get(request
                         .getPortletMode());
             } else {
-                String namespace = "";
-                String action = actionPath;
-                int idx = actionPath.lastIndexOf('/');
-                if (idx >= 0) {
-                    namespace = actionPath.substring(0, idx);
-                    action = actionPath.substring(idx + 1);
-                }
-                mapping.setName(action);
-                mapping.setNamespace(namespace);
+                
+                // Use the usual action mapper, but it is expecting an action extension
+                // on the uri, so we add the default one, which should be ok as the
+                // portlet is a portlet first, a servlet second
+                HttpServletRequestMock httpRequest = new HttpServletRequestMock()
+                    .setServletPath(actionPath + ".action")
+                    .setParameterMap(request.getParameterMap());
+                mapping = actionMapper.getMapping(httpRequest, dispatcherUtils.getConfigurationManager());
             }
         }
+        
+        if (mapping == null) {
+            throw new StrutsException("Unable to locate action mapping for request, probably due to " +
+                    "an invalid action path: "+actionPath);
+        }
         return mapping;
     }
 
@@ -579,4 +594,12 @@ public class Jsr168Dispatcher extends GenericPortlet implements StrutsStatics,
             dispatcherUtils.cleanup();
         }
     }
+
+    /**
+     * @param actionMapper the actionMapper to set
+     */
+    public void setActionMapper(ActionMapper actionMapper) {
+        this.actionMapper = actionMapper;
+    }
+    
 }

core/src/main/java/org/apache/struts2/portlet/interceptor/PortletPreferencesAware.java

@@ -0,0 +1,39 @@
+/*
+ * $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 org.apache.struts2.portlet.interceptor;
+
+import javax.portlet.PortletPreferences;
+
+
+/**
+ * All Actions that want to have access to the portlet preferences should
+ * implement this interface.  If running in a servlet environment, an
+ * appropriate testing implementation will be provided.
+ */
+public interface PortletPreferencesAware {
+
+    /**
+     * Sets the HTTP request object in implementing classes.
+     *
+     * @param request the HTTP request.
+     */
+    public void setPortletPreferences(PortletPreferences prefs);
+}

core/src/main/java/org/apache/struts2/portlet/interceptor/PortletPreferencesInterceptor.java

@@ -0,0 +1,104 @@
+/*
+ * $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 org.apache.struts2.portlet.interceptor;
+
+import javax.portlet.PortletRequest;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.struts2.StrutsStatics;
+import org.apache.struts2.portlet.context.PortletActionContext;
+
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.interceptor.AbstractInterceptor;
+
+
+/**
+ * <!-- START SNIPPET: description -->
+ *
+ * An interceptor which provides an implementation of PortletPreferences if the Action implements
+ * PortletPreferencesAware.
+ * 
+ * If running in a servlet environment, a testing implementation of PortletPreferences will be
+ * created and provided, but it should not be used in a production environment.
+ *
+ * <!-- END SNIPPET: description -->
+ *
+ * <p/> <u>Interceptor parameters:</u>
+ *
+ * <!-- START SNIPPET: parameters -->
+ *
+ * <ul>
+ *
+ * <li>None</li>
+ *
+ * </ul>
+ *
+ * <!-- END SNIPPET: parameters -->
+ *
+ * <p/> <u>Extending the interceptor:</u>
+ *
+ * <p/>
+ *
+ * <!-- START SNIPPET: extending -->
+ *
+ * There are no known extension points for this interceptor.
+ *
+ * <!-- END SNIPPET: extending -->
+ *
+ * <p/> <u>Example code:</u>
+ *
+ * <pre>
+ * <!-- START SNIPPET: example -->
+ * &lt;action name="someAction" class="com.examples.SomeAction"&gt;
+ *     &lt;interceptor-ref name="portlet-preferences"/&gt;
+ *     &lt;interceptor-ref name="basicStack"/&gt;
+ *     &lt;result name="success"&gt;good_result.ftl&lt;/result&gt;
+ * &lt;/action&gt;
+ * <!-- END SNIPPET: example -->
+ * </pre>
+ *
+ * @see PortletPreferencesAware
+ */
+public class PortletPreferencesInterceptor extends AbstractInterceptor implements StrutsStatics {
+
+    private static final Log LOG = LogFactory.getLog(PortletPreferencesInterceptor.class);
+    
+    public String intercept(ActionInvocation invocation) throws Exception {
+        final Object action = invocation.getAction();
+        final ActionContext context = invocation.getInvocationContext();
+
+        if (action instanceof PortletPreferencesAware) {
+            PortletRequest request = PortletActionContext.getRequest();
+            PortletPreferencesAware awareAction = (PortletPreferencesAware) action;
+            
+            // Check if running in a servlet environment
+            if (request == null) {
+                LOG.warn("This portlet preferences implementation should only be used during development");
+                awareAction.setPortletPreferences(new ServletPortletPreferences(ActionContext.getContext().getSession()));
+            } else {
+                awareAction.setPortletPreferences(request.getPreferences());
+            }
+        }
+        return invocation.invoke();
+    }
+}

core/src/main/java/org/apache/struts2/portlet/interceptor/PortletPrincipalProxy.java

@@ -0,0 +1,73 @@
+package org.apache.struts2.portlet.interceptor;
+
+import org.apache.struts2.interceptor.PrincipalProxy;
+
+import javax.portlet.PortletRequest;
+import javax.servlet.http.HttpServletRequest;
+import java.security.Principal;
+
+/**
+ * PrincipalProxy implementation for using PortletRequest Principal related methods.
+ */
+public class PortletPrincipalProxy implements PrincipalProxy {
+
+    private PortletRequest request;
+
+    /**
+     * Constructs a proxy
+     *
+     * @param request The underlying request
+     */
+    public PortletPrincipalProxy(PortletRequest request) {
+        this.request = request;
+    }
+
+    /**
+     * True if the user is in the given role
+     *
+     * @param role The role
+     * @return True if the user is in that role
+     */
+    public boolean isUserInRole(String role) {
+        return request.isUserInRole(role);
+    }
+
+    /**
+     * Gets the user principal
+     *
+     * @return The principal
+     */
+    public Principal getUserPrincipal() {
+        return request.getUserPrincipal();
+    }
+
+    /**
+     * Gets the user id
+     *
+     * @return The user id
+     */
+    public String getRemoteUser() {
+        return request.getRemoteUser();
+    }
+
+    /**
+     * Is the request using https?
+     *
+     * @return True if using https
+     */
+    public boolean isRequestSecure() {
+        return request.isSecure();
+    }
+
+    /**
+     * Gets the request.
+     *
+     * @return The request
+     * @throws UnsupportedOperationException not supported in this implementation.
+     * @deprecated To obtain the HttpServletRequest in your action, use
+     *             {@link org.apache.struts2.servlet.ServletRequestAware}, since this method will be dropped in future.
+     */
+    public HttpServletRequest getRequest() {
+        throw new UnsupportedOperationException("Usage of getRequest() method is deprecadet and not supported for this implementation");
+    }
+}

core/src/main/java/org/apache/struts2/portlet/interceptor/ServletPortletPreferences.java

@@ -0,0 +1,95 @@
+/*
+ * $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 org.apache.struts2.portlet.interceptor;
+
+import java.io.IOException;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Vector;
+
+import javax.portlet.PortletPreferences;
+import javax.portlet.ReadOnlyException;
+import javax.portlet.ValidatorException;
+
+/**
+ * Simple portlet preferences implementation that uses a map in the Session
+ * as storage.
+ */
+public class ServletPortletPreferences implements PortletPreferences {
+
+    private Map session;
+    private String PREFERENCES_KEY = "_portlet-preferences";
+    
+    public ServletPortletPreferences(Map session) {
+        this.session = session;
+    }
+    
+    public Map getMap() {
+        Map map = (Map) session.get(PREFERENCES_KEY);
+        if (map == null) {
+            map = new HashMap();
+            session.put(PREFERENCES_KEY, map);
+        }
+        return map;
+    }
+
+    public Enumeration getNames() {
+        return new Vector(getMap().keySet()).elements();
+    }
+
+    public String getValue(String key, String def) {
+        String val = (String) getMap().get(key);
+        if (val == null) {
+            val = def;
+        }
+        return val;
+    }
+
+    public String[] getValues(String key, String[] def) {
+        String[] val = (String[]) getMap().get(key);
+        if (val == null) {
+            val = def;
+        }
+        return val;
+    }
+
+    public boolean isReadOnly(String arg0) {
+        return false;
+    }
+
+    public void reset(String arg0) throws ReadOnlyException {
+        session.put(PREFERENCES_KEY, new HashMap());
+    }
+
+    public void setValue(String key, String value) throws ReadOnlyException {
+        getMap().put(key, value);
+    }
+
+    public void setValues(String key, String[] value) throws ReadOnlyException {
+        getMap().put(key, value);
+    }
+
+    public void store() throws IOException, ValidatorException {
+        
+    }
+
+}

core/src/main/java/org/apache/struts2/portlet/util/HttpServletRequestMock.java

@@ -0,0 +1,278 @@
+/*
+ * $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 org.apache.struts2.portlet.util;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.security.Principal;
+import java.util.Enumeration;
+import java.util.Locale;
+import java.util.Map;
+
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletInputStream;
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+
+/**
+ * A simple mock class to interact with Struts 2 API's that require a servlet request
+ */
+public class HttpServletRequestMock implements HttpServletRequest {
+
+    private String servletPath;
+    private Map parameterMap;
+    
+    public String getAuthType() {
+        return null;
+    }
+
+    public String getContextPath() {
+        return null;
+    }
+
+    public Cookie[] getCookies() {
+        return null;
+    }
+
+    public long getDateHeader(String arg0) {
+        return 0;
+    }
+
+    public String getHeader(String arg0) {
+        return null;
+    }
+
+    public Enumeration getHeaderNames() {
+        return null;
+    }
+
+    public Enumeration getHeaders(String arg0) {
+        return null;
+    }
+
+    public int getIntHeader(String arg0) {
+        return 0;
+    }
+
+    public String getMethod() {
+        return null;
+    }
+
+    public String getPathInfo() {
+        return null;
+    }
+
+    public String getPathTranslated() {
+        return null;
+    }
+
+    public String getQueryString() {
+        return null;
+    }
+
+    public String getRemoteUser() {
+        return null;
+    }
+
+    public String getRequestURI() {
+        return null;
+    }
+
+    public StringBuffer getRequestURL() {
+        return null;
+    }
+
+    public String getRequestedSessionId() {
+        return null;
+    }
+
+    public String getServletPath() {
+        return servletPath;
+    }
+
+    public HttpSession getSession() {
+        return null;
+    }
+
+    public HttpSession getSession(boolean arg0) {
+        return null;
+    }
+
+    public Principal getUserPrincipal() {
+        return null;
+    }
+
+    public boolean isRequestedSessionIdFromCookie() {
+        return false;
+    }
+
+    public boolean isRequestedSessionIdFromURL() {
+        return false;
+    }
+
+    public boolean isRequestedSessionIdFromUrl() {
+        return false;
+    }
+
+    public boolean isRequestedSessionIdValid() {
+        return false;
+    }
+
+    public boolean isUserInRole(String arg0) {
+        return false;
+    }
+
+    public Object getAttribute(String arg0) {
+        return null;
+    }
+
+    public Enumeration getAttributeNames() {
+        return null;
+    }
+
+    public String getCharacterEncoding() {
+        return null;
+    }
+
+    public int getContentLength() {
+        return 0;
+    }
+
+    public String getContentType() {
+        return null;
+    }
+
+    public ServletInputStream getInputStream() throws IOException {
+        return null;
+    }
+
+    public String getLocalAddr() {
+        return null;
+    }
+
+    public String getLocalName() {
+        return null;
+    }
+
+    public int getLocalPort() {
+        return 0;
+    }
+
+    public Locale getLocale() {
+        return null;
+    }
+
+    public Enumeration getLocales() {
+        return null;
+    }
+
+    public String getParameter(String arg0) {
+        return null;
+    }
+
+    public Map getParameterMap() {
+        return parameterMap;
+    }
+
+    public Enumeration getParameterNames() {
+        return null;
+    }
+
+    public String[] getParameterValues(String arg0) {
+        return null;
+    }
+
+    public String getProtocol() {
+        return null;
+    }
+
+    public BufferedReader getReader() throws IOException {
+        return null;
+    }
+
+    public String getRealPath(String arg0) {
+        return null;
+    }
+
+    public String getRemoteAddr() {
+        return null;
+    }
+
+    public String getRemoteHost() {
+        return null;
+    }
+
+    public int getRemotePort() {
+        return 0;
+    }
+
+    public RequestDispatcher getRequestDispatcher(String arg0) {
+        return null;
+    }
+
+    public String getScheme() {
+        return null;
+    }
+
+    public String getServerName() {
+        return null;
+    }
+
+    public int getServerPort() {
+        return 0;
+    }
+
+    public boolean isSecure() {
+        return false;
+    }
+
+    public void removeAttribute(String arg0) {
+    }
+
+    public void setAttribute(String arg0, Object arg1) {
+    }
+
+    public void setCharacterEncoding(String arg0)
+            throws UnsupportedEncodingException {
+
+    }
+
+    /**
+     * @param parameterMap the parameterMap to set
+     */
+    public HttpServletRequestMock setParameterMap(Map parameterMap) {
+        this.parameterMap = parameterMap;
+        return this;
+    }
+
+    /**
+     * @param servletPath the servletPath to set
+     */
+    public HttpServletRequestMock setServletPath(String servletPath) {
+        this.servletPath = servletPath;
+        return this;
+    }
+    
+    
+
+}

core/src/main/java/org/apache/struts2/servlet/interceptor/ServletPrincipalProxy.java

@@ -0,0 +1,70 @@
+package org.apache.struts2.servlet.interceptor;
+
+import org.apache.struts2.interceptor.PrincipalProxy;
+
+import javax.servlet.http.HttpServletRequest;
+import java.security.Principal;
+
+/**
+ * PrincipalProxy implementation for using HttpServletRequest Principal related methods.
+ */
+public class ServletPrincipalProxy implements PrincipalProxy {
+    private HttpServletRequest request;
+
+    /**
+     * Constructs a proxy
+     *
+     * @param request The underlying request
+     */
+    public ServletPrincipalProxy(HttpServletRequest request) {
+        this.request = request;
+    }
+
+    /**
+     * True if the user is in the given role
+     *
+     * @param role The role
+     * @return True if the user is in that role
+     */
+    public boolean isUserInRole(String role) {
+        return request.isUserInRole(role);
+    }
+
+    /**
+     * Gets the user principal
+     *
+     * @return The principal
+     */
+    public Principal getUserPrincipal() {
+        return request.getUserPrincipal();
+    }
+
+    /**
+     * Gets the user id
+     *
+     * @return The user id
+     */
+    public String getRemoteUser() {
+        return request.getRemoteUser();
+    }
+
+    /**
+     * Is the request using https?
+     *
+     * @return True if using https
+     */
+    public boolean isRequestSecure() {
+        return request.isSecure();
+    }
+
+    /**
+     * Gets the request.
+     *
+     * @return The request
+     * @deprecated To obtain the HttpServletRequest in your action, use
+     *             {@link org.apache.struts2.servlet.ServletRequestAware}, since this method will be dropped in future.
+     */
+    public HttpServletRequest getRequest() {
+        return request;
+    }
+}

core/src/main/java/org/apache/struts2/util/StrutsTestCaseHelper.java

@@ -1,5 +1,5 @@
 /*
- * $Id: StrutsTestCase.java 476696 2006-11-19 03:56:18Z tmjee $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

core/src/main/java/org/apache/struts2/views/DefaultTagLibrary.java

@@ -1,3 +1,23 @@
+/*
+ * $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 org.apache.struts2.views;
 
 import java.util.Arrays;

core/src/main/java/org/apache/struts2/views/TagLibrary.java

@@ -1,3 +1,23 @@
+/*
+ * $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 org.apache.struts2.views;
 
 import java.util.List;

core/src/main/java/org/apache/struts2/views/annotations/StrutsTag.java

@@ -1,5 +1,5 @@
 /*
- * $Id:  $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

core/src/main/java/org/apache/struts2/views/annotations/StrutsTagAttribute.java

@@ -1,5 +1,5 @@
 /*
- * $Id:  $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

core/src/main/java/org/apache/struts2/views/freemarker/tags/AutocompleterModel.java

@@ -1,5 +1,5 @@
 /*
- * $Id: ComboBoxModel.java 471756 2006-11-06 15:01:43Z husted $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

core/src/main/java/org/apache/struts2/views/freemarker/tags/StrutsModels.java

@@ -242,7 +242,7 @@ public class StrutsModels {
         return date;
     }
 
-    public DateTimePickerModel getDropdownDateTimePicker() {
+    public DateTimePickerModel getDateTimePicker() {
         if (dateTimePicker == null) {
             dateTimePicker = new DateTimePickerModel(stack, req, res);
         }

core/src/main/java/org/apache/struts2/views/freemarker/tags/TagModel.java

@@ -68,7 +68,7 @@ public abstract class TagModel implements TemplateTransformModel {
 
     protected abstract Component getBean();
 
-    private Map convertParams(Map params) {
+    protected Map convertParams(Map params) {
         HashMap map = new HashMap(params.size());
         for (Iterator iterator = params.entrySet().iterator(); iterator.hasNext();) {
             Map.Entry entry = (Map.Entry) iterator.next();
@@ -80,7 +80,7 @@ public abstract class TagModel implements TemplateTransformModel {
         return map;
     }
 
-    private Map getComplexParams(Map params) {
+    protected Map getComplexParams(Map params) {
         HashMap map = new HashMap(params.size());
         for (Iterator iterator = params.entrySet().iterator(); iterator.hasNext();) {
             Map.Entry entry = (Map.Entry) iterator.next();
@@ -102,7 +102,7 @@ public abstract class TagModel implements TemplateTransformModel {
         return map;
     }
 
-    private boolean complexType(Object value) {
+    protected boolean complexType(Object value) {
         return value instanceof freemarker.ext.beans.BeanModel
                 || value instanceof SimpleNumber
                 || value instanceof SimpleSequence;

core/src/main/java/org/apache/struts2/views/jsp/ui/DebugTag.java

@@ -1,3 +1,23 @@
+/*
+ * $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 org.apache.struts2.views.jsp.ui;
 
 import javax.servlet.http.HttpServletRequest;

core/src/main/java/org/apache/struts2/views/jsp/ui/InputTransferSelectTag.java

@@ -1,3 +1,23 @@
+/*
+ * $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 org.apache.struts2.views.jsp.ui;
 
 import org.apache.struts2.components.Component;

core/src/main/java/org/apache/struts2/views/velocity/components/AutocompleterDirective.java

@@ -1,46 +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 org.apache.struts2.views.velocity.components;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.struts2.components.Autocompleter;
-import org.apache.struts2.components.Bean;
-import org.apache.struts2.components.Component;
-
-import com.opensymphony.xwork2.util.ValueStack;
-
-/**
- * @see Autocompleter
- */
-public class AutocompleterDirective extends AbstractDirective {
-
-    protected Component getBean(ValueStack stack, HttpServletRequest req,
-            HttpServletResponse res) {
-        return new Autocompleter(stack, req, res);
-    }
-
-    public String getBeanName() {
-        return "autocompleter";
-    }
-
-}
+/*
+ * $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 org.apache.struts2.views.velocity.components;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.struts2.components.Autocompleter;
+import org.apache.struts2.components.Bean;
+import org.apache.struts2.components.Component;
+
+import com.opensymphony.xwork2.util.ValueStack;
+
+/**
+ * @see Autocompleter
+ */
+public class AutocompleterDirective extends AbstractDirective {
+
+    protected Component getBean(ValueStack stack, HttpServletRequest req,
+            HttpServletResponse res) {
+        return new Autocompleter(stack, req, res);
+    }
+
+    public String getBeanName() {
+        return "autocompleter";
+    }
+
+}

core/src/main/resources/LICENSE.txt

@@ -0,0 +1,174 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.

core/src/main/resources/NOTICE.txt

@@ -0,0 +1,5 @@
+Apache Struts
+Copyright 2000-2007 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).

core/src/main/resources/org/apache/struts2/default.properties

@@ -155,10 +155,7 @@ struts.xslt.nocache=false
 ### A list of configuration files automatically loaded by Struts
 struts.configuration.files=struts-default.xml,struts-plugin.xml,struts.xml
 
-### A list of template engines available
-struts.templateEngines=ftl,jsp,vm
-
-### A list of tag libraries available
-struts.tagLibraries=s
+### Whether to always select the namespace to be everything before the last slash or not
+struts.mapper.alwaysSelectFullNamespace=false
 
 ### END SNIPPET: complete_file

core/src/main/resources/org/apache/struts2/dispatcher/error.ftl

@@ -42,11 +42,19 @@
             <#if (msgs?size > 1)>
             <ol>
                 <#list msgs as msg>
-                    <li>${msg}</li>
+                    <#if (msg?is_method)>
+                        <li>${msg[0]}</li>
+                    <#else>
+                        <li>${msg}</li>
+                    </#if>
                 </#list>
             </ol>
             <#elseif (msgs?size == 1)>
-                ${msgs[0]}
+                <#if (msgs[0]?is_method)>
+                    <li>${msgs[0][0]}</li>
+                <#else>
+                    <li>${msgs[0]}</li>
+                </#if>
             </#if>
         </td>
     </tr>

core/src/main/resources/org/apache/struts2/static/dojo/struts/widget/Bind.js

@@ -44,13 +44,9 @@ dojo.widget.defineWidget(
       this.log("Listening to " + this.listenTopics + " to refresh");
       var topics = this.listenTopics.split(",");
       if(topics) {
-        if(topics) {
-          if(topics) {
-            dojo.lang.forEach(topics, function(topic){
-              dojo.event.topic.subscribe(topic, self, "reloadContents");
-            });
-          }
-        }
+        dojo.lang.forEach(topics, function(topic){
+          dojo.event.topic.subscribe(topic, self, "reloadContents");
+        });
       }
     }
 

core/src/main/resources/struts-default.xml

@@ -84,7 +84,7 @@
             <interceptor name="timer" class="com.opensymphony.xwork2.interceptor.TimerInterceptor"/>
             <interceptor name="token" class="org.apache.struts2.interceptor.TokenInterceptor"/>
             <interceptor name="token-session" class="org.apache.struts2.interceptor.TokenSessionStoreInterceptor"/>
-            <interceptor name="validation" class="com.opensymphony.xwork2.validator.ValidationInterceptor"/>
+            <interceptor name="validation" class="org.apache.struts2.interceptor.validation.AnnotationValidationInterceptor"/>
             <interceptor name="workflow" class="com.opensymphony.xwork2.interceptor.DefaultWorkflowInterceptor"/>
             <interceptor name="store" class="org.apache.struts2.interceptor.MessageStoreInterceptor" />
             <interceptor name="checkbox" class="org.apache.struts2.interceptor.CheckboxInterceptor" />

core/src/main/resources/struts-portlet-default.xml

@@ -12,7 +12,18 @@
 			<result-type name="freemarker" class="org.apache.struts2.views.freemarker.PortletFreemarkerResult"/>
 			<result-type name="velocity" class="org.apache.struts2.portlet.result.PortletVelocityResult"/>
 	   </result-types>
-
+       
+       <interceptors>
+        <interceptor name="portlet-preferences" class="org.apache.struts2.portlet.interceptor.PortletPreferencesInterceptor"/>
+        <interceptor-stack name="portletDefaultStack">
+            <interceptor-ref name="defaultStack"/>
+            <interceptor-ref name="portlet-preferences" />
+        </interceptor-stack>
+        
+       </interceptors>
+       
+       <default-interceptor-ref name="portletDefaultStack"/>
+       
 	   <action name="renderDirect" class="org.apache.struts2.portlet.dispatcher.DirectRenderFromEventAction">
 	   		<result name="success">${location}</result>
 	   </action>

core/src/main/resources/template/ajax/form-close.ftl

@@ -1,6 +1,6 @@
 
 <#if (parameters.customOnsubmitEnabled?default(false))>
-<script>
+<script type="text/javascript">
 <#-- 
   Enable auto-select of optiontransferselect tag's entries upon containing form's 
   submission.

core/src/main/resources/template/css_xhtml/datetimepicker.ftl

@@ -1 +1,4 @@
-<#include "/${parameters.templateDir}/simple/datetimepicker.ftl" />
+<#include "/${parameters.templateDir}/${parameters.theme}/controlheader.ftl" />
+<#include "/${parameters.templateDir}/simple/datetimepicker.ftl" />
+<#include "/${parameters.templateDir}/css_xhtml/controlfooter.ftl" />
+<#nt/>

core/src/main/resources/template/simple/combobox.ftl

@@ -1,4 +1,4 @@
-<script>
+<script type="text/javascript">
 	function autoPopulate_${parameters.name?html}(targetElement) {
 		<#if parameters.headerKey?exists && parameters.headerValue?exists>
 		if (targetElement.options[targetElement.selectedIndex].value == '${parameters.headerKey?html}') {

core/src/main/resources/template/simple/doubleselect.ftl

@@ -38,9 +38,9 @@
 </select>
 <script type="text/javascript">
 <#assign itemCount = startCount/>
-    var ${parameters.name}Group = new Array(${parameters.listSize} + ${startCount});
+    var ${parameters.id}Group = new Array(${parameters.listSize} + ${startCount});
     for (i = 0; i < (${parameters.listSize} + ${startCount}); i++)
-    ${parameters.name}Group[i] = new Array();
+    ${parameters.id}Group[i] = new Array();
 
 <@s.iterator value="parameters.list">
     <#if parameters.listKey?exists>
@@ -66,14 +66,14 @@
         <#else>
             <#assign doubleItemValue = stack.findString('top')/>
         </#if>
-    ${parameters.name}Group[${itemCount}][${doubleItemCount}] = new Option("${doubleItemValue}", "${doubleItemKeyStr}");
+    ${parameters.id}Group[${itemCount}][${doubleItemCount}] = new Option("${doubleItemValue}", "${doubleItemKeyStr}");
 
         <#assign doubleItemCount = doubleItemCount + 1/>
     </@s.iterator>
     <#assign itemCount = itemCount + 1/>
 </@s.iterator>
 
-    var ${parameters.name}Temp = document.${parameters.formName}.${parameters.doubleName};
+    var ${parameters.id}Temp = document.${parameters.formName}.${parameters.doubleName};
 <#assign itemCount = startCount/>
 <#assign redirectTo = 0/>
 <@s.iterator value="parameters.list">
@@ -87,25 +87,25 @@
     </#if>
     <#assign itemCount = itemCount + 1/>
 </@s.iterator>
-    ${parameters.name}Redirect(${redirectTo});
-    function ${parameters.name}Redirect(x) {
+    ${parameters.id}Redirect(${redirectTo});
+    function ${parameters.id}Redirect(x) {
     	var selected = false;
-        for (m = ${parameters.name}Temp.options.length - 1; m >= 0; m--) {
-            ${parameters.name}Temp.options[m] = null;
+        for (m = ${parameters.id}Temp.options.length - 1; m >= 0; m--) {
+            ${parameters.id}Temp.options[m] = null;
         }
 
-        for (i = 0; i < ${parameters.name}Group[x].length; i++) {
-            ${parameters.name}Temp.options[i] = new Option(${parameters.name}Group[x][i].text, ${parameters.name}Group[x][i].value);
+        for (i = 0; i < ${parameters.id}Group[x].length; i++) {
+            ${parameters.id}Temp.options[i] = new Option(${parameters.id}Group[x][i].text, ${parameters.id}Group[x][i].value);
             <#if parameters.doubleNameValue?exists>
-            	if (${parameters.name}Temp.options[i].value == '${parameters.doubleNameValue}') {
-            		${parameters.name}Temp.options[i].selected = true;
+            	if (${parameters.id}Temp.options[i].value == '${parameters.doubleNameValue}') {
+            		${parameters.id}Temp.options[i].selected = true;
             		selected = true;
             	}
             </#if>
         }
 
-        if ((${parameters.name}Temp.options.length > 0) && (! selected)) {
-           	${parameters.name}Temp.options[0].selected = true;
+        if ((${parameters.id}Temp.options.length > 0) && (! selected)) {
+           	${parameters.id}Temp.options[0].selected = true;
         }
     }
 </script>

core/src/main/resources/template/simple/form-close.ftl

@@ -1,7 +1,7 @@
 </form>
 
 <#if (parameters.customOnsubmitEnabled?if_exists)>
-<script>
+<script type="text/javascript">
 <#-- 
   Enable auto-select of optiontransferselect tag's entries upon containing form's 
   submission.

core/src/main/resources/template/simple/submit.ftl

@@ -17,9 +17,10 @@
 </#if>
 <#include "/${parameters.templateDir}/simple/scripting-events.ftl"/>
 <#include "/${parameters.templateDir}/simple/common-attributes.ftl" />
-><#if parameters.label?exists><@s.property value="parameters.label"/><#rt/></#if></button>
+><#if parameters.body?length gt 0><@s.property value="parameters.body"/><#elseif parameters.label?exists><@s.property value="parameters.label"/><#rt/></#if></button>
 <#else>
 <#if parameters.type?exists && parameters.type=="image">
+<@s.property value="parameters.body"/>
 <input type="image"<#rt/>
 <#if parameters.label?exists>
  alt="${parameters.label?html}"<#rt/>
@@ -51,4 +52,4 @@
 <#include "/${parameters.templateDir}/simple/scripting-events.ftl" />
 <#include "/${parameters.templateDir}/simple/common-attributes.ftl" />
 />
-</#if>
+</#if>

core/src/main/resources/template/xhtml/form-close-validate.ftl

@@ -12,7 +12,7 @@ Only the following validators are supported:
 END SNIPPET: supported-validators
 -->
 <#if ((parameters.validate?default(false) == true) && (parameters.performValidation?default(false) == true))>
-<script>
+<script type="text/javascript">
     function validateForm_${parameters.id}() {
         form = document.getElementById("${parameters.id}");
         clearErrorMessages(form);

core/src/test/java/org/apache/struts2/TestNGStrutsTestCaseTest.java

@@ -1,5 +1,5 @@
 /*
- * $Id: StrutsTestCase.java 476696 2006-11-19 03:56:18Z tmjee $
+ * $Id$
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

core/src/test/java/org/apache/struts2/components/UIBeanTest.java

@@ -48,6 +48,22 @@ public class UIBeanTest extends StrutsTestCase {
 
         assertEquals("txtFldId", txtFld.getParameters().get("id"));
     }
+    
+    public void testPopulateComponentHtmlIdWithOgnl() throws Exception {
+        ValueStack stack = ValueStackFactory.getFactory().createValueStack();
+        MockHttpServletRequest req = new MockHttpServletRequest();
+        MockHttpServletResponse res = new MockHttpServletResponse();
+
+        Form form = new Form(stack, req, res);
+        form.getParameters().put("id", "formId");
+
+        TextField txtFld = new TextField(stack, req, res);
+        txtFld.setName("txtFldName%{'1'}");
+
+        txtFld.populateComponentHtmlId(form);
+
+        assertEquals("formId_txtFldName1", txtFld.getParameters().get("id"));
+    }
 
     public void testPopulateComponentHtmlId2() throws Exception {
         ValueStack stack = ValueStackFactory.getFactory().createValueStack();

core/src/test/java/org/apache/struts2/config/BeanSelectionProviderTest.java

@@ -0,0 +1,50 @@
+/*
+ * $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 org.apache.struts2.config;
+
+import java.util.Locale;
+
+import org.apache.struts2.StrutsConstants;
+
+import com.opensymphony.xwork2.inject.ContainerBuilder;
+import com.opensymphony.xwork2.util.LocalizedTextUtil;
+import com.opensymphony.xwork2.util.location.LocatableProperties;
+
+import junit.framework.TestCase;
+
+public class BeanSelectionProviderTest extends TestCase {
+
+    public void testRegister() {
+        Locale.setDefault(Locale.US); // force to US locale as we also have _de and _da properties
+
+        LocalizedTextUtil.clearDefaultResourceBundles();
+        LocalizedTextUtil.addDefaultResourceBundle("org/apache/struts2/struts-messages");
+        assertEquals("The form has already been processed or no token was supplied, please try again.", LocalizedTextUtil.findDefaultText("struts.messages.invalid.token", Locale.getDefault()));
+        
+        LocatableProperties props = new LocatableProperties();
+        props.setProperty(StrutsConstants.STRUTS_CUSTOM_I18N_RESOURCES, "testmessages,testmessages2");
+        
+        new BeanSelectionProvider().register(new ContainerBuilder(), props);
+
+        assertEquals("Replaced message for token tag", LocalizedTextUtil.findDefaultText("struts.messages.invalid.token", Locale.getDefault()));
+    }
+
+}

core/src/test/java/org/apache/struts2/config/ClasspathConfigurationProviderTest.java

@@ -59,7 +59,8 @@ public class ClasspathConfigurationProviderTest extends TestCase {
         Map configs = pkg.getActionConfigs();
         assertNotNull(configs);
         // assertEquals(1, configs.size());
-        assertNotNull(configs.get("customParentPackage"));
+        ActionConfig actionConfig = (ActionConfig) configs.get("customParentPackage");
+        assertNotNull(actionConfig);
     }
 
     public void testParentPackage() {
@@ -76,9 +77,12 @@ public class ClasspathConfigurationProviderTest extends TestCase {
         Map configs = pkg.getAllActionConfigs();
         // assertEquals(2, configs.size());
         ActionConfig config = (ActionConfig) configs.get("customNamespace");
+        assertEquals(config.getPackageName(), pkg.getName());
+        assertEquals(1, pkg.getParents().size());
         assertNotNull(config);
         assertEquals("/mynamespace", pkg.getNamespace());
-        assertNotNull(configs.get("customParentPackage"));
+        ActionConfig ac = (ActionConfig) configs.get("customParentPackage");
+        assertNotNull(ac);
     }
 
     public void testResultAnnotations() {
@@ -95,14 +99,4 @@ public class ClasspathConfigurationProviderTest extends TestCase {
         ActionConfig acfg = pkg.getActionConfigs().get("actionImpl");
         assertNotNull(acfg);
     }
-
-    public void testDynamicResults() {
-        PackageConfig pkg = config.getPackageConfig("org.apache.struts2.config.cltest");
-        ActionConfig config = pkg.getActionConfigs().get("twoResult");
-        ResultConfig result = config.getResults().get("foobar");
-        assertNotNull(result);
-        assertEquals("/cltest/twoResult.jsp", result.getParams().get("location"));
-        assertEquals(ServletDispatcherResult.class.getName(), result.getClassName());
-    }
-
 }

core/src/test/java/org/apache/struts2/config/MethodConfigurationProviderTest.java

@@ -1,241 +1,241 @@
-/*
- * $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 org.apache.struts2.config;
-
-import org.apache.struts2.dispatcher.ServletDispatcherResult;
-import org.apache.struts2.dispatcher.Dispatcher;
-import org.springframework.mock.web.MockServletContext;
-
-import com.opensymphony.xwork2.config.Configuration;
-import com.opensymphony.xwork2.config.ConfigurationManager;
-import com.opensymphony.xwork2.config.entities.*;
-import com.opensymphony.xwork2.config.impl.DefaultConfiguration;
-import com.opensymphony.xwork2.ActionSupport;
-
-import junit.framework.TestCase;
-
-import java.util.Map;
-import java.util.HashMap;
-import java.util.List;
-
-/**
- * MethodConfigurationProviderTest exercises the MethodConfigurationProvider
- * to confirm that only the expected methods are generated.
- */
-public class MethodConfigurationProviderTest extends TestCase {
-
-    /**
-     * Object under test.
-     */
-    MethodConfigurationProvider provider;
-
-    /**
-     * Set of packages and ActionConfigs to exercise.
-     */
-    Configuration configuration;
-
-    /**
-     * Mock dispatcher.
-     */
-    Dispatcher dispatcher;
-
-    /**
-     * Creates a mock Dispatcher and seeds Configuration.
-     */
-    public void setUp() {
-
-        InternalConfigurationManager configurationManager = new InternalConfigurationManager();
-        dispatcher = new Dispatcher(new MockServletContext(), new HashMap<String, String>());
-        dispatcher.setConfigurationManager(configurationManager);
-        dispatcher.init();
-        Dispatcher.setInstance(dispatcher);
-
-        configuration = new DefaultConfiguration();
-        // empty package for the "default" namespace of empty String
-        PackageConfig strutsDefault = new PackageConfig("struts-default");
-        strutsDefault.addResultTypeConfig(new ResultTypeConfig("dispatcher", ServletDispatcherResult.class.getName(), "location"));
-        strutsDefault.setDefaultResultType("dispatcher");
-        configuration.addPackageConfig("struts-default", strutsDefault);
-
-        // custom package with various actions
-        PackageConfig customPackage = new PackageConfig("trick-package");
-        customPackage.setNamespace("/trick");
-        // action that specifies ActionSupport (not empty) but with no methods
-        ActionConfig action = new ActionConfig(null, ActionSupport.class, null, null, null);
-        customPackage.addActionConfig("action",action);
-        // action that species a custom Action with a manual method
-        ActionConfig custom = new ActionConfig(null, Custom.class, null, null, null);
-        customPackage.addActionConfig("custom",custom);
-        // action for manual method, with params, to prove it is not overwritten
-        Map params = new HashMap();
-        params.put("name","value");
-        ActionConfig manual = new ActionConfig("manual", Custom.class, params, null, null);
-        customPackage.addActionConfig("custom!manual",manual);
-        configuration.addPackageConfig("trick-package", customPackage);
-
-        provider = new MethodConfigurationProvider();
-        provider.init(configuration);
-        provider.loadPackages();
-    }
-
-    /**
-     * Provides the "custom-package" configuration.
-     * @return the "custom-package" configuration.
-     */
-    private PackageConfig getCustom() {
-        return configuration.getPackageConfig("trick-package");
-    }
-
-    /**
-     * Confirms baseline setup works as expected.
-     */
-    public void testSetup() {
-        assertEquals(2, configuration.getPackageConfigs().size());
-        PackageConfig struts = configuration.getPackageConfig("struts-default");
-        assertNotNull(struts);
-        assertTrue("testSetup: Expected struts-default to be empty!", struts.getActionConfigs().size() == 0);
-
-        PackageConfig custom = getCustom();
-        assertNotNull(custom);
-        assertTrue("testSetup: Expected ActionConfigs to be added!", custom.getActionConfigs().size() > 0);
-    }
-
-    /**
-     * Confirms that system detects no-argument methods that return Strings
-     * and generates the appropriate ActionConfigs.
-     */
-    public void testQualifyingMethods() {
-
-        PackageConfig config = getCustom();
-
-        boolean action = config.getActionConfigs().containsKey("action");
-        assertTrue("The root action is missing!",action);
-
-        boolean custom = config.getActionConfigs().containsKey("custom");
-        assertTrue("The custom action is missing!",custom);
-
-        boolean action_input = getCustom().getActionConfigs().containsKey("action!input");
-        assertTrue("The Action.input method should have an action mapping!",action_input);
-
-        boolean custom_input = getCustom().getActionConfigs().containsKey("custom!input");
-        assertTrue("The Custom.input method should have an action mapping!",custom_input);
-
-        boolean custom_auto = getCustom().getActionConfigs().containsKey("custom!auto");
-        assertTrue("The Custom.auto method should have an action mapping!",custom_auto);
-
-        boolean custom_gettysburg = getCustom().getActionConfigs().containsKey("custom!gettysburg");
-        assertTrue("The Custom.gettysburg method should have an action mapping!",custom_gettysburg);
-    }
-
-    /**
-     * Confirms system excludes methods that do not return Strings
-     * and no-argument or begin with "getx" or "isX".
-     */
-    public void testExcludedMethods() {
-
-        PackageConfig custom = getCustom();
-
-        boolean action_toString = custom.getActionConfigs().containsKey("action!toString");
-        assertFalse("The toString has an ActionConfig!",action_toString);
-
-        boolean action_execute = custom.getActionConfigs().containsKey("action!execute");
-        assertFalse("The execute has an ActionConfig!",action_execute);
-
-        boolean action_get_method = custom.getActionConfigs().containsKey("action!getLocale");
-        assertFalse("A 'getX' method has an ActionConfig!",action_get_method);
-
-        boolean action_is_method = custom.getActionConfigs().containsKey("custom!isIt");
-        assertFalse("A 'isX' method has an ActionConfig!",action_is_method);
-
-        boolean void_method = custom.getActionConfigs().containsKey("action!validate");
-        assertFalse("A void method has an ActionConfig!",void_method);
-
-        boolean void_with_parameters = custom.getActionConfigs().containsKey("action!addActionMessage");
-        assertFalse("A void method with parameters has an ActionConfig!",void_with_parameters);
-
-        boolean return_method = custom.getActionConfigs().containsKey("action!hasActionErrors");
-        assertFalse("A method with a return type other than String has an ActionConfig!",return_method);
-
-        ActionConfig manual = getCustom().getActionConfigs().get("custom!manual");
-        Object val = manual.getParams().get("name");
-        assertTrue("The custom.Manual method was generated!","value".equals(val.toString()));
-    }
-
-    /**
-     * Custom is a test Action class.
-     */
-    public class Custom extends ActionSupport {
-
-        /**
-         * Tests ordinary methods.
-         * @return SUCCESS
-         */
-        public String custom() {
-            return SUCCESS;
-        }
-
-        /**
-         * Tests JavaBean property.
-         * @return SUCCESS
-         */
-        public boolean isIt() {
-            return true;
-        }
-
-        /**
-         * Tests manual override.
-         * @return SUCCESS
-         */
-        public String manual() {
-            return SUCCESS;
-        }
-
-        /**
-         * Tests dynamic configuration.
-         * @return SUCCESS
-         */
-        public String auto() {
-            return SUCCESS;
-        }
-
-        /**
-         * Tests method that looks like a JavaBean property.
-         * @return SUCCESS
-         */
-        public String gettysburg() {
-            return SUCCESS;
-        }
-    }
-
-    /**
-     * InternalConfigurationManager is a mock ConfigurationManager.
-     */
-    class InternalConfigurationManager extends ConfigurationManager {
-    	public boolean destroyConfiguration = false;
-
-    	@Override
-    	public synchronized void destroyConfiguration() {
-    		super.destroyConfiguration();
-    		destroyConfiguration = 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 org.apache.struts2.config;
+
+import org.apache.struts2.dispatcher.ServletDispatcherResult;
+import org.apache.struts2.dispatcher.Dispatcher;
+import org.springframework.mock.web.MockServletContext;
+
+import com.opensymphony.xwork2.config.Configuration;
+import com.opensymphony.xwork2.config.ConfigurationManager;
+import com.opensymphony.xwork2.config.entities.*;
+import com.opensymphony.xwork2.config.impl.DefaultConfiguration;
+import com.opensymphony.xwork2.ActionSupport;
+
+import junit.framework.TestCase;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * MethodConfigurationProviderTest exercises the MethodConfigurationProvider
+ * to confirm that only the expected methods are generated.
+ */
+public class MethodConfigurationProviderTest extends TestCase {
+
+    /**
+     * Object under test.
+     */
+    MethodConfigurationProvider provider;
+
+    /**
+     * Set of packages and ActionConfigs to exercise.
+     */
+    Configuration configuration;
+
+    /**
+     * Mock dispatcher.
+     */
+    Dispatcher dispatcher;
+
+    /**
+     * Creates a mock Dispatcher and seeds Configuration.
+     */
+    public void setUp() {
+
+        InternalConfigurationManager configurationManager = new InternalConfigurationManager();
+        dispatcher = new Dispatcher(new MockServletContext(), new HashMap<String, String>());
+        dispatcher.setConfigurationManager(configurationManager);
+        dispatcher.init();
+        Dispatcher.setInstance(dispatcher);
+
+        configuration = new DefaultConfiguration();
+        // empty package for the "default" namespace of empty String
+        PackageConfig strutsDefault = new PackageConfig("struts-default");
+        strutsDefault.addResultTypeConfig(new ResultTypeConfig("dispatcher", ServletDispatcherResult.class.getName(), "location"));
+        strutsDefault.setDefaultResultType("dispatcher");
+        configuration.addPackageConfig("struts-default", strutsDefault);
+
+        // custom package with various actions
+        PackageConfig customPackage = new PackageConfig("trick-package");
+        customPackage.setNamespace("/trick");
+        // action that specifies ActionSupport (not empty) but with no methods
+        ActionConfig action = new ActionConfig(null, ActionSupport.class, null, null, null);
+        customPackage.addActionConfig("action",action);
+        // action that species a custom Action with a manual method
+        ActionConfig custom = new ActionConfig(null, Custom.class, null, null, null);
+        customPackage.addActionConfig("custom",custom);
+        // action for manual method, with params, to prove it is not overwritten
+        Map params = new HashMap();
+        params.put("name","value");
+        ActionConfig manual = new ActionConfig("manual", Custom.class, params, null, null);
+        customPackage.addActionConfig("custom!manual",manual);
+        configuration.addPackageConfig("trick-package", customPackage);
+
+        provider = new MethodConfigurationProvider();
+        provider.init(configuration);
+        provider.loadPackages();
+    }
+
+    /**
+     * Provides the "custom-package" configuration.
+     * @return the "custom-package" configuration.
+     */
+    private PackageConfig getCustom() {
+        return configuration.getPackageConfig("trick-package");
+    }
+
+    /**
+     * Confirms baseline setup works as expected.
+     */
+    public void testSetup() {
+        assertEquals(2, configuration.getPackageConfigs().size());
+        PackageConfig struts = configuration.getPackageConfig("struts-default");
+        assertNotNull(struts);
+        assertTrue("testSetup: Expected struts-default to be empty!", struts.getActionConfigs().size() == 0);
+
+        PackageConfig custom = getCustom();
+        assertNotNull(custom);
+        assertTrue("testSetup: Expected ActionConfigs to be added!", custom.getActionConfigs().size() > 0);
+    }
+
+    /**
+     * Confirms that system detects no-argument methods that return Strings
+     * and generates the appropriate ActionConfigs.
+     */
+    public void testQualifyingMethods() {
+
+        PackageConfig config = getCustom();
+
+        boolean action = config.getActionConfigs().containsKey("action");
+        assertTrue("The root action is missing!",action);
+
+        boolean custom = config.getActionConfigs().containsKey("custom");
+        assertTrue("The custom action is missing!",custom);
+
+        boolean action_input = getCustom().getActionConfigs().containsKey("action!input");
+        assertTrue("The Action.input method should have an action mapping!",action_input);
+
+        boolean custom_input = getCustom().getActionConfigs().containsKey("custom!input");
+        assertTrue("The Custom.input method should have an action mapping!",custom_input);
+
+        boolean custom_auto = getCustom().getActionConfigs().containsKey("custom!auto");
+        assertTrue("The Custom.auto method should have an action mapping!",custom_auto);
+
+        boolean custom_gettysburg = getCustom().getActionConfigs().containsKey("custom!gettysburg");
+        assertTrue("The Custom.gettysburg method should have an action mapping!",custom_gettysburg);
+    }
+
+    /**
+     * Confirms system excludes methods that do not return Strings
+     * and no-argument or begin with "getx" or "isX".
+     */
+    public void testExcludedMethods() {
+
+        PackageConfig custom = getCustom();
+
+        boolean action_toString = custom.getActionConfigs().containsKey("action!toString");
+        assertFalse("The toString has an ActionConfig!",action_toString);
+
+        boolean action_execute = custom.getActionConfigs().containsKey("action!execute");
+        assertFalse("The execute has an ActionConfig!",action_execute);
+
+        boolean action_get_method = custom.getActionConfigs().containsKey("action!getLocale");
+        assertFalse("A 'getX' method has an ActionConfig!",action_get_method);
+
+        boolean action_is_method = custom.getActionConfigs().containsKey("custom!isIt");
+        assertFalse("A 'isX' method has an ActionConfig!",action_is_method);
+
+        boolean void_method = custom.getActionConfigs().containsKey("action!validate");
+        assertFalse("A void method has an ActionConfig!",void_method);
+
+        boolean void_with_parameters = custom.getActionConfigs().containsKey("action!addActionMessage");
+        assertFalse("A void method with parameters has an ActionConfig!",void_with_parameters);
+
+        boolean return_method = custom.getActionConfigs().containsKey("action!hasActionErrors");
+        assertFalse("A method with a return type other than String has an ActionConfig!",return_method);
+
+        ActionConfig manual = getCustom().getActionConfigs().get("custom!manual");
+        Object val = manual.getParams().get("name");
+        assertTrue("The custom.Manual method was generated!","value".equals(val.toString()));
+    }
+
+    /**
+     * Custom is a test Action class.
+     */
+    public class Custom extends ActionSupport {
+
+        /**
+         * Tests ordinary methods.
+         * @return SUCCESS
+         */
+        public String custom() {
+            return SUCCESS;
+        }
+
+        /**
+         * Tests JavaBean property.
+         * @return SUCCESS
+         */
+        public boolean isIt() {
+            return true;
+        }
+
+        /**
+         * Tests manual override.
+         * @return SUCCESS
+         */
+        public String manual() {
+            return SUCCESS;
+        }
+
+        /**
+         * Tests dynamic configuration.
+         * @return SUCCESS
+         */
+        public String auto() {
+            return SUCCESS;
+        }
+
+        /**
+         * Tests method that looks like a JavaBean property.
+         * @return SUCCESS
+         */
+        public String gettysburg() {
+            return SUCCESS;
+        }
+    }
+
+    /**
+     * InternalConfigurationManager is a mock ConfigurationManager.
+     */
+    class InternalConfigurationManager extends ConfigurationManager {
+    	public boolean destroyConfiguration = false;
+
+    	@Override
+    	public synchronized void destroyConfiguration() {
+    		super.destroyConfiguration();
+    		destroyConfiguration = true;
+    	}
+    }
+
+}