Skip to Content.
Sympa Menu

notify-dpml - r1080 - in trunk/main/planet/http: . impl impl/src/main/net/dpml test/src/test/net/dpml/web/test

notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

r1080 - in trunk/main/planet/http: . impl impl/src/main/net/dpml test/src/test/net/dpml/web/test

Chronological Thread  
    < Chronological >       < Thread >
  • From: mcconnell at BerliOS <mcconnell AT mail.berlios.de>
  • To: notify-dpml AT lists.ibiblio.org
  • Subject: r1080 - in trunk/main/planet/http: . impl impl/src/main/net/dpml test/src/test/net/dpml/web/test
  • Date: Mon, 13 Feb 2006 01:29:46 +0100
Author: mcconnell
Date: 2006-02-13 01:29:21 +0100 (Mon, 13 Feb 2006)
New Revision: 1080

Added:
trunk/main/planet/http/impl/src/main/net/dpml/http/
Removed:
trunk/main/planet/http/impl/src/main/net/dpml/web/
Modified:
trunk/main/planet/http/impl/build.xml
trunk/main/planet/http/module.xml
trunk/main/planet/http/test/src/test/net/dpml/web/test/ServerTestCase.java
Log:
break out part form server impl

Modified: trunk/main/planet/http/impl/build.xml
===================================================================
--- trunk/main/planet/http/impl/build.xml 2006-02-13 00:12:05 UTC (rev
1079)
+++ trunk/main/planet/http/impl/build.xml 2006-02-13 00:29:21 UTC (rev
1080)
@@ -115,81 +115,6 @@
</parts>
</type>

- <component xmlns="metro" type="net.dpml.web.server.Server"
lifestyle="singleton">
- <parts>
- <!--
- Add a select channel connector to 8080.
- -->
- <component key="plain"
type="net.dpml.web.server.SelectChannelConnector">
- <context>
- <entry key="port" value="8080"/>
- <entry key="maxIdleTime" value="50000"/>
- <entry key="acceptors" value="10"/>
- </context>
- </component>
- <!--
- Add a SSL connector to 8443.
- -->
- <component key="ssl" type="net.dpml.web.server.SslSocketConnector">
- <context>
- <entry key="port" value="8443"/>
- <entry key="maxIdleTime" value="30000"/>
- <entry key="keystore"
value="local:keystore:dpml/planet/web/jetty"/>
- <entry key="password"
value="OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4"/>
- <entry key="keyPassword" value="OBF:1u2u1wml1z7s1z7a1wnl1u2g"/>
- </context>
- </component>
- <!--
- Add a user realm.
- -->
- <component key="realm" type="net.dpml.web.server.HashUserRealm">
- <context>
- <entry key="name" value="Test Realm"/>
- <entry key="URI" value="local:properties:dpml/planet/web/realm"/>
- </context>
- </component>
- <!--
- Add a web application.
- -->
- <component key="apps"
type="net.dpml.web.server.WebAppContextHandler">
- <context>
- <entry key="war" value="link:war:dpml/planet/web/dpml-web-app"/>
- <entry key="contextPath" value="/"/>
- </context>
- </component>
- <!--
- Creation of a HTTP server configured to present static content in
- the ${dpml.share}/docs directory.
- -->
- <component key="context"
type="net.dpml.web.server.ResourceContextHandler">
- <context>
- <entry key="resourceBase" value="$${dpml.share}/docs"/>
- <entry key="contextPath" value="/docs"/>
- </context>
- </component>
- <!--
- Add an experimental servlet context.
- (Need to add context cloassloader configuration but this requires
- per-component threads - currently limited to classes declared within
- the part classloader).
- -->
- <component key="servlets"
type="net.dpml.web.server.ServletContextHandler">
- <context>
- <entry key="resourceBase" value="$${dpml.data}"/>
- <entry key="contextPath" value="/demo"/>
- </context>
- <configuration>
- <servlets>
- <servlet name="data"
class="org.mortbay.jetty.servlet.DefaultServlet"/>
- </servlets>
- <mappings>
- <map servlet="data" path="/"/>
- </mappings>
- </configuration>
- </component>
- </parts>
- </component>
-
<catalog xmlns="metro" title="Test Catalog">
<fileset dir="${basedir}">
<include name="**/target/classes/main/**/*.type"/>
@@ -199,7 +124,7 @@
</target>

