Skip to Content.
Sympa Menu

notify-dpml - r1175 - in trunk/main/planet: . http http/impl http/server

notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

r1175 - in trunk/main/planet: . http http/impl http/server

Chronological Thread  
    < Chronological >       < Thread >
  • From: mcconnell at BerliOS <mcconnell AT mail.berlios.de>
  • To: notify-dpml AT lists.ibiblio.org
  • Subject: r1175 - in trunk/main/planet: . http http/impl http/server
  • Date: Tue, 14 Mar 2006 17:12:09 +0100
Author: mcconnell
Date: 2006-03-14 17:12:09 +0100 (Tue, 14 Mar 2006)
New Revision: 1175

Removed:
trunk/main/planet/http/server/build.xml
Modified:
trunk/main/planet/http/impl/build.xml
trunk/main/planet/http/module.xml
trunk/main/planet/module.xml
Log:
move defintions to schema-based declarations

Modified: trunk/main/planet/http/impl/build.xml
===================================================================
--- trunk/main/planet/http/impl/build.xml 2006-03-14 16:11:04 UTC (rev
1174)
+++ trunk/main/planet/http/impl/build.xml 2006-03-14 16:12:09 UTC (rev
1175)
@@ -22,8 +22,9 @@
<transit:import uri="local:template:dpml/tools/standard"/>

<target name="build" depends="standard.build">
- <depot:plugin uri="link:plugin:dpml/metro/dpml-metro-tools" urn="metro"/>

+ <depot:plugin uri="link:part:dpml/metro/dpml-metro-tools" urn="metro"/>
+
<type xmlns="metro" name="static"
class="net.dpml.http.ResourceContextHandler" threadsafe="true" >
<services>
<service class="net.dpml.http.ResourceContextHandler"/>

Modified: trunk/main/planet/http/module.xml
===================================================================
--- trunk/main/planet/http/module.xml 2006-03-14 16:11:04 UTC (rev 1174)
+++ trunk/main/planet/http/module.xml 2006-03-14 16:12:09 UTC (rev 1175)
@@ -1,13 +1,20 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE module PUBLIC "-//DPML//DTD Library 1.0//EN"
"http://download.dpml.net/dtds/library_1_0.dtd"; >
+<module name="http" basedir="."
+ xmlns="artifact:xsd:dpml/lang/dpml-module#1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xmlns:metro="artifact:xsd:dpml/lang/dpml-component#1.0"
+ >

-<module name="http" basedir=".">
+ <properties>
+ <property
name="project.xsd.builder.artifact:xsd:dpml/lang/dpml-component#1.0"
+ value="link:part:dpml/metro/dpml-metro-builder"/>
+ </properties>

<project name="dpml-http-impl" basedir="impl">
<types>
<type id="jar"/>
</types>
- <dependencies scope="RUNTIME">
+ <dependencies scope="runtime">
<include ref="dpml/metro/dpml-metro-model"/>
<include ref="dpml/util/dpml-logging-api"/>
<include ref="dpml/util/dpml-configuration-api"/>
@@ -35,12 +42,98 @@

<project name="dpml-http-server" basedir="server">
<types>
+ <component xmlns="artifact:xsd:dpml/lang/dpml-component#1.0"
class="net.dpml.http.Server" lifestyle="singleton">
+ <parts>
+ <!--
+ Add a select channel connector to 8080.
+ -->
+ <component key="plain"
class="net.dpml.http.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" class="net.dpml.http.SslSocketConnector">
+ <context>
+ <entry key="port" value="8443"/>
+ <entry key="maxIdleTime" value="30000"/>
+ <entry key="keystore"
value="local:keystore:dpml/planet/http/jetty"/>
+ <entry key="password"
value="OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4"/>
+ <entry key="keyPassword" value="OBF:1u2u1wml1z7s1z7a1wnl1u2g"/>
+ </context>
+ </component>
+ <!--
+ Add a user realm.
+ -->
+ <component key="realm" class="net.dpml.http.HashUserRealm">
+ <context>
+ <entry key="name" value="Test Realm"/>
+ <entry key="URI"
value="local:properties:dpml/planet/http/realm"/>
+ </context>
+ </component>
+ <!--
+ Add a web application.
+ -->
+ <component key="webapp" class="net.dpml.http.WebAppContextHandler">
+ <context>
+ <entry key="contextPath" value="/"/>
+ <entry key="war"
value="link:war:dpml/planet/http/dpml-http-app"/>
+ </context>
+ </component>
+ <!--
+ Creation of a HTTP server configured to present static content in
+ the ${dpml.share}/docs directory.
+ -->
+ <component key="context"
class="net.dpml.http.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"
class="net.dpml.http.ServletContextHandler">
+ <context>
+ <entry key="resourceBase" value="${dpml.data}"/>
+ <entry key="contextPath" value="/data"/>
+ <entry key="servletHolders">
+ <param class="net.dpml.http.ServletHolder">
+ <param value="data"/>
+ <param value="org.mortbay.jetty.servlet.DefaultServlet"/>
+ </param>
+ </entry>
+ <entry key="servletEntries">
+ <param class="net.dpml.http.ServletEntry">
+ <param value="data"/>
+ <param value="/"/>
+ </param>
+ </entry>
+ </context>
+ </component>
+ </parts>
+ </component>
+ <!--
+ -->
+ <!--
+ <part alias="true" id="part">
+ <metro:component class="net.dpml.http.Server" lifestyle="singleton">
+ </metro:component>
+ </part>
+ -->
<type id="part" alias="true"/>
</types>
- <dependencies scope="BUILD">
+ <dependencies scope="build">
<include key="dpml-http-app"/>
</dependencies>
- <dependencies scope="RUNTIME">
+ <dependencies scope="runtime">
<include urn="artifact:jar:org/mortbay/servlet-api-2.5#20060213"
tag="PUBLIC"/>
<include key="dpml-http-impl"/>
</dependencies>

