1. opensymphony
  2. xwork

Commits

rainerh  committed a9372cc

Ported XW-476 from trunk to branch 2.0: Checked the object tree built by Configuration to be Serializable

git-svn-id: http://svn.opensymphony.com/svn/xwork/branches/2.0@1349e221344d-f017-0410-9bd5-d282ab1896d7

  • Participants
  • Parent commits 4a80ba6
  • Branches 2.0, xwork_2_0_7

Comments (0)

Files changed (7)

File src/java/com/opensymphony/xwork2/ObjectFactory.java

View file
  • Ignore whitespace
 import com.opensymphony.xwork2.validator.Validator;
 
 import java.io.IOException;
+import java.io.Serializable;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.HashMap;
  *
  * @author Jason Carreira
  */
-public class ObjectFactory {
+public class ObjectFactory implements Serializable {
     private static final Log LOG = LogFactory.getLog(ObjectFactory.class);
 
-    private ClassLoader ccl;
+    private transient ClassLoader ccl;
     private static ThreadLocal<ObjectFactory> thSelf = new ThreadLocal<ObjectFactory>();
     private Container container;
 

File src/java/com/opensymphony/xwork2/config/Configuration.java

View file
  • Ignore whitespace
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.io.Serializable;
 
 
 /**
  *
  * @author Mike
  */
-public interface Configuration {
+public interface Configuration extends Serializable {
     
-    public void rebuildRuntimeConfiguration();
+    void rebuildRuntimeConfiguration();
 
     PackageConfig getPackageConfig(String name);
 
     /**
      * @return the container
      */
-    public Container getContainer();
+    Container getContainer();
 
-    public Set<String> getLoadedFileNames();
+    Set<String> getLoadedFileNames();
 }

File src/java/com/opensymphony/xwork2/config/RuntimeConfiguration.java

View file
  • Ignore whitespace
 import com.opensymphony.xwork2.config.entities.ActionConfig;
 
 import java.util.Map;
+import java.io.Serializable;
 
 
 /**
  * @author Jason Carreira
  *         Created Feb 25, 2003 10:56:02 PM
  */
-public interface RuntimeConfiguration {
+public interface RuntimeConfiguration extends Serializable {
 
     /**
      * get the fully expanded ActionConfig for a specified namespace and (action) name

File src/java/com/opensymphony/xwork2/config/impl/DefaultConfiguration.java

View file
  • Ignore whitespace
  * @author Jason Carreira
  *         Created Feb 24, 2003 7:38:06 AM
  */
-public class DefaultConfiguration implements Configuration, Serializable {
+public class DefaultConfiguration implements Configuration {
 
     protected static final Log LOG = LogFactory.getLog(DefaultConfiguration.class);
 

File src/java/com/opensymphony/xwork2/inject/Container.java

View file
  • Ignore whitespace
 package com.opensymphony.xwork2.inject;
 
 import java.util.Set;
+import java.io.Serializable;
 
 /**
  * Injects dependencies into constructors, methods and fields annotated with
  * @see ContainerBuilder
  * @author crazybob@google.com (Bob Lee)
  */
-public interface Container {
+public interface Container extends Serializable {
 
   /**
    * Default dependency name.

File src/java/com/opensymphony/xwork2/inject/ContainerImpl.java

View file
  • Ignore whitespace
 import java.util.Map;
 import java.util.Set;
 import java.util.Map.Entry;
+import java.io.Serializable;
 
 /**
  * Default {@link Container} implementation.
   /**
    * Injects a field or method in a given object.
    */
-  interface Injector {
+  interface Injector extends Serializable {
     void inject(InternalContext context, Object o);
   }
 

File src/java/com/opensymphony/xwork2/inject/InternalFactory.java

View file
  • Ignore whitespace
 
 package com.opensymphony.xwork2.inject;
 
+import java.io.Serializable;
+
 /**
  * Creates objects which will be injected.
  *
  * @author crazybob@google.com (Bob Lee)
  */
-interface InternalFactory<T> {
+interface InternalFactory<T> extends Serializable {
 
   /**
    * Creates an object to be injected.