User: jules_gosnell
  Date: 01/09/16 10:14:17

  Modified:    jetty/src/main/org/jboss/jetty JBossLogSink.java
                        JBossUserRealm.java Jetty.java JettyMBean.java
                        JettyResolver.java JettyService.java
                        JettyServiceMBean.java SetupHandler.java
  Log:
  starting to sort out 3.0
  
  Revision  Changes    Path
  1.5       +5 -6      contrib/jetty/src/main/org/jboss/jetty/JBossLogSink.java
  
  Index: JBossLogSink.java
  ===================================================================
  RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/jboss/jetty/JBossLogSink.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- JBossLogSink.java 2001/09/10 23:15:47     1.4
  +++ JBossLogSink.java 2001/09/16 17:14:17     1.5
  @@ -1,6 +1,3 @@
  -// ========================================================================
  -// $Id: JBossLogSink.java,v 1.4 2001/09/10 23:15:47 jules_gosnell Exp $
  -// ========================================================================
   /*
    * jBoss, the OpenSource EJB server
    *
  @@ -8,14 +5,16 @@
    * See terms of license at gnu.org.
    */
   
  +// $Id: JBossLogSink.java,v 1.5 2001/09/16 17:14:17 jules_gosnell Exp $
  +
   package org.jboss.jetty;
   
  +import java.util.HashMap;
  +import org.apache.log4j.Category;
   import org.mortbay.util.Code;
   import org.mortbay.util.Frame;
   import org.mortbay.util.Log;
   import org.mortbay.util.LogSink;
  -import java.util.HashMap;
  -import org.apache.log4j.Category;
   
   /* ------------------------------------------------------------ */
   
  @@ -23,7 +22,7 @@
    * This class bidges the API between Jetty and Log4J.
    *
    * @author <a href="mailto:";>Jules Gosnell</a>
  - * @version $Id: JBossLogSink.java,v 1.4 2001/09/10 23:15:47 jules_gosnell Exp $
  + * @version $Id: JBossLogSink.java,v 1.5 2001/09/16 17:14:17 jules_gosnell Exp $
    * @since 1.0
    * @see org.mortbay.util.LogSink
    */
  
  
  
  1.6       +13 -4     contrib/jetty/src/main/org/jboss/jetty/JBossUserRealm.java
  
  Index: JBossUserRealm.java
  ===================================================================
  RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/jboss/jetty/JBossUserRealm.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- JBossUserRealm.java       2001/09/10 23:15:47     1.5
  +++ JBossUserRealm.java       2001/09/16 17:14:17     1.6
  @@ -1,8 +1,14 @@
  +/*
  + * jBoss, the OpenSource EJB server
  + *
  + * Distributable under GPL license.
  + * See terms of license at gnu.org.
  + */
  +
  +// $Id: JBossUserRealm.java,v 1.6 2001/09/16 17:14:17 jules_gosnell Exp $
  +
   package org.jboss.jetty;
   
  -import org.mortbay.http.HttpRequest;
  -import org.mortbay.http.UserPrincipal;
  -import org.mortbay.http.UserRealm;
   import java.util.HashSet;
   import javax.naming.InitialContext;
   import javax.naming.NamingException;
  @@ -12,12 +18,15 @@
   import org.jboss.security.SecurityAssociation;
   import org.jboss.security.SimplePrincipal;
   import org.jboss.security.SubjectSecurityManager;
  +import org.mortbay.http.HttpRequest;
  +import org.mortbay.http.UserPrincipal;
  +import org.mortbay.http.UserRealm;
   
   /** An implementation of UserRealm that integrates with the JBossSX security
   manager associted with the web application.
   
    * @author  [EMAIL PROTECTED]
  - * @version $Revision: 1.5 $
  + * @version $Revision: 1.6 $
    */
   public class JBossUserRealm
     implements UserRealm
  
  
  
  1.16      +4 -3      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.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- Jetty.java        2001/09/10 23:15:47     1.15
  +++ Jetty.java        2001/09/16 17:14:17     1.16
  @@ -5,15 +5,13 @@
    * See terms of license at gnu.org.
    */
    
  +// $Id: Jetty.java,v 1.16 2001/09/16 17:14:17 jules_gosnell Exp $
   
   // A Jetty HttpServer with the interface expected by JBoss'
   // J2EEDeployer...
    
   package org.jboss.jetty;
   
  -import org.mortbay.http.HttpHandler;
  -import org.mortbay.jetty.servlet.WebApplicationContext;
  -import org.mortbay.util.Resource;
   import java.io.FileNotFoundException;
   import java.net.URL;
   import java.util.HashMap;
  @@ -23,6 +21,9 @@
   import org.jboss.ejb.DeploymentException;
   import org.jboss.web.AbstractWebContainer.WebDescriptorParser;
   import org.jboss.web.WebApplication;
  +import org.mortbay.http.HttpHandler;
  +import org.mortbay.jetty.servlet.WebApplicationContext;
  +import org.mortbay.util.Resource;
    
   public class Jetty
     extends org.mortbay.jetty.Server
  
  
  
  1.3       +3 -1      contrib/jetty/src/main/org/jboss/jetty/JettyMBean.java
  
  Index: JettyMBean.java
  ===================================================================
  RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/jboss/jetty/JettyMBean.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- JettyMBean.java   2001/09/10 23:15:47     1.2
  +++ JettyMBean.java   2001/09/16 17:14:17     1.3
  @@ -5,13 +5,15 @@
    * See terms of license at gnu.org.
    */
   
  +// $Id$
  +
   package org.jboss.jetty;
   
  -import org.mortbay.jetty.jmx.HttpServerMBean;
   import javax.management.InstanceNotFoundException;
   import javax.management.MBeanException;
   import javax.management.MBeanServer;
   import javax.management.ObjectName;
  +import org.mortbay.jetty.jmx.HttpServerMBean;
   
   public class JettyMBean
     extends HttpServerMBean
  
  
  
  1.2       +2 -0      contrib/jetty/src/main/org/jboss/jetty/JettyResolver.java
  
  Index: JettyResolver.java
  ===================================================================
  RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/jboss/jetty/JettyResolver.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- JettyResolver.java        2001/08/09 20:57:22     1.1
  +++ JettyResolver.java        2001/09/16 17:14:17     1.2
  @@ -5,6 +5,8 @@
    * See terms of license at gnu.org.
    */
    
  +// $Id$
  +
   package org.jboss.jetty;
   
   import java.io.IOException;
  
  
  
  1.23      +4 -8      contrib/jetty/src/main/org/jboss/jetty/JettyService.java
  
  Index: JettyService.java
  ===================================================================
  RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/jboss/jetty/JettyService.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- JettyService.java 2001/09/11 04:53:47     1.22
  +++ JettyService.java 2001/09/16 17:14:17     1.23
  @@ -5,29 +5,25 @@
    * See terms of license at gnu.org.
    */
    
  +// $Id: JettyService.java,v 1.23 2001/09/16 17:14:17 jules_gosnell Exp $
  +
   package org.jboss.jetty;
   
   import java.io.File;
   import java.io.IOException;
   import java.io.InputStream;
  -
   import java.net.URL;
   import java.util.Hashtable;
   import java.util.Vector;
  -
   import javax.management.MBeanRegistration;
   import javax.management.MBeanServer;
   import javax.management.ObjectName;
  -
   import org.apache.log4j.Category;
  -
   import org.jboss.ejb.DeploymentException;
   import org.jboss.system.ServiceMBeanSupport;
  -
  -import org.jboss.web.AbstractWebContainer;
   import org.jboss.web.AbstractWebContainer.WebDescriptorParser;
  +import org.jboss.web.AbstractWebContainer;
   import org.jboss.web.WebApplication;
  -
   import org.mortbay.http.HandlerContext;
   import org.mortbay.http.HttpServer;
   import org.mortbay.jetty.jmx.HttpServerMBean;
  @@ -40,7 +36,7 @@
    *      
    *   @see <related>
    *   @author <a href="mailto:[EMAIL PROTECTED]";>Julian Gosnell</a>
  - *   @version $Revision: 1.22 $
  + *   @version $Revision: 1.23 $
    */
   
   // NOTES
  
  
  
  1.8       +2 -2      contrib/jetty/src/main/org/jboss/jetty/JettyServiceMBean.java
  
  Index: JettyServiceMBean.java
  ===================================================================
  RCS file: 
