WW-1650 Tag r500931 as Struts 2.0.4

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

api/pom.xml

@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.struts</groupId>
+        <artifactId>struts2-parent</artifactId>
+        <version>2.0.4</version>
+    </parent>
+    <groupId>org.apache.struts</groupId>
+    <artifactId>struts2-api</artifactId>
+    <packaging>jar</packaging>
+    <name>Struts 2 API</name>
+
+    <scm>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/api/</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/api/</developerConnection>
+       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/api/</url>
+    </scm>
+
+   <dependencies>
+        <dependency>
+           <groupId>javax.servlet</groupId>
+           <artifactId>servlet-api</artifactId>
+           <version>2.4</version>
+           <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>3.8.1</version>
+            <scope>test</scope>
+            <!-- has to be compile for StrutsTestCase, which is part of the base package so others can write unit tests -->
+            <optional>true</optional>
+        </dependency>            
+        <dependency>
+            <groupId>org.easymock</groupId>
+            <artifactId>easymock</artifactId>
+            <scope>test</scope>
+            <version>2.0</version>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <configuration>
+                    <showPackage>false</showPackage>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>

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

@@ -0,0 +1,45 @@
+package org.apache.struts2;
+
+/**
+ * Default action interface. Provided purely for user convenience. Struts does not require actions to implement any
+ * interfaces. Actions need only implement a public, no argument method which returns {@code String}. If a user does
+ * not specify a method name, Struts defaults to {@code execute()}.
+ *
+ * <p>For example:
+ *
+ * <pre>
+ *   static import ResultNames.*;
+ *
+ *   public class MyAction <b>implements Action</b> {
+ *
+ *     public String execute() {
+ *       return SUCCESS;
+ *     }
+ *   }
+ * </pre>
+ *
+ * <p>is equivalent to:
+ *
+ * <pre>
+ *   static import ResultNames.*;
+ *
+ *   public class MyAction {
+ *
+ *     public String execute() {
+ *       return SUCCESS;
+ *     }
+ *   }
+ * </pre>
+ *
+ * @author crazybob@google.com (Bob Lee)
+ */
+public interface Action {
+
+    /**
+     * Executes this action.
+     *
+     * @return result name which matches a result name from the action mapping in the configuration file. See {@link
+     *  ResultNames} for common suggestions.
+     */
+    String execute();
+}

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

@@ -0,0 +1,41 @@
+package org.apache.struts2;
+
+/**
+ * Implemented by actions which may need to record errors or messages.
+ *
+ * <pre>
+ *   static import ResultNames.*;
+ *
+ *   public class SetName implements MessageAware {
+ *
+ *     Messages messages;
+ *     String name;
+ *
+ *     public String execute() {
+ *       return SUCCESS;
+ *     }
+ *
+ *     public void setName(String name) {
+ *       if ("".equals(name))
+ *         messages.forField("name").addError("name.required");
+ *
+ *       this.name = name;
+ *     }
+ *
+ *     public void setMessages(Messages messages) {
+ *       this.messages = messages;
+ *     }
+ *   }
+ * </pre>
+ *
+ * @author crazybob@google.com (Bob Lee)
+ */
+public interface MessageAware {
+
+    /**
+     * Sets messages.
+     *
+     * @param messages messages
+     */
+    void setMessages(Messages messages);
+}

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

@@ -0,0 +1,196 @@
+package org.apache.struts2;
+
+import java.util.List;
+import java.util.Set;
+import java.util.Map;
+
+/**
+ * Collection of messages. Supports nesting messages by field name.
+ *
+ * <p>Uses keys when adding instead of actual messages to decouple code from messages.
+ *
+ * @author crazybob@google.com (Bob Lee)
+ */
+public interface Messages {
+
+    // TODO: Use Object[] for args instead of String[].
+
+    /**
+     * Message severity.
+     */
+    public enum Severity {
+
+        /**
+         * Informational messages.
+         */
+        INFO,
+
+        /**
+         * Warning messages.
+         */
+        WARN,
+
+        /**
+         * Error messages.
+         */
+        ERROR,
+    }
+
+    /**
+     * Gets nested messages for the given field.
+     *
+     * <p>Supports dot notation to represent nesting. For example:
+     *
+     * <pre>
+     * messages.forField("foo").forField("bar") == messages.forField("foo.bar")
+     * </pre>
+     *
+     * @param fieldName name of the field
+     * @return nested {@code Messages} for given field name
+     */
+    Messages forField(String fieldName);
+
+    /**
+     * Gets map of field name to messages for that field.
+     *
+     * @return map of field name to {@code Messages}
+     */
+    Map<String, Messages> forFields();
+
+    /**
+     * Adds informational message.
+     *
+     * @param key message key
+     * @see Severity.INFO
+     */
+    void addInformation(String key);
+
+    /**
+     * Adds informational message.
+     *
+     * @param key message key
+     * @param arguments message arguments
+     * @see Severity.INFO
+     */
+    void addInformation(String key, String... arguments);
+
+    /**
+     * Adds warning message.
+     *
+     * @param key message key
+     * @see Severity.WARN
+     */
+    void addWarning(String key);
+
+    /**
+     * Adds warning message.
+     *
+     * @param key message key
+     * @param arguments message arguments
+     * @see Severity.WARN
+     */
+    void addWarning(String key, String... arguments);
+
+    /**
+     * Adds error message.
+     *
+     * @param key message key
+     * @see Severity.ERROR
+     */
+    void addError(String key);
+
+    /**
+     * Adds error message.
+     *
+     * @param key message key
+     * @param arguments message arguments
+     * @see Severity.ERROR
+     */
+    void addError(String key, String... arguments);
+
+    /**
+     * Adds message.
+     *
+     * @param severity message severity
+     * @param key message key
+     */
+    void add(Severity severity, String key);
+
+    /**
+     * Adds request-scoped message.
+     *
+     * @param severity message severity
+     * @param key message key
+     * @param arguments message arguments
+     */
+    void add(Severity severity, String key, String... arguments);
+
+    /**
+     * Gets set of severities for which this {@code Messages} instance has messages. Not recursive.
+     *
+     * @return unmodifiable set of {@link Severity} sorted from least to most severe
+     */
+    Set<Severity> getSeverities();
+
+    /**
+     * Gets message strings for the given severity. Not recursive.
+     *
+     * @param severity message severity
+     * @return unmodifiable list of messages
+     */
+    List<String> forSeverity(Severity severity);
+
+    /**
+     * Gets error message strings for this {@code Messages} instance. Not recursive.
+     *
+     * @return unmodifiable list of messages
+     */
+    List<String> getErrors();
+
+    /**
+     * Gets error message strings for this {@code Messages} instance. Not recursive.
+     *
+     * @return unmodifiable list of messages
+     */
+    List<String> getWarnings();
+
+    /**
+     * Gets informational message strings for this {@code Messages} instance. Not recursive.
+     *
+     * @return unmodifiable list of messages
+     */
+    List<String> getInformation();
+
+    /**
+     * Returns true if this or a nested {@code Messages} instance has error messages.
+     *
+     * @see Severity.ERROR
+     */
+    boolean hasErrors();
+
+    /**
+     * Returns true if this or a nested {@code Messages} instance has warning messages.
+     *
+     * @see Severity.WARN
+     */
+    boolean hasWarnings();
+
+    /**
+     * Returns true if this or a nested {@code Messages} instance has informational messages.
+     *
+     * @see Severity.INFO
+     */
+    boolean hasInformation();
+
+    /**
+     * Returns true if this and all nested {@code Messages} instances have no messages.
+     */
+    boolean isEmpty();
+
+    /**
+     * Returns true if this and all nested {@code Messages} instances have no messages for the given severity.
+     *
+     * @param severity message severity
+     */
+    boolean isEmpty(Severity severity);
+}

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

@@ -0,0 +1,36 @@
+package org.apache.struts2;
+
+/**
+ * Commonly used result names returned by action methods.
+ *
+ * @author crazybob@google.com (Bob Lee)
+ */
+public final class ResultNames {
+
+    private ResultNames() {}
+
+    /**
+     * The action executed successfully.
+     */
+    public static final String SUCCESS = "success";
+
+    /**
+     * The action requires more input, i.e. a validation error occurred.
+     */
+    public static final String INPUT = "input";
+
+    /**
+     * The action requires the user to log in before executing.
+     */
+    public static final String LOGIN = "login";
+
+    /**
+     * The action execution failed irrecoverably.
+     */
+    public static final String ERROR = "error";
+
+    /**
+     * The action executed successfully, but do not execute a result.
+     */
+    public static final String NONE = "none";
+}

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

@@ -0,0 +1,17 @@
+package org.apache.struts2;
+
+import org.apache.struts2.MessageAware;
+
+/**
+ * Implemented by actions which wish to execute some validation logic before their action method. Useful for
+ * cross-field validations.
+ *
+ * @author crazybob@google.com (Bob Lee)
+ */
+public interface Validatable extends MessageAware {
+
+    /**
+     * Validates input. Executes before action method.
+     */
+    public void validate();
+}

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

@@ -0,0 +1,18 @@
+package org.apache.struts2.servlet;
+
+import java.util.Map;
+
+/**
+ * Implemented by actions which need direct access to the request parameters.
+ *
+ * @author crazybob@google.com (Bob Lee)
+ */
+public interface ParameterAware {
+
+    /**
+     * Sets parameters.
+     *
+     * @param parameters map of parameter name to parameter values
+     */
+    void setParameters(Map<String, String[]> parameters);
+}

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

@@ -0,0 +1,18 @@
+package org.apache.struts2.servlet;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * Implemented by actions which need direct access to the servlet request.
+ *
+ * @author crazybob@google.com (Bob Lee)
+ */
+public interface ServletRequestAware {
+
+    /**
+     * Sets the servlet request.
+     *
+     * @param request servlet request.
+     */
+    void setServletRequest(HttpServletRequest request);
+}

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

@@ -0,0 +1,18 @@
+package org.apache.struts2.servlet;
+
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * Implemented by actions which need direct access to the servlet response.
+ *
+ * @author crazybob@google.com (Bob Lee)
+ */
+public interface ServletResponseAware {
+
+    /**
+     * Sets the servlet response.
+     *
+     * @param response servlet response
+     */
+    void setServletResponse(HttpServletResponse response);
+}

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

@@ -0,0 +1,59 @@
+package org.apache.struts2.spi;
+
+import java.lang.reflect.Method;
+
+/**
+ * Context of an action execution.
+ *
+ * @author crazybob@google.com (Bob Lee)
+ */
+public interface ActionContext {
+
+    /**
+     * Gets action instance.
+     */
+    Object getAction();
+
+    /**
+     * Gets action method.
+     */
+    Method getMethod();
+
+    /**
+     * Gets action name.
+     */
+    String getActionName();
+
+    /**
+     * Gets the path for the action's namespace.
+     */
+    String getNamespacePath();
+
+    /**
+     * Gets the {@link Result} instance for the action.
+     *
+     * @return {@link Result} instance or {@code null} if we don't have a result yet.
+     */
+    Result getResult();
+
+    /**
+     * Adds a result interceptor for the action. Enables executing code before and after a result, executing an
+     * alternate result, etc.
+     */
+    void addResultInterceptor(Result interceptor);
+
+    /**
+     * Gets context of action which chained to us.
+     *
+     * @return context of previous action or {@code null} if this is the first action in the chain
+     */
+    ActionContext getPrevious();
+
+    /**
+     * Gets context of action which this action chained to.
+     *
+     * @return context of next action or {@code null} if we haven't chained to another action yet or this is the last
+     *  action in the chain.
+     */
+    ActionContext getNext();
+}

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

@@ -0,0 +1,16 @@
+package org.apache.struts2.spi;
+
+/**
+ * Intercepts an action request.
+ *
+ * @author crazybob@google.com (Bob Lee)
+ */
+public interface Interceptor {
+
+    /**
+     * Intercepts an action request.
+     *
+     * @param requestContext current request context
+     */
+    String intercept(RequestContext requestContext) throws Exception;
+}

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

@@ -0,0 +1,101 @@
+package org.apache.struts2.spi;
+
+import org.apache.struts2.Messages;
+
+import javax.servlet.ServletContext;
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
+/**
+ * Request context. A single request may span multiple actions with action chaining.
+ *
+ * @author crazybob@google.com (Bob Lee)
+ */
+public interface RequestContext {
+
+    /**
+     * Gets context of the currently executing action.
+     *
+     * @return current action context
+     */
+    ActionContext getActionContext();
+
+    /**
+     * Convenience method. Equivalent to {@code getActionContext().getAction()}.
+     *
+     * @return currently executing action
+     */
+    Object getAction();
+
+    /**
+     * Gets map of request parameters.
+     */
+    Map<String, String[]> getParameterMap();
+
+    /**
+     * Gets map of request attributes.
+     */
+    Map<String, Object> getAttributeMap();
+
+    /**
+     * Gets map of session attributes.
+     */
+    Map<String, Object> getSessionMap();
+
+    /**
+     * Gets map of application (servlet context) attributes.
+     */
+    Map<String, Object> getApplicationMap();
+
+    /**
+     * Finds cookies with the given name,
+     */
+    List<Cookie> findCookiesForName(String name);
+
+    /**
+     * Gets locale.
+     */
+    Locale getLocale();
+
+    /**
+     * Sets locale. Stores the locale in the session for future requests.
+     */
+    void setLocale(Locale locale);
+
+    /**
+     * Gets messages.
+     */
+    Messages getMessages();
+
+    /**
+     * Gets the servlet request.
+     */
+    HttpServletRequest getServletRequest();
+
+    /**
+     * Gets the servlet response.
+     */
+    HttpServletResponse getServletResponse();
+
+    /**
+     * Gets the servlet context.
+     */
+    ServletContext getServletContext();
+
+    /**
+     * Gets the value stack.
+     */
+    ValueStack getValueStack();
+
+    /**
+     * Invokes the next interceptor or the action method if no more interceptors remain.
+     *
+     * @return result name
+     * @throws IllegalStateException if already invoked or called from the action
+     */
+    String proceed() throws Exception;
+}

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

@@ -0,0 +1,19 @@
+package org.apache.struts2.spi;
+
+import org.apache.struts2.spi.RequestContext;
+
+/**
+ * Implemented by actions that need access to the current {@link org.apache.struts2.spi.RequestContext}. Use
+ * judiciously.
+ *
+ * @author crazybob@google.com (Bob Lee)
+ */
+public interface RequestContextAware {
+
+    /**
+     * Sets {@link org.apache.struts2.spi.RequestContext}.
+     *
+     * @param requestContext
+     */
+    void setRequestContext(RequestContext requestContext);
+}

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

@@ -0,0 +1,18 @@
+package org.apache.struts2.spi;
+
+import org.apache.struts2.spi.RequestContext;
+
+/**
+ * The result of an action request. Struts creates a new {@code Result} instance for each request.
+ *
+ * @author crazybob@google.com (Bob Lee)
+ */
+public interface Result {
+
+    /**
+     * Executes result.
+     *
+     * @param requestContext
+     */
+    void execute(RequestContext requestContext) throws Exception;
+}

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

@@ -0,0 +1,93 @@
+package org.apache.struts2.spi;
+
+/**
+ * A central fixture of the Struts framework, the {@code ValueStack} is a stack which contains the actions
+ * which have executed in addition to other objects. Users can get and set values on the stack using expressions. The
+ * {@code ValueStack} will search down the stack starting with the most recent objects until it finds an object to
+ * which the expression can apply.
+ *
+ * @author crazybob@google.com (Bob Lee)
+ */
+public interface ValueStack extends Iterable<Object> {
+
+    /**
+     * Gets the top, most recent object from the stack without changing the stack.
+     *
+     * @return the top object
+     */
+    Object peek();
+
+    /**
+     * Removes the top, most recent object from the stack.
+     *
+     * @return the top object
+     */
+    Object pop();
+
+    /**
+     * Pushes an object onto the stack.
+     *
+     * @param o
+     */
+    void push(Object o);
+
+    /**
+     * Creates a shallow copy of this stack.
+     *
+     * @return a new stack which contains the same objects as this one
+     */
+    ValueStack clone();
+
+    /**
+     * Queries the stack. Starts with the top, most recent object. If the expression can apply to the object, this
+     * method returns the result of evaluating the expression. If the expression does not apply, this method moves
+     * down the stack to the next object and repeats. Returns {@code null} if the expression doesn't apply to any
+     * objects.
+     *
+     * @param expression
+     * @return the evaluation of the expression against the first applicable object in the stack
+     */
+    Object get(String expression);
+
+    /**
+     * Queries the stack and converts the result to the specified type. Starts with the top, most recent object. If
+     * the expression can apply to the object, this method returns the result of evaluating the expression converted
+     * to the specified type. If the expression does not apply, this method moves down the stack to the next object
+     * and repeats. Returns {@code null} if the expression doesn't apply to any objects.
+     *
+     * @param expression
+     * @param asType the type to convert the result to
+     * @return the evaluation of the expression against the first applicable object in the stack converted to the
+     *  specified type
+     */
+    <T> T get(String expression, Class<T> asType);
+
+    /**
+     * Queries the stack and converts the result to a {@code String}. Starts with the top, most recent object. If the
+     * expression can apply to the object, this method returns the result of evaluating the expression converted to a
+     * {@code String}. If the expression does not apply, this method moves down the stack to the next object and
+     * repeats. Returns {@code null} if the expression doesn't apply to any objects.
+     *
+     * @param expression
+     * @return the evaluation of the expression against the first applicable object in the stack converted to a {@code
+     *  String}
+     */
+    String getString(String expression);
+
+    /**
+     * Sets a value on an object from the stack. This method starts at the top, most recent object. If the expression
+     * applies to that object, this methods sets the given value on that object using the expression and converting
+     * the type as necessary. If the expression does not apply, this method moves to the next object and repeats.
+     *
+     * @param expression
+     * @param value
+     */
+    void set(String expression, Object value);
+
+    /**
+     * Returns the number of object on the stack.
+     *
+     * @return size of stack
+     */
+    int size();
+}

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.8</version>
+        <version>2.0.4</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-blank</artifactId>
@@ -47,7 +47,7 @@
         <plugins>
             <plugin>
                 <groupId>org.mortbay.jetty</groupId>
