notify-dpml AT lists.ibiblio.org
Subject: DPML Notify
List archive
svn commit: r2886 - development/main/test/components/http/impl/src/main/net/dpml/http/impl
- From: mcconnell AT dpml.net
- To: notify-dpml AT lists.ibiblio.org
- Subject: svn commit: r2886 - development/main/test/components/http/impl/src/main/net/dpml/http/impl
- Date: Fri, 17 Jun 2005 19:06:24 -0400
Author: mcconnell AT dpml.net
Date: Fri Jun 17 19:06:24 2005
New Revision: 2886
Modified:
development/main/test/components/http/impl/src/main/net/dpml/http/impl/Ajp13Listener.java
development/main/test/components/http/impl/src/main/net/dpml/http/impl/DumpHandler.java
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/HttpContextImpl.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/ServletHandler.java
Log:
updating to FT
Modified:
development/main/test/components/http/impl/src/main/net/dpml/http/impl/Ajp13Listener.java
==============================================================================
---
development/main/test/components/http/impl/src/main/net/dpml/http/impl/Ajp13Listener.java
(original)
+++
development/main/test/components/http/impl/src/main/net/dpml/http/impl/Ajp13Listener.java
Fri Jun 17 19:06:24 2005
@@ -33,7 +33,7 @@
{
public interface Context
{
- HttpService getHttpService();
+ HttpService getHttpServer();
int getBufferReserve( int value );
int getBufferSize( int value );
int getConfidentialPort( int value );
@@ -63,7 +63,7 @@
setBufferReserve( reserve );
}
- int reserve = context.getBufferSize( -1 );
+ int size = context.getBufferSize( -1 );
if( size > 0 )
{
setBufferSize( size );
Modified:
development/main/test/components/http/impl/src/main/net/dpml/http/impl/DumpHandler.java
==============================================================================
---
development/main/test/components/http/impl/src/main/net/dpml/http/impl/DumpHandler.java
(original)
+++
development/main/test/components/http/impl/src/main/net/dpml/http/impl/DumpHandler.java
Fri Jun 17 19:06:24 2005
@@ -30,6 +30,7 @@
{
HttpContextService getHttpContext();
int getHandlerIndex( int value );
+ String getName();
}
private Logger m_logger;
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 19:06:24 2005
@@ -28,7 +28,7 @@
public interface Context
{
String getName();
- int getHandlerIndex();
+ int getHandlerIndex( int value );
HttpContextService getHttpContext();
}
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 19:06:24 2005
@@ -53,6 +53,7 @@
File getTempDirectory();
Authenticator getAuthenticator( Authenticator value );
UserRealm getUserRealm( UserRealm value );
+ MimeTypes getMimeTypes( MimeTypes value );
RequestLog getRequestLog();
String getName();
}
@@ -61,14 +62,6 @@
private boolean m_Graceful;
private Logger m_logger;
-
- /**
- * @metro.logger name="http"
- * @metro.entry key="urn:metro:temp"
- * type="java.io.File"
- * @metro.entry key="urn:metro:classloader"
- * type="java.lang.ClassLoader"
- */
public HttpContextImpl( Logger logger, Context context, Configuration
conf )
throws ConfigurationException
{
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 19:06:24 2005
@@ -63,7 +63,7 @@
* @metro.dependency type="net.dpml.http.HttpService"
* key="server"
*/
- public JsseListener( Logger logger, Context context )
+ public JsseListener( Logger logger, Context context ) throws
java.net.UnknownHostException
{
m_logger = logger;
m_HttpServer = (HttpService) context.getServer();
@@ -75,7 +75,7 @@
setBufferReserve( reserve );
}
- int reserve = context.getBufferSize( -1 );
+ int size = context.getBufferSize( -1 );
if( size > 0 )
{
setBufferSize( size );
@@ -112,17 +112,10 @@
}
String host = context.getHostName( null );
- try
+ if( host != null )
{
- if( host != null )
- {
- setHost( host );
- }
+ setHost( host );
}
- catch( java.net.UnknownHostException e )
- {
- throw new ParameterException( "Unknown hostname: " + host );
- }
int port = context.getPort( 8080 );
setPort( port );
@@ -151,7 +144,7 @@
String keyStore = context.getKeyStore( null );
if( keyStore != null )
{
- setKeyStore( keyStore );
+ setKeystore( keyStore );
}
String keyStoreProviderClass = context.getKeystoreProviderClass(
null );
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 19:06:24 2005
@@ -18,25 +18,12 @@
import javax.servlet.ServletContext;
import net.dpml.activity.Startable;
-import net.dpml.composition.model.ContainmentModel;
-import net.dpml.configuration.Configurable;
import net.dpml.configuration.Configuration;
import net.dpml.configuration.ConfigurationException;
-import net.dpml.context.Context;
-import net.dpml.context.ContextException;
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 org.mortbay.jetty.servlet.SessionManager;
-/**
- * @metro.component name="http-servlet-handler" lifestyle="singleton"
- * @metro.service type="net.dpml.http.ServletHandler"
- */
public class ServletHandler extends org.mortbay.jetty.servlet.ServletHandler
implements Startable, net.dpml.http.ServletHandler
{
- svn commit: r2886 - development/main/test/components/http/impl/src/main/net/dpml/http/impl, mcconnell, 06/17/2005
Archive powered by MHonArc 2.6.24.