Skip to Content.
Sympa Menu

notify-dpml - svn commit: r1259 - in development/main/planet/facilities/http: blocks blocks/server blocks/simple blocks/webappserver examples/hangman examples/tapestry

notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

Chronological Thread  
  • From: niclas AT netcompartner.com
  • To: notify-dpml AT lists.ibiblio.org
  • Subject: svn commit: r1259 - in development/main/planet/facilities/http: blocks blocks/server blocks/simple blocks/webappserver examples/hangman examples/tapestry
  • Date: Wed, 22 Dec 2004 21:09:54 +0100

Author: niclas
Date: Wed Dec 22 21:09:54 2004
New Revision: 1259

Removed:
development/main/planet/facilities/http/blocks/simple/
development/main/planet/facilities/http/examples/hangman/hangman.war
development/main/planet/facilities/http/examples/tapestry/
Modified:
development/main/planet/facilities/http/blocks/index.xml
development/main/planet/facilities/http/blocks/server/build.xml
development/main/planet/facilities/http/blocks/webappserver/build.xml
development/main/planet/facilities/http/examples/hangman/build.xml
Log:
Progress...

Modified: development/main/planet/facilities/http/blocks/index.xml
==============================================================================
--- development/main/planet/facilities/http/blocks/index.xml (original)
+++ development/main/planet/facilities/http/blocks/index.xml Wed Dec 22
21:09:54 2004
@@ -28,11 +28,16 @@
<status>SNAPSHOT</status>
<type>block</type>
</info>
- <dependencies>
- <include key="dpml-planet-http-api" />
- <include key="dpml-planet-http-impl" />
- <include key="servletapi" />
- </dependencies>
+ </project>
+
+ <project basedir="webappserver">
+ <info>
+ <group>dpml/planet/http</group>
+ <name>dpml-planet-http-webappserver</name>
+ <version>1.0.0</version>
+ <status>SNAPSHOT</status>
+ <type>block</type>
+ </info>
</project>

<project basedir="server">
@@ -43,10 +48,6 @@
<status>SNAPSHOT</status>
<type>block</type>
</info>
- <dependencies>
- <include key="dpml-planet-http-api" />
- <include key="dpml-planet-http-impl" />
- </dependencies>
</project>

<project basedir="hash-basic">
@@ -109,10 +110,6 @@
<type>jar</type>
<status>SNAPSHOT</status>
</info>
- <dependencies>
- <include key="dpml-planet-http-impl" />
- <include key="servletapi" />
- </dependencies>
<plugins>
<include key="dpml-meta-tools"/>
</plugins>
@@ -126,10 +123,6 @@
<type>block</type>
<status>SNAPSHOT</status>
</info>
- <dependencies>
- <include key="dpml-planet-http-impl" />
- <include key="servletapi" />
- </dependencies>
</project>

<project basedir="servlet">
@@ -141,10 +134,6 @@
<type>block</type>
<status>SNAPSHOT</status>
</info>
- <dependencies>
- <include key="dpml-planet-http-impl" />
- <include key="servletapi" />
- </dependencies>
</project>

<project basedir="examples">

Modified: development/main/planet/facilities/http/blocks/server/build.xml
==============================================================================
--- development/main/planet/facilities/http/blocks/server/build.xml
(original)
+++ development/main/planet/facilities/http/blocks/server/build.xml Wed
Dec 22 21:09:54 2004
@@ -22,31 +22,12 @@
<magic:import uri="artifact:template:dpml/magic/standard"/>

<target name="build" depends="standard.build">
- <x:block name="default-server">
+ <x:block name="http-server">
<x:service type="net.dpml.planet.http.HttpService"
source="httpserver"/>
<x:component name="socketlistener"
class="net.dpml.planet.http.impl.SocketListener" />
- <x:component name="httpserver"
class="net.dpml.planet.http.impl.HttpServerImpl" />
- </x:block>
- </target>
-
- <!--
- <target name="build" depends="standard.build">
- <x:block name="default-server">
- <x:service type="net.dpml.planet.http.HttpService"
source="httpserver"/>
<x:component name="ssllistener"
class="net.dpml.planet.http.impl.JsseListener" />
<x:component name="httpserver"
class="net.dpml.planet.http.impl.HttpServerImpl" />
</x:block>
</target>
- -->
-
- <!--
- <target name="build" depends="standard.build">
- <x:block name="default-server">
- <x:service type="net.dpml.planet.http.HttpService"
source="httpserver"/>
- <x:component name="ajplistener"
class="net.dpml.planet.http.impl.Ajp13Listener" />
- <x:component name="httpserver"
class="net.dpml.planet.http.impl.HttpServerImpl" />
- </x:block>
- </target>
- -->
-
+
</project>

Modified:
development/main/planet/facilities/http/blocks/webappserver/build.xml
==============================================================================
--- development/main/planet/facilities/http/blocks/webappserver/build.xml
(original)
+++ development/main/planet/facilities/http/blocks/webappserver/build.xml
Wed Dec 22 21:09:54 2004
@@ -16,13 +16,19 @@
* limitations under the License.
-->

-<project name="dpml-planet-http-context" default="install" basedir="."
+<project name="dpml-planet-http-webappserver" default="install" basedir="."
xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

<magic:import uri="artifact:template:dpml/magic/standard"/>

<target name="build" depends="standard.build">
- <x:block name="default-context">
+
+ <x:property name="server.uri"
+ key="dpml-planet-http-server" feature="block"/>
+
+ <x:block name="webapp">
+ <x:include name="server" uri="${server.uri}"/>
+
<x:component name="context"
class="net.dpml.planet.http.impl.WebContextImpl" />
<x:component name="security-handler"
class="net.dpml.planet.http.impl.SecurityHandler" />


Modified: development/main/planet/facilities/http/examples/hangman/build.xml
==============================================================================
--- development/main/planet/facilities/http/examples/hangman/build.xml
(original)
+++ development/main/planet/facilities/http/examples/hangman/build.xml Wed
Dec 22 21:09:54 2004
@@ -22,11 +22,17 @@
<magic:import uri="artifact:template:dpml/magic/standard"/>

<target name="build" depends="standard.build">
- <war destfile="hangman.war" webxml="etc/web.xml">
+ <x:property name="webappserver.uri"
+ key="dpml-planet-http-server" feature="block"/>
+
+ <x:block name="hangman-app" >
+ <x:include name="webapp-server" uri="${webappserver.uri}" />
+ </x:block>
+
+ <war destfile="target/deliverables/wars/hangman.war"
webxml="etc/web.xml">
<fileset dir="src/web"/>
<classes dir="target/classes"/>
</war>
- <x:install />
</target>

</project>



  • svn commit: r1259 - in development/main/planet/facilities/http: blocks blocks/server blocks/simple blocks/webappserver examples/hangman examples/tapestry, niclas, 12/22/2004

Archive powered by MHonArc 2.6.24.

Top of Page