-                <artifactId>maven-jetty-plugin</artifactId>
+                <artifactId>maven-jetty6-plugin</artifactId>
                 <configuration>
                     <scanIntervalSeconds>10</scanIntervalSeconds>
                 </configuration>

apps/blank/src/main/resources/struts.xml

@@ -6,7 +6,7 @@
 <struts>
 
     <constant name="struts.enable.DynamicMethodInvocation" value="false" />
-    <constant name="struts.devMode" value="false" />
+    <constant name="struts.devMode" value="true" />
 
     <include file="example.xml"/>
 

apps/mailreader/pom.xml

@@ -5,7 +5,7 @@
     <parent>
       <groupId>org.apache.struts</groupId>
       <artifactId>struts2-apps</artifactId>
-      <version>2.0.8</version>
+      <version>2.0.4</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-mailreader</artifactId>
@@ -19,7 +19,7 @@
     </scm>
 
     <dependencies>
-
+    
         <dependency>
            <groupId>javax.servlet</groupId>
            <artifactId>servlet-api</artifactId>
@@ -31,8 +31,14 @@
            <artifactId>struts-mailreader-dao</artifactId>
            <version>1.3.5</version>
         </dependency>
-    </dependencies>
+        <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-spring-plugin</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
 
+    </dependencies>
+    
     <build>
         <resources>
             <resource>

apps/mailreader/src/main/java/applicationContext.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+
+<beans default-autowire="autodetect">
+    <!-- add your spring beans here -->
+</beans>

apps/mailreader/src/main/java/mailreader2/MailreaderSupport.java

@@ -32,6 +32,8 @@ import org.apache.struts.apps.mailreader.dao.User;
 import org.apache.struts.apps.mailreader.dao.UserDatabase;
 import org.apache.struts.apps.mailreader.dao.impl.memory.MemorySubscription;
 import org.apache.struts.apps.mailreader.dao.impl.memory.MemoryUser;
+import org.springframework.beans.BeanUtils;
+
 import java.util.Map;
 
 /**
@@ -61,28 +63,6 @@ public class MailreaderSupport extends ActionSupport
         return Constants.CANCEL;
     }
 
-    /**
-     * Convenience method to copy User properties.
-     **/
-    protected void copyUser(User source, User target) {
-      if ((source==null) || (target==null)) return;
-      target.setFromAddress(source.getFromAddress());
-      target.setFullName(source.getFullName());
-      target.setPassword(source.getPassword());
-      target.setReplyToAddress(source.getReplyToAddress());
-    }
-
-    /**
-     * Convenience method to copy Subscription properties.
-     **/
-    protected void copySubscription(Subscription source, Subscription target) {
-      if ((source==null) || (target==null)) return;
-      target.setAutoConnect(source.getAutoConnect());
-      target.setPassword(source.getPassword());
-      target.setType(source.getType());
-      target.setUsername(source.getUsername());
-    }
-
 
     // ---- ApplicationAware ----
 
@@ -455,7 +435,7 @@ public class MailreaderSupport extends ActionSupport
         input.setPassword(_password);
         User user = createUser(_username, _password);
         if (null != user) {
-            copyUser(input,user);
+            BeanUtils.copyProperties(input,user);
             setUser(user);
         }
     }
@@ -552,7 +532,7 @@ public class MailreaderSupport extends ActionSupport
         Subscription input = getSubscription();
         Subscription sub = createSubscription(host);
         if (null != sub) {
-            copySubscription(input, sub);
+            BeanUtils.copyProperties(input, sub);
             setSubscription(sub);
             setHost(sub.getHost());
         }

apps/mailreader/src/main/java/struts.xml

@@ -8,6 +8,7 @@
     <constant name="struts.action.extension" value="do" />
     <constant name="struts.devMode" value="false" />
     <constant name="struts.enable.DynamicMethodInvocation" value="false" />
+    <constant name="struts.objectFactory" value="spring" />
 
     <include file="mailreader-default.xml"/>
 

apps/mailreader/src/main/webapp/Footer.jsp

@@ -2,5 +2,5 @@
 <hr/>
 
 <p>
-    <a href="<s:url action="Welcome"  includeParams="none"/>"><s:text name="index.title"/></a>
+    <a href="<s:url action="Welcome" />"><s:text name="index.title"/></a>
 </p>

apps/mailreader/src/main/webapp/Registration.jsp

@@ -28,7 +28,7 @@
         <s:hidden name="username"/>
     </s:else>
 
-    <s:password key="password" showPassword="true"/>
+    <s:password key="password"/>
     <s:password key="password2"/>
     <s:textfield key="user.fullName"/>
     <s:textfield key="user.fromAddress"/>

apps/mailreader/src/main/webapp/Subscription.jsp

@@ -13,7 +13,7 @@
     <s:if test="task=='Delete'">
         <title><s:text name="subscription.title.delete"/></title>
     </s:if>
-    <link href="<s:url value="/css/mailreader.css" includeParams="none"/>" rel="stylesheet"
+    <link href="<s:url value="/css/mailreader.css"/>" rel="stylesheet"
           type="text/css"/>
 </head>
 

apps/mailreader/src/main/webapp/WEB-INF/web.xml

@@ -4,6 +4,11 @@
 
     <display-name>Struts 2 Mailreader</display-name>
 
+    <context-param>
+        <param-name>contextConfigLocation</param-name>
+        <param-value>classpath*:applicationContext*.xml</param-value>
+    </context-param>
+
     <filter>
         <filter-name>Struts2</filter-name>
         <filter-class>
@@ -13,16 +18,22 @@
 
     <filter-mapping>
         <filter-name>Struts2</filter-name>