Deleted: trunk/main/planet/http/server/build.xml
===================================================================
--- trunk/main/planet/http/server/build.xml 2006-03-14 16:11:04 UTC (rev
1174)
+++ trunk/main/planet/http/server/build.xml 2006-03-14 16:12:09 UTC (rev
1175)
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- * Copyright 2004-2005 Stephen J. McConnell.
- * Copyright 2004 Niclas Hedman.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.dpml.net/central/about/legal/
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<project default="install"
- xmlns:transit="antlib:net.dpml.transit" xmlns:depot="dpml:depot">
-
- <transit:import uri="local:template:dpml/tools/standard"/>
-
- <target name="build" depends="standard.build">
-
- <depot:plugin uri="link:plugin:dpml/metro/dpml-metro-tools" urn="metro"/>
-
- <component xmlns="metro" type="net.dpml.http.Server"
lifestyle="singleton">
- <parts>
- <!--
- Add a select channel connector to 8080.
- -->
- <component key="plain" type="net.dpml.http.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.http.SslSocketConnector">
- <context>
- <entry key="port" value="8443"/>
- <entry key="maxIdleTime" value="30000"/>
- <entry key="keystore"
value="local:keystore:dpml/planet/http/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.http.HashUserRealm">
- <context>
- <entry key="name" value="Test Realm"/>
- <entry key="URI"
value="local:properties:dpml/planet/http/realm"/>
- </context>
- </component>
- <!--
- Add a web application.
- -->
- <component key="webapp" type="net.dpml.http.WebAppContextHandler">
- <context>
- <entry key="contextPath" value="/"/>
- <entry key="war"
value="link:war:dpml/planet/http/dpml-http-app"/>
- </context>
- </component>
- <!--
- Creation of a HTTP server configured to present static content in
- the ${dpml.share}/docs directory.
- -->
- <component key="context" type="net.dpml.http.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.http.ServletContextHandler">
- <context>
- <entry key="resourceBase" value="$${dpml.data}"/>
- <entry key="contextPath" value="/data"/>
- <entry key="servletHolders">
- <value class="net.dpml.http.ServletHolder">
- <value value="data"/>
- <value value="org.mortbay.jetty.servlet.DefaultServlet"/>
- </value>
- </entry>
- <entry key="servletEntries">
- <value class="net.dpml.http.ServletEntry">
- <value value="data"/>
- <value value="/"/>
- </value>
- </entry>
- </context>
- </component>
- </parts>
- </component>
-
- </target>
-
-</project>
-

Modified: trunk/main/planet/module.xml
===================================================================
--- trunk/main/planet/module.xml 2006-03-14 16:11:04 UTC (rev 1174)
+++ trunk/main/planet/module.xml 2006-03-14 16:12:09 UTC (rev 1175)
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE module PUBLIC "-//DPML//DTD Library 1.0//EN"
"http://download.dpml.net/dtds/library_1_0.dtd"; >
+<module name="planet"
+ xmlns="artifact:xsd:dpml/lang/dpml-module#1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; >

-<module name="planet">
+ <import file="http/module.xml"/>

- <module file="http/module.xml"/>
-
</module>



  • r1175 - in trunk/main/planet: . http http/impl http/server, mcconnell at BerliOS, 03/14/2006

Archive powered by MHonArc 2.6.24.

Top of Page