notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

r1047 - trunk/main/planet/web/server/src/main/net/dpml/web/server

From: mcconnell at BerliOS <mcconnell AT mail.berlios.de>
To: notify-dpml AT lists.ibiblio.org
Subject: r1047 - trunk/main/planet/web/server/src/main/net/dpml/web/server
Date: Mon, 6 Feb 2006 20:25:58 +0100

Author: mcconnell
Date: 2006-02-06 20:25:51 +0100 (Mon, 06 Feb 2006)
New Revision: 1047

Modified:

trunk/main/planet/web/server/src/main/net/dpml/web/server/ContextHandler.java

trunk/main/planet/web/server/src/main/net/dpml/web/server/ResourceContextHandler.java
trunk/main/planet/web/server/src/main/net/dpml/web/server/Server.java

trunk/main/planet/web/server/src/main/net/dpml/web/server/ServletContextHandler.java

trunk/main/planet/web/server/src/main/net/dpml/web/server/WebAppContextHandler.java
Log:
remove server dependency

Modified:
trunk/main/planet/web/server/src/main/net/dpml/web/server/ContextHandler.java
===================================================================
---
trunk/main/planet/web/server/src/main/net/dpml/web/server/ContextHandler.java
2006-02-06 18:51:33 UTC (rev 1046)
+++
trunk/main/planet/web/server/src/main/net/dpml/web/server/ContextHandler.java
2006-02-06 19:25:51 UTC (rev 1047)
@@ -32,12 +32,6 @@
public interface Context
{
/**
- * Get the required HTTP server.
- * @return the assigned http server
- */
- Server getServer();
-
- /**
* Get the http context resource base. The value may contain symbolic
* property references and should resolve to a local directory.
*
@@ -64,7 +58,7 @@

private int m_priority = 0;

- public ContextHandler( Context context ) throws Exception
+ public ContextHandler( Server server, Context context ) throws Exception
{
String base = context.getResourceBase();
super.setResourceBase( base );
@@ -72,8 +66,6 @@
super.setContextPath( path );
Handler handler = context.getHandler();
super.setHandler( handler );
- Server server = context.getServer();
- server.addHandler( this );
}

/**

Modified:
trunk/main/planet/web/server/src/main/net/dpml/web/server/ResourceContextHandler.java
===================================================================
---
trunk/main/planet/web/server/src/main/net/dpml/web/server/ResourceContextHandler.java
2006-02-06 18:51:33 UTC (rev 1046)
+++
trunk/main/planet/web/server/src/main/net/dpml/web/server/ResourceContextHandler.java
2006-02-06 19:25:51 UTC (rev 1047)
@@ -32,12 +32,6 @@
public interface Context
{
/**
- * Get the required HTTP server.
- * @return the assigned http server
- */
- Server getServer();
-
- /**
* Get the http context resource base. The value may contain symbolic
* property references and should resolve to a local directory.
*
@@ -64,8 +58,6 @@
super.setContextPath( path );
ResourceHandler handler = new ResourceHandler( "static", "/" );
super.setHandler( handler );
- Server server = context.getServer();
- server.addHandler( this );
}

}

Modified:
trunk/main/planet/web/server/src/main/net/dpml/web/server/Server.java
===================================================================
--- trunk/main/planet/web/server/src/main/net/dpml/web/server/Server.java
2006-02-06 18:51:33 UTC (rev 1046)
+++ trunk/main/planet/web/server/src/main/net/dpml/web/server/Server.java
2006-02-06 19:25:51 UTC (rev 1047)
@@ -120,7 +120,6 @@
getLogger().debug( "adding handler: " + handler );
try
{
- handler.getContextMap().put( "server", this );
Provider provider = handler.getProvider();
org.mortbay.jetty.handler.ContextHandler ch =
(org.mortbay.jetty.handler.ContextHandler)
provider.getValue( false );

Modified:
trunk/main/planet/web/server/src/main/net/dpml/web/server/ServletContextHandler.java
===================================================================
---
trunk/main/planet/web/server/src/main/net/dpml/web/server/ServletContextHandler.java
2006-02-06 18:51:33 UTC (rev 1046)
+++
trunk/main/planet/web/server/src/main/net/dpml/web/server/ServletContextHandler.java
2006-02-06 19:25:51 UTC (rev 1047)
@@ -37,12 +37,6 @@
public interface Context
{
/**
- * Get the required HTTP server.
- * @return the assigned http server
- */
- Server getServer();
-
- /**
* Get the http context resource base. The value may contain symbolic
* property references and should resolve to a local directory.
*
@@ -73,8 +67,6 @@
super.setContextPath( path );
Handler handler = buildHandler( config );
super.setHandler( handler );
- Server server = context.getServer();
- server.addHandler( this );
}

private Handler buildHandler( Configuration config ) throws
ConfigurationException

Modified:
trunk/main/planet/web/server/src/main/net/dpml/web/server/WebAppContextHandler.java
===================================================================
---
trunk/main/planet/web/server/src/main/net/dpml/web/server/WebAppContextHandler.java
2006-02-06 18:51:33 UTC (rev 1046)
+++
trunk/main/planet/web/server/src/main/net/dpml/web/server/WebAppContextHandler.java
2006-02-06 19:25:51 UTC (rev 1047)
@@ -38,12 +38,6 @@
public interface Context
{
/**
- * Get the required HTTP server.
- * @return the assigned http server
- */
- Server getServer();
-
- /**
* Get the context path under which the http context instance will
* be associated.
*

r1047 - trunk/main/planet/web/server/src/main/net/dpml/web/server, mcconnell at BerliOS, 02/06/2006