User: jules_gosnell
  Date: 02/02/02 07:06:14

  Modified:    src/main/org/jboss/web AbstractWebContainer.java
  Log:
  small fix
  tmp debugging to help Marc figure out what is going wrong
  
  Revision  Changes    Path
  1.15      +11 -3     jboss/src/main/org/jboss/web/AbstractWebContainer.java
  
  Index: AbstractWebContainer.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/web/AbstractWebContainer.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- AbstractWebContainer.java 2002/02/02 01:00:46     1.14
  +++ AbstractWebContainer.java 2002/02/02 15:06:13     1.15
  @@ -118,7 +118,7 @@
   @see org.jboss.security.SecurityAssociation;
   
   @author  [EMAIL PROTECTED]
  -@version $Revision: 1.14 $
  +@version $Revision: 1.15 $
   */
   public abstract class AbstractWebContainer 
   extends ServiceMBeanSupport 
  @@ -187,7 +187,10 @@
                  
                  if (mod.isWeb())        
                  {
  -                  
  +              System.out.println("[1] DEBUG:"+mod.getWebContext());
  +              System.out.println("[2] DEBUG:"+mod.getFileName());
  +              System.out.println("[3] DEBUG:"+di.shortName);
  +              System.out.println("[4] 
DEBUG:"+mod.getFileName().indexOf(di.shortName));
                     //only pick up the context for our war
                     if (mod.getFileName().indexOf(di.shortName) != -1) di.webContext 
= mod.getWebContext();
                  
  @@ -195,13 +198,16 @@
               }
            }
            
  +         System.out.println("[5] DEBUG:"+di.webContext);
            if (di.webContext == null) di.webContext = di.shortName;
               
            // if it is not a sub-deployment get the context from the name of the 
deployment
            // FIXME marcf: I can't believe there is no way to specify the context in 
web.xml
            
            // make sure the context starts with a slash
  +         System.out.println("[6] DEBUG:"+di.webContext);
            if (!di.webContext.startsWith("/")) di.webContext = "/"+di.webContext;
  +         System.out.println("[7] DEBUG:"+di.webContext);
               
            
            // resolve the watch
  @@ -266,7 +272,8 @@
            URLClassLoader warLoader = URLClassLoader.newInstance(empty, 
appClassLoader);
            thread.setContextClassLoader(warLoader);
            WebDescriptorParser webAppParser = new DescriptorParser();
  -         WebApplication warInfo = performDeploy(di.webContext, 
di.localUrl.getFile(), webAppParser);
  +         System.out.println("[8] DEBUG performDeploy:"+di.webContext);
  +         WebApplication warInfo = performDeploy(di.webContext, 
di.localUrl.toString(), webAppParser);
            deploymentMap.put(di.localUrl, warInfo);
         }
         catch(DeploymentException e)
  @@ -315,6 +322,7 @@
      {
         try
         {
  +     System.out.println("UNDEPLOY: "+warUrl);
            performUndeploy(warUrl);
            // Remove the web application ENC...
            deploymentMap.remove(warUrl);
  
  
  

_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development

Reply via email to