notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

r1084 - in trunk/main/planet/http: impl impl/src/main/net/dpml/http test/src/test/net/dpml test/src/test/net/dpml/http/test

From: mcconnell at BerliOS <mcconnell AT mail.berlios.de>
To: notify-dpml AT lists.ibiblio.org
Subject: r1084 - in trunk/main/planet/http: impl impl/src/main/net/dpml/http test/src/test/net/dpml test/src/test/net/dpml/http/test
Date: Mon, 13 Feb 2006 01:41:24 +0100

Author: mcconnell
Date: 2006-02-13 01:40:56 +0100 (Mon, 13 Feb 2006)
New Revision: 1084

Added:
trunk/main/planet/http/test/src/test/net/dpml/http/
Removed:
trunk/main/planet/http/test/src/test/net/dpml/web/
Modified:
trunk/main/planet/http/impl/build.xml
trunk/main/planet/http/impl/src/main/net/dpml/http/BoundedThreadPool.java
trunk/main/planet/http/impl/src/main/net/dpml/http/ConnectorContext.java
trunk/main/planet/http/impl/src/main/net/dpml/http/ContextHandler.java
trunk/main/planet/http/impl/src/main/net/dpml/http/HashUserRealm.java
trunk/main/planet/http/impl/src/main/net/dpml/http/NCSARequestLog.java

trunk/main/planet/http/impl/src/main/net/dpml/http/ResolvingContextHandler.java

trunk/main/planet/http/impl/src/main/net/dpml/http/ResourceContextHandler.java
trunk/main/planet/http/impl/src/main/net/dpml/http/ResourceHandler.java
trunk/main/planet/http/impl/src/main/net/dpml/http/Scheme.java

trunk/main/planet/http/impl/src/main/net/dpml/http/SelectChannelConnector.java
trunk/main/planet/http/impl/src/main/net/dpml/http/Server.java

trunk/main/planet/http/impl/src/main/net/dpml/http/ServletContextHandler.java
trunk/main/planet/http/impl/src/main/net/dpml/http/ServletHandler.java
trunk/main/planet/http/impl/src/main/net/dpml/http/ServletHolder.java
trunk/main/planet/http/impl/src/main/net/dpml/http/ServletMapping.java
trunk/main/planet/http/impl/src/main/net/dpml/http/SslSocketConnector.java

trunk/main/planet/http/impl/src/main/net/dpml/http/WebAppContextHandler.java
trunk/main/planet/http/test/src/test/net/dpml/http/test/ServerTestCase.java
Log:
continued ...

Modified: trunk/main/planet/http/impl/build.xml
===================================================================
--- trunk/main/planet/http/impl/build.xml 2006-02-13 00:34:01 UTC (rev
1083)
+++ trunk/main/planet/http/impl/build.xml 2006-02-13 00:40:56 UTC (rev
1084)
@@ -24,57 +24,57 @@
<target name="build" depends="standard.build">
<depot:plugin uri="link:plugin:dpml/metro/dpml-metro-tools" urn="metro"/>

- <type xmlns="metro" name="static"
class="net.dpml.web.server.ResourceContextHandler" threadsafe="true" >
+ <type xmlns="metro" name="static"
class="net.dpml.http.ResourceContextHandler" threadsafe="true" >
<services>
- <service class="net.dpml.web.server.ResourceContextHandler"/>
+ <service class="net.dpml.http.ResourceContextHandler"/>
</services>
</type>

- <type xmlns="metro" name="servlets"
class="net.dpml.web.server.ServletContextHandler" threadsafe="true" >
+ <type xmlns="metro" name="servlets"
class="net.dpml.http.ServletContextHandler" threadsafe="true" >
<services>
- <service class="net.dpml.web.server.ServletContextHandler"/>
+ <service class="net.dpml.http.ServletContextHandler"/>
</services>
</type>

- <type xmlns="metro" name="apps"
class="net.dpml.web.server.WebAppContextHandler" threadsafe="true" >
+ <type xmlns="metro" name="apps"
class="net.dpml.http.WebAppContextHandler" threadsafe="true" >
<services>
- <service class="net.dpml.web.server.WebAppContextHandler"/>
+ <service class="net.dpml.http.WebAppContextHandler"/>
</services>
</type>

- <type xmlns="metro" class="net.dpml.web.server.NCSARequestLog"
threadsafe="true" name="ncsa">
+ <type xmlns="metro" class="net.dpml.http.NCSARequestLog"
threadsafe="true" name="ncsa">
<services>
<service class="org.mortbay.jetty.RequestLog"/>
</services>
</type>

