User: jules_gosnell
  Date: 02/02/24 06:10:47

  Modified:    jetty/src/main/org/jboss/jetty
                        JBossWebApplicationContext.java
  Log:
  we need to catch a different exception if deploying packed
  
  Revision  Changes    Path
  1.29      +11 -6     
contrib/jetty/src/main/org/jboss/jetty/JBossWebApplicationContext.java
  
  Index: JBossWebApplicationContext.java
  ===================================================================
  RCS file: 
/cvsroot/jboss/contrib/jetty/src/main/org/jboss/jetty/JBossWebApplicationContext.java,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- JBossWebApplicationContext.java   24 Feb 2002 05:08:29 -0000      1.28
  +++ JBossWebApplicationContext.java   24 Feb 2002 14:10:47 -0000      1.29
  @@ -5,7 +5,7 @@
    * See terms of license at gnu.org.
    */
   
  -// $Id: JBossWebApplicationContext.java,v 1.28 2002/02/24 05:08:29 janb Exp $
  +// $Id: JBossWebApplicationContext.java,v 1.29 2002/02/24 14:10:47 jules_gosnell 
Exp $
   
   // A Jetty HttpServer with the interface expected by JBoss'
   // J2EEDeployer...
  @@ -17,6 +17,7 @@
   //------------------------------------------------------------------------------
   
   import java.io.FileNotFoundException;
  +import java.io.IOException;
   import java.net.URL;
   import java.net.URLClassLoader;
   import javax.xml.parsers.DocumentBuilder;
  @@ -53,7 +54,7 @@
                               WebApplication webApp,
                               DocumentBuilder parser,
                               String warUrl)
  -    throws java.io.IOException
  +    throws IOException
       {
   
         super(jetty, contextPathSpec, warUrl);
  @@ -64,7 +65,7 @@
         _webApp           = webApp;
         _parser           = parser;
         _subjAttrName     = jetty.getSubjectAttributeName();
  -                     
  +
         getServletHandler().
        setSessionManager(new DistributedHttpSessionManager(this,
                                                               
jetty.getHttpSessionStorageStrategy(),
  @@ -152,7 +153,7 @@
     // ready.
   
     protected void initClassLoader()
  -    throws java.net.MalformedURLException, java.io.IOException
  +    throws java.net.MalformedURLException, IOException
       {
         super.initClassLoader();
   
  @@ -175,8 +176,8 @@
         for (int i=0; i<entries.length; i++)
        
classpath+=(classpath.length()==0?"":_separator)+entries[i].substring("file:".length());
   
  -      //      if (_log.isDebugEnabled())
  -     _log.info("JSP classpath: "+classpath);
  +      if (_log.isDebugEnabled())
  +     _log.debug("JSP classpath: "+classpath);
   
         return classpath;
       }
  @@ -225,6 +226,10 @@
          
_webApp.setJbossWeb(_parser.parse(jbossWeb.getInputStream()).getDocumentElement());
         }
         catch (FileNotFoundException e)
  +      {
  +     _log.debug("no jboss-web.xml found");
  +      }
  +      catch (IOException e)
         {
        _log.debug("no jboss-web.xml found");
         }
  
  
  

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

Reply via email to