svn commit: rev 35628 - avalon/trunk/planet/facilities/http/impl/src/main/org/apache/avalon/http/impl

Author: niclas
Date: Tue Aug  3 03:29:35 2004
New Revision: 35628

Added:
   avalon/trunk/planet/facilities/http/impl/src/main/org/apache/avalon/http/impl/HashSessionManager.java   (contents, props changed)
   avalon/trunk/planet/facilities/http/impl/src/main/org/apache/avalon/http/impl/ServletHandler.java   (contents, props changed)
Log:
Added the first cut for the ServletHandler.

Added: avalon/trunk/planet/facilities/http/impl/src/main/org/apache/avalon/http/impl/HashSessionManager.java
==============================================================================
--- (empty file)
+++ avalon/trunk/planet/facilities/http/impl/src/main/org/apache/avalon/http/impl/HashSessionManager.java	Tue Aug  3 03:29:35 2004
@@ -0,0 +1,52 @@
+/* 
+ * Copyright 2004 Apache Software Foundation
+ * Licensed  under the  Apache License,  Version 2.0  (the "License");
+ * you may not use  this file  except in  compliance with the License.
+ * You may obtain a copy of the License at 
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed  under the  License is distributed on an "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
+ * implied.
+ * 
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.avalon.http.impl;
+
+import org.apache.avalon.framework.parameters.ParameterException;
+import org.apache.avalon.framework.parameters.Parameterizable;
+import org.apache.avalon.framework.parameters.Parameters;
+
+/**
+ * @avalon.component name="http-session-manager" lifestyle="singleton"
+ * @avalon.service   type="org.mortbay.jetty.servlet.SessionManager"
+ */
+public class HashSessionManager
+    extends org.mortbay.jetty.servlet.HashSessionManager
+    implements Parameterizable
+{
+
+    public void parameterize( Parameters params )
+        throws ParameterException
+    {
+        int maxInactiveInterval = params.getParameterAsInteger( "max-inactive-interval", -1 );
+        if( maxInactiveInterval >= 0 )
+            setMaxInactiveInterval( maxInactiveInterval );
+            
+        int scavangePeriod = params.getParameterAsInteger( "scavange-period", -1 );
+        if( scavangePeriod >= 0 )
+            setScavengePeriod( scavangePeriod );
+
+        boolean useRequestedId = params.getParameterAsBoolean( "use-requested-id", false );
+        setUseRequestedId( useRequestedId );
+        
+        String workerName = params.getParameter( "worker-name", null );
+        if( workerName != null )
+            setWorkerName( workerName );
+    }
+}
+ 

