You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by re...@apache.org on 2001/06/14 17:15:18 UTC

cvs commit: jakarta-slide/src/wrappers/catalina SlideHost.java

remm        01/06/14 08:15:18

  Modified:    src/wrappers/catalina SlideHost.java
  Log:
  - The resources should be set after calling addChild.
  
  Revision  Changes    Path
  1.3       +7 -7      jakarta-slide/src/wrappers/catalina/SlideHost.java
  
  Index: SlideHost.java
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/src/wrappers/catalina/SlideHost.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SlideHost.java	2001/06/13 17:44:30	1.2
  +++ SlideHost.java	2001/06/14 15:15:16	1.3
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-slide/src/wrappers/catalina/SlideHost.java,v 1.2 2001/06/13 17:44:30 remm Exp $
  - * $Revision: 1.2 $
  - * $Date: 2001/06/13 17:44:30 $
  + * $Header: /home/cvs/jakarta-slide/src/wrappers/catalina/SlideHost.java,v 1.3 2001/06/14 15:15:16 remm Exp $
  + * $Revision: 1.3 $
  + * $Date: 2001/06/14 15:15:16 $
    *
    * ====================================================================
    *
  @@ -103,7 +103,7 @@
    * Slide implementation of Host.
    *
    * @author Remy Maucherat
  - * @version $Revision: 1.2 $ $Date: 2001/06/13 17:44:30 $
  + * @version $Revision: 1.3 $ $Date: 2001/06/14 15:15:16 $
    */
   
   public class SlideHost
  @@ -204,9 +204,6 @@
               Context context = (Context) clazz.newInstance();
               context.setPath(contextPath);
               context.setDocBase(docBase);
  -            SlideDirContext resources = new SlideDirContext();
  -            resources.setNamespaceName(war.getFile());
  -            context.setResources(resources);
               SlideRealm slideRealm = new SlideRealm();
               String namespaceName = contextPath;
               while (namespaceName.startsWith("/")) {
  @@ -224,6 +221,9 @@
                   ((Lifecycle) context).addLifecycleListener(listener);
               }
               addChild(context);
  +            SlideDirContext resources = new SlideDirContext();
  +            resources.setNamespaceName(war.getFile());
  +            context.setResources(resources);
   	    fireContainerEvent(INSTALL_EVENT, context);
           } catch (Exception e) {
               log(sm.getString("standardHost.installError", contextPath), e);