<target name="install" depends="standard.install">
- <property name="prefs" location="${dpml.prefs}/dpml/planet/web"/>
+ <property name="prefs" location="${dpml.prefs}/dpml/planet/http"/>
<mkdir dir="${prefs}"/>
<copy toDir="${prefs}" filtering="false">
<fileset dir="target/prefs">

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

Modified: trunk/main/planet/http/module.xml
===================================================================
--- trunk/main/planet/http/module.xml 2006-02-13 00:12:05 UTC (rev 1079)
+++ trunk/main/planet/http/module.xml 2006-02-13 00:29:21 UTC (rev 1080)
@@ -1,34 +1,20 @@
<?xml version="1.0" encoding="ISO-8859-1"?>

-<module name="web">
+<module name="http">

<types>
<type id="module" alias="true"/>
</types>

- <project name="dpml-http-app" basedir="war">
- <types>
- <type id="jar"/>
- <type id="war" alias="true"/>
- </types>
- <dependencies>
- <include urn="artifact:jar:servletapi/servletapi#2.4" tag="public"/>
- </dependencies>
- </project>
-
<project name="dpml-http-impl" basedir="impl">
<types>
<type id="jar"/>
- <type id="part" alias="true"/>
</types>
- <dependencies scope="BUILD">
- <include key="dpml-http-app"/>
- </dependencies>
<dependencies scope="RUNTIME">
<include ref="dpml/metro/dpml-metro-model"/>
<include ref="dpml/util/dpml-logging-api"/>
<include ref="dpml/util/dpml-configuration-api"/>
- <include urn="artifact:jar:jetty/servlet-api-2.5#20060131"/>
+ <include urn="artifact:jar:jetty/servlet-api-2.5#20060131"
tag="PUBLIC"/>
<include urn="artifact:jar:tomcat/jasper-runtime#5.5.12"/>
<include urn="artifact:jar:tomcat/jasper-compiler#5.5.12"/>
<include urn="artifact:jar:tomcat/jasper-compiler-jdt#5.5.12"/>
@@ -40,6 +26,29 @@
</dependencies>
</project>

+ <project name="dpml-http-app" basedir="war">
+ <types>
+ <type id="jar"/>
+ <type id="war" alias="true"/>
+ </types>
+ <dependencies>
+ <include urn="artifact:jar:servletapi/servletapi#2.4"/>
+ </dependencies>
+ </project>
+
+ <project name="dpml-http-server" basedir="server">
+ <types>
+ <type id="part" alias="true"/>
+ </types>
+ <dependencies scope="BUILD">
+ <include key="dpml-http-app"/>
+ </dependencies>
+ <dependencies scope="RUNTIME">
+ <include urn="artifact:jar:jetty/servlet-api-2.5#20060131"
tag="PUBLIC"/>
+ <include key="dpml-http-impl"/>
+ </dependencies>
+ </project>
+
<project name="dpml-http-test" basedir="test">
<types>
<type id="jar"/>
@@ -48,7 +57,7 @@
<property name="project.test.fork" value="true"/>
</properties>
<dependencies scope="build">
- <include key="dpml-http-impl"/>
+ <include key="dpml-http-server"/>
</dependencies>
<dependencies scope="test">
<include ref="dpml/metro/dpml-metro-model"/>

Modified:
trunk/main/planet/http/test/src/test/net/dpml/web/test/ServerTestCase.java
===================================================================
---
trunk/main/planet/http/test/src/test/net/dpml/web/test/ServerTestCase.java
2006-02-13 00:12:05 UTC (rev 1079)
+++
trunk/main/planet/http/test/src/test/net/dpml/web/test/ServerTestCase.java
2006-02-13 00:29:21 UTC (rev 1080)
@@ -41,7 +41,7 @@
*/
public void testServerDeployment() throws Exception
{
- URI uri = new URI( "link:part:dpml/planet/web/dpml-web-server" );
+ URI uri = new URI( "link:part:dpml/planet/http/dpml-http-server" );
Controller control = Controller.STANDARD;
Component component = control.createComponent( uri );
try



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

Archive powered by MHonArc 2.6.24.

Top of Page