Added: avalon/trunk/planet/facilities/http/impl/src/main/org/apache/avalon/http/impl/ServletHandler.java
==============================================================================
--- (empty file)
+++ avalon/trunk/planet/facilities/http/impl/src/main/org/apache/avalon/http/impl/ServletHandler.java	Tue Aug  3 03:29:35 2004
@@ -0,0 +1,177 @@
+/* 
+ * Copyright 2004 Apache Software Foundation
+ * Licensed  under the  Apache License,  Version 2.0  (the "License");
+ * you may not use  this file  except in  compliance with the License.
+ * You may obtain a copy of the License at 
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed  under the  License is distributed on an "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
+ * implied.
+ * 
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.avalon.http.impl;
+
+import org.apache.avalon.framework.activity.Startable;
+
+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.context.Context;
+import org.apache.avalon.framework.context.ContextException;
+import org.apache.avalon.framework.context.Contextualizable;
+
+import org.apache.avalon.framework.logger.LogEnabled;
+import org.apache.avalon.framework.logger.Logger;
+
+import org.apache.avalon.framework.parameters.ParameterException;
+import org.apache.avalon.framework.parameters.Parameterizable;
+import org.apache.avalon.framework.parameters.Parameters;
+
+import org.apache.avalon.framework.service.Serviceable;
+import org.apache.avalon.framework.service.ServiceException;
+import org.apache.avalon.framework.service.ServiceManager;
+
+import org.apache.avalon.http.HttpContextService;
+
+import org.mortbay.jetty.servlet.SessionManager;
+
+/**
+ * @avalon.component name="http-servlet-handler" lifestyle="singleton"
+ * @avalon.service   type="org.mortbay.http.HttpHandler"
+ */
+public class ServletHandler 
+    extends org.mortbay.jetty.servlet.ServletHandler 
+    implements Startable, Parameterizable, LogEnabled, 
+               Serviceable, Contextualizable, Configurable
+{
+    private Logger m_Logger;
+    private HttpContextService  m_Context;
+    private int m_Index;
+    
+    public ServletHandler()
+    {
+    }
+    
+    /**
+     * Enable the logging system.
+     *
+     * @avalon.logger name="http"
+     */
+    public void enableLogging( Logger logger )
+    {
+        m_Logger = logger;
+    }
+    
+    public Logger getLogger() 
+    {
+        return m_Logger;
+    }
+    
+    /**
+     * Contextulaization of the Handler.
+     *
+     * @param ctx the supplied listener context
+     *
+     * @exception ContextException if a contextualization error occurs
+     *
+     * @avalon.entry key="urn:avalon:name" 
+     *               type="java.lang.String" 
+     */
+    public void contextualize( Context ctx ) 
+        throws ContextException
+    {
+        String name = (String) ctx.get( "urn:avalon:name" );
+        setName( name );
+    }
+
+    public void parameterize( Parameters params )
+        throws ParameterException
+    {
+        m_Index = params.getParameterAsInteger( "handler-index", -1 );
+        
+        boolean useCookies = params.getParameterAsBoolean( "using-cookies", false );
+        setUsingCookies( useCookies );
+        
+        boolean autoInitialize = params.getParameterAsBoolean( "auto-initialize-servlets", true );
+        setAutoInitializeServlets( autoInitialize );
+    }
+
+    public void configure( Configuration conf )
+        throws ConfigurationException
+    {
+        Configuration child = conf.getChild( "servlets" );
+        configureServlets( child );
+    }
+    
+    private void configureServlets( Configuration conf )
+        throws ConfigurationException 
+    {
+        Configuration[] children = conf.getChildren( "servlet" );
+        for( int i = 0 ; i < children.length ; i++ )
+            configureServlet( children[i] );
+    }
+    
+    private void configureServlet( Configuration conf )
+        throws ConfigurationException 
+    {
+        String path = conf.getChild( "path" ).getValue();
+        String classname = conf.getChild( "classname" ).getValue();
+        String name = conf.getChild( "name" ).getValue( null );
+        if( name == null )
+            addServlet( path, classname );
+        else
+        {
+            String forcedPath = conf.getChild( "forced" ).getValue( null );
+            if( forcedPath == null )
+                addServlet( name, path, classname, forcedPath );
+            else
+                addServlet( name, path, classname );
+        }
+    }
+    
+    /**  
+     * @avalon.dependency type="org.apache.avalon.http.HttpContextService"
+     *                    key="http-context" 
+     * @avalon.dependency type="org.mortbay.jetty.servlet.SessionManager"
+     *                    key="session-manager" optional="true"
+     */
+    public void service( ServiceManager man )
+        throws ServiceException
+    {
+        m_Context = (HttpContextService) man.lookup( "http-context" );
+        if( man.hasService( "session-manager" ) )
+        {
+            SessionManager sm = (SessionManager) man.lookup( "session-manager" );
+            setSessionManager( sm );
+        }
+    }
+ 
+    public void start()
+        throws Exception
+    {
+        if( m_Index >= 0 )
+            m_Context.addHandler( m_Index, this );
+        else
+            m_Context.addHandler( this );
+        if( m_Logger.isDebugEnabled() )
+            m_Logger.debug( "Starting ServletHandler: " + this );
+        super.start();
+    }
+    
+    public void stop()
+        throws InterruptedException
+    {
+        if( m_Logger.isDebugEnabled() )
+            m_Logger.debug( "Stopping ServletHandler: " + this );
+        super.stop();
+        m_Context.removeHandler( this );
+    }
+} 
+