- <type xmlns="metro" class="net.dpml.web.server.HashUserRealm"
threadsafe="true" name="realm">
+ <type xmlns="metro" class="net.dpml.http.HashUserRealm"
threadsafe="true" name="realm">
<services>
<service class="org.mortbay.jetty.security.UserRealm"/>
</services>
</type>

- <type xmlns="metro" class="net.dpml.web.server.BoundedThreadPool"
threadsafe="true" name="pool">
+ <type xmlns="metro" class="net.dpml.http.BoundedThreadPool"
threadsafe="true" name="pool">
<services>
<service class="org.mortbay.thread.ThreadPool"/>
</services>
</type>

- <type xmlns="metro" class="net.dpml.web.server.SelectChannelConnector"
threadsafe="true" name="sc-connector">
+ <type xmlns="metro" class="net.dpml.http.SelectChannelConnector"
threadsafe="true" name="sc-connector">
<services>
<service class="org.mortbay.jetty.Connector"/>
</services>
</type>

- <type xmlns="metro" class="net.dpml.web.server.SslSocketConnector"
threadsafe="true" name="ssl">
+ <type xmlns="metro" class="net.dpml.http.SslSocketConnector"
threadsafe="true" name="ssl">
<services>
<service class="org.mortbay.jetty.Connector"/>
</services>
</type>

- <type xmlns="metro" name="server" class="net.dpml.web.server.Server"
threadsafe="true" collection="hard">
+ <type xmlns="metro" name="server" class="net.dpml.http.Server"
threadsafe="true" collection="hard">
<services>
- <service class="net.dpml.web.server.Server"/>
+ <service class="net.dpml.http.Server"/>
</services>
<state>
<trigger event="initialization">
@@ -98,7 +98,7 @@
</state>
<parts>
<component key="requestLog"
- type="net.dpml.web.server.NCSARequestLog" collection="hard"
activation="DEMAND">
+ type="net.dpml.http.NCSARequestLog" collection="hard"
activation="DEMAND">
<context>
<entry key="filename"
value="$${dpml.data}/logs/http/request.log"/>
<entry key="append" value="true"/>
@@ -106,7 +106,7 @@
</context>
</component>
<component key="threadPool"
- type="net.dpml.web.server.BoundedThreadPool" collection="hard"
activation="DEMAND">
+ type="net.dpml.http.BoundedThreadPool" collection="hard"
activation="DEMAND">
<context>
<entry key="min" value="10"/>
<entry key="max" value="100"/>

Modified:
trunk/main/planet/http/impl/src/main/net/dpml/http/BoundedThreadPool.java
===================================================================
--- trunk/main/planet/http/impl/src/main/net/dpml/http/BoundedThreadPool.java
2006-02-13 00:34:01 UTC (rev 1083)
+++ trunk/main/planet/http/impl/src/main/net/dpml/http/BoundedThreadPool.java
2006-02-13 00:40:56 UTC (rev 1084)
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.web.server;
+package net.dpml.http;