-        <url-pattern>*.do</url-pattern>
+        <url-pattern>/*</url-pattern>
     </filter-mapping>
 
+    <listener>
+        <listener-class>
+            org.springframework.web.context.ContextLoaderListener
+        </listener-class>
+    </listener>
+
     <!-- Application Listener for Mailreader database -->
     <listener>
         <listener-class>
             mailreader2.ApplicationListener
         </listener-class>
     </listener>
-
+       
     <welcome-file-list>
         <welcome-file>index.html</welcome-file>
     </welcome-file-list>

apps/mailreader/src/main/webapp/Welcome.jsp

@@ -44,12 +44,13 @@
 
 <hr/>
 
-<p><s:i18n name="alternate"><a href="http://struts.apache.org/">
+<p><s:i18n name="alternate">
     <img src="<s:text name="struts.logo.path"/>"
-         alt="<s:text name="struts.logo.alt"/>" border="0px"/>
-</a>
+         alt="<s:text name="struts.logo.alt"/>"/>
 </s:i18n></p>
 
+<p><a href="<s:url action="Tour" />"><s:text name="index.tour"/></a></p>
+
 </body>
 </html>
 

apps/mailreader/src/main/webapp/tour.html

@@ -820,7 +820,7 @@ public class Welcome extends MailreaderSupport {
 </p>
 
 <hr/>
-<pre><code>&lt;#if (actionErrors?exists &amp;&amp; actionErrors?size > 0)>
+<pre><code>&lt;#if (actionErrors?exists && actionErrors?size > 0)>
   &lt;ul>
     &lt;#list actionErrors as error>
       &lt;li>&lt;span class="errorMessage">${error}&lt;/span>&lt;/li>
@@ -837,7 +837,7 @@ public class Welcome extends MailreaderSupport {
 </p>
 
 <hr/>
-<pre><code>&lt;#if (actionErrors?exists &amp;&amp; actionErrors?size > 0)>
+<pre><code>&lt;#if (actionErrors?exists && actionErrors?size > 0)>
   <strong>&lt;table></strong>
     &lt;#list actionErrors as error>
       <strong>&lt;tr>&lt;td></strong>&lt;span class="errorMessage">${error}&lt;/span><strong>&lt;/td>&lt;/tr></strong>
@@ -1064,7 +1064,7 @@ public void setPassword(String password) {
 <pre><code>public User <strong>findUser</strong>(String username, String password)
   throws <strong>ExpiredPasswordException</strong> {
   User user = <strong>getDatabase().findUser(username)</strong>;
-  if ((user != null) &amp;&amp; !user.getPassword().equals(password)) {
+  if ((user != null) && !user.getPassword().equals(password)) {
     user = null;
   }
   if (user == null) {
@@ -1427,7 +1427,7 @@ public class <strong>AuthenticationInterceptor</strong> implements Interceptor {
   public String <strong>intercept</strong>(ActionInvocation actionInvocation) throws Exception {
     Map session = actionInvocation.getInvocationContext().getSession();
     User user = (User) session.get(Constants.USER_KEY);
-    boolean isAuthenticated = (null!=user) &amp;&amp; (null!=user.getDatabase());
+    boolean isAuthenticated = (null!=user) && (null!=user.getDatabase());
     if (<strong>isAuthenticated</strong>) {
       return actionInvocation.invoke();
     }

apps/pom.xml

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-/*
+/* 
  * Copyright 2005-2006 The Apache Software Foundation.
- *
+ * 
  * Licensed 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.
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>2.0.8</version>
+        <version>2.0.4</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-apps</artifactId>
@@ -37,7 +37,7 @@
         <module>portlet</module>
         <module>showcase</module>
     </modules>
-
+    
     <scm>
        <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/apps/</connection>
        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/apps/</developerConnection>
@@ -50,7 +50,7 @@
             <url>scp://people.apache.org/www/struts.apache.org/struts2/apps</url>
         </site>
     </distributionManagement>
-
+    
     <profiles>
         <profile>
             <id>hostedqa</id>
@@ -173,9 +173,9 @@
                 </executions>
             </plugin>
         </plugins>
-
+        
         <finalName>${pom.artifactId}</finalName>
-
+              
     </build>
 
     <dependencies>
@@ -193,5 +193,5 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
+    
 </project>

apps/portlet/pom.xml

@@ -5,7 +5,7 @@
     <parent>
       <groupId>org.apache.struts</groupId>
       <artifactId>struts2-apps</artifactId>
-      <version>2.0.8</version>
+      <version>2.0.4</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-portlet</artifactId>
@@ -29,7 +29,7 @@
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-spring-plugin</artifactId>
             <version>${pom.version}</version>
-        </dependency>
+        </dependency>      
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-core</artifactId>

apps/portlet/src/main/resources/validators.xml

@@ -1,6 +1,3 @@
-<!DOCTYPE validators PUBLIC
-        "-//OpenSymphony Group//XWork Validator Config 1.0//EN"
-        "http://www.opensymphony.com/xwork/xwork-validator-config-1.0.dtd">
 <validators>
     <validator name="required" class="com.opensymphony.xwork2.validator.validators.RequiredFieldValidator"/>
     <validator name="requiredstring" class="com.opensymphony.xwork2.validator.validators.RequiredStringValidator"/>

apps/showcase/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-apps</artifactId>
-        <version>2.0.8</version>
+        <version>2.0.4</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-showcase</artifactId>
@@ -17,7 +17,7 @@
        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/apps/showcase/</developerConnection>
        <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/apps/showcase/</url>
     </scm>
-
+    
 
     <profiles>
         <profile>
@@ -31,7 +31,7 @@
         </profile>
     </profiles>
     <dependencies>
-
+        
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-struts1-plugin</artifactId>
@@ -55,7 +55,7 @@
             <artifactId>struts2-sitemesh-plugin</artifactId>
             <version>${pom.version}</version>
         </dependency>
-
+        
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-tiles-plugin</artifactId>
@@ -63,10 +63,9 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.tiles</groupId>
-            <artifactId>tiles-jsp</artifactId>
-            <version>2.0.3</version>
-            <scope>runtime</scope>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-continuations-plugin</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
@@ -80,14 +79,14 @@
             <artifactId>struts2-spring-plugin</artifactId>
             <version>${pom.version}</version>
         </dependency>
-
+ 
         <dependency>
            <groupId>javax.servlet</groupId>
            <artifactId>servlet-api</artifactId>
            <version>2.4</version>
            <scope>provided</scope>
         </dependency>
-
+        
         <!-- Velocity -->
         <dependency>
             <groupId>velocity</groupId>
@@ -138,9 +137,9 @@
          <version>1.1.1</version>
      </dependency>
 
-
+ 
     </dependencies>
-
+    
     <build>
         <plugins>
             <plugin>

apps/showcase/quickstart.xml

@@ -0,0 +1,66 @@
+<configuration>
+    <!--
+    QuickStart can be used to extend other QuickStart configurations.
+    This is great for applications that have multiple "editions" and
+    extend upon a base webapp or evven just a base set of classes.
+    -->
+    <!--<extendsConfig>../path/to/quickstart.xml</extendsConfig>-->
+
+    <!--
+    QuickStart supports reading your IDEA module configuration and
+    using the libraries there. This is especially useful for maven
+    users who don't have a single directory in their project that
+    contains all the libraries they need.
+    -->
+    <ideaConfig>../../../xwork/xwork.iml,../../core/struts2-core.iml,struts2-showcase.iml</ideaConfig>
+
+    <!-- The context in which to deploy the web application -->
+    <context>/showcase</context>
+
+    <!-- The port in which to deploy the web application -->
+    <port>8080</port>
+
+    <!--
+    The libs directories can be a jar, a directory of jars, or even
+    a directory of directories (searched recursively)
+    <libs>
+        <dir>../../lib</dir>
+    </libs>
+    -->
+
+    <!--
+    Optional: the location where your source files are. If this is
+    not included, the auto-recompiling feature of QuickStart will
+    not be enabled. You may wish to do this anyway, as this feature
+    has been known to cause strange side effects. If you don't
+    specify your sources, you must specify where your classes are by
+    using the classDirs and libs elements
+    <sources>
+        <dir>src/main/java</dir>
+    </sources>
+    -->
+
+    <!--
+    The classDirs directories can be a jar or a directory of classes.
+    The WEB-INF/classes directory for each webDir (below) will automatically
+    be added if it exists.
+    -->
+    <classDirs>
+        <dir>src/main/resources</dir>
+        <dir>target/classes</dir>
+        <dir>../../core/target/classes</dir>
+    </classDirs>
+
+    <!--
+    You can specify one or more directories where your webapp files
+    are located. This is useful if you have your project split up in
+    unique ways. You can also specify the path that the directory is
+    mapped to, relative to the context.
+    -->
+    <webDirs>
+        <webDir>
+            <path>/</path>
+            <dir>src/main/webapp</dir>
+        </webDir>
+    </webDirs>
+</configuration>

apps/showcase/src/main/java/org/apache/struts2/showcase/Guess.java

@@ -0,0 +1,71 @@
+/*
+ * $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;
+
+import java.util.Random;
+
+import com.opensymphony.xwork2.Action;
+import com.opensymphony.xwork2.ActionSupport;
+import com.opensymphony.xwork2.Preparable;
+import com.uwyn.rife.continuations.ContinuableObject;
+
+// START SNIPPET: example
+public class Guess extends ActionSupport implements Preparable, ContinuableObject {
+    int guess;
+
+    public void prepare() throws Exception {
+        // We clear the error message state before the action.
+        // That is because with continuations, the original (or cloned) action is being
+        //  executed, which will still have the old errors and potentially cause problems,
+        //  such as with the workflow interceptor
+        clearErrorsAndMessages();
+    }
+
+    public String execute() throws Exception {
+        int answer = new Random().nextInt(100) + 1;
+        int tries = 5;
+
+        while (answer != guess && tries > 0) {
+            pause(Action.SUCCESS);
+
+            if (guess > answer) {
+                addFieldError("guess", "Too high!");
+            } else if (guess < answer) {
+                addFieldError("guess", "Too low!");
+            }
+
+            tries--;
+        }
+
+        if (answer == guess) {
+            addActionMessage("You got it!");
+        } else {
+            addActionMessage("You ran out of tries, the answer was " + answer);
+        }
+
+        return Action.SUCCESS;
+    }
+
+    public void setGuess(int guess) {
+        this.guess = guess;
+    }
+}
+// END SNIPPET: example

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

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

@@ -57,7 +57,7 @@ public class ViewSourceAction extends ActionSupport implements ServletContextAwa
 
     public String execute() throws MalformedURLException, IOException {
 
-        if (page != null && page.trim().length() > 0) {
+        if (page != null) {
 
             InputStream in = ClassLoaderUtil.getResourceAsStream(page.substring(page.indexOf("//")+1), getClass());
             page = page.replace("//", "/");
@@ -72,7 +72,7 @@ public class ViewSourceAction extends ActionSupport implements ServletContextAwa
             pageLines = read(in, -1);
         }
 
-        if (className != null && className.trim().length() > 0) {
+        if (className != null) {
             className = "/"+className.replace('.', '/') + ".java";
             InputStream in = getClass().getResourceAsStream(className);
             if (in == null) {
@@ -81,7 +81,7 @@ public class ViewSourceAction extends ActionSupport implements ServletContextAwa
             classLines = read(in, -1);
         }
 
-        if (config != null && config.trim().length() > 0) {
+        if (config != null) {
             int pos = config.lastIndexOf(':');
             configLine = Integer.parseInt(config.substring(pos+1));
             config = config.substring(0, pos).replace("//", "/");

apps/showcase/src/main/resources/struts-continuations.xml

@@ -0,0 +1,10 @@
+<!DOCTYPE struts PUBLIC
+    "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
+    "http://struts.apache.org/dtds/struts-2.0.dtd">
+<struts>
+    <package name="continuations" extends="struts-default" namespace="/continuations">
+        <action name="guess" class="org.apache.struts2.showcase.Guess">
+            <result type="freemarker">guess.ftl</result>
+        </action>
+    </package>
+</struts>

apps/showcase/src/main/resources/struts-filedownload.xml

@@ -10,7 +10,7 @@
         <default-action-ref name="download"/>
 
         <action name="download" class="org.apache.struts2.showcase.filedownload.FileDownloadAction">
-            <param name="inputPath">/images/struts.gif</param>
+            <param name="inputPath">\images\struts.gif</param>
 			<result name="success" type="stream">
                 <param name="contentType">image/gif</param>
                 <param name="inputName">inputStream</param>
@@ -20,7 +20,7 @@
         </action>
 
         <action name="download2" class="org.apache.struts2.showcase.filedownload.FileDownloadAction">
-            <param name="inputPath">/images/struts-gif.zip</param>
+            <param name="inputPath">\images\struts-gif.zip</param>
             <result name="success" type="stream">
                 <param name="contentType">application/zip</param>
                 <param name="inputName">inputStream</param>

apps/showcase/src/main/resources/struts.properties

@@ -0,0 +1,11 @@
+struts.i18n.reload=true
+struts.devMode = true
+struts.configuration.xml.reload=true
+struts.continuations.package=org.apache.struts2.showcase
+struts.custom.i18n.resources=globalMessages
+#struts.action.extension=jspa
+struts.url.http.port = 8080
+struts.freemarker.manager.classname=customFreemarkerManager
+struts.serve.static=true
+struts.serve.static.browserCache=false
+struts.codebehind.defaultPackage=person

apps/showcase/src/main/resources/struts.xml

@@ -7,27 +7,16 @@
 <!-- START SNIPPET: xworkSample -->
 <struts>
 
-    <!-- Some or all of these can be flipped to true for debugging -->
-    <constant name="struts.i18n.reload" value="false" />
-    <constant name="struts.devMode" value="false" />
-    <constant name="struts.configuration.xml.reload" value="false" />
-    <constant name="struts.custom.i18n.resources" value="globalMessages" />
-
-    <constant name="struts.codebehind.defaultPackage" value="person" />
-    <constant name="struts.freemarker.manager.classname" value="customFreemarkerManager" />
-    <constant name="struts.serve.static" value="true" />
-    <constant name="struts.serve.static.browserCache" value="false" />
-
     <include file="struts-chat.xml" />
-
+    
     <include file="struts-hangman.xml" />
-
+    
     <include file="struts-continuations.xml"/>
 
     <include file="struts-tags.xml"/>
-
+    
     <include file="struts-validation.xml" />
-
+    
     <include file="struts-actionchaining.xml" />
 
     <include file="struts-ajax.xml" />
@@ -37,19 +26,19 @@
     <include file="struts-person.xml" />
 
     <include file="struts-wait.xml" />
-
+	
     <include file="struts-jsf.xml" />
 
     <include file="struts-token.xml" />
-
+    
     <include file="struts-model-driven.xml" />
-
+    
     <include file="struts-integration.xml" />
-
+    
     <include file="struts-filedownload.xml" />
-
+    
     <include file="struts-conversion.xml" />
-
+    
     <include file="struts-freemarker.xml" />
 
     <include file="struts-tiles.xml" />
@@ -59,17 +48,17 @@
     <package name="default" extends="struts-default">
         <interceptors>
             <interceptor-stack name="crudStack">
-              <interceptor-ref name="checkbox" />
+            	<interceptor-ref name="checkbox" />
                 <interceptor-ref name="params" />
-        <interceptor-ref name="static-params" />
+				<interceptor-ref name="static-params" />
                 <interceptor-ref name="defaultStack" />
             </interceptor-stack>
         </interceptors>
-
+		
         <action name="showcase">
             <result>showcase.jsp</result>
         </action>
-
+        
         <action name="viewSource" class="org.apache.struts2.showcase.source.ViewSourceAction">
             <result>viewSource.jsp</result>
         </action>
@@ -110,7 +99,7 @@
             <interceptor-ref name="basicStack"/>
         </action>
         <action name="edit-*" class="org.apache.struts2.showcase.action.EmployeeAction">
-      <param name="empId">{1}</param>
+			<param name="empId">{1}</param>
             <result>/empmanager/editEmployee.jsp</result>
             <interceptor-ref name="crudStack"><param name="validation.excludeMethods">execute</param></interceptor-ref>
         </action>

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

@@ -5,7 +5,7 @@
     response.setHeader("Pragma", "no-cache");
     response.setHeader("Cache-Control", "no-cache");
     response.setDateHeader("Expires", 0);
-
+    
     // Calculate the view sources url
     String sourceUrl = request.getContextPath()+"/viewSource.action";
     com.opensymphony.xwork2.ActionInvocation inv = com.opensymphony.xwork2.ActionContext.getContext().getActionInvocation();
@@ -14,9 +14,9 @@
         com.opensymphony.xwork2.util.location.Location loc = inv.getProxy().getConfig().getLocation();
         sourceUrl += "?config="+(loc != null ? loc.getURI()+":"+loc.getLineNumber() : "");
         sourceUrl += "&className="+inv.getProxy().getConfig().getClassName();
-
+        
         if (inv.getResult() != null && inv.getResult() instanceof org.apache.struts2.dispatcher.StrutsResultSupport) {
-          sourceUrl += "&page="+mapping.getNamespace()+"/"+((org.apache.struts2.dispatcher.StrutsResultSupport)inv.getResult()).getLastFinalLocation();
+	        sourceUrl += "&page="+mapping.getNamespace()+"/"+((org.apache.struts2.dispatcher.StrutsResultSupport)inv.getResult()).getLastFinalLocation();
         }
     } else {
         sourceUrl += "?page="+request.getServletPath();
@@ -104,11 +104,11 @@
 
     </div><!-- end content -->
 
-  <div>
-      <p>
-        <a href="<%=sourceUrl %>">View Sources</a>
-      </p>
-  </div>
+	<div>
+    	<p>
+    		<a href="<%=sourceUrl %>">View Sources</a>
+    	</p>
+	</div>
     <div id="footer" class="clearfix">
         <p>Copyright &copy; 2003-<s:property value="#dateAction.now.year + 1900" /> The Apache Software Foundation.</p>
     </div><!-- end footer -->

apps/showcase/src/main/webapp/WEB-INF/tiles.xml

@@ -28,15 +28,15 @@
 <tiles-definitions>
 
     <definition name="showcase.index" template="/tiles/layout.jsp">
-        <put-attribute name="title" value="Tiles Showcase"/>
-        <put-attribute name="header" value="/tiles/header.jsp"/>
-        <put-attribute name="body" value="/tiles/body.jsp"/>
+        <put name="title" value="Tiles Showcase"/>
+        <put name="header" value="/tiles/header.jsp"/>
+        <put name="body" value="/tiles/body.jsp"/>
     </definition>
 
     <definition name="showcase.freemarker" template="/tiles/layout.jsp">
-        <put-attribute name="title" value="Tiles/Freemarker Showcase"/>
-        <put-attribute name="header" value="/tiles/header.jsp"/>
-        <put-attribute name="body" value="/tiles/body.ftl"/>
+        <put name="title" value="Tiles/Freemarker Showcase"/>
+        <put name="header" value="/tiles/header.jsp"/>
+        <put name="body" value="/tiles/body.ftl"/>
     </definition>
 
 </tiles-definitions>

apps/showcase/src/main/webapp/WEB-INF/web.xml

@@ -5,6 +5,11 @@
 	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
 
     <display-name>Struts Showcase Application</display-name>
+
+    <context-param>
+        <param-name>org.apache.tiles.CONTAINER_FACTORY</param-name>
+        <param-value>org.apache.struts2.tiles.StrutsTilesContainerFactory</param-value>
+    </context-param>
 	
     <filter>
         <filter-name>struts-cleanup</filter-name>
@@ -52,7 +57,7 @@
 
     <listener>
         <listener-class>
-            org.apache.struts2.tiles.StrutsTilesListener
+            org.apache.tiles.listener.TilesListener
         </listener-class>
     </listener>
     

apps/showcase/src/main/webapp/ajax/autocompleter/index.jsp

@@ -24,7 +24,7 @@ Using a JSON list returned from an action (href="/JSONList.action"), without aut
 
 Reload on type (loadOnTextChange="true"), after 3 characters (loadMinimumCout="3", it is "3" by default), without the down arrow button (showDownArrow="false")
 <br/>
-<s:autocompleter name="state" theme="ajax" indicator="indicator" href="%{jsonList}" cssStyle="width: 200px;" autoComplete="false" loadOnTextChange="true" loadMinimumCount="3" showDownArrow="false"/>
+<s:autocompleter theme="ajax" indicator="indicator" href="%{jsonList}" cssStyle="width: 200px;" autoComplete="false" loadOnTextChange="true" loadMinimumCount="3" showDownArrow="false"/>
 <img id="indicator" src="${pageContext.request.contextPath}/images/indicator.gif" alt="Loading..." style="display:none"/>
 
 <br/>

apps/showcase/src/main/webapp/ajax/index.jsp

@@ -15,9 +15,9 @@ Note: The Ajax tags are experimental. These examples have only been tested under
     <li><a href="remotediv">Remote div tag</a></li>
     <li><a href="remotelink">Remote link tag</a></li>
     <li><a href="tabbedpanel">Tabbed panel</a></li>
-    <li><a href="widgets">Widgets </a> (may not work in all browsers!)
+    <li><a href="widgets">Widgets </a> (may not work in all browsers!) 
         see the <a href="http://www.dojotoolkit.org">dojo website</a> for more information</li>
-    <li><a href="remoteforms">Remote forms</a></li>
+    <li>(broken) <a href="remoteforms">Remote forms</a></li>
 </ul>
 </body>
 </html>

apps/showcase/src/main/webapp/continuations/guess.ftl

@@ -0,0 +1,18 @@
+<!-- START SNIPPET: example -->
+<html>
+<head>
+    <title></title>
+</head>
+
+<body>
+<#list actionMessages as msg>
+    ${msg}
+</#list>
+
+<@s.form action="guess" method="post">
+    <@s.textfield label="Guess" name="guess"/>
+    <@s.submit value="Guess"/>
+</@s.form>
+</body>
+</html>
+<!-- END SNIPPET: example -->

apps/showcase/src/main/webapp/hangman/hangmanMenu.ftl

@@ -11,7 +11,7 @@
 		</li>
         <li>
             <@s.url id="url" action="hangmanAjax" namespace="/hangman" />
-            (broken) <@s.a href="%{#url}">Hangman (Ajax - Experimental)</@s.a>
+            <@s.a href="%{#url}">Hangman (Ajax - Experimental)</@s.a>
         </li>
 	</ul>
 </body>

apps/showcase/src/main/webapp/showcase.jsp

@@ -1,6 +1,6 @@
-<%--
+<%-- 
     showcase.jsp
-
+    
     @version $Date$ $Id$
 --%>
 
@@ -32,7 +32,7 @@
     <p>
     <%-- THIS LIST IS MAINTAINED IN WEB-INF/decorators/main.jsp TO CREATE THE MENU BAR -- EDIT THERE AND COPY HERE --%>
     <ul>
-        <li><a href="<s:url value="/showcase.jsp"/>">Home</a></li>
+        <li><a href="<s:url value="/showcase.jsp"/>">Home</a></li>        
         <li><a href="<s:url value="/ajax/index.jsp" />">Ajax Theme for Struts Tags</a></li>
         <li><a href="<s:url value="/chat/index.jsp"/>">Ajax Chat</a>
         <li><a href="<s:url action="actionChain1!input" namespace="/actionchaining"  includeParams="none" />">Action Chaining</a></li>
@@ -52,6 +52,15 @@
         <li><a href="<s:url value="/validation/index.jsp"/>">Validation</a></li>
         <li class="last"><a href="<s:url value="/help.jsp"/>">Help</a></li>
      </ul>
+
+    <h2>Sandbox</h2>
+    <p>
+        These examples are under development and may not be fully operational.
+    </p>
+    <ul>
+        <li><a href="<s:url action="guess" namespace="/continuations" />">Continuations</a></li>
+    </ul>
+
 </p>
 
 </body>

apps/showcase/src/main/webapp/tiles/layout.jsp

@@ -1,4 +1,4 @@
-<%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles" %>
+<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
 <%@ taglib prefix="s" uri="/struts-tags" %>
 
 <%-- Show usage; Used in Header --%>
@@ -6,10 +6,10 @@
 <html>
     <head><title><tiles:getAsString name="title"/></title></head>
 <body>
-    <tiles:insertAttribute name="header"/>
+    <tiles:attribute name="header"/>
 
     <p id="body">
-        <tiles:insertAttribute name="body"/>
+        <tiles:attribute name="body"/>
     </p>
 </body>
 </html>

assembly/pom.xml

@@ -1,14 +1,14 @@
 <?xml version="1.0"?>
 <!--
-/*
+/* 
  * Copyright 2005-2006 The Apache Software Foundation.
- *
+ * 
  * Licensed 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.
@@ -33,7 +33,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>2.0.8</version>
+        <version>2.0.4</version>
     </parent>
 
     <scm>
@@ -103,7 +103,7 @@
                                     <groupId>opensymphony</groupId>
                                     <artifactId>xwork</artifactId>
                                     <classifier>javadoc</classifier>
-                                    <version>2.0.3</version>
+                                    <version>2.0.0</version>
                                 </artifactItem>
                             </artifactItems>
                             <outputDirectory>${project.build.directory}/xwork-apidocs</outputDirectory>
@@ -155,13 +155,12 @@
 
         <dependency>
             <groupId>org.apache.struts</groupId>
-            <artifactId>struts2-core</artifactId>
+            <artifactId>struts2-api</artifactId>
             <version>${version}</version>
         </dependency>
-
         <dependency>
             <groupId>org.apache.struts</groupId>
-            <artifactId>struts2-codebehind-plugin</artifactId>
+            <artifactId>struts2-core</artifactId>
             <version>${version}</version>
         </dependency>
 
@@ -193,43 +192,37 @@
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-pell-multipart-plugin</artifactId>
             <version>${version}</version>
-        </dependency>
+        </dependency> 
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-plexus-plugin</artifactId>
             <version>${version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.struts</groupId>
-            <artifactId>struts2-spring-plugin</artifactId>
-            <version>${version}</version>
-        </dependency>
+        </dependency> 
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-sitegraph-plugin</artifactId>
             <version>${version}</version>
-        </dependency>
+        </dependency> 
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-sitemesh-plugin</artifactId>
             <version>${version}</version>
-        </dependency>
+        </dependency> 
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-struts1-plugin</artifactId>
             <version>${version}</version>
-        </dependency>
+        </dependency> 
 
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-tiles-plugin</artifactId>
             <version>${version}</version>
-        </dependency>
+        </dependency> 
 
 
         <!-- Include optional dependencies -->
@@ -384,7 +377,7 @@
         <dependency>
             <groupId>org.codehaus.plexus</groupId>
             <artifactId>plexus-container-default</artifactId>
-            <version>1.0-alpha-10</version>
+            <version>1.0-alpha-10-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
 
@@ -423,7 +416,7 @@
             <version>1.2.8</version>
             <scope>provided</scope>
         </dependency>
-
+        
 
         <dependency>
             <groupId>myfaces</groupId>
@@ -432,6 +425,13 @@
             <scope>provided</scope>
         </dependency>
 
+      <dependency>
+         <groupId>org.rifers</groupId>
+         <artifactId>rife-continuations</artifactId>
+         <version>0.0.2</version>
+         <scope>provided</scope>
+     </dependency>
+ 
         <!-- Exclude transitive dependencies -->
         <dependency>
             <groupId>javax.servlet</groupId>

assembly/src/main/assembly/all.xml

@@ -58,10 +58,10 @@
         <directory>../target/site</directory>
         <outputDirectory>docs</outputDirectory>
       </fileSet>
-      <!--fileSet>
+      <fileSet>
         <directory>../api/target/site</directory>
         <outputDirectory>docs/struts2-api</outputDirectory>
-      </fileSet-->
+      </fileSet>
       <fileSet>
         <directory>../core/target/site</directory>
         <outputDirectory>docs/struts2-core</outputDirectory>
@@ -130,14 +130,14 @@
         <include>src/</include>
       </includes>
     </fileSet>
-      <!--fileSet>
+      <fileSet>
         <directory>../api</directory>
         <outputDirectory>src/api</outputDirectory>
         <includes>
           <include>pom.xml</include>
           <include>src/</include>
         </includes>
-      </fileSet-->
+      </fileSet>
     <fileSet>
       <directory>../apps</directory>
       <outputDirectory>src/apps</outputDirectory>

assembly/src/main/assembly/src.xml

@@ -60,14 +60,14 @@
           <include>src/</include>
         </includes>
       </fileSet>
-        <!--fileSet>
+        <fileSet>
           <directory>../api</directory>
           <outputDirectory>src/api</outputDirectory>
           <includes>
             <include>pom.xml</include>
             <include>src/</include>
           </includes>
-        </fileSet-->
+        </fileSet>
       <fileSet>
         <directory>../apps</directory>
         <outputDirectory>src/apps</outputDirectory>

backport/translate.bat

@@ -1,2 +1,4 @@
-java -jar retrotranslator-transformer-1.2.0.jar -advanced -srcjar ../lib/struts2-core-2.0.8.jar -destjar struts2-core-j4-2.0.8.jar
-java -jar retrotranslator-transformer-1.2.0.jar -advanced -srcjar ../lib/xwork-2.0.3.jar -destjar xwork-j4-2.0.3.jar 
+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 

core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-parent</artifactId>
-        <version>2.0.8</version>
+        <version>2.0.4</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-core</artifactId>
@@ -20,9 +20,9 @@
 
     <build>
         <plugins>
-            <plugin>
+        	<plugin>
                 <artifactId>maven-dependency-plugin</artifactId>
-                <version>2.0-alpha-4</version>
+                <version>2.0-alpha-1-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <id>unpack-xwork</id>
@@ -31,25 +31,25 @@
                             <goal>unpack</goal>
                         </goals>
                         <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>opensymphony</groupId>
-                                    <artifactId>xwork</artifactId>
-                                    <version>2.0.3</version>
-                                    <classifier>sources</classifier>
-                                </artifactItem>
-                            </artifactItems>
-                            <outputDirectory>${project.build.directory}/xwork-sources</outputDirectory>
-                        </configuration>
+		                    <artifactItems>
+		                        <artifactItem>
+		                            <groupId>opensymphony</groupId>
+		                            <artifactId>xwork</artifactId>
+		                            <version>2.0.0</version>
+		                            <classifier>sources</classifier>
+		                        </artifactItem>
+		                    </artifactItems>
+		                    <outputDirectory>${project.build.directory}/xwork-sources</outputDirectory>
+		                </configuration>
                     </execution>
-                </executions>
+				</executions>
             </plugin>
             <plugin>
                 <groupId>org.apache.myfaces.tobago</groupId>
                 <artifactId>maven-apt-plugin</artifactId>
                 <configuration>
                     <A>uri=/struts-tags,tlibVersion=2.2.3,jspVersion=1.2,shortName=s,displayName="Struts Tags",
-                    outFile=${basedir}/target/classes/META-INF/struts-tags.tld,
+                    outFile=${basedir}/src/main/resources/META-INF/struts-tags.tld,
                     description="To make it easier to access dynamic data;
                     the Apache Struts framework includes a library of custom tags.
                     The tags interact with the framework's validation and internationalization features;
@@ -75,14 +75,14 @@
                             <goal>execute</goal>
                         </goals>
                 </execution>
-                </executions>
+				</executions>
             </plugin>
         </plugins>
     </build>
 
     <reporting>
         <plugins>
-            <plugin>
+        	<plugin>
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <version>2.2</version>
                 <configuration>
@@ -111,69 +111,68 @@
     </reporting>
 
     <profiles>
-        <profile>
-            <!--
-                Run the translator for Java 1.4 compatiblity
+     	<profile>
+	    	<!--
+	    		Run the translator for Java 1.4 compatiblity
 
-                Samples:
-                $ cd struts/struts2/
-                $ mvn clean install -Papps,j4 -Djava14.jar=$JAVA_HOME/../Classes/classes.jar
-                $ mvn clean install -Papps,j4 -Djava14.jar="$JAVA_HOME/jre/lib/rt.jar"                
+	    		Sample:
+	    		$ cd struts/struts2/
+	    		$ mvn clean install -Papps,j4 -Djava14.jar=$JAVA_HOME/../Classes/classes.jar
 
-             -->
-          <id>j4</id>
-          <build>
-            <plugins>
-              <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>retrotranslator-maven-plugin</artifactId>
-                <executions>
-                  <execution>
-                    <id>retrotranslate</id>
-                  </execution>
-                </executions>
-              </plugin>
-              <plugin>
-                <artifactId>maven-jar-plugin</artifactId>
-                <executions>
-                  <execution>
-                    <id>create-j4-jar</id>
-                    <goals><goal>jar</goal></goals>
-                    <configuration>
-                      <classesDirectory>${project.build.directory}/classes-retro</classesDirectory>
-                      <classifier>j4</classifier>
-                      <archive>
-                        <manifestEntries>
-                          <Extension-Name>${project.artifactId}-j4</Extension-Name>
-                          <Specification-Vendor>${project.organization.name}</Specification-Vendor>
-                          <Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
-                          <Implementation-Title>${project.description}</Implementation-Title>
-                          <Implementation-Version>${project.version}</Implementation-Version>
-                          <Revision>${scm.revision}</Revision>
-                        </manifestEntries>
-                       </archive>
-                    </configuration>
-                  </execution>
-                </executions>
-              </plugin>
-            </plugins>
-          </build>
-           <dependencies>
-            <dependency>
-              <groupId>sun.jdk</groupId>
-              <artifactId>rt</artifactId>
-              <version>1.4.0</version>
-              <scope>system</scope>
-              <!-- path to rt.jar (on OSX, it's classes.jar) -->
-              <systemPath>${java14.jar}</systemPath>
-            </dependency>
-            <dependency>
-              <groupId>net.sf.retrotranslator</groupId>
-              <artifactId>retrotranslator-runtime</artifactId>
-              <version>1.0.8</version>
-            </dependency>
-          </dependencies>
-        </profile>
+	    	 -->
+	      <id>j4</id>
+	      <build>
+	        <plugins>
+	          <plugin>
+	            <groupId>org.codehaus.mojo</groupId>
+	            <artifactId>retrotranslator-maven-plugin</artifactId>
+	            <executions>
+	              <execution>
+	                <id>retrotranslate</id>
+	              </execution>
+	            </executions>
+	          </plugin>
+	          <plugin>
+	            <artifactId>maven-jar-plugin</artifactId>
+	            <executions>
+	              <execution>
+	                <id>create-j4-jar</id>
+	                <goals><goal>jar</goal></goals>
+	                <configuration>
+	                  <classesDirectory>${project.build.directory}/classes-retro</classesDirectory>
+	                  <classifier>j4</classifier>
+	                  <archive>
+	                    <manifestEntries>
+	                      <Extension-Name>${project.artifactId}-j4</Extension-Name>
+	                      <Specification-Vendor>${project.organization.name}</Specification-Vendor>
+	                      <Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
+	                      <Implementation-Title>${project.description}</Implementation-Title>
+	                      <Implementation-Version>${project.version}</Implementation-Version>
+	                      <Revision>${scm.revision}</Revision>
+	                    </manifestEntries>
+	                   </archive>
+	                </configuration>
+	              </execution>
+	            </executions>
+	          </plugin>
+	        </plugins>
+	      </build>
+	       <dependencies>
+	        <dependency>
+	          <groupId>sun.jdk</groupId>
+	          <artifactId>rt</artifactId>
+	          <version>1.4.0</version>
+	          <scope>system</scope>
+	          <!-- path to rt.jar (on OSX, it's classes.jar) -->
+	          <systemPath>${java14.jar}</systemPath>
+	        </dependency>
+	        <dependency>
+	          <groupId>net.sf.retrotranslator</groupId>
+	          <artifactId>retrotranslator-runtime</artifactId>
+	          <version>1.0.8</version>
+	        </dependency>
+	      </dependencies>
+	    </profile>
 
         <profile>
             <id>alljars</id>
@@ -253,13 +252,19 @@
         <dependency>
             <groupId>opensymphony</groupId>
             <artifactId>xwork</artifactId>
-            <version>2.0.3</version>
+            <version>2.0.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-api</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>freemarker</groupId>
             <artifactId>freemarker</artifactId>
-            <version>2.3.8</version>
+            <version>2.3.4</version>
         </dependency>
 
         <dependency>
@@ -277,9 +282,9 @@
         </dependency>
 
         <dependency>
-            <groupId>opensymphony</groupId>
+            <groupId>ognl</groupId>
             <artifactId>ognl</artifactId>
-            <version>2.6.11</version>
+            <version>2.6.9</version>
         </dependency>
 
         <dependency>
@@ -462,10 +467,10 @@
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts-annotations</artifactId>
-            <version>1.0.2</version>
+            <version>1.0-SNAPSHOT</version>
             <optional>true</optional>
         </dependency>
 
-
+        
     </dependencies>
 </project>

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

@@ -147,11 +147,4 @@ public final class StrutsConstants {
     public static final String STRUTS_XWORKCONVERTER = "struts.xworkConverter";
 
     public static final String STRUTS_ALWAYS_SELECT_FULL_NAMESPACE = "struts.mapper.alwaysSelectFullNamespace";
-
-    /** XWork default text provider */
-    public static final String STRUTS_XWORKTEXTPROVIDER = "struts.xworkTextProvider";
-
-    /** The name of the parameter to create when mapping an id (used by some action mappers) */
-	public static final String STRUTS_ID_PARAMETER_NAME = "struts.mapper.idParameterName";
-
 }

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

