Skip to Content.
Sympa Menu

notify-dpml - svn commit: r2878 - development/main/test/components/http/impl/src/main/net/dpml/http/impl

notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

Chronological Thread  
  • From: mcconnell AT dpml.net
  • To: notify-dpml AT lists.ibiblio.org
  • Subject: svn commit: r2878 - development/main/test/components/http/impl/src/main/net/dpml/http/impl
  • Date: Fri, 17 Jun 2005 16:27:55 -0400

Author: mcconnell AT dpml.net
Date: Fri Jun 17 16:27:55 2005
New Revision: 2878

Modified:

development/main/test/components/http/impl/src/main/net/dpml/http/impl/ErrorPageHandler.java

development/main/test/components/http/impl/src/main/net/dpml/http/impl/ExpiryHandler.java

development/main/test/components/http/impl/src/main/net/dpml/http/impl/ForwardHandler.java

development/main/test/components/http/impl/src/main/net/dpml/http/impl/HTAccessHandler.java

development/main/test/components/http/impl/src/main/net/dpml/http/impl/HttpContextImpl.java

development/main/test/components/http/impl/src/main/net/dpml/http/impl/HttpServerImpl.java

development/main/test/components/http/impl/src/main/net/dpml/http/impl/IPAccessHandler.java

development/main/test/components/http/impl/src/main/net/dpml/http/impl/JsseListener.java

development/main/test/components/http/impl/src/main/net/dpml/http/impl/ModelHandler.java

development/main/test/components/http/impl/src/main/net/dpml/http/impl/MsieSslHandler.java

development/main/test/components/http/impl/src/main/net/dpml/http/impl/NotFoundHandler.java

development/main/test/components/http/impl/src/main/net/dpml/http/impl/NullHandler.java

development/main/test/components/http/impl/src/main/net/dpml/http/impl/ProxyHandler.java

development/main/test/components/http/impl/src/main/net/dpml/http/impl/ResourceHandler.java

development/main/test/components/http/impl/src/main/net/dpml/http/impl/RootNotFoundHandler.java

development/main/test/components/http/impl/src/main/net/dpml/http/impl/SecurityConstraint.java

development/main/test/components/http/impl/src/main/net/dpml/http/impl/SecurityHandler.java

development/main/test/components/http/impl/src/main/net/dpml/http/impl/ServletHandler.java

development/main/test/components/http/impl/src/main/net/dpml/http/impl/SetResponseHeadersHandler.java

development/main/test/components/http/impl/src/main/net/dpml/http/impl/SocketListener.java

development/main/test/components/http/impl/src/main/net/dpml/http/impl/WebApplicationContext.java
Log:
updating to FT

Modified:
development/main/test/components/http/impl/src/main/net/dpml/http/impl/ErrorPageHandler.java
==============================================================================
---
development/main/test/components/http/impl/src/main/net/dpml/http/impl/ErrorPageHandler.java
(original)
+++
development/main/test/components/http/impl/src/main/net/dpml/http/impl/ErrorPageHandler.java
Fri Jun 17 16:27:55 2005
@@ -37,7 +37,6 @@
private int m_index;

public ErrorPageHandler( Logger logger, Context context )
- throws ContextException, ServiceException
{
m_logger = logger;
String name = (String) context.getName();

Modified:
development/main/test/components/http/impl/src/main/net/dpml/http/impl/ExpiryHandler.java
==============================================================================
---
development/main/test/components/http/impl/src/main/net/dpml/http/impl/ExpiryHandler.java
(original)
+++
development/main/test/components/http/impl/src/main/net/dpml/http/impl/ExpiryHandler.java
Fri Jun 17 16:27:55 2005
@@ -16,18 +16,8 @@
package net.dpml.http.impl;

import net.dpml.activity.Startable;
-import net.dpml.context.Context;
-import net.dpml.context.ContextException;
-import net.dpml.context.Contextualizable;
-import net.dpml.logging.LogEnabled;
import net.dpml.logging.Logger;
-import net.dpml.parameters.ParameterException;
-import net.dpml.parameters.Parameterizable;
-import net.dpml.parameters.Parameters;
import net.dpml.http.HttpContextService;
-import net.dpml.service.ServiceException;
-import net.dpml.service.ServiceManager;
-import net.dpml.service.Serviceable;

/**
* @metro.component name="http-expiry-handler" lifestyle="singleton"
@@ -37,51 +27,67 @@
extends org.mortbay.http.handler.ExpiryHandler
implements Startable
{
- private Logger m_Logger;
- private HttpContextService m_Context;
- private int m_Index;
+ public interface Context
+ {
+ HttpContextService getHttpContext();
+ int getHandlerIndex( int value );
+ int getTimeToLive( int value );
+ String getName();
+ }
+
+ private Logger m_logger;
+ private HttpContextService m_context;
+ private int m_index;

/**
- * @metro.logger name="http"
- * @metro.entry key="urn:metro:name"
- * type="java.lang.String"
- * @metro.dependency type="net.dpml.http.HttpContextService"
- * key="http-context"
*/
- public ExpiryHandler( Logger logger, Context ctx, Parameters params,
ServiceManager man )
- throws ContextException, ServiceException
+ public ExpiryHandler( Logger logger, Context context )
{
- m_Logger = logger;
- String name = (String) ctx.get( "urn:metro:name" );
+ m_logger = logger;
+
+ String name = context.getName();
setName( name );
- m_Index = params.getParameterAsInteger( "handler-index", -1 );
- int ttl = params.getParameterAsInteger( "time-to-live", -1 );
- if( ttl > 0 )
- setTimeToLive( ttl );
- m_Context = (HttpContextService) man.lookup( "http-context" );
+ m_index = context.getHandlerIndex( -1 );
+ int timeToLive = context.getTimeToLive( -1 );
+ if( timeToLive > 0 )
+ {
+ setTimeToLive( timeToLive );
+ }
+ m_context = context.getHttpContext();
}

public void start()
throws Exception
{
- if( m_Index >= 0 )
- m_Context.addHandler( m_Index, this );
+ if( m_index >= 0 )
+ {
+ m_context.addHandler( m_index, this );
+ }
else
- m_Context.addHandler( this );
- if( m_Logger.isDebugEnabled() )
- m_Logger.debug( "Starting ExpiryHandler: " + this );
+ {
+ m_context.addHandler( this );
+ }
+ if( m_logger.isDebugEnabled() )
+ {
+ m_logger.debug( "Starting ExpiryHandler: " + this );
+ }
if( ! isStarted() )
+ {
super.start();
+ }
}

- public void stop()
- throws InterruptedException
+ public void stop() throws InterruptedException
{
- if( m_Logger.isDebugEnabled() )
- m_Logger.debug( "Stopping ExpiryHandler: " + this );
+ if( m_logger.isDebugEnabled() )
+ {
+ m_logger.debug( "Stopping ExpiryHandler: " + this );
+ }
if( isStarted() )
+ {
super.stop();
- m_Context.removeHandler( this );
+ }
+ m_context.removeHandler( this );
}
}