/**
* Thread pool implementation.

Modified:
trunk/main/planet/http/impl/src/main/net/dpml/http/ConnectorContext.java
===================================================================
--- trunk/main/planet/http/impl/src/main/net/dpml/http/ConnectorContext.java
2006-02-13 00:34:01 UTC (rev 1083)
+++ trunk/main/planet/http/impl/src/main/net/dpml/http/ConnectorContext.java
2006-02-13 00:40:56 UTC (rev 1084)
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.web.server;
+package net.dpml.http;

/**
* Common connector context contract.

Modified:
trunk/main/planet/http/impl/src/main/net/dpml/http/ContextHandler.java
===================================================================
--- trunk/main/planet/http/impl/src/main/net/dpml/http/ContextHandler.java
2006-02-13 00:34:01 UTC (rev 1083)
+++ trunk/main/planet/http/impl/src/main/net/dpml/http/ContextHandler.java
2006-02-13 00:40:56 UTC (rev 1084)
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.web.server;
+package net.dpml.http;

import net.dpml.transit.util.PropertyResolver;

Modified:
trunk/main/planet/http/impl/src/main/net/dpml/http/HashUserRealm.java
===================================================================
--- trunk/main/planet/http/impl/src/main/net/dpml/http/HashUserRealm.java
2006-02-13 00:34:01 UTC (rev 1083)
+++ trunk/main/planet/http/impl/src/main/net/dpml/http/HashUserRealm.java
2006-02-13 00:40:56 UTC (rev 1084)
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.web.server;
+package net.dpml.http;

import java.io.File;
import java.io.IOException;

Modified:
trunk/main/planet/http/impl/src/main/net/dpml/http/NCSARequestLog.java
===================================================================
--- trunk/main/planet/http/impl/src/main/net/dpml/http/NCSARequestLog.java
2006-02-13 00:34:01 UTC (rev 1083)
+++ trunk/main/planet/http/impl/src/main/net/dpml/http/NCSARequestLog.java
2006-02-13 00:40:56 UTC (rev 1084)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.web.server;
+package net.dpml.http;

import java.io.File;
import java.util.ArrayList;

Modified:
trunk/main/planet/http/impl/src/main/net/dpml/http/ResolvingContextHandler.java
===================================================================
---
trunk/main/planet/http/impl/src/main/net/dpml/http/ResolvingContextHandler.java
2006-02-13 00:34:01 UTC (rev 1083)
+++
trunk/main/planet/http/impl/src/main/net/dpml/http/ResolvingContextHandler.java
2006-02-13 00:40:56 UTC (rev 1084)
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.web.server;
+package net.dpml.http;

import net.dpml.transit.util.PropertyResolver;

Modified:
trunk/main/planet/http/impl/src/main/net/dpml/http/ResourceContextHandler.java
===================================================================
---
trunk/main/planet/http/impl/src/main/net/dpml/http/ResourceContextHandler.java
2006-02-13 00:34:01 UTC (rev 1083)
+++
trunk/main/planet/http/impl/src/main/net/dpml/http/ResourceContextHandler.java
2006-02-13 00:40:56 UTC (rev 1084)
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.web.server;
+package net.dpml.http;

import net.dpml.transit.util.PropertyResolver;

Modified:
trunk/main/planet/http/impl/src/main/net/dpml/http/ResourceHandler.java
===================================================================
--- trunk/main/planet/http/impl/src/main/net/dpml/http/ResourceHandler.java
2006-02-13 00:34:01 UTC (rev 1083)
+++ trunk/main/planet/http/impl/src/main/net/dpml/http/ResourceHandler.java
2006-02-13 00:40:56 UTC (rev 1084)
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.web.server;
+package net.dpml.http;

import java.io.File;
import java.io.IOException;

Modified: trunk/main/planet/http/impl/src/main/net/dpml/http/Scheme.java
===================================================================
--- trunk/main/planet/http/impl/src/main/net/dpml/http/Scheme.java
2006-02-13 00:34:01 UTC (rev 1083)
+++ trunk/main/planet/http/impl/src/main/net/dpml/http/Scheme.java
2006-02-13 00:40:56 UTC (rev 1084)
@@ -17,7 +17,7 @@
* limitations under the License.
*/

-package net.dpml.web.server;
+package net.dpml.http;

import net.dpml.lang.Enum;

Modified:
trunk/main/planet/http/impl/src/main/net/dpml/http/SelectChannelConnector.java
===================================================================
---
trunk/main/planet/http/impl/src/main/net/dpml/http/SelectChannelConnector.java
2006-02-13 00:34:01 UTC (rev 1083)
+++
trunk/main/planet/http/impl/src/main/net/dpml/http/SelectChannelConnector.java
2006-02-13 00:40:56 UTC (rev 1084)
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.web.server;
+package net.dpml.http;