@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $Id: StrutsTestCase.java 476696 2006-11-19 03:56:18Z tmjee $
  *
  * 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/AbstractRemoteCallUIBean.java

@@ -49,7 +49,6 @@ public abstract class AbstractRemoteCallUIBean extends ClosingUIBean implements
     protected String notifyTopics;
     protected String showErrorTransportText;
     protected String indicator;
-    protected String showLoadingText;
 
     public AbstractRemoteCallUIBean(ValueStack stack, HttpServletRequest request,
             HttpServletResponse response) {
@@ -87,8 +86,6 @@ public abstract class AbstractRemoteCallUIBean extends ClosingUIBean implements
             addParameter("showErrorTransportText", findValue(showErrorTransportText, Boolean.class));
         else
             addParameter("showErrorTransportText", true);
-        if (showLoadingText != null)
-            addParameter("showLoadingText", findString(showLoadingText));
     }
 
 
@@ -168,8 +165,4 @@ public abstract class AbstractRemoteCallUIBean extends ClosingUIBean implements
         this.indicator = indicator;
     }
 
-    @StrutsTagAttribute(description="Show loading text on targets", type="Boolean", defaultValue="true")
-    public void setShowLoadingText(String showLoadingText) {
-        this.showLoadingText = showLoadingText;
-    }
 }

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

@@ -71,7 +71,6 @@ import com.opensymphony.xwork2.util.ValueStack;
  * 'listenTopics' comma separated list of topics names, that will trigger a request
  * 'indicator' element to be shown while the request executing
  * 'showErrorTransportText': whether errors should be displayed (on 'targets')</p>
- * 'showLoadingText' show loading text on targets</p>
  * 'notifyTopics' comma separated list of topics names, that will be published. Three parameters are passed:<p/>
  * <ul>
  *      <li>data: html or json object when type='load' or type='error'</li>

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