Modified:
development/main/test/components/http/impl/src/main/net/dpml/http/impl/ForwardHandler.java
==============================================================================
---
development/main/test/components/http/impl/src/main/net/dpml/http/impl/ForwardHandler.java
(original)
+++
development/main/test/components/http/impl/src/main/net/dpml/http/impl/ForwardHandler.java
Fri Jun 17 16:27:55 2005
@@ -40,9 +40,9 @@
extends org.mortbay.http.handler.ForwardHandler
implements Startable, Configurable
{
- private Logger m_Logger;
- private HttpContextService m_Context;
- private int m_Index;
+ private Logger m_logger;
+ private HttpContextService m_context;
+ private int m_index;

/**
* @metro.logger name="http"
@@ -54,11 +54,11 @@
public ForwardHandler(Logger logger, Context ctx, Parameters params,
ServiceManager man)
throws ContextException, ServiceException
{
- m_Logger = logger;
+ m_logger = logger;
String name = (String) ctx.get( "urn:metro:name" );
setName( name );

- m_Index = params.getParameterAsInteger( "handler-index", -1 );
+ m_index = params.getParameterAsInteger( "handler-index", -1 );

String rootForward = params.getParameter( "root-forward", null );
if( rootForward != null )
@@ -66,7 +66,7 @@

boolean queries = params.getParameterAsBoolean( "handle-queries",
false );
setHandleQueries( queries );
- m_Context = (HttpContextService) man.lookup( "http-context" );
+ m_context = (HttpContextService) man.lookup( "http-context" );
}

public void configure( Configuration conf )
@@ -95,12 +95,12 @@
public void start()
throws Exception
{
- if( m_Index >= 0 )
- m_Context.addHandler( m_Index, this );
+ if( m_index >= 0 )
+ m_context.addHandler( m_index, this );
else
- m_Context.addHandler( this );
- if( m_Logger.isDebugEnabled() )
- m_Logger.debug( "Starting ForwardHandler: " + this );
+ m_context.addHandler( this );
+ if( m_logger.isDebugEnabled() )
+ m_logger.debug( "Starting ForwardHandler: " + this );
if( ! isStarted() )
super.start();
}
@@ -108,11 +108,11 @@
public void stop()
throws InterruptedException
{
- if( m_Logger.isDebugEnabled() )
- m_Logger.debug( "Stopping ForwardHandler: " + this );
+ if( m_logger.isDebugEnabled() )
+ m_logger.debug( "Stopping ForwardHandler: " + this );
if( isStarted() )
super.stop();
- m_Context.removeHandler( this );
+ m_context.removeHandler( this );
}
}


Modified:
development/main/test/components/http/impl/src/main/net/dpml/http/impl/HTAccessHandler.java
==============================================================================
---
development/main/test/components/http/impl/src/main/net/dpml/http/impl/HTAccessHandler.java
(original)
+++
development/main/test/components/http/impl/src/main/net/dpml/http/impl/HTAccessHandler.java
Fri Jun 17 16:27:55 2005
@@ -37,9 +37,9 @@
extends org.mortbay.http.handler.HTAccessHandler
implements Startable
{
- private Logger m_Logger;
- private HttpContextService m_Context;
- private int m_Index;
+ private Logger m_logger;
+ private HttpContextService m_context;
+ private int m_index;

/**
* @metro.logger name="http"
@@ -51,12 +51,12 @@
public HTAccessHandler( Logger logger, Context ctx, Parameters params,
ServiceManager man)
throws ContextException, ServiceException
{
- m_Logger = logger;
- m_Context = (HttpContextService) man.lookup( "http-context" );
+ m_logger = logger;
+ m_context = (HttpContextService) man.lookup( "http-context" );
String name = (String) ctx.get( "urn:metro:name" );
setName( name );

- m_Index = params.getParameterAsInteger( "handler-index", -1 );
+ m_index = params.getParameterAsInteger( "handler-index", -1 );

String defaultAccess = params.getParameter( "default-access", null );
if( defaultAccess != null )
@@ -70,12 +70,12 @@
public void start()
throws Exception
{
- if( m_Index >= 0 )
- m_Context.addHandler( m_Index, this );
+ if( m_index >= 0 )
+ m_context.addHandler( m_index, this );
else
- m_Context.addHandler( this );
- if( m_Logger.isDebugEnabled() )
- m_Logger.debug( "Starting HTAccessHandler: " + this );
+ m_context.addHandler( this );
+ if( m_logger.isDebugEnabled() )
+ m_logger.debug( "Starting HTAccessHandler: " + this );
if( ! isStarted() )
super.start();
}
@@ -83,11 +83,11 @@
public void stop()
throws InterruptedException
{
- if( m_Logger.isDebugEnabled() )
- m_Logger.debug( "Stopping HTAccessHandler: " + this );
+ if( m_logger.isDebugEnabled() )
+ m_logger.debug( "Stopping HTAccessHandler: " + this );
if( isStarted() )
super.stop();
- m_Context.removeHandler( this );
+ m_context.removeHandler( this );
}
}


Modified:
development/main/test/components/http/impl/src/main/net/dpml/http/impl/HttpContextImpl.java
==============================================================================
---
development/main/test/components/http/impl/src/main/net/dpml/http/impl/HttpContextImpl.java
(original)
+++
development/main/test/components/http/impl/src/main/net/dpml/http/impl/HttpContextImpl.java
Fri Jun 17 16:27:55 2005
@@ -59,7 +59,7 @@
{
private HttpService m_HttpServer;
private boolean m_Graceful;
- private Logger m_Logger;
+ private Logger m_logger;


/**
@@ -72,7 +72,7 @@
public HttpContextImpl( Logger logger, Context ctx )
throws ContextException
{
- m_Logger = logger;
+ m_logger = logger;
File tmpDir = (File) ctx.get( "urn:metro:temp" );
tmpDir.mkdirs();
setTempDirectory( tmpDir );
@@ -218,8 +218,8 @@
protected void doStart()
throws Exception
{
- if( m_Logger.isDebugEnabled() )
- m_Logger.debug( "Starting context: " + this );
+ if( m_logger.isDebugEnabled() )
+ m_logger.debug( "Starting context: " + this );
m_HttpServer.addContext( this );
super.doStart();
}
@@ -227,16 +227,16 @@
protected void doStop()
throws Exception
{
- if( m_Logger.isDebugEnabled() )
- m_Logger.debug( "Stopping context: " + this );
+ if( m_logger.isDebugEnabled() )
+ m_logger.debug( "Stopping context: " + this );
super.doStop();
m_HttpServer.removeContext( this );
}

public void dispose()
{
- if( m_Logger.isDebugEnabled() )
- m_Logger.debug( "Disposing context: " + this );
+ if( m_logger.isDebugEnabled() )
+ m_logger.debug( "Disposing context: " + this );
destroy();
m_HttpServer = null;
}
@@ -244,11 +244,11 @@
public void handle( String pathInContext, String pathParams, HttpRequest
request, HttpResponse response)
throws IOException, HttpException
{
- if( m_Logger.isDebugEnabled() )
+ if( m_logger.isDebugEnabled() )
{
- m_Logger.debug( "Path: " + pathInContext );
- m_Logger.debug( "Parameters: " + pathParams );
- m_Logger.debug( "Request:\n" + request );
+ m_logger.debug( "Path: " + pathInContext );
+ m_logger.debug( "Parameters: " + pathParams );
+ m_logger.debug( "Request:\n" + request );
HttpHandler[] handlers = getHandlers();
for( int i=0 ; i < handlers.length ; i++ )
{
@@ -258,11 +258,11 @@
warning = "";
else
warning = " : NOT STARTED.";
- m_Logger.debug( "Handler[" + i + "] = " + handler + warning
);
+ m_logger.debug( "Handler[" + i + "] = " + handler + warning
);
}
}
super.handle( pathInContext, pathParams, request, response );
- if( m_Logger.isDebugEnabled() )
- m_Logger.debug( "Response:\n" + response );
+ if( m_logger.isDebugEnabled() )
+ m_logger.debug( "Response:\n" + response );
}
}

Modified:
development/main/test/components/http/impl/src/main/net/dpml/http/impl/HttpServerImpl.java
==============================================================================
---
development/main/test/components/http/impl/src/main/net/dpml/http/impl/HttpServerImpl.java
(original)
+++
development/main/test/components/http/impl/src/main/net/dpml/http/impl/HttpServerImpl.java
Fri Jun 17 16:27:55 2005
@@ -34,7 +34,7 @@
public class HttpServerImpl extends Server
implements Startable, Disposable, HttpService
{
- private Logger m_Logger;
+ private Logger m_logger;
private boolean m_Graceful;


@@ -43,7 +43,7 @@
*/
public HttpServerImpl(Logger logger, Parameters params)
{
- m_Logger = logger;
+ m_logger = logger;

boolean trace = params.getParameterAsBoolean( "trace", false );
setTrace( trace );
@@ -60,8 +60,8 @@

public void dispose()
{
- if( m_Logger.isDebugEnabled() )
- m_Logger.debug( "Disposing server: " + this );
+ if( m_logger.isDebugEnabled() )
+ m_logger.debug( "Disposing server: " + this );
super.destroy();
}
}

Modified:
development/main/test/components/http/impl/src/main/net/dpml/http/impl/IPAccessHandler.java
==============================================================================
---
development/main/test/components/http/impl/src/main/net/dpml/http/impl/IPAccessHandler.java
(original)
+++
development/main/test/components/http/impl/src/main/net/dpml/http/impl/IPAccessHandler.java
Fri Jun 17 16:27:55 2005
@@ -39,9 +39,9 @@
extends org.mortbay.http.handler.IPAccessHandler
implements Startable
{
- private Logger m_Logger;
- private HttpContextService m_Context;
- private int m_Index;
+ private Logger m_logger;
+ private HttpContextService m_context;
+ private int m_index;

/**
* @metro.logger name="http"
@@ -53,12 +53,12 @@
public IPAccessHandler(Logger logger, Context ctx, Parameters params,
ServiceManager man )
throws ContextException, ServiceException
{
- m_Logger = logger;
- m_Context = (HttpContextService) man.lookup( "http-context" );
+ m_logger = logger;
+ m_context = (HttpContextService) man.lookup( "http-context" );
String name = (String) ctx.get( "urn:metro:name" );
setName( name );

- m_Index = params.getParameterAsInteger( "handler-index", -1 );
+ m_index = params.getParameterAsInteger( "handler-index", -1 );

String standard = params.getParameter( "standard-action", null );
if( standard != null )
@@ -87,12 +87,12 @@
public void start()
throws Exception
{
- if( m_Index >= 0 )
- m_Context.addHandler( m_Index, this );
+ if( m_index >= 0 )
+ m_context.addHandler( m_index, this );
else
- m_Context.addHandler( this );
- if( m_Logger.isDebugEnabled() )
- m_Logger.debug( "Starting IPAccessHandler: " + this );
+ m_context.addHandler( this );
+ if( m_logger.isDebugEnabled() )
+ m_logger.debug( "Starting IPAccessHandler: " + this );
if( ! isStarted() )
super.start();
}
@@ -100,10 +100,10 @@
public void stop()
throws InterruptedException
{
- if( m_Logger.isDebugEnabled() )
- m_Logger.debug( "Stopping IPAccessHandler: " + this );
+ if( m_logger.isDebugEnabled() )
+ m_logger.debug( "Stopping IPAccessHandler: " + this );
if( isStarted() )
super.stop();
- m_Context.removeHandler( this );
+ m_context.removeHandler( this );
}
}

Modified:
development/main/test/components/http/impl/src/main/net/dpml/http/impl/JsseListener.java
==============================================================================
---
development/main/test/components/http/impl/src/main/net/dpml/http/impl/JsseListener.java
(original)
+++
development/main/test/components/http/impl/src/main/net/dpml/http/impl/JsseListener.java
Fri Jun 17 16:27:55 2005
@@ -38,7 +38,7 @@
implements Parameterizable, HttpListener, Startable
{
private HttpService m_HttpServer;
- private Logger m_Logger;
+ private Logger m_logger;

/**
*
@@ -49,7 +49,7 @@
public JsseListener( Logger logger, ServiceManager man )
throws ServiceException
{
- m_Logger = logger;
+ m_logger = logger;
m_HttpServer = (HttpService) man.lookup( "server" );
m_HttpServer.addListener( this );
}
@@ -138,23 +138,23 @@
public void start()
throws Exception
{
- if( m_Logger.isDebugEnabled() )
- m_Logger.debug( "Starting SSL socket: " + this );
+ if( m_logger.isDebugEnabled() )
+ m_logger.debug( "Starting SSL socket: " + this );
try
{
if( ! isStarted() )
super.start();
} catch( IOException e )
{
- m_Logger.warn( "Unable to start SSL. Possibly missing password
to KeyStore or an invalid KeyStore." );
+ m_logger.warn( "Unable to start SSL. Possibly missing password
to KeyStore or an invalid KeyStore." );
}
}

public void stop()
throws InterruptedException
{
- if( m_Logger.isDebugEnabled() )
- m_Logger.debug( "Stopping SSL socket: " + this );
+ if( m_logger.isDebugEnabled() )
+ m_logger.debug( "Stopping SSL socket: " + this );
if( isStarted() )
super.stop();
m_HttpServer.removeListener( this );

Modified:
development/main/test/components/http/impl/src/main/net/dpml/http/impl/ModelHandler.java
==============================================================================
---
development/main/test/components/http/impl/src/main/net/dpml/http/impl/ModelHandler.java
(original)
+++
development/main/test/components/http/impl/src/main/net/dpml/http/impl/ModelHandler.java
Fri Jun 17 16:27:55 2005
@@ -48,13 +48,13 @@
public class ModelHandler
implements HttpHandler, CompositionListener, Initializable, Startable
{
- private Logger m_Logger;
+ private Logger m_logger;
private ContainmentModel m_Model;
- private HttpContextService m_Context;
+ private HttpContextService m_context;
private String m_Name;
private boolean m_Started;
- private int m_Index;
- private String m_ContextPath;
+ private int m_index;
+ private String m_contextPath;
private String m_ComponentPath;

private HttpHandler m_HandlerComponent;
@@ -72,14 +72,14 @@
public ModelHandler(Logger logger, Context ctx, Parameters params,
ServiceManager man)
throws ContextException, ServiceException, ParameterException
{
- m_Logger = logger;
- m_Context = (HttpContextService) man.lookup( "httpcontext" );
+ m_logger = logger;
+ m_context = (HttpContextService) man.lookup( "httpcontext" );
m_Started = false;
m_Model = (ContainmentModel) ctx.get(
"urn:composition:containment.model" );
m_Name = (String) ctx.get( "urn:metro:name" );

- m_Index = params.getParameterAsInteger( "handler-index", -1 );
- m_ContextPath = params.getParameter( "context-path", "/" );
+ m_index = params.getParameterAsInteger( "handler-index", -1 );
+ m_contextPath = params.getParameter( "context-path", "/" );
m_ComponentPath = params.getParameter( "target" );
}

@@ -87,7 +87,7 @@

public HttpContext getHttpContext()
{
- return m_Context.getHttpContext();
+ return m_context.getHttpContext();
}

public String getName()
@@ -99,11 +99,11 @@
HttpRequest request, HttpResponse response )
throws IOException
{
- m_Logger.info( "Delegating to: " + m_HandlerComponent );
+ m_logger.info( "Delegating to: " + m_HandlerComponent );

- if( pathInContext.startsWith( m_ContextPath ) )
+ if( pathInContext.startsWith( m_contextPath ) )
{
- pathInContext = pathInContext.substring( m_ContextPath.length()
);
+ pathInContext = pathInContext.substring( m_contextPath.length()
);
m_HandlerComponent.handle( pathInContext, pathParams, request,
response );
request.setHandled( true );
response.getOutputStream().close();
@@ -135,7 +135,7 @@

public void initialize( HttpContext context )
{
- m_Logger.warn( "unhandled: initialize( " + context + " );" );
+ m_logger.warn( "unhandled: initialize( " + context + " );" );
}

public boolean isStarted()
@@ -147,21 +147,21 @@

public void start()
{
- if( m_Logger.isDebugEnabled() )
- m_Logger.debug( "Starting ModelHandler: " + this );
- if( m_Index >= 0 )
- m_Context.addHandler( m_Index, this );
+ if( m_logger.isDebugEnabled() )
+ m_logger.debug( "Starting ModelHandler: " + this );
+ if( m_index >= 0 )
+ m_context.addHandler( m_index, this );
else
- m_Context.addHandler( this );
+ m_context.addHandler( this );
m_Started = true;
}

public void stop()
{
m_Started = false;
- if( m_Logger.isDebugEnabled() )
- m_Logger.debug( "Stopping ModelHandler: " + this );
- m_Context.removeHandler( this );
+ if( m_logger.isDebugEnabled() )
+ m_logger.debug( "Stopping ModelHandler: " + this );
+ m_context.removeHandler( this );
}

/* CompositionListener interface */
@@ -171,8 +171,8 @@
*/
public void modelAdded( CompositionEvent event )
{
- if( m_Logger.isDebugEnabled() )
- m_Logger.debug( "modelRemoved( " + event + " );" );
+ if( m_logger.isDebugEnabled() )
+ m_logger.debug( "modelRemoved( " + event + " );" );

DeploymentModel dmodel = event.getChild();

@@ -186,16 +186,16 @@

if( m_HandlerComponent != null )
{
- m_Logger.warn( "Internal error. New component added at the same
path, without a modelRemoved() event: " + path );
+ m_logger.warn( "Internal error. New component added at the same
path, without a modelRemoved() event: " + path );
}

try
{
m_HandlerComponent = (HttpHandler) cmodel.resolve();
- m_Logger.info( "HttpHandler added: " + path );
+ m_logger.info( "HttpHandler added: " + path );
} catch( Exception e )
{
- m_Logger.error( "Unable to resolve " + path, e );
+ m_logger.error( "Unable to resolve " + path, e );
}
}

@@ -204,8 +204,8 @@
*/
public void modelRemoved( CompositionEvent event )
{
- if( m_Logger.isDebugEnabled() )
- m_Logger.debug( "modelRemoved( " + event + " );" );
+ if( m_logger.isDebugEnabled() )
+ m_logger.debug( "modelRemoved( " + event + " );" );

if( m_HandlerComponent == null) // No model bound to this handler.
return;
@@ -218,7 +218,7 @@
if( path.equals( m_ComponentPath ) )
{
m_HandlerComponent = null;
- m_Logger.info( "HttpHandler removed: " + path );
+ m_logger.info( "HttpHandler removed: " + path );
}
}
}

Modified:
development/main/test/components/http/impl/src/main/net/dpml/http/impl/MsieSslHandler.java
==============================================================================
---
development/main/test/components/http/impl/src/main/net/dpml/http/impl/MsieSslHandler.java
(original)
+++
development/main/test/components/http/impl/src/main/net/dpml/http/impl/MsieSslHandler.java
Fri Jun 17 16:27:55 2005
@@ -37,9 +37,9 @@
extends org.mortbay.http.handler.MsieSslHandler
implements Startable
{
- private Logger m_Logger;
- private HttpContextService m_Context;
- private int m_Index;
+ private Logger m_logger;
+ private HttpContextService m_context;
+ private int m_index;

/**
* @metro.logger name="http"
@@ -51,12 +51,12 @@
public MsieSslHandler( Logger logger, Context ctx, Parameters params,
ServiceManager man )
throws ContextException, ServiceException
{
- m_Logger = logger;
- m_Context = (HttpContextService) man.lookup( "http-context" );
+ m_logger = logger;
+ m_context = (HttpContextService) man.lookup( "http-context" );
String name = (String) ctx.get( "urn:metro:name" );
setName( name );

- m_Index = params.getParameterAsInteger( "handler-index", -1 );
+ m_index = params.getParameterAsInteger( "handler-index", -1 );

String agent = params.getParameter( "user-agent-substring", null );
if( agent != null )
@@ -66,12 +66,12 @@
public void start()
throws Exception
{
- if( m_Index >= 0 )
- m_Context.addHandler( m_Index, this );
+ if( m_index >= 0 )
+ m_context.addHandler( m_index, this );
else
- m_Context.addHandler( this );
- if( m_Logger.isDebugEnabled() )
- m_Logger.debug( "Starting MsieSslHandler: " + this );
+ m_context.addHandler( this );
+ if( m_logger.isDebugEnabled() )
+ m_logger.debug( "Starting MsieSslHandler: " + this );
if( ! isStarted() )
super.start();
}
@@ -79,11 +79,11 @@
public void stop()
throws InterruptedException
{
- if( m_Logger.isDebugEnabled() )
- m_Logger.debug( "Stopping MsieSslHandler: " + this );
+ if( m_logger.isDebugEnabled() )
+ m_logger.debug( "Stopping MsieSslHandler: " + this );
if( isStarted() )
super.stop();
- m_Context.removeHandler( this );
+ m_context.removeHandler( this );
}
}


Modified:
development/main/test/components/http/impl/src/main/net/dpml/http/impl/NotFoundHandler.java
==============================================================================
---
development/main/test/components/http/impl/src/main/net/dpml/http/impl/NotFoundHandler.java
(original)
+++
development/main/test/components/http/impl/src/main/net/dpml/http/impl/NotFoundHandler.java
Fri Jun 17 16:27:55 2005
@@ -37,9 +37,9 @@
extends org.mortbay.http.handler.NotFoundHandler
implements Startable
{
- private Logger m_Logger;
- private HttpContextService m_Context;
- private int m_Index;
+ private Logger m_logger;
+ private HttpContextService m_context;
+ private int m_index;

/**
* @metro.logger name="http"
@@ -51,24 +51,24 @@
public NotFoundHandler(Logger logger, Context ctx, Parameters params,
ServiceManager man )
throws ContextException, ServiceException
{
- m_Logger = logger;
- m_Context = (HttpContextService) man.lookup( "http-context" );
+ m_logger = logger;
+ m_context = (HttpContextService) man.lookup( "http-context" );

String name = (String) ctx.get( "urn:metro:name" );
setName( name );

- m_Index = params.getParameterAsInteger( "handler-index", -1 );
+ m_index = params.getParameterAsInteger( "handler-index", -1 );
}

public void start()
throws Exception
{
- if( m_Index >= 0 )
- m_Context.addHandler( m_Index, this );
+ if( m_index >= 0 )
+ m_context.addHandler( m_index, this );
else
- m_Context.addHandler( this );
- if( m_Logger.isDebugEnabled() )
- m_Logger.debug( "Starting NotFoundHandler: " + this );
+ m_context.addHandler( this );
+ if( m_logger.isDebugEnabled() )
+ m_logger.debug( "Starting NotFoundHandler: " + this );
if( ! isStarted() )
super.start();
}
@@ -76,10 +76,10 @@
public void doStop()
throws InterruptedException
{
- if( m_Logger.isDebugEnabled() )
- m_Logger.debug( "Stopping NotFoundHandler: " + this );
+ if( m_logger.isDebugEnabled() )
+ m_logger.debug( "Stopping NotFoundHandler: " + this );
if( isStarted() )
super.stop();
- m_Context.removeHandler( this );
+ m_context.removeHandler( this );
}
}

Modified:
development/main/test/components/http/impl/src/main/net/dpml/http/impl/NullHandler.java
==============================================================================
---
development/main/test/components/http/impl/src/main/net/dpml/http/impl/NullHandler.java
(original)
+++
development/main/test/components/http/impl/src/main/net/dpml/http/impl/NullHandler.java
Fri Jun 17 16:27:55 2005
@@ -37,9 +37,9 @@
extends org.mortbay.http.handler.NullHandler
implements Startable
{
- private Logger m_Logger;
- private HttpContextService m_Context;
- private int m_Index;
+ private Logger m_logger;
+ private HttpContextService m_context;
+ private int m_index;

/**
* @metro.logger name="http"
@@ -51,22 +51,22 @@
public NullHandler(Logger logger, Context ctx, Parameters params,
ServiceManager man )
throws ContextException, ServiceException
{
- m_Logger = logger;
- m_Context = (HttpContextService) man.lookup( "http-context" );
+ m_logger = logger;
+ m_context = (HttpContextService) man.lookup( "http-context" );
String name = (String) ctx.get( "urn:metro:name" );
setName( name );
- m_Index = params.getParameterAsInteger( "handler-index", -1 );
+ m_index = params.getParameterAsInteger( "handler-index", -1 );
}

public void start()
throws Exception
{
- if( m_Index >= 0 )
- m_Context.addHandler( m_Index, this );
+ if( m_index >= 0 )
+ m_context.addHandler( m_index, this );
else
- m_Context.addHandler( this );
- if( m_Logger.isDebugEnabled() )
- m_Logger.debug( "Starting NullHandler: " + this );
+ m_context.addHandler( this );
+ if( m_logger.isDebugEnabled() )
+ m_logger.debug( "Starting NullHandler: " + this );
if( ! isStarted() )
super.start();
}
@@ -74,11 +74,11 @@
public void stop()
throws InterruptedException
{
- if( m_Logger.isDebugEnabled() )
- m_Logger.debug( "Stopping NullHandler: " + this );
+ if( m_logger.isDebugEnabled() )
+ m_logger.debug( "Stopping NullHandler: " + this );
if( isStarted() )
super.stop();
- m_Context.removeHandler( this );
+ m_context.removeHandler( this );
}
}


Modified:
development/main/test/components/http/impl/src/main/net/dpml/http/impl/ProxyHandler.java
==============================================================================
---
development/main/test/components/http/impl/src/main/net/dpml/http/impl/ProxyHandler.java
(original)
+++
development/main/test/components/http/impl/src/main/net/dpml/http/impl/ProxyHandler.java
Fri Jun 17 16:27:55 2005
@@ -37,9 +37,9 @@
extends org.mortbay.http.handler.ProxyHandler
implements Startable
{
- private Logger m_Logger;
- private HttpContextService m_Context;
- private int m_Index;
+ private Logger m_logger;
+ private HttpContextService m_context;
+ private int m_index;

/**
* @metro.logger name="http"
@@ -51,12 +51,12 @@
public ProxyHandler( Logger logger, Context ctx, Parameters params,
ServiceManager man )
throws ContextException, ServiceException
{
- m_Logger = logger;
- m_Context = (HttpContextService) man.lookup( "http-context" );
+ m_logger = logger;
+ m_context = (HttpContextService) man.lookup( "http-context" );
String name = (String) ctx.get( "urn:metro:name" );
setName( name );

- m_Index = params.getParameterAsInteger( "handler-index", -1 );
+ m_index = params.getParameterAsInteger( "handler-index", -1 );

String whitelist = params.getParameter( "proxy-host-white-list",
null );
if( whitelist != null )
@@ -76,12 +76,12 @@
public void start()
throws Exception
{
- if( m_Index >= 0 )
- m_Context.addHandler( m_Index, this );
+ if( m_index >= 0 )
+ m_context.addHandler( m_index, this );
else
- m_Context.addHandler( this );
- if( m_Logger.isDebugEnabled() )
- m_Logger.debug( "Starting ProxyHandler: " + this );
+ m_context.addHandler( this );
+ if( m_logger.isDebugEnabled() )
+ m_logger.debug( "Starting ProxyHandler: " + this );
if( ! isStarted() )
super.start();
}
@@ -89,11 +89,11 @@
public void stop()
throws InterruptedException
{
- if( m_Logger.isDebugEnabled() )
- m_Logger.debug( "Stopping ProxyHandler: " + this );
+ if( m_logger.isDebugEnabled() )
+ m_logger.debug( "Stopping ProxyHandler: " + this );
if( isStarted() )
super.stop();
- m_Context.removeHandler( this );
+ m_context.removeHandler( this );
}
}


Modified:
development/main/test/components/http/impl/src/main/net/dpml/http/impl/ResourceHandler.java
==============================================================================
---
development/main/test/components/http/impl/src/main/net/dpml/http/impl/ResourceHandler.java
(original)
+++
development/main/test/components/http/impl/src/main/net/dpml/http/impl/ResourceHandler.java
Fri Jun 17 16:27:55 2005
@@ -37,9 +37,9 @@
extends org.mortbay.http.handler.ResourceHandler
implements Startable
{
- private Logger m_Logger;
- private HttpContextService m_Context;
- private int m_Index;
+ private Logger m_logger;
+ private HttpContextService m_context;
+ private int m_index;

/**
* @metro.logger name="http"
@@ -51,8 +51,8 @@
public ResourceHandler(Logger logger, Context ctx, Parameters params,
ServiceManager man )
throws ContextException, ServiceException
{
- m_Logger = logger;
- m_Context = (HttpContextService) man.lookup( "http-context" );
+ m_logger = logger;
+ m_context = (HttpContextService) man.lookup( "http-context" );
String name = (String) ctx.get( "urn:metro:name" );
setName( name );

@@ -69,7 +69,7 @@
if( minGzip > 0 )
setMinGzipLength( minGzip );

- m_Index = params.getParameterAsInteger( "handler-index", -1 );
+ m_index = params.getParameterAsInteger( "handler-index", -1 );

String allow = params.getParameter( "allow-methods", null );
if( allow != null )
@@ -82,12 +82,12 @@
public void start()
throws Exception
{
- if( m_Index >= 0 )
- m_Context.addHandler( m_Index, this );
+ if( m_index >= 0 )
+ m_context.addHandler( m_index, this );
else
- m_Context.addHandler( this );
- if( m_Logger.isDebugEnabled() )
- m_Logger.debug( "Starting ResourceHandler: " + this );
+ m_context.addHandler( this );
+ if( m_logger.isDebugEnabled() )
+ m_logger.debug( "Starting ResourceHandler: " + this );
if( ! isStarted() )
super.start();
}
@@ -95,10 +95,10 @@
public void stop()
throws InterruptedException
{
- if( m_Logger.isDebugEnabled() )
- m_Logger.debug( "Stopping ResourceHandler: " + this );
+ if( m_logger.isDebugEnabled() )
+ m_logger.debug( "Stopping ResourceHandler: " + this );
if( isStarted() )
super.stop();
- m_Context.removeHandler( this );
+ m_context.removeHandler( this );
}
}

Modified:
development/main/test/components/http/impl/src/main/net/dpml/http/impl/RootNotFoundHandler.java
==============================================================================
---
development/main/test/components/http/impl/src/main/net/dpml/http/impl/RootNotFoundHandler.java
(original)
+++
development/main/test/components/http/impl/src/main/net/dpml/http/impl/RootNotFoundHandler.java
Fri Jun 17 16:27:55 2005
@@ -34,9 +34,9 @@
extends org.mortbay.http.handler.RootNotFoundHandler
implements Startable
{
- private Logger m_Logger;
- private HttpContextService m_Context;
- private int m_Index;
+ private Logger m_logger;
+ private HttpContextService m_context;
+ private int m_index;

/**
* @metro.logger name="http"
@@ -48,23 +48,23 @@
public RootNotFoundHandler( Logger logger, Context ctx, Parameters
params, ServiceManager man )
throws ContextException, ServiceException
{
- m_Logger = logger;
- m_Context = (HttpContextService) man.lookup( "http-context" );
+ m_logger = logger;
+ m_context = (HttpContextService) man.lookup( "http-context" );

String name = (String) ctx.get( "urn:metro:name" );
setName( name );
- m_Index = params.getParameterAsInteger( "handler-index", -1 );
+ m_index = params.getParameterAsInteger( "handler-index", -1 );
}

public void start()
throws Exception
{
- if( m_Index >= 0 )
- m_Context.addHandler( m_Index, this );
+ if( m_index >= 0 )
+ m_context.addHandler( m_index, this );
else
- m_Context.addHandler( this );
- if( m_Logger.isDebugEnabled() )
- m_Logger.debug( "Starting RootNotFoundHandler: " + this );
+ m_context.addHandler( this );
+ if( m_logger.isDebugEnabled() )
+ m_logger.debug( "Starting RootNotFoundHandler: " + this );
if( ! isStarted() )
super.start();
}
@@ -72,11 +72,11 @@
public void stop()
throws InterruptedException
{
- if( m_Logger.isDebugEnabled() )
- m_Logger.debug( "Stopping RootNotFoundHandler: " + this );
+ if( m_logger.isDebugEnabled() )
+ m_logger.debug( "Stopping RootNotFoundHandler: " + this );
if( isStarted() )
super.stop();
- m_Context.removeHandler( this );
+ m_context.removeHandler( this );
}
}


Modified:
development/main/test/components/http/impl/src/main/net/dpml/http/impl/SecurityConstraint.java
==============================================================================
---
development/main/test/components/http/impl/src/main/net/dpml/http/impl/SecurityConstraint.java
(original)
+++
development/main/test/components/http/impl/src/main/net/dpml/http/impl/SecurityConstraint.java
Fri Jun 17 16:27:55 2005
@@ -37,8 +37,8 @@
public class SecurityConstraint
extends org.mortbay.http.SecurityConstraint
{
- private Logger m_Logger;
- private HttpContextService m_Context;
+ private Logger m_logger;
+ private HttpContextService m_context;

/**
* @metro.logger name="http"
@@ -50,9 +50,9 @@
public SecurityConstraint( Logger logger, Context ctx, ServiceManager
man, Configuration conf )
throws ContextException, ServiceException, ConfigurationException
{
- m_Context = (HttpContextService) man.lookup( "http-context" );
+ m_context = (HttpContextService) man.lookup( "http-context" );

- m_Logger = logger;
+ m_logger = logger;
String name = (String) ctx.get( "urn:metro:name" );
setName( name );
String path = conf.getChild( "path" ).getValue( "/" );
@@ -77,7 +77,7 @@
Configuration methods = conf.getChild( "methods" );
configureMethods( methods );

- m_Context.addSecurityConstraint( path, this );
+ m_context.addSecurityConstraint( path, this );
}

private void configureRoles( Configuration rolesConf )

Modified:
development/main/test/components/http/impl/src/main/net/dpml/http/impl/SecurityHandler.java
==============================================================================
---
development/main/test/components/http/impl/src/main/net/dpml/http/impl/SecurityHandler.java
(original)
+++
development/main/test/components/http/impl/src/main/net/dpml/http/impl/SecurityHandler.java
Fri Jun 17 16:27:55 2005
@@ -37,9 +37,9 @@
extends org.mortbay.http.handler.SecurityHandler
implements Startable
{
- private Logger m_Logger;
- private HttpContextService m_Context;
- private int m_Index;
+ private Logger m_logger;
+ private HttpContextService m_context;
+ private int m_index;

/**
* @metro.logger name="http"
@@ -57,23 +57,23 @@
public SecurityHandler( Logger logger, Context ctx, Parameters params,
ServiceManager man )
throws ContextException, ServiceException
{
- m_Context = (HttpContextService) man.lookup( "http-context" );
+ m_context = (HttpContextService) man.lookup( "http-context" );

- m_Logger = logger;
+ m_logger = logger;
String name = (String) ctx.get( "urn:metro:name" );
setName( name );
- m_Index = params.getParameterAsInteger( "handler-index", -1 );
+ m_index = params.getParameterAsInteger( "handler-index", -1 );
}

public void start()
throws Exception
{
- if( m_Index >= 0 )
- m_Context.addHandler( m_Index, this );
+ if( m_index >= 0 )
+ m_context.addHandler( m_index, this );
else
- m_Context.addHandler( this );
- if( m_Logger.isDebugEnabled() )
- m_Logger.debug( "Starting SecurityHandler: " + this );
+ m_context.addHandler( this );
+ if( m_logger.isDebugEnabled() )
+ m_logger.debug( "Starting SecurityHandler: " + this );
if( ! isStarted() )
super.start();
}
@@ -81,11 +81,11 @@
public void stop()
throws InterruptedException
{
- if( m_Logger.isDebugEnabled() )
- m_Logger.debug( "Stopping SecurityHandler: " + this );
+ if( m_logger.isDebugEnabled() )
+ m_logger.debug( "Stopping SecurityHandler: " + this );
if( isStarted() )
super.stop();
- m_Context.removeHandler( this );
+ m_context.removeHandler( this );
}
}


Modified:
development/main/test/components/http/impl/src/main/net/dpml/http/impl/ServletHandler.java
==============================================================================
---
development/main/test/components/http/impl/src/main/net/dpml/http/impl/ServletHandler.java
(original)
+++
development/main/test/components/http/impl/src/main/net/dpml/http/impl/ServletHandler.java
Fri Jun 17 16:27:55 2005
@@ -40,9 +40,9 @@
public class ServletHandler extends org.mortbay.jetty.servlet.ServletHandler
implements Configurable, Startable, net.dpml.http.ServletHandler
{
- private Logger m_Logger;
- private HttpContextService m_Context;
- private int m_Index;
+ private Logger m_logger;
+ private HttpContextService m_context;
+ private int m_index;
private boolean m_EnableModelInContext;

/**
@@ -57,8 +57,8 @@
public ServletHandler( Logger logger, Context ctx, Parameters params,
ServiceManager man )
throws ServiceException, ContextException
{
- m_Logger = logger;
- m_Context = (HttpContextService) man.lookup( "http-context" );
+ m_logger = logger;
+ m_context = (HttpContextService) man.lookup( "http-context" );

if( man.hasService( "session-manager" ) )
{
@@ -68,7 +68,7 @@
String name = (String) ctx.get( "urn:metro:name" );
setName( name );

- m_Index = params.getParameterAsInteger( "handler-index", -1 );
+ m_index = params.getParameterAsInteger( "handler-index", -1 );

boolean useCookies = params.getParameterAsBoolean( "using-cookies",
false );
setUsingCookies( useCookies );
@@ -113,12 +113,12 @@
protected void doStart()
throws Exception
{
- if( m_Index >= 0 )
- m_Context.addHandler( m_Index, this );
+ 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 );
+ m_context.addHandler( this );
+ if( m_logger.isDebugEnabled() )
+ m_logger.debug( "Starting ServletHandler: " + this );
if( ! isStarted() )
super.doStart();
}
@@ -126,11 +126,11 @@
protected void doStop()
throws Exception
{
- if( m_Logger.isDebugEnabled() )
- m_Logger.debug( "Stopping ServletHandler: " + this );
+ if( m_logger.isDebugEnabled() )
+ m_logger.debug( "Stopping ServletHandler: " + this );
if( isStarted() )
super.doStop();
- m_Context.removeHandler( this );
+ m_context.removeHandler( this );
}

/** Adds the contextObject into the ServletContext object.

Modified:
development/main/test/components/http/impl/src/main/net/dpml/http/impl/SetResponseHeadersHandler.java
==============================================================================
---
development/main/test/components/http/impl/src/main/net/dpml/http/impl/SetResponseHeadersHandler.java
(original)
+++
development/main/test/components/http/impl/src/main/net/dpml/http/impl/SetResponseHeadersHandler.java
Fri Jun 17 16:27:55 2005
@@ -40,9 +40,9 @@
extends org.mortbay.http.handler.SetResponseHeadersHandler
implements Configurable, Startable
{
- private Logger m_Logger;
- private HttpContextService m_Context;
- private int m_Index;
+ private Logger m_logger;
+ private HttpContextService m_context;
+ private int m_index;

/**
* @metro.logger name="http"
@@ -54,11 +54,11 @@
public SetResponseHeadersHandler( Logger logger, Context ctx, Parameters
params, ServiceManager man )
throws ContextException, ServiceException
{
- m_Logger = logger;
- m_Context = (HttpContextService) man.lookup( "http-context" );
+ m_logger = logger;
+ m_context = (HttpContextService) man.lookup( "http-context" );
String name = (String) ctx.get( "urn:metro:name" );
setName( name );
- m_Index = params.getParameterAsInteger( "handler-index", -1 );
+ m_index = params.getParameterAsInteger( "handler-index", -1 );

}

@@ -88,12 +88,12 @@
public void start()
throws Exception
{
- if( m_Index >= 0 )
- m_Context.addHandler( m_Index, this );
+ if( m_index >= 0 )
+ m_context.addHandler( m_index, this );
else
- m_Context.addHandler( this );
- if( m_Logger.isDebugEnabled() )
- m_Logger.debug( "Starting SetResponseHeadersHandler: " + this );
+ m_context.addHandler( this );
+ if( m_logger.isDebugEnabled() )
+ m_logger.debug( "Starting SetResponseHeadersHandler: " + this );
if( ! isStarted() )
super.start();
}
@@ -101,11 +101,11 @@
public void stop()
throws InterruptedException
{
- if( m_Logger.isDebugEnabled() )
- m_Logger.debug( "Stopping SetResponseHeadersHandler: " + this );
+ if( m_logger.isDebugEnabled() )
+ m_logger.debug( "Stopping SetResponseHeadersHandler: " + this );
if( isStarted() )
super.stop();
- m_Context.removeHandler( this );
+ m_context.removeHandler( this );
}
}


Modified:
development/main/test/components/http/impl/src/main/net/dpml/http/impl/SocketListener.java
==============================================================================
---
development/main/test/components/http/impl/src/main/net/dpml/http/impl/SocketListener.java
(original)
+++
development/main/test/components/http/impl/src/main/net/dpml/http/impl/SocketListener.java
Fri Jun 17 16:27:55 2005
@@ -34,7 +34,7 @@
implements Parameterizable, HttpListener, Startable
{
private HttpService m_HttpServer;
- private Logger m_Logger;
+ private Logger m_logger;

/**
* @metro.logger name="http"
@@ -45,7 +45,7 @@
public SocketListener(Logger logger, ServiceManager man)
throws ServiceException
{
- m_Logger = logger;
+ m_logger = logger;
m_HttpServer = (HttpService) man.lookup( "server" );
m_HttpServer.addListener( this );
}
@@ -107,8 +107,8 @@
public void start()
throws Exception
{
- if( m_Logger.isDebugEnabled() )
- m_Logger.debug( "Starting socket: " + this );
+ if( m_logger.isDebugEnabled() )
+ m_logger.debug( "Starting socket: " + this );
if( ! isStarted() )
super.start();
}
@@ -116,8 +116,8 @@
public void stop()
throws InterruptedException
{
- if( m_Logger.isDebugEnabled() )
- m_Logger.debug( "Stopping socket: " + this );
+ if( m_logger.isDebugEnabled() )
+ m_logger.debug( "Stopping socket: " + this );
if( isStarted() )
super.stop();
m_HttpServer.removeListener( this );

Modified:
development/main/test/components/http/impl/src/main/net/dpml/http/impl/WebApplicationContext.java
==============================================================================
---
development/main/test/components/http/impl/src/main/net/dpml/http/impl/WebApplicationContext.java
(original)
+++
development/main/test/components/http/impl/src/main/net/dpml/http/impl/WebApplicationContext.java
Fri Jun 17 16:27:55 2005
@@ -51,7 +51,7 @@
{
private HttpService m_HttpServer;
private boolean m_Graceful;
- private Logger m_Logger;
+ private Logger m_logger;


/**
@@ -64,7 +64,7 @@
public WebApplicationContext( Logger logger, Context ctx )
throws ContextException
{
- m_Logger = logger;
+ m_logger = logger;
File tmpDir = (File) ctx.get( "urn:metro:temp" );
tmpDir.mkdirs();
setTempDirectory( tmpDir );
@@ -234,8 +234,8 @@
protected void doStart()
throws Exception
{
- if( m_Logger.isDebugEnabled() )
- m_Logger.debug( "Starting context: " + this );
+ if( m_logger.isDebugEnabled() )
+ m_logger.debug( "Starting context: " + this );
m_HttpServer.addContext( this );
super.doStart();
}
@@ -243,16 +243,16 @@
protected void doStop()
throws Exception
{
- if( m_Logger.isDebugEnabled() )
- m_Logger.debug( "Stopping context: " + this );
+ if( m_logger.isDebugEnabled() )
+ m_logger.debug( "Stopping context: " + this );
m_HttpServer.removeContext( this );
super.doStop();
}

public void dispose()
{
- if( m_Logger.isDebugEnabled() )
- m_Logger.debug( "Disposing context: " + this );
+ if( m_logger.isDebugEnabled() )
+ m_logger.debug( "Disposing context: " + this );
destroy();
m_HttpServer = null;
}



  • svn commit: r2878 - development/main/test/components/http/impl/src/main/net/dpml/http/impl, mcconnell, 06/17/2005

Archive powered by MHonArc 2.6.24.

Top of Page