[JBoss-dev] CVS update: contrib/jetty/src/main/org/jboss/jetty Jetty.java

[Jules Gosnell]

  User: jules_gosnell
  Date: 01/11/28 15:54:57

  Modified:    jetty/src/main/org/jboss/jetty Jetty.java
  Log:
  move jetty.xml and webdefault.xml into jetty-plugin.sar
  
  Revision  Changes    Path
  1.23      +18 -4     contrib/jetty/src/main/org/jboss/jetty/Jetty.java
  
  Index: Jetty.java
  ===================================================================
  RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/jboss/jetty/Jetty.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- Jetty.java        2001/11/28 01:22:25     1.22
  +++ Jetty.java        2001/11/28 23:54:57     1.23
  @@ -5,7 +5,7 @@
    * See terms of license at gnu.org.
    */
   
  -// $Id: Jetty.java,v 1.22 2001/11/28 01:22:25 jules_gosnell Exp $
  +// $Id: Jetty.java,v 1.23 2001/11/28 23:54:57 jules_gosnell Exp $
   
   // A Jetty HttpServer with the interface expected by JBoss'
   // J2EEDeployer...
  @@ -25,6 +25,8 @@
   import org.mortbay.jetty.servlet.WebApplicationContext;
   import org.mortbay.util.Resource;
   
  +import java.io.File;
  +
   public class Jetty
     extends org.mortbay.jetty.Server
   {
  @@ -98,6 +100,7 @@
     public synchronized void
       setWebDefault(String webDefault)
     {
  +    webDefault=fixURL(findResourceInJar(webDefault).toString());
       _webDefault=webDefault;
     }
   
  @@ -119,13 +122,11 @@
       if (configUrl==null)
         return;
   
  -    _log.info("CONFIG IS: "+configUrl);
  -    _log.info("CONFIG IS: "+findResourceInJar(configUrl));
  +    configUrl=fixURL(findResourceInJar(configUrl).toString());
   
       try
       {
         _log.info("loading config: "+configUrl);
  -      //      configure(findResourceInJar(configUrl).toString());
         configure(configUrl);
         _log.info("loaded config: "+configUrl);
         _configuration=configUrl;
  @@ -272,5 +273,18 @@
       }
   
       return url;
  +  }
  +
  +  // work around broken JarURLConnection caching...
  +  private String
  +    fixURL(String url)
  +  {
  +    String protocol="file:";
  +    int index=url.indexOf(protocol)+protocol.length();
  +    return
  +      url.substring(0,index)+
  +      File.separator +
  +      "."+
  +      url.substring(index, url.length());
     }
   }
  
  
  

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