/**
* Thread pool implementation.

Modified: trunk/main/planet/http/impl/src/main/net/dpml/http/Server.java
===================================================================
--- trunk/main/planet/http/impl/src/main/net/dpml/http/Server.java
2006-02-13 00:34:01 UTC (rev 1083)
+++ trunk/main/planet/http/impl/src/main/net/dpml/http/Server.java
2006-02-13 00:40:56 UTC (rev 1084)
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.web.server;
+package net.dpml.http;

import java.net.URI;
import java.net.URL;

Modified:
trunk/main/planet/http/impl/src/main/net/dpml/http/ServletContextHandler.java
===================================================================
---
trunk/main/planet/http/impl/src/main/net/dpml/http/ServletContextHandler.java
2006-02-13 00:34:01 UTC (rev 1083)
+++
trunk/main/planet/http/impl/src/main/net/dpml/http/ServletContextHandler.java
2006-02-13 00:40:56 UTC (rev 1084)
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.web.server;
+package net.dpml.http;

import java.util.ArrayList;

Modified:
trunk/main/planet/http/impl/src/main/net/dpml/http/ServletHandler.java
===================================================================
--- trunk/main/planet/http/impl/src/main/net/dpml/http/ServletHandler.java
2006-02-13 00:34:01 UTC (rev 1083)
+++ trunk/main/planet/http/impl/src/main/net/dpml/http/ServletHandler.java
2006-02-13 00:40:56 UTC (rev 1084)
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.web.server;
+package net.dpml.http;

import org.mortbay.jetty.servlet.ServletHolder;
import org.mortbay.jetty.servlet.ServletMapping;

Modified:
trunk/main/planet/http/impl/src/main/net/dpml/http/ServletHolder.java
===================================================================
--- trunk/main/planet/http/impl/src/main/net/dpml/http/ServletHolder.java
2006-02-13 00:34:01 UTC (rev 1083)
+++ trunk/main/planet/http/impl/src/main/net/dpml/http/ServletHolder.java
2006-02-13 00:40:56 UTC (rev 1084)
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.web.server;
+package net.dpml.http;

/**
* Servlet classname to name binding.

Modified:
trunk/main/planet/http/impl/src/main/net/dpml/http/ServletMapping.java
===================================================================
--- trunk/main/planet/http/impl/src/main/net/dpml/http/ServletMapping.java
2006-02-13 00:34:01 UTC (rev 1083)
+++ trunk/main/planet/http/impl/src/main/net/dpml/http/ServletMapping.java
2006-02-13 00:40:56 UTC (rev 1084)
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.web.server;
+package net.dpml.http;

/**
* Servlet path to name mapping.

Modified:
trunk/main/planet/http/impl/src/main/net/dpml/http/SslSocketConnector.java
===================================================================
---
trunk/main/planet/http/impl/src/main/net/dpml/http/SslSocketConnector.java
2006-02-13 00:34:01 UTC (rev 1083)
+++
trunk/main/planet/http/impl/src/main/net/dpml/http/SslSocketConnector.java
2006-02-13 00:40:56 UTC (rev 1084)
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.web.server;
+package net.dpml.http;

import java.io.File;
import java.io.IOException;

Modified:
trunk/main/planet/http/impl/src/main/net/dpml/http/WebAppContextHandler.java
===================================================================
---
trunk/main/planet/http/impl/src/main/net/dpml/http/WebAppContextHandler.java
2006-02-13 00:34:01 UTC (rev 1083)
+++
trunk/main/planet/http/impl/src/main/net/dpml/http/WebAppContextHandler.java
2006-02-13 00:40:56 UTC (rev 1084)
@@ -13,18 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package net.dpml.web.server;
+package net.dpml.http;

import java.net.URI;
import java.util.ArrayList;

import net.dpml.transit.util.PropertyResolver;

-import net.dpml.logging.Logger;
-
-import net.dpml.configuration.Configuration;
-import net.dpml.configuration.ConfigurationException;
-
import org.mortbay.jetty.Handler;

/**
@@ -52,22 +47,13 @@
URI getWar();
}

- private final Logger m_logger;
-
private int m_priority = 0;

- public WebAppContextHandler( Logger logger, Context context ) throws
Exception
+ public WebAppContextHandler( Context context ) throws Exception
{
- m_logger = logger;
-
String path = context.getContextPath();
setContextPath( path );
getSessionHandler().setSessionManager( new
org.mortbay.jetty.servlet.HashSessionManager() );
setWar( context.getWar().toString() );
}
-
- private Logger getLogger()
- {
- return m_logger;
- }
}

Copied: trunk/main/planet/http/test/src/test/net/dpml/http (from rev 1081,
trunk/main/planet/http/test/src/test/net/dpml/web)

Modified:
trunk/main/planet/http/test/src/test/net/dpml/http/test/ServerTestCase.java
===================================================================
---
trunk/main/planet/http/test/src/test/net/dpml/web/test/ServerTestCase.java
2006-02-13 00:31:30 UTC (rev 1081)
+++
trunk/main/planet/http/test/src/test/net/dpml/http/test/ServerTestCase.java
2006-02-13 00:40:56 UTC (rev 1084)
@@ -17,7 +17,7 @@
* limitations under the License.
*/

-package net.dpml.web.test;
+package net.dpml.http.test;

import java.net.URI;

r1084 - in trunk/main/planet/http: impl impl/src/main/net/dpml/http test/src/test/net/dpml test/src/test/net/dpml/http/test, mcconnell at BerliOS, 02/12/2006