/cvsroot/jboss/contrib/jetty/src/main/org/jboss/jetty/JettyServiceMBean.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- JettyServiceMBean.java    2001/07/08 10:48:58     1.7
  +++ JettyServiceMBean.java    2001/09/16 17:14:17     1.8
  @@ -5,18 +5,18 @@
    * See terms of license at gnu.org.
    */
    
  +// $Id: JettyServiceMBean.java,v 1.8 2001/09/16 17:14:17 jules_gosnell Exp $
    
   package org.jboss.jetty;
   
   import org.jboss.ejb.DeploymentException;
   
  -
   /**
    *   <description> 
    *      
    *   @see <related>
    *   @author <a href="mailto:[EMAIL PROTECTED]";>Sebastien Alborini</a>
  - *   @version $Revision: 1.7 $
  + *   @version $Revision: 1.8 $
    */
   public interface JettyServiceMBean
     extends org.jboss.web.AbstractWebContainerMBean
  
  
  
  1.9       +53 -56    contrib/jetty/src/main/org/jboss/jetty/SetupHandler.java
  
  Index: SetupHandler.java
  ===================================================================
  RCS file: /cvsroot/jboss/contrib/jetty/src/main/org/jboss/jetty/SetupHandler.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- SetupHandler.java 2001/09/10 23:15:47     1.8
  +++ SetupHandler.java 2001/09/16 17:14:17     1.9
  @@ -1,3 +1,12 @@
  +/*
  + * jBoss, the OpenSource EJB server
  + *
  + * Distributable under GPL license.
  + * See terms of license at gnu.org.
  + */
  + 
  +// $Id: SetupHandler.java,v 1.9 2001/09/16 17:14:17 jules_gosnell Exp $
  +
   package org.jboss.jetty;
   
   import java.io.IOException;
  @@ -17,70 +26,58 @@
    * so that is sees the correct class loader and security realm name.
    *
    * @author  [EMAIL PROTECTED]
  - * @version $Revision: 1.8 $
  + * @version $Revision: 1.9 $
    */
   public class SetupHandler
  -   extends NullHandler
  +  extends NullHandler
   {
  -   Category            _log;
  -   WebDescriptorParser _descriptorParser;
  -   WebApplication      _webApp;
  -
  -   //----------------------------------------------------------------------
  -
  -   public SetupHandler(Category log,
  -                       WebDescriptorParser descriptorParser,
  -                       WebApplication webApp)
  -   {
  -      _log              = log;
  -      _descriptorParser = descriptorParser;
  -      _webApp           = webApp;
  -   }
  +  Category            _log;
  +  WebDescriptorParser _descriptorParser;
  +  WebApplication      _webApp;
  +
  +  //----------------------------------------------------------------------
  +
  +  public
  +    SetupHandler(Category log,
  +              WebDescriptorParser descriptorParser,
  +              WebApplication webApp)
  +  {
  +    _log              = log;
  +    _descriptorParser = descriptorParser;
  +    _webApp           = webApp;
  +  }
     
  -   //----------------------------------------------------------------------
  +  //----------------------------------------------------------------------
   
  -   public void start() throws Exception
  -   {
  -      ClassLoader loader = getHandlerContext().getClassLoader();
  -      if (_webApp.getClassLoader()!=loader.getParent()) {
  -         _log.warn("WebApp ClassLoader is not child of J2EEDeployer's ClassLoader");
  -      }
  +  public void
  +    start()
  +    throws Exception
  +  {
  +    ClassLoader loader = getHandlerContext().getClassLoader();
  +    if (_webApp.getClassLoader()!=loader.getParent())
  +      _log.warn("WebApp ClassLoader is not child of J2EEDeployer's ClassLoader");
       
  -      // Setup the JNDI environment
  -      Element webAppDD = _webApp.getWebApp();
  -      Element jbossDD  = _webApp.getJbossWeb();
  -      _descriptorParser.parseWebAppDescriptors(loader, webAppDD, jbossDD);
  +    // Setup the JNDI environment
  +    Element webAppDD = _webApp.getWebApp();
  +    Element jbossDD  = _webApp.getJbossWeb();
  +    _descriptorParser.parseWebAppDescriptors(loader, webAppDD, jbossDD);
       
  -      // Add the JBoss security realm
  -      HttpServer server    = getHandlerContext().getHttpServer();
  -      String     realmName = getHandlerContext().getRealm();
  -      server.addRealm(new JBossUserRealm(_log, realmName));
  +    // Add the JBoss security realm
  +    HttpServer server    = getHandlerContext().getHttpServer();
  +    String     realmName = getHandlerContext().getRealm();
  +    server.addRealm(new JBossUserRealm(_log, realmName));
       
  -      super.start();
  -   }
  +    super.start();
  +  }
     
  -   //----------------------------------------------------------------------
  +  //----------------------------------------------------------------------
   
  -   /**
  -    * Does nothing - we are only interested in {@link #start}.
  -    */
  -   public void handle(String pathInContext,
  -                      String pathParams,
  -                      HttpRequest request,
  -                      HttpResponse response)
  -      
  -      throws HttpException, IOException
  -   {
  -   }
  -
  -   /**
  -    * Does nothing - we are only interested in {@link #start}.
  -    */
  -   public void handle(String pathInContext,
  -                      HttpRequest request,
  -                      HttpResponse response)
  -      
  -      throws HttpException, IOException
  -   {
  -   }
  +  /**
  +   * Does nothing - we are only interested in {@link #start}.
  +   */
  +  public void
  +    handle(String pathInContext, String pathParams, HttpRequest request, 
HttpResponse response)
  +    throws HttpException, IOException
  +  {
  +  }
   }
  
  
  

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

Reply via email to