Remove serialization from Container. Old experiment that didn't work.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@740701 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/core/ContainerBase.java b/java/org/apache/catalina/core/ContainerBase.java
index a8377b9..9717fba 100644 (file)
--- a/java/org/apache/catalina/core/ContainerBase.java
+++ b/java/org/apache/catalina/core/ContainerBase.java
@@ -22,7 +22,6 @@ package org.apache.catalina.core;
 import java.beans.PropertyChangeListener;
 import java.beans.PropertyChangeSupport;
 import java.io.IOException;
-import java.io.Serializable;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 import java.util.ArrayList;
@@ -121,7 +120,7 @@ import org.apache.tomcat.util.modeler.Registry;
  */
 
 public abstract class ContainerBase
-    implements Container, Lifecycle, Pipeline, MBeanRegistration, Serializable {
+    implements Container, Lifecycle, Pipeline, MBeanRegistration {
 
     private static org.apache.juli.logging.Log log=
         org.apache.juli.logging.LogFactory.getLog( ContainerBase.class );
@@ -1396,7 +1395,7 @@ public abstract class ContainerBase
     protected String suffix;
     protected ObjectName oname;
     protected ObjectName controller;
-    protected transient MBeanServer mserver;
+    protected MBeanServer mserver;
 
     public ObjectName getJmxName() {
         return oname;

diff --git a/java/org/apache/catalina/core/StandardContext.java b/java/org/apache/catalina/core/StandardContext.java
index 284ac5f..9acef0a 100644 (file)
--- a/java/org/apache/catalina/core/StandardContext.java
+++ b/java/org/apache/catalina/core/StandardContext.java
@@ -23,7 +23,6 @@ import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Hashtable;
@@ -114,9 +113,9 @@ import org.apache.tomcat.util.modeler.Registry;
 
 public class StandardContext
     extends ContainerBase
-    implements Context, Serializable, NotificationEmitter
+    implements Context, NotificationEmitter
 {
-    private static transient Log log = LogFactory.getLog(StandardContext.class);
+    private static Log log = LogFactory.getLog(StandardContext.class);
 
 
     // ----------------------------------------------------------- Constructors
@@ -207,14 +206,14 @@ public class StandardContext
     /**
      * The set of instantiated application event listener objects</code>.
      */
-    private transient Object applicationEventListenersObjects[] = 
+    private Object applicationEventListenersObjects[] = 
         new Object[0];
 
 
     /**
      * The set of instantiated application lifecycle listener objects</code>.
      */
-    private transient Object applicationLifecycleListenersObjects[] = 
+    private Object applicationLifecycleListenersObjects[] = 
         new Object[0];
 
 
@@ -233,12 +232,12 @@ public class StandardContext
     /**
      * The broadcaster that sends j2ee notifications. 
      */
-    private transient NotificationBroadcasterSupport broadcaster = null;
+    private NotificationBroadcasterSupport broadcaster = null;
     
     /**
      * The Locale to character set mapper for this application.
      */
-    private transient CharsetMapper charsetMapper = null;
+    private CharsetMapper charsetMapper = null;
 
 
     /**
@@ -269,7 +268,7 @@ public class StandardContext
     /**
      * The ServletContext implementation associated with this Context.
      */
-    protected transient ApplicationContext context = null;
+    protected ApplicationContext context = null;
 
 
     /**
@@ -399,14 +398,14 @@ public class StandardContext
     /**
      * The mapper associated with this context.
      */
-    private transient org.apache.tomcat.util.http.mapper.Mapper mapper = 
+    private org.apache.tomcat.util.http.mapper.Mapper mapper = 
         new org.apache.tomcat.util.http.mapper.Mapper();
 
 
     /**
      * The naming context listener for this web application.
      */
-    private transient NamingContextListener namingContextListener = null;
+    private NamingContextListener namingContextListener = null;
 
 
     /**
@@ -654,7 +653,7 @@ public class StandardContext
     /**
      * Non proxied resources.
      */
-    private transient DirContext webappResources = null;
+    private DirContext webappResources = null;
 
     private long startupTime;
     private long startTime;