@@ -29,10 +29,18 @@ import org.apache.struts2.views.annotations.StrutsTagAttribute;
 import com.opensymphony.xwork2.util.ValueStack;
 
 /**
- * <!-- START SNIPPET: javadoc -->
  * <p>The autocomplete tag is a combobox that can autocomplete text entered on the input box.
  * When used on the "simple" theme, the autocompleter can be used like the ComboBox.
- * When used on the "ajax" theme, the list can be retieved from an action. </p>
+ * When used on the "ajax" theme, the list can be retieved from an action. This action must
+ * return a JSON list in the format:</p>
+ * <pre>
+ * [
+ *   ["Text 1","Value1"],
+ *   ["Text 2","Value2"],
+ *   ["Text 3","Value3"]
+ * ]
+ * </pre>
+ * <!-- START SNIPPET: ajaxJavadoc -->
  * <B>THE FOLLOWING IS ONLY VALID WHEN AJAX IS CONFIGURED</B>
  * <ul>
  *      <li>href</li>
@@ -62,27 +70,15 @@ import com.opensymphony.xwork2.util.ValueStack;
  * 'showErrorTransportText': whether errors should be displayed (on 'targets')<p/>
  * 'loadOnTextChange' options will be reloaded everytime a character is typed on the textbox<p/>
  * 'loadMinimumCount' minimum number of characters that will force the content to be loaded<p/>
- * 'showDownError' show or hide the down arrow button<p/>
+ * 'showDownError' show or hide the down arrow button
  * 'searchType' how the search must be performed, options are: "startstring", "startword" and "substring"<p/>
- * 'keyName' name of the field to which the selected key will be assigned<p/>
- * 'iconPath' path of icon used for the dropdown<p/>
- * 'templateCssPath' path to css file used to customize Dojo's widget<p/>
- * 'dataFieldName' name of the field to be used as the list in the returned JSON string<p/>
  * 'notifyTopics' comma separated list of topics names, that will be published. Three parameters are passed:<p/>
  * <ul>
  *      <li>data: selected value when type='valuechanged'</li>
  *      <li>type: 'before' before the request is made, 'valuechanged' when selection changes, 'load' when the request succeeds, or 'error' when it fails</li>
  *      <li>request: request javascript object, when type='load' or type='error'</li>
  * <ul>
- *<!-- END SNIPPET: javadoc -->
- *<!-- START SNIPPET: example -->
- *<p>Autocompleter that gets its list from an action:</p>
- *&lt;s:autocompleter name="test"  href="%{jsonList}" autoComplete="false"/&gt;
- *<br/>
- **<p>Autocompleter that uses a list:</p>
- *&lt;s:autocompleter name="test"  list="{'apple','banana','grape','pear'}" autoComplete="false"/&gt;
- *<br/>
- *<!-- END SNIPPET: example -->
+ *
  */
 @StrutsTag(name="autocompleter", tldTagClass="org.apache.struts2.views.jsp.ui.AutocompleterTag", description="Renders a combobox with autocomplete and AJAX capabilities")
 public class Autocompleter extends ComboBox {
@@ -105,12 +101,7 @@ public class Autocompleter extends ComboBox {
     protected String loadOnTextChange;
     protected String loadMinimumCount;
     protected String showDownArrow;
-    protected String templateCssPath;
-    protected String iconPath;
-    protected String keyName;
-    protected String dataFieldName;
-    protected String resultsLimit;
-    
+
     public Autocompleter(ValueStack stack, HttpServletRequest request,
             HttpServletResponse response) {
         super(stack, request, response);
@@ -168,23 +159,11 @@ public class Autocompleter extends ComboBox {
             addParameter("showDownArrow", findValue(showDownArrow, Boolean.class));
         else
             addParameter("showDownArrow", Boolean.TRUE);
-        if(templateCssPath != null)
-            addParameter("templateCssPath", findString(templateCssPath));
-        if(iconPath != null)
-            addParameter("iconPath", findString(iconPath));
-        if(dataFieldName != null)
-            addParameter("dataFieldName", findString(dataFieldName));
-        if(keyName != null)
-            addParameter("keyName", findString(keyName));
-        else {
-            keyName = name + "Key";
-            addParameter("keyName", findString(keyName));
+        //get the key value
+        if(name != null) {
+            String keyNameExpr = "%{" + name + "Key}";
+            addParameter("key", findString(keyNameExpr));
         }
-        
-        String keyNameExpr = "%{" + keyName + "}";
-        addParameter("key", findString(keyNameExpr));
-        if(resultsLimit != null)
-            addParameter("searchLimit", findString(resultsLimit));
     }
 
     protected Object findListValue() {
@@ -277,29 +256,4 @@ public class Autocompleter extends ComboBox {
     public void setList(String list) {
         super.setList(list);
     }
-    
-    @StrutsTagAttribute(description="Template css path")
-    public void setTemplateCssPath(String templateCssPath) {
-        this.templateCssPath = templateCssPath;
-    }
-    
-    @StrutsTagAttribute(description="Path to icon used for the dropdown")
-    public void setIconPath(String iconPath) {
-        this.iconPath = iconPath;
-    }
-    
-    @StrutsTagAttribute(description="Name of the field to which the selected key will be assigned")
-    public void setKeyName(String keyName) {
-       this.keyName = keyName;
-    }
-
-    @StrutsTagAttribute(description="Name of the field in the returned JSON object that contains the data array", defaultValue="Value specified in 'name'")
-    public void setDataFieldName(String dataFieldName) {
-        this.dataFieldName = dataFieldName;
-    }
-
-    @StrutsTagAttribute(description="Limit how many results are shown as autocompletion options", defaultValue="30")
-    public void setResultsLimit(String resultsLimit) {
-        this.resultsLimit = resultsLimit;
-    }
 }

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

@@ -23,8 +23,8 @@ package org.apache.struts2.components;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.Writer;
+import java.util.HashMap;
 import java.util.Iterator;
-import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Stack;
 
@@ -65,7 +65,7 @@ public class Component {
      */
     public Component(ValueStack stack) {
         this.stack = stack;
-        this.parameters = new LinkedHashMap();
+        this.parameters = new HashMap();
         getComponentStack().push(this);
     }
 

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

@@ -43,53 +43,51 @@ import com.opensymphony.xwork2.util.ValueStack;
  * A stand-alone DateTimePicker widget that makes it easy to select a date/time, or increment by week, month,
  * and/or year.
  * </p>
+ * Dates attributes passed in the `RFC 3339` format:
  *
- * <p>
- * It is possible to customize the user-visible formatting with either the
- * 'formatLength' (long, short, medium or full) or 'displayFormat' attributes. By defaulty current
- * locale will be used.</p>
- * </p>
- * 
- * Syntax supported by 'displayFormat' is (http://www.unicode.org/reports/tr35/tr35-4.html#Date_Format_Patterns):-
+ * Renders date/time picker element.</p>
+ * Format supported by this component are:-
  * <table border="1">
  *   <tr>
  *      <td>Format</td>
  *      <td>Description</td>
  *   </tr>
  *   <tr>
- *      <td>d</td>
- *      <td>Day of the month</td>
+ *      <td>#dd</td>
+ *      <td>Display day in two digits format</td>
  *   </tr>
  *   <tr>
- *      <td>D</td>
- *      <td>Day of year</td>
+ *      <td>#d</td>
+ *      <td>Try to display day in one digit format, if cannot use 2 digit format</td>
  *   </tr>
  *   <tr>
- *      <td>M</td>
- *      <td>Month - Use one or two for the numerical month, three for the abbreviation, or four for the full name, or 5 for the narrow name.</td>
+ *      <td>#MM</td>
+ *      <td>Display month in two digits format</td>
  *   </tr>
  *   <tr>
- *      <td>h</td>
- *      <td>Hour [1-12].</td>
+ *      <td>#M</td>
+ *      <td>Try to display month in one digits format, if cannot use 2 digit format</td>
  *   </tr>
  *   <tr>
- *      <td>H</td>
- *      <td>Hour [0-23].</td>
+ *      <td>#yyyy</td>
+ *      <td>Display year in four digits format</td>
  *   </tr>
  *   <tr>
- *      <td>m</td>
- *      <td>Minute. Use one or two for zero padding.</td>
+ *      <td>#yy</td>
+ *      <td>Display the last two digits of the yaer</td>
  *   </tr>
  *   <tr>
- *      <td>s</td>
- *      <td>Second. Use one or two for zero padding.</td>
+ *      <td>#y</td>
+ *      <td>Display the last digits of the year</td>
  *   </tr>
  * </table>
  * 
  * <p>
- * The value sent to the server is
+ * It is possible to customize the user-visible formatting with either the
+ * formatLength or displayFormat attributes. The value sent to the server is
  * typically a locale-independent value in a hidden field as defined by the name
- * attribute. RFC3339 representation is the format used.
+ * attribute. RFC3339 representation is used by default, but other options are
+ * available with saveFormat
  * </p>
  *
  * <p/>
@@ -104,7 +102,7 @@ import com.opensymphony.xwork2.util.ValueStack;
  * Example 1:
  *     &lt;s:datetimepicker name="order.date" label="Order Date" /&gt;
  * Example 2:
- *     &lt;s:datetimepicker name="delivery.date" label="Delivery Date" format="yyyy-MM-dd"  /&gt;
+ *     &lt;s:datetimepicker name="delivery.date" label="Delivery Date" format="#yyyy-#MM-#dd"  /&gt;
  *
  * <!-- END SNIPPET: expl1 -->
  * </pre>
@@ -129,7 +127,7 @@ import com.opensymphony.xwork2.util.ValueStack;
 public class DateTimePicker extends UIBean {
 
     final public static String TEMPLATE = "datetimepicker";
-    final private static SimpleDateFormat RFC3339_FORMAT = new SimpleDateFormat(
+    final private static SimpleDateFormat RFC3399_FORMAT = new SimpleDateFormat(
     "yyyy-MM-dd'T'HH:mm:ss");
     final protected static Log LOG = LogFactory.getLog(DateTimePicker.class);
     
@@ -148,7 +146,6 @@ public class DateTimePicker extends UIBean {
     protected String staticDisplay;
     protected String dayWidth;
     protected String language;
-    protected String templateCssPath;
 
     public DateTimePicker(ValueStack stack, HttpServletRequest request, HttpServletResponse response) {
         super(stack, request, response);
@@ -180,7 +177,7 @@ public class DateTimePicker extends UIBean {
         if(value != null)
             addParameter("value", findString(value));
         if(iconPath != null)
-            addParameter("iconPath", findString(iconPath));
+            addParameter("iconPath", iconPath);
         if(formatLength != null)
             addParameter("formatLength", findString(formatLength));
         if(displayFormat != null)
@@ -194,9 +191,7 @@ public class DateTimePicker extends UIBean {
             addParameter("type", findString(type));
         else
             addParameter("type", "date");
-        if(templateCssPath != null)
-            addParameter("templateCssPath", findString(templateCssPath));
-        
+
         // format the value to RFC 3399
         if(parameters.containsKey("value")) {
             parameters.put("nameValue", format(parameters.get("value")));
@@ -263,7 +258,7 @@ public class DateTimePicker extends UIBean {
         this.formatLength = formatLength;
     }
 
-    @StrutsTagAttribute(description="Path to icon used for the dropdown")
+    @StrutsTagAttribute(description=" Path to icon used for the dropdown")
     public void setIconPath(String iconPath) {
         this.iconPath = iconPath;
     }
@@ -284,30 +279,25 @@ public class DateTimePicker extends UIBean {
         this.toggleType = toggleType;
     }
     
-    @StrutsTagAttribute(description="Template css path")
-    public void setTemplateCssPath(String templateCssPath) {
-        this.templateCssPath = templateCssPath;
-    }
-    
     private String format(Object obj) {
         if(obj == null)
             return null;
 
         if(obj instanceof Date) {
-            return RFC3339_FORMAT.format((Date) obj);
+            return RFC3399_FORMAT.format((Date) obj);
         } else {
             // try to parse a date
             String dateStr = obj.toString();
             if(dateStr.equalsIgnoreCase("today"))
-                return RFC3339_FORMAT.format(new Date());
+                return  RFC3399_FORMAT.format(new Date());
 
             try {
                 Date date = null;
                 if(this.displayFormat != null) {
                     SimpleDateFormat format = new SimpleDateFormat(
-                            (String) getParameters().get("displayFormat"));
+                            this.displayFormat);
                     date = format.parse(dateStr);
-                    return RFC3339_FORMAT.format(date);
+                    return RFC3399_FORMAT.format(date);
                 } else {
                     // last resource to assume already in correct/default format
                     return dateStr;

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

@@ -69,16 +69,14 @@ import com.opensymphony.xwork2.util.ValueStack;
  * 'formFilter' is the name of a function which will be used to filter the fields that will be
  * seralized. This function takes as a parameter the element and returns true if the element
  * should be included.<p/>
- * 'updateFreq' sets(in milliseconds) the update interval.<p/>
- * 'autoStart' if set to true(true by default) starts the timer automatically<p/>
- * 'startTimerListenTopics' is a comma-separated list of topics used to start the timer<p/>
- * 'stopTimerListenTopics' is a comma-separated list of topics used to stop the timer<p/>
- * 'listenTopics' comma separated list of topics names, that will trigger a request<p/>
- * 'indicator' element to be shown while the request executing<p/>
+ * 'updateFreq' sets(in milliseconds) the update interval.
+ * 'autoStart' if set to true(true by default) starts the timer automatically
+ * 'startTimerListenTopics' is a comma-separated list of topics used to start the timer
+ * 'stopTimerListenTopics' is a comma-separated list of topics used to stop the timer
+ * 'listenTopics' comma separated list of topics names, that will trigger a request
+ * 'indicator' element to be shown while the request executing
  * 'showErrorTransportText': whether errors should be displayed (on 'targets')</p>
- * 'showLoadingText' show loading text on targets</p>
- * 'separateScript' Run scripts in a separate scope, unique for each Div<p/>
- * 'notifyTopics' comma separated list of topics names, that will be published. Three parameters are passed:<p/>
+ * 'notifyTopics' comma separated list of topics names, that will be published. Three parameters are passed:
  * <ul>
  *      <li>data: html or json object when type='load' or type='error'</li>
  *      <li>type: 'before' before the request is made, 'load' when the request succeeds, or 'error' when it fails</li>
@@ -118,7 +116,6 @@ public class Div extends AbstractRemoteCallUIBean {
     protected String startTimerListenTopics;
     protected String stopTimerListenTopics;
     protected String refreshOnShow;
-    protected String separateScripts;
 
     public Div(ValueStack stack, HttpServletRequest request, HttpServletResponse response) {
         super(stack, request, response);
@@ -147,8 +144,6 @@ public class Div extends AbstractRemoteCallUIBean {
             addParameter("startTimerListenTopics", findString(startTimerListenTopics));
         if (stopTimerListenTopics != null)
             addParameter("stopTimerListenTopics", findString(stopTimerListenTopics));
-        if (separateScripts != null)
-            addParameter("separateScripts", findValue(separateScripts, Boolean.class));
     }
 
     @StrutsTagAttribute(description="Start timer automatically", type="Boolean", defaultValue="true")
@@ -185,9 +180,4 @@ public class Div extends AbstractRemoteCallUIBean {
     public void setAfterLoading(String afterLoading) {
         this.afterLoading = afterLoading;
     }
-
-    @StrutsTagAttribute(description="Run scripts in a separate scope, unique for each Div", defaultValue="true")
-    public void setSeparateScripts(String separateScripts) {
-        this.separateScripts = separateScripts;
-    }
 }

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

@@ -514,6 +514,7 @@ public abstract class DoubleListUIBean extends ListUIBean {
         return doubleList;
     }
 
+    @StrutsTagAttribute(description="Set the list key of the second attribute")
     public String getDoubleListKey() {
         return doubleListKey;
     }

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("id") + "Redirect(this.options.selectedIndex)");
+        addParameter("onchange", getParameters().get("name") + "Redirect(this.options.selectedIndex)");
     }
 }

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

@@ -20,20 +20,20 @@
  */
 package org.apache.struts2.components;
 
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.LocaleProvider;
-import com.opensymphony.xwork2.TextProviderFactory;
-import com.opensymphony.xwork2.util.LocalizedTextUtil;
-import com.opensymphony.xwork2.util.ValueStack;
-import org.apache.struts2.StrutsException;
-import org.apache.struts2.dispatcher.Dispatcher;
-import org.apache.struts2.views.annotations.StrutsTag;
-import org.apache.struts2.views.annotations.StrutsTagAttribute;
-
 import java.io.Writer;
 import java.util.Locale;
 import java.util.ResourceBundle;
 
+import org.apache.struts2.views.annotations.StrutsTag;
+import org.apache.struts2.views.annotations.StrutsTagAttribute;
+import org.apache.struts2.StrutsException;
+
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.LocaleProvider;
+import com.opensymphony.xwork2.TextProviderSupport;
+import com.opensymphony.xwork2.util.LocalizedTextUtil;
+import com.opensymphony.xwork2.util.ValueStack;
+
 /**
  * <!-- START SNIPPET: javadoc -->
  *
@@ -102,12 +102,10 @@ public class I18n extends Component {
 
             if (bundle != null) {
                 final Locale locale = (Locale) getStack().getContext().get(ActionContext.LOCALE);
-                TextProviderFactory tpf = new TextProviderFactory();
-                Dispatcher.getInstance().getContainer().inject(tpf);
-                getStack().push(tpf.createInstance(bundle, new LocaleProvider() {
-                     public Locale getLocale() {
-                         return locale;
-                     }
+                getStack().push(new TextProviderSupport(bundle, new LocaleProvider() {
+                    public Locale getLocale() {
+                        return locale;
+                    }
                 }));
                 pushed = true;
             }

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

@@ -32,8 +32,6 @@ 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;
 
 /**
@@ -92,11 +90,6 @@ 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,23 +1,3 @@
-/*
- * $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;
 
 
@@ -47,8 +27,6 @@ public interface RemoteUICallBean {
 
     void setShowErrorTransportText(String showError);
 
-    void setShowLoadingText(String showLoadingText);
-
     void setIndicator(String indicator);
 
 }

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

@@ -32,9 +32,7 @@ import com.opensymphony.xwork2.util.ValueStack;
  * <p>The set tag assigns a value to a variable in a specified scope. It is useful when you wish to assign a variable to a
  * complex expression and then simply reference that variable each time rather than the complex expression. This is
  * useful in both cases: when the complex expression takes time (performance improvement) or is hard to read (code
- * readability improvement).</p>
- * <p>If the tag is used with body content, the evaluation of the value parameter is omitted. Instead, the String to
- * which the body eveluates is set as value for the scoped variable.</p>
+ * readability improvement).</P>
  *
  * The scopes available are as follows :-
  * <ul>
@@ -77,7 +75,7 @@ import com.opensymphony.xwork2.util.ValueStack;
  * </pre>
  *
  */
-@StrutsTag(name="set", tldBodyContent="JSP", tldTagClass="org.apache.struts2.views.jsp.SetTag", description="Assigns a value to a variable in a specified scope")
+@StrutsTag(name="set", tldBodyContent="empty", tldTagClass="org.apache.struts2.views.jsp.SetTag", description="Assigns a value to a variable in a specified scope")
 public class Set extends Component {
     protected String name;
     protected String scope;
@@ -90,18 +88,11 @@ public class Set extends Component {
     public boolean end(Writer writer, String body) {
         ValueStack stack = getStack();
 
-        Object o;
         if (value == null) {
-        	if (body!=null && !body.equals("")) {
-        		o = body;
-        	} else {
-        		o = findValue("top");
-        	}
-        } else {
-        	o = findValue(value);
+            value = "top";
         }
-        
-        body="";
+
+        Object o = findValue(value);
 
         String name;
         if (altSyntax()) {

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

@@ -20,13 +20,9 @@
  */
 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;
 
@@ -101,7 +97,6 @@ import com.opensymphony.xwork2.util.ValueStack;
  * 'listenTopics' comma separated list of topics names, that will trigger a request
  * 'indicator' element to be shown while the request executing
  * 'showErrorTransportText': whether errors should be displayed (on 'targets')</p>
- * 'showLoadingText' show loading text on targets</p>
  * 'notifyTopics' comma separated list of topics names, that will be published. Three parameters are passed:<p/>
  * <ul>
  *      <li>data: html or json object when type='load' or type='error'</li>
@@ -138,9 +133,6 @@ 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;
@@ -155,7 +147,7 @@ public class Submit extends FormButton implements RemoteUICallBean{
     protected String notifyTopics;
     protected String showErrorTransportText;
     protected String indicator;
-    protected String showLoadingText;
+
     //these two are called "preInvokeJS" and "onLoadJS" on the tld
     //Names changed here to keep some consistency
     protected String beforeLoading;
@@ -215,8 +207,6 @@ public class Submit extends FormButton implements RemoteUICallBean{
             addParameter("indicator", findString(indicator));
         if (targets != null)
             addParameter("targets", findString(targets));
-        if (showLoadingText != null)
-            addParameter("showLoadingText", findString(showLoadingText));
     }
 
     /**
@@ -227,25 +217,6 @@ 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) {
@@ -330,9 +301,4 @@ public class Submit extends FormButton implements RemoteUICallBean{
     public void setIndicator(String indicator) {
         this.indicator = indicator;
     }
-
-    @StrutsTagAttribute(description="Show loading text on targets", type="Boolean", defaultValue="true")
-    public void setShowLoadingText(String showLoadingText) {
-        this.showLoadingText = showLoadingText;
-    }
 }

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

@@ -66,7 +66,6 @@ public class TabbedPanel extends ClosingUIBean {
     protected String selectedTab;
     protected String closeButton;
     protected String doLayout ;
-    protected String templateCssPath;
 
     public TabbedPanel(ValueStack stack, HttpServletRequest request, HttpServletResponse response) {
         super(stack, request, response);
@@ -90,8 +89,6 @@ public class TabbedPanel extends ClosingUIBean {
             addParameter("labelPosition", null);
             addParameter("labelPosition", labelPosition);
         }
-        if(templateCssPath != null)
-            addParameter("templateCssPath", findString(templateCssPath));
     }
 
     public String getDefaultOpenTemplate() {
@@ -127,9 +124,4 @@ public class TabbedPanel extends ClosingUIBean {
     public void setDoLayout(String doLayout) {
         this.doLayout = doLayout;
     }
-
-    @StrutsTagAttribute(description="Template css path")
-    public void setTemplateCssPath(String templateCssPath) {
-        this.templateCssPath = templateCssPath;
-    }
 }

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

@@ -98,7 +98,7 @@ import com.opensymphony.xwork2.util.ValueStack;
  *
  * <-- Example 3-->
  * <s:url includeParams="get"  >
- *     <s:param name="id" value="%{'22'}" />
+ *     &lt:param name="id" value="%{'22'}" />
  * </s:url>
  *
  * <!-- END SNIPPET: example -->

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

@@ -26,6 +26,7 @@ import java.util.StringTokenizer;
 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.dispatcher.mapper.ActionMapper;
 import org.apache.struts2.dispatcher.multipart.MultiPartRequest;
 import org.apache.struts2.views.freemarker.FreemarkerManager;
@@ -33,7 +34,6 @@ import org.apache.struts2.views.velocity.VelocityManager;
 
 import com.opensymphony.xwork2.ActionProxyFactory;
 import com.opensymphony.xwork2.ObjectFactory;
-import com.opensymphony.xwork2.TextProvider;
 import com.opensymphony.xwork2.config.Configuration;
 import com.opensymphony.xwork2.config.ConfigurationException;
 import com.opensymphony.xwork2.config.ConfigurationProvider;
@@ -41,10 +41,12 @@ import com.opensymphony.xwork2.inject.Container;
 import com.opensymphony.xwork2.inject.ContainerBuilder;
 import com.opensymphony.xwork2.inject.Context;
 import com.opensymphony.xwork2.inject.Factory;
+import com.opensymphony.xwork2.inject.Inject;
 import com.opensymphony.xwork2.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;
 import com.opensymphony.xwork2.util.location.LocatableProperties;
 
@@ -152,7 +154,6 @@ public class BeanSelectionProvider implements ConfigurationProvider {
     public void register(ContainerBuilder builder, LocatableProperties props) {
         alias(ObjectFactory.class, StrutsConstants.STRUTS_OBJECTFACTORY, builder, props);
         alias(XWorkConverter.class, StrutsConstants.STRUTS_XWORKCONVERTER, builder, props);
-        alias(TextProvider.class, StrutsConstants.STRUTS_XWORKTEXTPROVIDER, builder, props);
         alias(ActionProxyFactory.class, StrutsConstants.STRUTS_ACTIONPROXYFACTORY, builder, props);
         alias(ObjectTypeDeterminer.class, StrutsConstants.STRUTS_OBJECTTYPEDETERMINER, builder, props);
         alias(ActionMapper.class, StrutsConstants.STRUTS_MAPPER_CLASS, builder, props);

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

@@ -289,11 +289,6 @@ 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();
@@ -328,6 +323,7 @@ public class ClasspathConfigurationProvider implements ConfigurationProvider {
         actionConfig.setPackageName(actionPackage);
 
         actionConfig.setResults(new ResultMap<String,ResultConfig>(cls, actionName, pkgConfig));
+
         pkgConfig.addActionConfig(actionName, actionConfig);
     }
 
@@ -481,6 +477,33 @@ 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

@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $Id: DefaultActionMapper.java 498085 2007-01-20 08:13:11Z mrdon $
  *
  * 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/config/MethodConfigurationProvider.java

@@ -1,259 +1,239 @@
-/*
- * $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);
-    }
-}
+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/config/PropertiesSettings.java

@@ -29,7 +29,6 @@ import java.util.Properties;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.struts2.StrutsException;
-import org.apache.struts2.util.ClassLoaderUtils;
 
 import com.opensymphony.xwork2.util.location.LocatableProperties;
 import com.opensymphony.xwork2.util.location.Location;
@@ -54,7 +53,7 @@ class PropertiesSettings extends Settings {
      */
     public PropertiesSettings(String name) {
         
-        URL settingsUrl = ClassLoaderUtils.getResource(name + ".properties", getClass());
+        URL settingsUrl = Thread.currentThread().getContextClassLoader().getResource(name + ".properties");
         
         if (settingsUrl == null) {
             LOG.debug(name + ".properties missing");

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

@@ -52,7 +52,10 @@ import org.apache.struts2.util.ObjectFactoryDestroyable;
 import org.apache.struts2.views.freemarker.FreemarkerManager;
 
 import com.opensymphony.xwork2.util.FileManager;
-import com.opensymphony.xwork2.*;
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.ActionProxy;
+import com.opensymphony.xwork2.ActionProxyFactory;
+import com.opensymphony.xwork2.ObjectFactory;
 import com.opensymphony.xwork2.Result;
 import com.opensymphony.xwork2.config.Configuration;
 import com.opensymphony.xwork2.config.ConfigurationException;
@@ -512,7 +515,8 @@ Caused by: com.opensymphony.xwork2.inject.ContainerImpl$MissingDependencyExcepti
             LOG.error("Could not find action or result", e);
             sendError(request, response, context, HttpServletResponse.SC_NOT_FOUND, e);
         } catch (Exception e) {
-            throw new ServletException(e);
+            LOG.error("Could not execute action", e);
+            sendError(request, response, context, HttpServletResponse.SC_INTERNAL_SERVER_ERROR, e);
         } finally {
             UtilTimerStack.pop(timerKey);
         }

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

@@ -123,7 +123,7 @@ import com.opensymphony.xwork2.ActionContext;
  * <li><b>actionPackages</b> - a comma-delimited list of Java packages to scan for Actions.</li>
  *
  * <li><b>configProviders</b> - a comma-delimited list of Java classes that implement the 
- * {@link com.opensymphony.xwork2.config.ConfigurationProvider} interface that should be used for building the {@link com.opensymphony.xwork2.config.Configuration}.</li>
+ * {@link ConfigurationProvider} interface that should be used for building the {@link Configuration}.</li>
  * 
  * <li><b>*</b> - any other parameters are treated as framework constants.</li>
  * 
@@ -320,20 +320,20 @@ public class FilterDispatcher implements StrutsStatics, Filter {
             // prepare the request no matter what - this ensures that the proper character encoding
             // is used before invoking the mapper (see WW-9127)
             dispatcher.prepare(request, response);
-        } else {
+
+            try {
+                // Wrap request first, just in case it is multipart/form-data
+                // parameters might not be accessible through before encoding (ww-1278)
+                request = dispatcher.wrapRequest(request, getServletContext());
+            } catch (IOException e) {
+                String message = "Could not wrap servlet request with MultipartRequestWrapper!";
+                LOG.error(message, e);
+                throw new ServletException(message, e);
+            }
+        }
+        else {
             dispatcher = du;
         }
-        
-        try {
-            // Wrap request first, just in case it is multipart/form-data
-            // parameters might not be accessible through before encoding (ww-1278)
-            request = dispatcher.wrapRequest(request, getServletContext());
-        } catch (IOException e) {
-            String message = "Could not wrap servlet request with MultipartRequestWrapper!";
-            LOG.error(message, e);
-            throw new ServletException(message, e);
-        }
-
         return request;
     }
 
@@ -379,7 +379,7 @@ public class FilterDispatcher implements StrutsStatics, Filter {
      */
     public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain) throws IOException, ServletException {
 
-
+    	
         HttpServletRequest request = (HttpServletRequest) req;
         HttpServletResponse response = (HttpServletResponse) res;
         ServletContext servletContext = getServletContext();
@@ -394,6 +394,7 @@ public class FilterDispatcher implements StrutsStatics, Filter {
             } catch (Exception ex) {
                 LOG.error("error getting ActionMapping", ex);
                 dispatcher.sendError(request, response, servletContext, HttpServletResponse.SC_INTERNAL_SERVER_ERROR, ex);
+                ActionContextCleanUp.cleanUp(req);
                 return;
             }
 
@@ -416,15 +417,15 @@ public class FilterDispatcher implements StrutsStatics, Filter {
                 return;
             }
 
-            dispatcher.serviceAction(request, response, servletContext, mapping);
-
-        } finally {
             try {
-                ActionContextCleanUp.cleanUp(req);
+                dispatcher.serviceAction(request, response, servletContext, mapping);
             } finally {
-                UtilTimerStack.pop(timerKey);
+                ActionContextCleanUp.cleanUp(req);
             }
         }
+        finally {
+            UtilTimerStack.pop(timerKey);
+        }
     }
 
     /**
@@ -536,7 +537,6 @@ public class FilterDispatcher implements StrutsStatics, Filter {
         while (-1 != (n = input.read(buffer))) {
             output.write(buffer, 0, n);
         }
-        output.flush(); // WW-1526
     }
 
     /**

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

@@ -23,7 +23,6 @@ package org.apache.struts2.dispatcher;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Iterator;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -46,6 +45,19 @@ import com.opensymphony.xwork2.inject.Inject;
  * standard redirect result.
  *
  * <p/>
+ * @TODO - the below sentence is confusing and seems to be contradictory -- FIX ME
+ * To pass parameters, use the &lt;param&gt; ... &lt;/param&gt; tag. The following parameters will not be
+ * passed because they are part of the config param for this particular result.
+ *
+ * <ul>
+ *  <li>actionName</li>
+ *  <li>namespace</li>
+ *  <li>method</li>
+ *  <li>encode</li>
+ *  <li>parse</li>
+ *  <li>location</li>
+ *  <li>prependServletContext</li>
+ * </ul>
  *
  * See examples below for an example of how request parameters could be passed in.
  *
@@ -123,8 +135,9 @@ public class ServletActionRedirectResult extends ServletRedirectResult {
     protected String actionName;
     protected String namespace;
     protected String method;
+    protected ActionMapper actionMapper;
 
-    private Map<String, String> requestParameters = new LinkedHashMap<String, String>();
+    private Map<String, String> requestParameters = new HashMap<String, String>();
 
     public ServletActionRedirectResult() {
         super();
@@ -145,6 +158,11 @@ 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

@@ -85,7 +85,7 @@ public class ServletRedirectResult extends StrutsResultSupport {
 
     protected boolean prependServletContext = true;
 
-    protected ActionMapper actionMapper;
+    private ActionMapper actionMapper;
 
     public ServletRedirectResult() {
         super();

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

@@ -485,17 +485,11 @@ public class DefaultActionMapper implements ActionMapper {
 
         return uri.toString();
     }
-    
 
-	public boolean isSlashesInActionNames() {
-		return allowSlashesInActionNames;
-	}
-	
-	/**
+    /**
      * Defines a parameter action prefix
      */
     interface ParameterAction {
         void execute(String key, ActionMapping mapping);
     }
-
 }

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

@@ -21,7 +21,6 @@
 package org.apache.struts2.dispatcher.mapper;
 
 import com.opensymphony.xwork2.config.ConfigurationManager;
-import com.opensymphony.xwork2.inject.Inject;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
@@ -30,7 +29,6 @@ import java.net.URLDecoder;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.struts2.StrutsConstants;
 
 /**
  * <!-- START SNIPPET: description -->
@@ -58,25 +56,16 @@ import org.apache.struts2.StrutsConstants;
  *   &lt;/action&gt;
  * </pre>
  * <p>
- *   This mapper supports the following parameters:
- * </p>
- * <ul>
- *   <li><code>struts.mapper.idParameterName</code> - If set, this value will be the name
- *       of the parameter under which the id is stored.  The id will then be removed
- *       from the action name.  This allows restful actions to not require wildcards.
- *   </li>
- * </ul>
- * <p>
  * The following URL's will invoke its methods:
  * </p>
  * <ul>
- *  <li><code>GET:    /movie/               => method="index"</code></li>
+ *  <li><code>GET:    /movie               => method="index"</code></li>
  *  <li><code>GET:    /movie/Thrillers      => method="view", id="Thrillers"</code></li>
  *  <li><code>GET:    /movie/Thrillers!edit => method="edit", id="Thrillers"</code></li>
- *  <li><code>GET:    /movie/new            => method="editNew"</code></li>
- *  <li><code>POST:   /movie/               => method="create"</code></li>
- *  <li><code>PUT:    /movie/Thrillers      => method="update", id="Thrillers"</code></li>
- *  <li><code>DELETE: /movie/Thrillers      => method="remove", id="Thrillers"</code></li>
+ *  <li><code>GET:    /movie/new           => method="editNew"</code></li>
+ *  <li><code>POST:   /movie/Thrillers      => method="create"</code></li>
+ *  <li><code>PUT:    /movie/              => method="update"</code></li>
+ *  <li><code>DELETE: /movie/Thrillers      => method="remove"</code></li>
  * </ul>
  * <p>
  * To simulate the HTTP methods PUT and DELETE, since they aren't supported by HTML,
@@ -94,13 +83,7 @@ import org.apache.struts2.StrutsConstants;
 public class Restful2ActionMapper extends DefaultActionMapper {
 
     protected static final Log LOG = LogFactory.getLog(Restful2ActionMapper.class);
-    public static final String HTTP_METHOD_PARAM = "__http_method";
-    private String idParameterName = null;
-    
-    public Restful2ActionMapper() {
-    	setSlashesInActionNames("true");
-    }
-    
+    private static final String HTTP_METHOD_PARAM = "__http_method";
 
     /*
     * (non-Javadoc)
@@ -109,9 +92,6 @@ public class Restful2ActionMapper extends DefaultActionMapper {
     */
     public ActionMapping getMapping(HttpServletRequest request, ConfigurationManager configManager) {
 
-    	if (!isSlashesInActionNames()) {
-    		throw new IllegalStateException("This action mapper requires the setting 'slashesInActionNames' to be set to 'true'");
-    	}
         ActionMapping mapping = super.getMapping(request, configManager);
         
         if (mapping == null) {
@@ -134,7 +114,7 @@ public class Restful2ActionMapper extends DefaultActionMapper {
                         mapping.setMethod("index");
                         
                     // Creating a new entry on POST e.g. foo/
-                    } else if (isPost(request)) {
+                    } else if (isPut(request)) {
                         mapping.setMethod("create");
                     }
 
@@ -149,25 +129,14 @@ public class Restful2ActionMapper extends DefaultActionMapper {
                     } else if (isGet(request)) {
                         mapping.setMethod("view");
 
+                    // Updating an item e.g. foo/1
+                    } else if (isPost(request)) {
+                        mapping.setMethod("update");
+
                     // Removing an item e.g. foo/1
                     } else if (isDelete(request)) {
                         mapping.setMethod("remove");
-                    
-                    // Updating an item e.g. foo/1    
-                    }  else if (isPut(request)) {
-                        mapping.setMethod("update");
                     }
-                    
-                    if (idParameterName != null) {
-                    	if (mapping.getParams() == null) {
-                            mapping.setParams(new HashMap());
-                        }
-                    	mapping.getParams().put(idParameterName, id);
-                    }
-                }
-                
-                if (idParameterName != null && lastSlashPos > -1) {
-                	actionName = actionName.substring(0, lastSlashPos);
                 }
             }
 
@@ -236,15 +205,4 @@ public class Restful2ActionMapper extends DefaultActionMapper {
         }
     }
 
-	public String getIdParameterName() {
-		return idParameterName;
-	}
-
-	@Inject(required=false,value=StrutsConstants.STRUTS_ID_PARAMETER_NAME)
-	public void setIdParameterName(String idParameterName) {
-		this.idParameterName = idParameterName;
-	}
-    
-    
-
 }

core/src/main/java/org/apache/struts2/impl/ActionContextImpl.java

@@ -0,0 +1,84 @@
+/*
+ * $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.
+ */
+// Copyright 2006 Google Inc. All Rights Reserved.
+
+package org.apache.struts2.impl;
+
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.struts2.spi.ActionContext;
+import org.apache.struts2.spi.Result;
+
+import com.opensymphony.xwork2.ActionInvocation;
+
+public class ActionContextImpl implements ActionContext {
+
+    final ActionInvocation invocation;
+
+    public ActionContextImpl(ActionInvocation invocation) {
+        this.invocation = invocation;
+    }
+
+    public Object getAction() {
+        return invocation.getAction();
+    }
+
+    public Method getMethod() {
+        String methodName = invocation.getProxy().getMethod();
+        try {
+            return getAction().getClass().getMethod(methodName);
+        } catch (NoSuchMethodException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public String getActionName() {
+        return invocation.getProxy().getActionName();
+    }
+
+    public String getNamespacePath() {
+        return invocation.getProxy().getNamespace();
+    }
+
+    // TODO: Do something with these.
+    List<Result> resultInterceptors = new ArrayList<Result>();
+
+    public void addResultInterceptor(Result interceptor) {
+        resultInterceptors.add(interceptor);
+    }
+
+    public Result getResult() {
+        // TODO
+        throw new UnsupportedOperationException();
+    }
+
+    public ActionContext getPrevious() {
+        // TODO
+        throw new UnsupportedOperationException();
+    }
+
+    public ActionContext getNext() {
+        // TODO
+        throw new UnsupportedOperationException();
+    }
+}

core/src/main/java/org/apache/struts2/impl/InterceptorAdapter.java

@@ -0,0 +1,69 @@
+/*
+ * $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.
+ */
+// Copyright 2006 Google Inc. All Rights Reserved.
+
+package org.apache.struts2.impl;
+
+import static org.apache.struts2.impl.RequestContextImpl.ILLEGAL_PROCEED;
+
+import java.util.concurrent.Callable;
+
+import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.interceptor.Interceptor;
+
+public class InterceptorAdapter implements Interceptor {
+
+    private static final long serialVersionUID = 8020658947818231684L;
+    final org.apache.struts2.spi.Interceptor delegate;
+
+    public InterceptorAdapter(org.apache.struts2.spi.Interceptor delegate) {
+        this.delegate = delegate;
+    }
+
+    public String intercept(final ActionInvocation invocation) throws Exception {
+        final RequestContextImpl requestContext = RequestContextImpl.get();
+
+        // Save the existing proceed implementation so we can restore it later.
+        Callable<String> previous = requestContext.getProceed();
+
+        requestContext.setProceed(new Callable<String>() {
+            public String call() throws Exception {
+                // This proceed implementation is no longer valid past this point.
+                requestContext.setProceed(ILLEGAL_PROCEED);
+                try {
+                    return invocation.invoke();
+                } finally {
+                    // We're valid again.
+                    requestContext.setProceed(this);
+                }
+            }
+        });
+
+        try {
+            return delegate.intercept(requestContext);
+        } finally {
+            requestContext.setProceed(previous);
+        }
+    }
+
+    public void destroy() {}
+    public void init() {}
+}

core/src/main/java/org/apache/struts2/impl/MessagesImpl.java

@@ -0,0 +1,154 @@
+/*
+ * $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.
+ */
+// Copyright 2006 Google Inc. All Rights Reserved.
+
+package org.apache.struts2.impl;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.EnumMap;
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.struts2.Messages;
+
+import com.opensymphony.xwork2.DefaultTextProvider;
+import com.opensymphony.xwork2.TextProvider;
+
+public class MessagesImpl implements Messages {
+
+    final TextProvider textProvider = DefaultTextProvider.INSTANCE;
+    Map<String, Messages> fieldMap = new HashMap<String, Messages>();
+    Map<Severity, List<String>> severityMap = new EnumMap<Severity, List<String>>(Severity.class);
+
+    public Messages forField(String fieldName) {
+        Messages forField = fieldMap.get(fieldName);
+        if (forField == null) {
+            forField = new MessagesImpl();
+            fieldMap.put(fieldName, forField);
+        }
+        return forField;
+    }
+
+    public Map<String, Messages> forFields() {
+        return fieldMap;
+    }
+
+    public void addInformation(String key) {
+        forSeverity(Severity.INFO).add(textProvider.getText(key));
+    }
+
+    public void addInformation(String key, String... arguments) {
+        forSeverity(Severity.INFO).add(textProvider.getText(key, arguments));
+    }
+
+    public void addWarning(String key) {
+        forSeverity(Severity.WARN).add(textProvider.getText(key));
+    }
+
+    public void addWarning(String key, String... arguments) {
+        forSeverity(Severity.WARN).add(textProvider.getText(key, arguments));
+    }
+
+    public void addError(String key) {
+        forSeverity(Severity.ERROR).add(textProvider.getText(key));
+    }
+
+    public void addError(String key, String... arguments) {
+        forSeverity(Severity.ERROR).add(textProvider.getText(key, arguments));
+    }
+
+    public void add(Severity severity, String key) {
+        forSeverity(severity).add(textProvider.getText(key));
+    }
+
+    public void add(Severity severity, String key, String... arguments) {
+        forSeverity(severity).add(textProvider.getText(key, arguments));
+    }
+
+    public Set<Severity> getSeverities() {
+        Set<Severity> severities = EnumSet.noneOf(Severity.class);
+        for (Severity severity : Severity.values()) {
+            List<String> messages = severityMap.get(severity);
+            if (messages != null && !messages.isEmpty()) {
+                severities.add(severity);
+            }
+        }
+        return Collections.unmodifiableSet(severities);
+    }
+
+    public List<String> forSeverity(Severity severity) {
+        List<String> messages = severityMap.get(severity);
+        if (messages == null) {
+            messages = new ArrayList<String>();
+            severityMap.put(severity, messages);
+        }
+        return messages;
+    }
+
+    public List<String> getErrors() {
+        return forSeverity(Severity.ERROR);
+    }
+
+    public List<String> getWarnings() {
+        return forSeverity(Severity.WARN);
+    }
+
+    public List<String> getInformation() {
+        return forSeverity(Severity.INFO);
+    }
+
+    public boolean hasErrors() {
+        return !isEmpty(Severity.ERROR);
+    }
+
+    public boolean hasWarnings() {
+        return !isEmpty(Severity.WARN);
+    }
+
+    public boolean hasInformation() {
+        return !isEmpty(Severity.INFO);
+    }
+
+    public boolean isEmpty() {
+        for (Severity severity : Severity.values())
+            if (!isEmpty(severity))
+                return false;
+
+        return true;
+    }
+
+    public boolean isEmpty(Severity severity) {
+        List<String> messages = severityMap.get(severity);
+        if (messages != null && !messages.isEmpty()) {
+            return false;
+        }
+
+        for (Messages fieldMessages : fieldMap.values())
+            if (!fieldMessages.isEmpty(severity))
+                return false;
+
+        return true;
+    }
+}

core/src/main/java/org/apache/struts2/impl/RequestContextImpl.java

@@ -0,0 +1,197 @@
+/*
+ * $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.
+ */
+// Copyright 2006 Google Inc. All Rights Reserved.
+
+package org.apache.struts2.impl;
+
+import static org.apache.struts2.StrutsStatics.HTTP_REQUEST;
+import static org.apache.struts2.StrutsStatics.HTTP_RESPONSE;
+import static org.apache.struts2.StrutsStatics.SERVLET_CONTEXT;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.concurrent.Callable;
+
+import javax.servlet.ServletContext;
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.struts2.Messages;
+import org.apache.struts2.dispatcher.RequestMap;
+import org.apache.struts2.spi.ActionContext;
+import org.apache.struts2.spi.RequestContext;
+import org.apache.struts2.spi.ValueStack;
+
+import com.opensymphony.xwork2.ActionInvocation;
+
+public class RequestContextImpl implements RequestContext {
+
+    com.opensymphony.xwork2.ActionContext xworkContext;
+    ActionContext actionContext;
+    Messages messages = new MessagesImpl();
+
+    public static final Callable<String> ILLEGAL_PROCEED = new Callable<String>() {
+        public String call() throws Exception {
+            throw new IllegalStateException();
+        }
+    };
+
+    public RequestContextImpl(com.opensymphony.xwork2.ActionContext xworkContext) {
+        this.xworkContext = xworkContext;
+    }
+
+    public ActionContext getActionContext() {
+        return actionContext;
+    }
+
+    public Object getAction() {
+        return getActionContext().getAction();
+    }
+
+    void setActionContext(ActionContext actionContext) {
+        this.actionContext = actionContext;
+    }
+
+    public Map<String, String[]> getParameterMap() {
+        return xworkContext.getParameters();
+    }
+
+    Map<String, Object> attributeMap;
+
+    public Map<String, Object> getAttributeMap() {
+        if (attributeMap == null) {
+            attributeMap = new RequestMap(getServletRequest());
+        }
+        return attributeMap;
+    }
+
+    public Map<String, Object> getSessionMap() {
+        return xworkContext.getSession();
+    }
+
+    public Map<String, Object> getApplicationMap() {
+        return xworkContext.getApplication();
+    }
+
+    public List<Cookie> findCookiesForName(String name) {
+        List<Cookie> cookies = new ArrayList<Cookie>();
+        for (Cookie cookie : getServletRequest().getCookies())
+            if (name.equals(cookie.getName()))
+                cookies.add(cookie);
+
+        return cookies;
+   }
+
+    public Locale getLocale() {
+        return xworkContext.getLocale();
+    }
+
+    public void setLocale(Locale locale) {
+        xworkContext.setLocale(locale);
+    }
+
+    public Messages getMessages() {
+        return messages;
+    }
+
+    public HttpServletRequest getServletRequest() {
+        return (HttpServletRequest) xworkContext.get(HTTP_REQUEST);
+    }
+
+    public HttpServletResponse getServletResponse() {
+        return (HttpServletResponse) xworkContext.get(HTTP_RESPONSE);
+    }
+
+    public ServletContext getServletContext() {
+        return (ServletContext) xworkContext.get(SERVLET_CONTEXT);
+    }
+
+    ValueStack valueStack;
+
+    public ValueStack getValueStack() {
+        if (valueStack == null) {
+            valueStack = new ValueStackAdapter(xworkContext.getValueStack());
+        }
+        return valueStack;
+    }
+
+    Callable<String> proceed = ILLEGAL_PROCEED;
+
+    public String proceed() throws Exception {
+        return proceed.call();
+    }
+
+    public void setProceed(Callable<String> proceed) {
+        this.proceed = proceed;
+    }
+
+    public Callable<String> getProceed() {
+        return proceed;
+    }
+
+    static ThreadLocal<Object[]> threadLocalRequestContext = new ThreadLocal<Object[]>() {
+        protected RequestContextImpl[] initialValue() {
+            return new RequestContextImpl[1];
+        }
+    };
+
+    /**
+     * Creates RequestContext if necessary. Always creates a new ActionContext and restores an existing ActionContext
+     * when finished.
+     */
+    public static String callInContext(ActionInvocation invocation, Callable<String> callable)
+            throws Exception {
+        RequestContextImpl[] reference = (RequestContextImpl[])threadLocalRequestContext.get();
+
+        if (reference[0] == null) {
+            // Initial invocation.
+            reference[0] = new RequestContextImpl(invocation.getInvocationContext());
+            reference[0].setActionContext(new ActionContextImpl(invocation));
+            try {
+                return callable.call();
+            } finally {
+                reference[0] = null;
+            }
+        } else {
+            // Nested invocation.
+            RequestContextImpl requestContext = reference[0];
+            ActionContext previous = requestContext.getActionContext();
+            requestContext.setActionContext(new ActionContextImpl(invocation));
+            try {
+                return callable.call();
+            } finally {
+                requestContext.setActionContext(previous);
+            }
+        }
+    }
+
+    public static RequestContextImpl get() {
+        RequestContextImpl requestContext = ((RequestContextImpl[])threadLocalRequestContext.get())[0];
+
+        if (requestContext == null)
+            throw new IllegalStateException("RequestContext has not been created.");
+
+        return requestContext;
+    }
+}

core/src/main/java/org/apache/struts2/impl/ResultAdapter.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
@@ -18,10 +18,23 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.struts2.interceptor;
+// Copyright 2006 Google Inc. All Rights Reserved.
 
-import java.util.Map;
+package org.apache.struts2.impl;
 
-public interface CookiesAware {
-    void setCookiesMap(Map cookies);
+import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.Result;
+
+public class ResultAdapter implements Result {
+
+    private static final long serialVersionUID = -5107033078266553554L;
+    final org.apache.struts2.spi.Result delegate;
+
+    public ResultAdapter(org.apache.struts2.spi.Result delegate) {
+        this.delegate = delegate;
+    }
+
+    public void execute(ActionInvocation invocation) throws Exception {
+        delegate.execute(RequestContextImpl.get());
+    }
 }

core/src/main/java/org/apache/struts2/impl/StrutsActionProxy.java

@@ -22,11 +22,12 @@
 
 package org.apache.struts2.impl;
 
+import java.util.Map;
+import java.util.concurrent.Callable;
+
 import com.opensymphony.xwork2.ActionContext;
 import com.opensymphony.xwork2.DefaultActionProxy;
 
-import java.util.Map;
-
 public class StrutsActionProxy extends DefaultActionProxy {
 
     private static final long serialVersionUID = -2434901249671934080L;
@@ -40,14 +41,11 @@ public class StrutsActionProxy extends DefaultActionProxy {
         ActionContext previous = ActionContext.getContext();
         ActionContext.setContext(invocation.getInvocationContext());
         try {
-// This is for the new API:
-//            return RequestContextImpl.callInContext(invocation, new Callable<String>() {
-//                public String call() throws Exception {
-//                    return invocation.invoke();
-//                }
-//            });
-            
-            return invocation.invoke();
+            return RequestContextImpl.callInContext(invocation, new Callable<String>() {
+                public String call() throws Exception {
+                    return invocation.invoke();
+                }
+            });
         } finally {
             if (cleanupContext)
                 ActionContext.setContext(previous);

core/src/main/java/org/apache/struts2/impl/StrutsObjectFactory.java

@@ -22,6 +22,9 @@
 
 package org.apache.struts2.impl;
 
+import java.util.HashMap;
+import java.util.Map;
+
 import com.opensymphony.xwork2.ObjectFactory;
 import com.opensymphony.xwork2.Result;
 import com.opensymphony.xwork2.config.ConfigurationException;
@@ -30,9 +33,6 @@ import com.opensymphony.xwork2.config.entities.ResultConfig;
 import com.opensymphony.xwork2.interceptor.Interceptor;
 import com.opensymphony.xwork2.util.OgnlUtil;
 
-import java.util.HashMap;
-import java.util.Map;
-
 public class StrutsObjectFactory extends ObjectFactory {
 
     public Interceptor buildInterceptor(InterceptorConfig interceptorConfig, Map refParams)
@@ -59,9 +59,8 @@ public class StrutsObjectFactory extends ObjectFactory {
                 return interceptor;
             }
 
-// This is for the new API:
-//            if (o instanceof org.apache.struts2.spi.Interceptor)
-//                return new InterceptorAdapter((org.apache.struts2.spi.Interceptor) o);
+            if (o instanceof org.apache.struts2.spi.Interceptor)
+                return new InterceptorAdapter((org.apache.struts2.spi.Interceptor) o);
 
             throw new ConfigurationException(
                     "Class [" + className + "] does not implement Interceptor", interceptorConfig);
@@ -97,9 +96,8 @@ public class StrutsObjectFactory extends ObjectFactory {
         if (result instanceof Result)
             return (Result) result;
 
-// This is for the new API:
-//        if (result instanceof org.apache.struts2.spi.Result)
-//            return new ResultAdapter((org.apache.struts2.spi.Result) result);
+        if (result instanceof org.apache.struts2.spi.Result)
+            return new ResultAdapter((org.apache.struts2.spi.Result) result);
 
         throw new ConfigurationException(result.getClass().getName() + " does not implement Result.");
     }

core/src/main/java/org/apache/struts2/impl/ValueStackAdapter.java

@@ -0,0 +1,78 @@
+/*
+ * $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.
+ */
+// Copyright 2006 Google Inc. All Rights Reserved.
+
+package org.apache.struts2.impl;
+
+import java.util.Iterator;
+
+import org.apache.struts2.spi.ValueStack;
+
+import com.opensymphony.xwork2.util.ValueStackFactory;
+
+public class ValueStackAdapter implements ValueStack {
+
+    final com.opensymphony.xwork2.util.ValueStack delegate;
+
+    public ValueStackAdapter(com.opensymphony.xwork2.util.ValueStack delegate) {
+        this.delegate = delegate;
+    }
+
+    public Object peek() {
+        return delegate.peek();
+    }
+
+    public Object pop() {
+        return delegate.pop();
+    }
+
+    public void push(Object o) {
+        delegate.push(o);
+    }
+
+    public ValueStack clone() {
+        return new ValueStackAdapter(ValueStackFactory.getFactory().createValueStack(delegate));
+    }
+
+    public Object get(String expr) {
+        return delegate.findValue(expr);
+    }
+
+    public <T> T get(String expr, Class<T> requiredType) {
+        return (T) delegate.findValue(expr, requiredType);
+    }
+
+    public String getString(String expr) {
+        return delegate.findString(expr);
+    }
+
+    public void set(String expr, Object o) {
+        delegate.set(expr, o);
+    }
+
+    public int size() {
+        return delegate.size();
+    }
+
+    public Iterator<Object> iterator() {
+        return delegate.getRoot().iterator();
+    }
+}

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

@@ -1,277 +0,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.interceptor;
-
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.Set;
-
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.apache.struts2.ServletActionContext;
-import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.interceptor.AbstractInterceptor;
-import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.TextParseUtil;
-
-/**
- * <!-- START SNIPPET: description -->
- *
- * The aim of this interceptor is to set values in the stack/action based on cookie name/value
- * of interest. <p/>
- *
- * If an asterik is present in cookiesName parameter, it will be assume that
- * all cookies name are to be injected into struts' action, even though
- * cookiesName is comma-separated by other values, eg (cookie1,*,cookie2). <p/>
- *
- * If cookiesName is left empty it will assume that no cookie will be injected
- * into Struts' action. <p/>
- *
- * If an asterik is present in cookiesValue parameter, it will assume that all
- * cookies name irrespective of its value will be injected into Struts' action so
- * long as the cookie name matches those specified in cookiesName parameter.<p/>
- *
- * If cookiesValue is left empty it will assume that all cookie that match the cookieName
- * parameter will be injected into Struts' action.<p/>
- *
- * The action could implements {@link CookiesAware} in order to have a {@link Map}
- * of filtered cookies set into it. <p/>
- *
- * <!-- END SNIPPET: description -->
- *
- *
- * <!-- START SNIPPET: parameters -->
- *
- * <ul>
- *      <li>cookiesName (mandatory) - Name of cookies to be injected into the action. If more
- *                                                                 than one cookie name is desired it could be comma-separated.
- *                                                                 If all cookies name is desired, it could simply be *, an asterik.
- *                                                                 When many cookies name are comma-separated either of the cookie
- *                                                        that match the name in the comma-separated list will be qualified.</li>
- *     <li>cookiesValue (mandatory) - Value of cookies that if its name matches cookieName attribute
- *                                                         and its value matched this, will be injected into Struts'
- *                                                         action. If more than one cookie name is desired it could be
- *                                                         comma-separated. If left empty, it will assume any value would
- *                                                         be ok. If more than one value is specified (comma-separated)
- *                                                         it will assume a match if either value is matched.
- * </ul>
- *
- * <!-- END SNIPPET: parameters -->
- *
- *
- * <!-- START SNIPPET: extending -->
- *
- * <ul>
- *      populateCookieValueIntoStack - this method will decide if this cookie value is qualified to be
- *                                                                                                         populated into the value stack (hence into the action itself)
- *      injectIntoCookiesAwareAction - this method will inject selected cookies (as a java.util.Map) into
- *                                                                                                        action that implements {@link CookiesAware}.
- * </ul>
- *
- * <!-- END SNIPPET: extending -->
- *
- * <pre>
- * <!-- START SNIPPET: example -->
- *
- * &lt;!--
- *   This example will inject cookies named either 'cookie1' or 'cookie2' whose
- *   value could be either 'cookie1value' or 'cookie2value' into Struts' action.
- * --&gt;
- * &lt;action ... &gt;
- *    &lt;interceptor-ref name="cookie"&gt;
- *        &lt;param name="cookiesName"&gt;cookie1, cookie2&lt;/param&gt;
- *        &lt;param name="cookiesValue"&gt;cookie1value, cookie2value&lt;/param&gt;
- *    &lt;/interceptor-ref&gt;
- *    ....
- * &lt;/action&gt;
- *
- *
- * &lt;!--
- *      This example will inject cookies named either 'cookie1' or 'cookie2'
- *     regardless of their value into Struts' action.
- * --&gt;
- * &lt;action ... &gt;
- *   &lt;interceptor-ref name="cookie"&gt;
- *      &lt;param name="cookiesName"&gt;cookie1, cookie2&lt;/param&gt;
- *      &lt;param name="cookiesValue"&gt;*&lt;/param&gt;
- *   &lt;interceptor-ref&gt;
- *   ...
- * &lt;/action&gt;
- *
- *
- * &lt;!--
- *      This example will inject cookies named either 'cookie1' with value
- *      'cookie1value' or 'cookie2' with value 'cookie2value' into Struts'
- *      action.
- * --&gt;
- * &lt;action ... &gt;
- *   &lt;interceptor-ref name="cookie"&gt;
- *      &lt;param name="cookiesName"&gt;cookie1&lt;/param&gt;
- *      &lt;param name="cookiesValue"&gt;cookie1value&lt;/param&gt;
- *   &lt;/interceptor-ref&gt;
- *   &lt;interceptor-ref name="cookie"&gt;
- *      &lt;param name="cookiesName"&lt;cookie2&lt;/param&gt;
- *     &lt;param name="cookiesValue"&gt;cookie2value&lt;/param&gt;
- *   &lt;/interceptor-ref&gt;
- *   ....
- * &lt;/action&gt;
- *
- * &lt;!--
- *    This example will inject any cookies regardless of its value into
- *    Struts' action.
- *  --&gt;
- * &lt;action ... &gt;
- *   &lt;interceptor-ref name="cookie"&gt;
- *      &lt;param name="cookiesName"&gt;*&lt;/param&gt;
- *      &lt;param name="cookiesValue"&gt;*&lt;/param&gt;
- *   &lt;/interceptor-ref&gt;
- *    ...
- * &lt;/action&gt;
- *
- * <!-- END SNIPPET: example -->
- * </pre>
- *
- * @see CookiesAware
- */
-public class CookieInterceptor extends AbstractInterceptor {
-
-    private static final long serialVersionUID = 4153142432948747305L;
-
-    private static final Log LOG = LogFactory.getLog(CookieInterceptor.class);
-
-    private Set cookiesNameSet = Collections.EMPTY_SET;
-    private Set cookiesValueSet = Collections.EMPTY_SET;
-
-    /**
-     * Set the <code>cookiesName</code> which if matche will allow the cookie
-     * to be injected into action, could be comma-separated string.
-     *
-     * @param cookiesName
-     */
-    public void setCookiesName(String cookiesName) {
-        if (cookiesName != null)
-            this.cookiesNameSet = TextParseUtil.commaDelimitedStringToSet(cookiesName);
-    }
-
-    /**
-     * Set the <code>cookiesValue</code> which if matched (together with matching
-     * cookiesName) will caused the cookie to be injected into action, could be
-     * comma-separated string.
-     *
-     * @param cookiesValue
-     */
-    public void setCookiesValue(String cookiesValue) {
-        if (cookiesValue != null)
-            this.cookiesValueSet = TextParseUtil.commaDelimitedStringToSet(cookiesValue);
-    }
-
-
-    public String intercept(ActionInvocation invocation) throws Exception {
-
-        if (LOG.isDebugEnabled())
-            LOG.debug("start interception");
-
-        final ValueStack stack = ActionContext.getContext().getValueStack();
-        HttpServletRequest request = ServletActionContext.getRequest();
-
-        // contains selected cookies
-        Map cookiesMap = new LinkedHashMap();
-
-        Cookie cookies[] = request.getCookies();
-        if (cookies != null) {
-            for (int a=0; a< cookies.length; a++) {
-                String name = cookies[a].getName();
-                String value = cookies[a].getValue();
-
-                if (cookiesNameSet.contains("*")) {
-                    if (LOG.isDebugEnabled())
-                        LOG.debug("contains cookie name [*] in configured cookies name set, cookie with name ["+name+"] with value ["+value+"] will be injected");
-                    populateCookieValueIntoStack(name, value, cookiesMap, stack);
-                }
-                else if (cookiesNameSet.contains(cookies[a].getName())) {
-                    populateCookieValueIntoStack(name, value, cookiesMap, stack);
-                }
-            }
-        }
-
-        injectIntoCookiesAwareAction(invocation.getAction(), cookiesMap);
-
-        return invocation.invoke();
-    }
-
-    /**
-     * Hook that populate cookie value into value stack (hence the action)
-     * if the criteria is satisfied (if the cookie value matches with those configured).
-     *
-     * @param cookieName
-     * @param cookieValue
-     * @param cookiesMap
-     * @param stack
-     */
-    protected void populateCookieValueIntoStack(String cookieName, String cookieValue, Map cookiesMap, ValueStack stack) {
-        if (cookiesValueSet.isEmpty() || cookiesValueSet.contains("*")) {
-            // If the interceptor is configured to accept any cookie value
-            // OR
-            // no cookiesValue is defined, so as long as the cookie name match
-            // we'll inject it into Struts' action
-            if (LOG.isDebugEnabled()) {
-                if (cookiesValueSet.isEmpty())
-                    LOG.debug("no cookie value is configured, cookie with name ["+cookieName+"] with value ["+cookieValue+"] will be injected");
-                else if (cookiesValueSet.contains("*"))
-                    LOG.debug("interceptor is configured to accept any value, cookie with name ["+cookieName+"] with value ["+cookieValue+"] will be injected");
-            }
-            cookiesMap.put(cookieName, cookieValue);
-            stack.setValue(cookieName, cookieValue);
-        }
-        else {
-            // if cookiesValues is specified, the cookie's value must match before we
-            // inject them into Struts' action
-            if (cookiesValueSet.contains(cookieValue)) {
-                if (LOG.isDebugEnabled())
-                    LOG.debug("both configured cookie name and value matched, cookie ["+cookieName+"] with value ["+cookieValue+"] will be injected");
-                cookiesMap.put(cookieName, cookieValue);
-                stack.setValue(cookieName, cookieValue);
-            }
-        }
-    }
-
-    /**
-     * Hook that set the <code>cookiesMap</code> into action that implements
-     * {@link CookiesAware}.
-     *
-     * @param action
-     * @param cookiesMap
-     */
-    protected void injectIntoCookiesAwareAction(Object action, Map cookiesMap) {
-        if (action instanceof CookiesAware) {
-            if (LOG.isDebugEnabled())
-                LOG.debug("action ["+action+"] implements CookiesAware, injecting cookies map ["+cookiesMap+"]");
-            ((CookiesAware)action).setCookiesMap(cookiesMap);
-        }
-    }
-
-}

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

@@ -193,23 +193,12 @@ public class ExecuteAndWaitInterceptor extends MethodFilterInterceptor {
         return new BackgroundProcess(name + "BackgroundThread", actionInvocation, threadPriority);
     }
 
-    /**
-     * Returns the name to associate the background process.  Override to change the way background processes
-     * are mapped to requests.
-     * 
-     * @param actionInvocation The action invocation
-     * @return the name of the background thread
-     */
-    protected String getBackgroundProcessName(ActionProxy proxy) {
-        return proxy.getActionName();
-    }
-    
     /* (non-Javadoc)
      * @see com.opensymphony.xwork2.interceptor.MethodFilterInterceptor#doIntercept(com.opensymphony.xwork2.ActionInvocation)
      */
     protected String doIntercept(ActionInvocation actionInvocation) throws Exception {
         ActionProxy proxy = actionInvocation.getProxy();
-        String name = getBackgroundProcessName(proxy);
+        String name = proxy.getActionName();
         ActionContext context = actionInvocation.getInvocationContext();
         Map session = context.getSession();
 

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

@@ -25,10 +25,21 @@ import java.security.Principal;
 import javax.servlet.http.HttpServletRequest;
 
 /**
- * Proxy interface used together with PrincipalAware interface. It allows to get indirect access to
- * HttpServletRequest or PortletRequest Principal related methods.
+ * Proxy class used together with PrincipalAware interface. It allows to get indirect access to
+ * HttpServletRequest Principal related methods.
+ *
  */
-public interface PrincipalProxy {
+public class PrincipalProxy {
+    private HttpServletRequest request;
+
+    /**
+     * Constructs a proxy
+     *
+     * @param request The underlying request
+     */
+    public PrincipalProxy(HttpServletRequest request) {
+        this.request = request;
+    }
 
     /**
      * True if the user is in the given role
@@ -36,35 +47,43 @@ public interface PrincipalProxy {
      * @param role The role
      * @return True if the user is in that role
      */
-    boolean isUserInRole(String role);
+    public boolean isUserInRole(String role) {
+        return request.isUserInRole(role);
+    }
 
     /**
      * Gets the user principal
      *
      * @return The principal
      */
-    Principal getUserPrincipal();
+    public Principal getUserPrincipal() {
+        return request.getUserPrincipal();
+    }
 
     /**
      * Gets the user id
      *
      * @return The user id
      */
-    String getRemoteUser();
+    public String getRemoteUser() {
+        return request.getRemoteUser();
+    }
 
     /**
      * Is the request using https?
      *
      * @return True if using https
      */
-    boolean isRequestSecure();
+    public boolean isRequestSecure() {
+        return request.isSecure();
+    }
 
     /**
-     * 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.
      */
-    HttpServletRequest getRequest();
+    public HttpServletRequest getRequest() {
+        return request;
+    }
 }

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

@@ -202,30 +202,26 @@ public class ScopeInterceptor extends AbstractInterceptor implements PreResultLi
         super();
     }
 
-    // Since 2.0.7. Avoid null references on session serialization (WW-1803).
-    private static class NULLClass implements Serializable {
-      public String toString() {
-        return "NULL";
-      }
-      public boolean equals(Object obj) {
-        return obj == null || (obj instanceof NULLClass);
-      }
-    }
 
-    private static final Object NULL = new NULLClass();
+    private static final Object NULL = new Serializable() {
+        public String toString() {
+            return "NULL";
+        }
+    };
 
     private static final Object nullConvert(Object o) {
         if (o == null) {
             return NULL;
         }
 
-        if (o == NULL || NULL.equals(o)) {
+        if (o == NULL) {
             return null;
         }
 
         return o;
     }
 
+
     private static Map locks = new IdentityHashMap();
 
     static final void lock(Object o, ActionInvocation invocation) throws Exception {

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

@@ -25,12 +25,8 @@ 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;
@@ -154,14 +150,7 @@ public class ServletConfigInterceptor extends AbstractInterceptor implements Str
 
         if (action instanceof PrincipalAware) {
             HttpServletRequest request = (HttpServletRequest) context.get(HTTP_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));
-            }
+            ((PrincipalAware) action).setPrincipalProxy(new PrincipalProxy(request));
         }
         if (action instanceof ServletContextAware) {
             ServletContext servletContext = (ServletContext) context.get(SERVLET_CONTEXT);

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

@@ -23,7 +23,6 @@ package org.apache.struts2.interceptor;
 import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
 import org.apache.struts2.ServletActionContext;
 import org.apache.struts2.util.InvocationSessionStore;
@@ -111,7 +110,6 @@ public class TokenSessionStoreInterceptor extends TokenInterceptor {
         ActionContext ac = invocation.getInvocationContext();
 
         HttpServletRequest request = (HttpServletRequest) ac.get(ServletActionContext.HTTP_REQUEST);
-        HttpServletResponse response = (HttpServletResponse) ac.get(ServletActionContext.HTTP_RESPONSE); 
         String tokenName = TokenHelper.getTokenName();
         String token = TokenHelper.getToken(tokenName);
 
@@ -125,18 +123,12 @@ public class TokenSessionStoreInterceptor extends TokenInterceptor {
             if (savedInvocation != null) {
                 // set the valuestack to the request scope
                 ValueStack stack = savedInvocation.getStack();
-                Map context = stack.getContext();
                 request.setAttribute(ServletActionContext.STRUTS_VALUESTACK_KEY, stack);
 
-                ActionContext savedContext = savedInvocation.getInvocationContext();
-                savedContext.getContextMap().put(ServletActionContext.HTTP_REQUEST, request);
-                savedContext.getContextMap().put(ServletActionContext.HTTP_RESPONSE, response);
                 Result result = savedInvocation.getResult();
 
                 if ((result != null) && (savedInvocation.getProxy().getExecuteResult())) {
-                    synchronized (context) {
-                        result.execute(savedInvocation);
-                    }
+                    result.execute(savedInvocation);
                 }
 
                 // turn off execution of this invocations result

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

@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $Id: Result.java 490514 2006-12-27 15:25:48Z ddewolf $
  *
  * 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/interceptor/validation/SkipValidation.java

@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $Id: Result.java 490514 2006-12-27 15:25:48Z ddewolf $
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file