Commits

Anonymous committed d8ae4d2

Fixes to usage of Serializable and configuration trimming.

git-svn-id: http://svn.opensymphony.com/svn/xwork/trunk@387e221344d-f017-0410-9bd5-d282ab1896d7

Comments (0)

Files changed (8)

src/java/com/opensymphony/xwork/Action.java

  */
 package com.opensymphony.xwork;
 
-import java.io.Serializable;
-
-
 /**
  * All Actions must minimally implement this interface, which exposes
  * the execute() method.
  * @author $Author$
  * @version $Revision$
  */
-public interface Action extends Serializable {
+public interface Action {
     //~ Static fields/initializers /////////////////////////////////////////////
 
     /**

src/java/com/opensymphony/xwork/ActionProxy.java

 package com.opensymphony.xwork;
 
 import com.opensymphony.xwork.config.entities.ActionConfig;
-import com.opensymphony.xwork.util.OgnlValueStack;
-
-import java.io.Serializable;
 
 
 /**
  * @author Jason Carreira
  * Created Jun 9, 2003 11:27:55 AM
  */
-public interface ActionProxy extends Serializable {
+public interface ActionProxy {
     //~ Methods ////////////////////////////////////////////////////////////////
 
     /**

src/java/com/opensymphony/xwork/ActionSupport.java

  * Provides a default implementation for the most common actions.
  * See the documentation for all the interfaces this class implements for more detailed information.
  */
-public class ActionSupport implements Action, Serializable, Validateable, ValidationAware, TextProvider, LocaleProvider {
+public class ActionSupport implements Action, Validateable, ValidationAware, TextProvider, LocaleProvider, Serializable {
     //~ Static fields/initializers /////////////////////////////////////////////
 
     protected transient static final Log LOG = LogFactory.getLog(ActionSupport.class);

src/java/com/opensymphony/xwork/DefaultActionProxy.java

 
 import java.util.Locale;
 import java.util.Map;
+import java.io.Serializable;
 
 
 /**
  * @author $Author$
  * @version $Revision$
  */
-public class DefaultActionProxy implements ActionProxy {
+public class DefaultActionProxy implements ActionProxy, Serializable {
     //~ Static fields/initializers /////////////////////////////////////////////
 
     private static final Log LOG = LogFactory.getLog(DefaultActionProxy.class);

src/java/com/opensymphony/xwork/ValidationAware.java

  */
 package com.opensymphony.xwork;
 
-import java.io.Serializable;
-
 import java.util.Collection;
 import java.util.Map;
 
-
 /**
  * ValidationAware classes can accept Action (class level) or field level error messages. Action level messages are kept
  * in a Collection. Field level error messages are kept in a Map from String field name to a List of field error msgs.
  * @author $Author$
  * @version $Revision$
  */
-public interface ValidationAware extends Serializable {
+public interface ValidationAware {
     //~ Methods ////////////////////////////////////////////////////////////////
 
     /**

src/java/com/opensymphony/xwork/ValidationAwareSupport.java

  */
 package com.opensymphony.xwork;
 
+import java.io.Serializable;
 import java.util.*;
 
-
 /**
  * Provides a default implementation of ValidationAware. Returns new collections for
  * errors and messages (defensive copy).
  *
  * @author Jason Carreira
  */
-public class ValidationAwareSupport implements ValidationAware {
+public class ValidationAwareSupport implements ValidationAware, Serializable {
     //~ Instance fields ////////////////////////////////////////////////////////
 
     private Collection actionErrors;

src/java/com/opensymphony/xwork/config/providers/XmlHelper.java

 
                 if (paramElement.getChildNodes().item(0) != null) {
                     String paramValue = paramElement.getChildNodes().item(0).getNodeValue();
+                    if (paramValue != null) paramValue = paramValue.trim();
                     params.put(paramName, paramValue);
                 }
             }

src/java/com/opensymphony/xwork/validator/ActionValidatorManager.java

                     try {
                         is.close();
                     } catch (IOException e) {
-                        LOG.error("Unable to close input stream", e);
+                        LOG.error("Unable to close input stream for " + fileName, e);
                     }
                 }
             }