tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core StandardDefaultContext.java
Date Sat, 08 Jun 2002 07:35:07 GMT
remm        2002/06/08 00:35:07

  Modified:    catalina/src/share/org/apache/catalina/core
                        StandardDefaultContext.java
  Log:
  - (Experimental) changes to support a more dynamic configuration of the default
    context. The idea is that a change in the DefaultContext (through the admin
    webapp) would be mirrored on all associated contexts dynamically.
  
  Revision  Changes    Path
  1.4       +152 -27   jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardDefaultContext.java
  
  Index: StandardDefaultContext.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardDefaultContext.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- StandardDefaultContext.java	31 Jan 2002 23:02:41 -0000	1.3
  +++ StandardDefaultContext.java	8 Jun 2002 07:35:06 -0000	1.4
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardDefaultContext.java,v
1.3 2002/01/31 23:02:41 amyroh Exp $
  - * $Revision: 1.3 $
  - * $Date: 2002/01/31 23:02:41 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardDefaultContext.java,v
1.4 2002/06/08 07:35:06 remm Exp $
  + * $Revision: 1.4 $
  + * $Date: 2002/06/08 07:35:06 $
    *
    * ====================================================================
    *
  @@ -66,7 +66,9 @@
   
   import java.beans.PropertyChangeListener;
   import java.beans.PropertyChangeSupport;
  +import java.util.Enumeration;
   import java.util.HashMap;
  +import java.util.Hashtable;
   import java.util.Iterator;
   import javax.naming.directory.DirContext;
   import org.apache.catalina.Container;
  @@ -75,6 +77,7 @@
   import org.apache.catalina.DefaultContext;
   import org.apache.catalina.InstanceListener;
   import org.apache.catalina.Lifecycle;
  +import org.apache.catalina.LifecycleEvent;
   import org.apache.catalina.LifecycleException;
   import org.apache.catalina.LifecycleListener;
   import org.apache.catalina.Loader;
  @@ -96,10 +99,11 @@
    * <CODE>override="true"</CODE>.
    *
    * @author Glenn Nielsen
  - * @version $Revision: 1.3 $ $Date: 2002/01/31 23:02:41 $
  + * @version $Revision: 1.4 $ $Date: 2002/06/08 07:35:06 $
    */
   
  -public class StandardDefaultContext implements DefaultContext {
  +public class StandardDefaultContext 
  +    implements DefaultContext, LifecycleListener {
   
   
       // ----------------------------------------------------------- Constructors
  @@ -116,6 +120,12 @@
   
   
       /**
  +     * Contexts we are currently associated with.
  +     */
  +    private Hashtable contexts = new Hashtable();
  +
  +
  +    /**
        * The set of application listener class names configured for this
        * application, in the order they were encountered in the web.xml file.
        */
  @@ -239,17 +249,20 @@
        */
       protected Manager manager = null;
   
  +
       /**
        * The string manager for this package.
        */
       protected static StringManager sm =
           StringManager.getManager(Constants.Package);
   
  +
       /**
        * The property change support for this component.
        */
       protected PropertyChangeSupport support = new PropertyChangeSupport(this);
   
  +
       // ----------------------------------------------------- Context Properties
   
   
  @@ -908,6 +921,16 @@
   
   
       /**
  +     * Return the naming resources associated with this web application.
  +     */
  +    public NamingResources getNamingResources() {
  +
  +        return (this.namingResources);
  +
  +    }
  +
  +
  +    /**
        * Remove the specified application listener class from the set of
        * listeners for this application.
        *
  @@ -1165,17 +1188,111 @@
   
   
       /**
  +     * Process the START event for an associated Context.
  +     *
  +     * @param event The lifecycle event that has occurred
  +     */
  +    public void lifecycleEvent(LifecycleEvent event) {
  +
  +        StandardContext context = null;
  +        NamingContextListener listener = null;
  +
  +        if (event.getLifecycle() instanceof StandardContext) {
  +            context = (StandardContext) event.getLifecycle();
  +            LifecycleListener[] listeners = context.findLifecycleListeners();
  +            for (int i = 0; i < listeners.length; i++) {
  +                if (listeners[i] instanceof NamingContextListener) {
  +                    listener = (NamingContextListener) listeners[i];
  +                    break;
  +                }
  +            }
  +        }
  +
  +        if (listener == null) {
  +            System.out.println("Not found");
  +            return;
  +        }
  +
  +        if (event.getType().equals(Lifecycle.AFTER_START_EVENT)) {
  +
  +            // Add context
  +            contexts.put(context, context);
  +
  +            NamingResources contextResources = context.getNamingResources();
  +
  +            // Send notifications to the listener to add the appropriate 
  +            // resources
  +            ContextEjb [] contextEjb = findEjbs();
  +            for (int i = 0; i < contextEjb.length; i++) {
  +                ContextEjb contextEntry = contextEjb[i];
  +                if (contextResources.exists(contextEntry.getName())) {
  +                    listener.removeEjb(contextEntry.getName());
  +                }
  +                listener.addEjb(contextEntry);
  +            }
  +            ContextEnvironment [] contextEnv = findEnvironments();
  +            for (int i = 0; i < contextEnv.length; i++) {
  +                ContextEnvironment contextEntry = contextEnv[i];
  +                if (contextResources.exists(contextEntry.getName())) {
  +                    listener.removeEnvironment(contextEntry.getName());
  +                }
  +                listener.addEnvironment(contextEntry);
  +            }
  +            ContextResource [] resources = findResources();
  +            for (int i = 0; i < resources.length; i++) {
  +                ContextResource contextEntry = resources[i];
  +                if (contextResources.exists(contextEntry.getName())) {
  +                    listener.removeResource(contextEntry.getName());
  +                }
  +                listener.addResource(contextEntry);
  +            }
  +            String [] envRefs = findResourceEnvRefs();
  +            for (int i = 0; i < envRefs.length; i++) {
  +                if (contextResources.exists(envRefs[i])) {
  +                    listener.removeResourceEnvRef(envRefs[i]);
  +                }
  +                listener.addResourceEnvRef
  +                    (envRefs[i], findResourceEnvRef(envRefs[i]));
  +            }
  +
  +            // Add listener to the NamingResources listener list
  +            namingResources.addPropertyChangeListener(listener);
  +
  +        } else if (event.getType().equals(Lifecycle.BEFORE_STOP_EVENT)) {
  +
  +            // Remove context
  +            contexts.remove(context);
  +
  +            // Remove listener from the NamingResource listener list
  +            namingResources.removePropertyChangeListener(listener);
  +
  +            // Remove listener from lifecycle listeners
  +            context.removeLifecycleListener(this);
  +
  +        }
  +
  +    }
  +
  +
  +    /**
        * Import the configuration from the DefaultContext into
        * current Context.
        *
        * @param context current web application context
        */
       public void importDefaultContext(Context context) {
  -        if( context instanceof StandardContext )
  +
  +        if (context instanceof StandardContext) {
               ((StandardContext)context).setUseNaming(isUseNaming());
  +            if (!contexts.containsKey(context)) {
  +                ((StandardContext) context).addLifecycleListener(this);
  +            }
  +        }
  +
           context.setCookies(getCookies());
           context.setCrossContext(getCrossContext());
           context.setReloadable(getReloadable());
  +
           String [] listeners = findApplicationListeners();
           for( int i = 0; i < listeners.length; i++ ) {
               context.addApplicationListener(listeners[i]);
  @@ -1200,28 +1317,36 @@
           for( int i = 0; i < appParam.length; i++ ) {
               context.addApplicationParameter(appParam[i]);
           }
  -        ContextEjb [] contextEjb = findEjbs();
  -        for( int i = 0; i < contextEjb.length; i++ ) {
  -            context.addEjb(contextEjb[i]);
  -        }
  -        ContextEnvironment [] contextEnv = findEnvironments();
  -        for( int i = 0; i < contextEnv.length; i++ ) {
  -            context.addEnvironment(contextEnv[i]);
  -        }
  -        if( context instanceof StandardContext ) {
  -            ResourceParams [] resourceParams = findResourceParams();
  -            for( int i = 0; i < resourceParams.length; i++ ) {
  -                ((StandardContext)context).addResourceParams(resourceParams[i]);
  -            }
  -        }
  -        ContextResource [] resources = findResources();
  -        for( int i = 0; i < resources.length; i++ ) {
  -            context.addResource(resources[i]);
  -        }
  -        String [] envRefs = findResourceEnvRefs();
  -        for( int i = 0; i < envRefs.length; i++ ) {
  -            context.addResourceEnvRef(envRefs[i],findResourceEnvRef(envRefs[i]));
  +
  +        if (!(context instanceof StandardContext)) {
  +            ContextEjb [] contextEjb = findEjbs();
  +            for( int i = 0; i < contextEjb.length; i++ ) {
  +                context.addEjb(contextEjb[i]);
  +            }
  +            ContextEnvironment [] contextEnv = findEnvironments();
  +            for( int i = 0; i < contextEnv.length; i++ ) {
  +                context.addEnvironment(contextEnv[i]);
  +            }
  +            /*
  +            if (context instanceof StandardContext) {
  +                ResourceParams [] resourceParams = findResourceParams();
  +                for( int i = 0; i < resourceParams.length; i++ ) {
  +                    ((StandardContext)context).addResourceParams
  +                        (resourceParams[i]);
  +                }
  +            }
  +            */
  +            ContextResource [] resources = findResources();
  +            for( int i = 0; i < resources.length; i++ ) {
  +                context.addResource(resources[i]);
  +            }
  +            String [] envRefs = findResourceEnvRefs();
  +            for( int i = 0; i < envRefs.length; i++ ) {
  +                context.addResourceEnvRef
  +                    (envRefs[i],findResourceEnvRef(envRefs[i]));
  +            }
           }
  +
       }
   
       /**
  
  
  

--
To unsubscribe, e-mail:   <mailto:tomcat-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:tomcat-dev-help@jakarta.apache.org>


Mime
View raw message