CVS: plexus-components/jetty/src/java/org/apache/plexus/jetty AvalonLogSink.java,1.1.1.1,1.2 JettyServer.java,1.1.1.1,1.2 JettyServletContainer.java,1.1.1.1,1.2 ServletContainer.java,1.1.1.1,1.2

Update of /cvsroot/plexus/plexus-components/jetty/src/java/org/apache/plexus/jetty
In directory eng.werken.com:/tmp/cvs-serv11419/src/java/org/apache/plexus/jetty

Modified Files:
	AvalonLogSink.java JettyServer.java JettyServletContainer.java 
	ServletContainer.java 
Log Message:
o Converting to plexus 0.4.


Index: AvalonLogSink.java
===================================================================
RCS file: /cvsroot/plexus/plexus-components/jetty/src/java/org/apache/plexus/jetty/AvalonLogSink.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- AvalonLogSink.java	15 Feb 2003 03:55:37 -0000	1.1.1.1
+++ AvalonLogSink.java	28 Apr 2003 02:22:41 -0000	1.2
@@ -3,7 +3,7 @@
 import org.mortbay.util.LogSink;
 import org.mortbay.util.Frame;
 import org.mortbay.util.Log;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.plexus.logging.AbstractLogEnabled;
 
 /**
  * Jetty Log redirection
@@ -15,7 +15,7 @@
  * @version 1.0
  */
 public class AvalonLogSink 
-    extends AbstractLogEnabled 
+    extends AbstractLogEnabled
     implements LogSink
 {
 

Index: JettyServer.java
===================================================================
RCS file: /cvsroot/plexus/plexus-components/jetty/src/java/org/apache/plexus/jetty/JettyServer.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- JettyServer.java	15 Feb 2003 03:55:38 -0000	1.1.1.1
+++ JettyServer.java	28 Apr 2003 02:22:41 -0000	1.2
@@ -56,9 +56,8 @@
  * ----------------------------------------------------------------------------
  */
 
-import org.apache.plexus.context.PlexusContext;
-import org.apache.plexus.service.ServiceBroker;
 import org.apache.plexus.servlet.PlexusServlet;
+import org.apache.avalon.framework.service.ServiceManager;
 import org.mortbay.jetty.Server;
 import org.mortbay.jetty.servlet.WebApplicationContext;
 
@@ -94,8 +93,8 @@
     private ClassLoader classLoader;
 
     /** Plexus service broker. */
-    private ServiceBroker serviceBroker;
-    
+    private ServiceManager serviceManager;
+
     // ----------------------------------------------------------------------
     //     Constructors
     // ----------------------------------------------------------------------
@@ -121,26 +120,16 @@
         this.classLoader = classLoader;
     }
 
-    /**
-     * Sets the {@link ServiceBroker} for this server.
-     *
-     * @param serviceBroker The service broker for this server.
-     */
-    public void setServiceBroker(ServiceBroker serviceBroker)
+    public void setServiceManager( ServiceManager serviceManager )
     {
-        this.serviceBroker = serviceBroker;
+        this.serviceManager = serviceManager;
     }
-    
-    /**
-     * Gets the {@link ServiceBroker} for this server.
-     * 
-     * @return The service broker for this server.
-     */
-    public ServiceBroker getServiceBroker()
+
+    public ServiceManager getServiceManager()
     {
-        return this.serviceBroker;
+        return serviceManager;
     }
-    
+
     /**
      * Set the WAR deploy directory.
      *
@@ -186,9 +175,9 @@
         // this anymore.
         appContext.setParentClassLoader( classLoader );
 
-        // Make the ServiceBroker available in context for use by PlexusServlets 
-        appContext.setAttribute( PlexusServlet.SERVICE_BROKER_KEY, getServiceBroker() );
-        
+        // Make the ServiceBroker available in context for use by PlexusServlets
+        appContext.setAttribute( PlexusServlet.SERVICE_MANAGER_KEY, getServiceManager() );
+
         // Add this webapp context to the running server.
         addContext( virtualHost, appContext );
 

Index: JettyServletContainer.java
===================================================================
RCS file: /cvsroot/plexus/plexus-components/jetty/src/java/org/apache/plexus/jetty/JettyServletContainer.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- JettyServletContainer.java	15 Feb 2003 03:55:37 -0000	1.1.1.1
+++ JettyServletContainer.java	28 Apr 2003 02:22:41 -0000	1.2
@@ -61,10 +61,13 @@
 import org.apache.avalon.framework.configuration.Configurable;
 import org.apache.avalon.framework.configuration.Configuration;
 import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
 import org.apache.avalon.framework.service.ServiceException;
-import org.apache.plexus.service.ServiceBroker;
-import org.apache.plexus.service.Serviceable;
+import org.apache.avalon.framework.service.Serviceable;
+import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.avalon.framework.context.Contextualizable;
+import org.apache.avalon.framework.context.ContextException;
+import org.apache.avalon.framework.context.Context;
+import org.apache.plexus.logging.AbstractLogEnabled;
 import org.mortbay.http.SocketListener;
 import org.mortbay.util.Log;
 
@@ -79,7 +82,7 @@
  */
 public class JettyServletContainer
     extends AbstractLogEnabled
-    implements Serviceable, Configurable, Initializable, Startable, ServletContainer
+    implements Contextualizable, Serviceable, Configurable, Initializable, Startable, ServletContainer
 {
     // ----------------------------------------------------------------------
     //     Instance members
@@ -103,7 +106,11 @@
     /** State to indicate that the server should be stopped gracefully. */
     private boolean stopGracefully;
 
-    private ServiceBroker serviceBroker;
+    /** Service Manager. */
+    private ServiceManager serviceManager;
+
+    /** ClassLoader. */
+    private ClassLoader classLoader;
 
     // ----------------------------------------------------------------------
     //     Constructors
@@ -214,11 +221,18 @@
     // Lifecylce Management
     // ----------------------------------------------------------------------
 
+    /** @see Contextualizable#contextualize */
+    public void contextualize( Context context )
+        throws ContextException
+    {
+        classLoader = (ClassLoader) context.get( "common.classloader" );
+    }
+
     /** @see */
-    public void service( ServiceBroker serviceBroker )
+    public void service( ServiceManager serviceBroker )
         throws ServiceException
     {
-        this.serviceBroker = serviceBroker;
+        this.serviceManager = serviceBroker;
     }
 
     /** @see */
@@ -248,10 +262,10 @@
         // Create the Jetty server which understands servlet requests.
         server = new JettyServer();
         server.addListener( listener );
-        server.setServiceBroker( serviceBroker );
+        server.setServiceManager( serviceManager );
         
         // This is wrong, but will suffice at the moment. jvz.
-        server.setClassLoader( serviceBroker.getClassLoader() );
+        server.setClassLoader( classLoader );
 
         // Make sure the webapps directory exists.
         if ( getWebappsDirectory().exists() == false )

Index: ServletContainer.java
===================================================================
RCS file: /cvsroot/plexus/plexus-components/jetty/src/java/org/apache/plexus/jetty/ServletContainer.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- ServletContainer.java	15 Feb 2003 03:55:37 -0000	1.1.1.1
+++ ServletContainer.java	28 Apr 2003 02:22:41 -0000	1.2
@@ -56,8 +56,6 @@
  * ----------------------------------------------------------------------------
  */
 
-import java.io.File;
-
 /**
  * Servlet Container Role
  *