notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

svn commit: r2344 - in development/planet/facilities: . http http/blocks http/examples http/examples/hangman/app

From: niclas AT hedhman.org
To: notify-dpml AT lists.ibiblio.org
Subject: svn commit: r2344 - in development/planet/facilities: . http http/blocks http/examples http/examples/hangman/app
Date: Thu, 21 Apr 2005 14:46:00 -0400

Author: niclas AT hedhman.org
Date: Thu Apr 21 14:45:56 2005
New Revision: 2344

Modified:
development/planet/facilities/http/blocks/index.xml
development/planet/facilities/http/examples/hangman/app/build.xml
development/planet/facilities/http/examples/index.xml
development/planet/facilities/http/index.xml
development/planet/facilities/index.xml
Log:
Fixed http to build again properly, without everything else.

Modified: development/planet/facilities/http/blocks/index.xml
==============================================================================
--- development/planet/facilities/http/blocks/index.xml (original)
+++ development/planet/facilities/http/blocks/index.xml Thu Apr 21 14:45:56
2005
@@ -6,9 +6,9 @@
* 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.
@@ -18,14 +18,14 @@

<index>

- <import index="../../index.xml"/>
+ <import index="../index.xml"/>

<project basedir="context">
<info>
<group>dpml/http</group>
<name>dpml-http-context</name>
<version>1.0</version>
- <type>block</type>
+ <type>block</type>
</info>
<dependencies>
<include key="dpml-http-impl" />
@@ -37,7 +37,7 @@
<group>dpml/http</group>
<name>dpml-http-webappserver</name>
<version>1.0</version>
- <type>block</type>
+ <type>block</type>
</info>
<dependencies>
<include key="dpml-http-impl" />
@@ -49,7 +49,7 @@
<group>dpml/http</group>
<name>dpml-http-server</name>
<version>1.0</version>
- <type>block</type>
+ <type>block</type>
</info>
<dependencies>
<include key="dpml-http-impl" />
@@ -61,7 +61,7 @@
<group>dpml/http</group>
<name>dpml-http-hash-basic</name>
<version>1.0</version>
- <type>block</type>
+ <type>block</type>
</info>
<dependencies>
<include key="dpml-http-impl" />
@@ -73,7 +73,7 @@
<group>dpml/http</group>
<name>dpml-http-hash-form</name>
<version>1.0</version>
- <type>block</type>
+ <type>block</type>
</info>
<dependencies>
<include key="dpml-http-impl" />
@@ -85,7 +85,7 @@
<group>dpml/http</group>
<name>dpml-http-hash-clientcert</name>
<version>1.0</version>
- <type>block</type>
+ <type>block</type>
</info>
<dependencies>
<include key="dpml-http-impl" />
@@ -97,7 +97,7 @@
<group>dpml/http</group>
<name>dpml-http-hash-digest</name>
<version>1.0</version>
- <type>block</type>
+ <type>block</type>
</info>
<dependencies>
<include key="dpml-http-impl" />
@@ -133,7 +133,7 @@
<group>dpml/http</group>
<name>dpml-http-tapestry</name>
<version>1.0</version>
- <type>block</type>
+ <type>block</type>
</info>
<dependencies>
<include key="dpml-http-impl" />
@@ -164,4 +164,4 @@
</dependencies>
</resource>
</index>
-
+

Modified: development/planet/facilities/http/examples/hangman/app/build.xml
==============================================================================
--- development/planet/facilities/http/examples/hangman/app/build.xml
(original)
+++ development/planet/facilities/http/examples/hangman/app/build.xml Thu
Apr 21 14:45:56 2005
@@ -6,9 +6,9 @@
* 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.
@@ -16,7 +16,7 @@
* limitations under the License.
-->

-<project name="hangman-app" default="install" basedir="."
+<project name="hangman-app" default="install" basedir="."
xmlns:transit="antlib:net.dpml.transit"
xmlns:x="plugin:dpml/magic/dpml-magic-core" >

<x:filter token="HANGMAN_WAR_URI" feature="uri" key="hangman-view" />
@@ -26,13 +26,13 @@
<target name="build" depends="standard.build" >
<x:property name="hangman.uri" key="hangman-game" feature="block"/>
<x:property name="tapestry.uri" key="dpml-http-tapestry"
feature="block"/>
- <x:property name="console.uri" key="dpml-console-default"
feature="block"/>
-
+ 
+
<x:block name="web-hangman" >
- <x:include name="console" uri="${console.uri}" />
+ 
<x:include name="tapestry" uri="${tapestry.uri}" />
<x:include name="app" uri="${hangman.uri}" />
</x:block>
</target>
-
+
</project>

Modified: development/planet/facilities/http/examples/index.xml
==============================================================================
--- development/planet/facilities/http/examples/index.xml (original)
+++ development/planet/facilities/http/examples/index.xml Thu Apr 21
14:45:56 2005
@@ -6,9 +6,9 @@
* 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.
@@ -18,14 +18,14 @@

<index>

- <import index="../../index.xml" />
+ <import index="../index.xml" />

<project basedir="hello">
<info>
<group>dpml/http/examples/hello</group>
<name>dpml-http-hello</name>
<version>2.0.0</version>
- <type>jar</type>
+ <type>jar</type>
</info>
<dependencies>
<include key="dpml-service-api" />
@@ -37,7 +37,7 @@
<include key="dpml-meta-tools"/>
</plugins>
</project>
-
+
<project basedir="hangman/api">
<info>
<group>dpml/http/examples/hangman</group>
@@ -45,7 +45,7 @@
<version>2.0.0</version>
</info>
</project>
-
+
<project basedir="hangman/app">
<info>
<group>dpml/http/examples/hangman</group>
@@ -62,7 +62,7 @@
<include key="dpml-meta-tools"/>
</plugins>
</project>
-
+
<project basedir="hangman/game">
<info>
<group>dpml/http/examples/hangman</group>
@@ -80,12 +80,12 @@
<include key="dpml-meta-tools"/>
</plugins>
</project>
-
+
<project basedir="hangman/view">
<info>
<group>dpml/http/examples/hangman</group>
<name>hangman-view</name>
- <type>war</type>
+ <type>war</type>
</info>
<dependencies>
<include key="hangman-api" />
@@ -93,4 +93,4 @@
</dependencies>
</project>
</index>
-
+

Modified: development/planet/facilities/http/index.xml
==============================================================================
--- development/planet/facilities/http/index.xml (original)
+++ development/planet/facilities/http/index.xml Thu Apr 21 14:45:56
2005
@@ -6,9 +6,9 @@
* 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.
@@ -18,6 +18,7 @@

<index key="dpml-http">

+ <import uri="artifact:module:dpml/metro/dpml-metro#SNAPSHOT"/>
<import index="blocks/index.xml" />
<import index="examples/index.xml" />

@@ -41,7 +42,7 @@
<group>dpml/http</group>
<name>dpml-http-api</name>
<version>1.0.0</version>
- <status>SNAPSHOT</status>
+ <status>SNAPSHOT</status>
</info>
<dependencies>
<include key="org.mortbay.jetty"/>
@@ -53,7 +54,7 @@
<group>dpml/http</group>
<name>dpml-http-spi</name>
<version>1.0.0</version>
- <status>SNAPSHOT</status>
+ <status>SNAPSHOT</status>
</info>
<dependencies>
<include key="dpml-http-api"/>
@@ -70,7 +71,7 @@
<group>dpml/http</group>
<name>dpml-http-util</name>
<version>1.0.0</version>
- <status>SNAPSHOT</status>
+ <status>SNAPSHOT</status>
</info>
<dependencies>
<include key="dpml-http-api"/>
@@ -85,7 +86,7 @@
<group>dpml/http</group>
<name>dpml-http-impl</name>
<version>1.0.0</version>
- <status>SNAPSHOT</status>
+ <status>SNAPSHOT</status>
</info>
<dependencies>
<include key="dpml-activity-api"/>
@@ -129,7 +130,7 @@

<resource>
<info>
- <name>bsf</name>
+ <name>bsf</name>
<version>2.3.0</version>
<group>bsf</group>
</info>
@@ -147,7 +148,7 @@
<info>
<name>commons-fileupload</name>
<version>1.0</version>
- <group>commons-fileupload</group>
+ <group>commons-fileupload</group>
</info>
</resource>

@@ -161,7 +162,7 @@

<resource>
<info>
- <name>commons-logging</name>
+ <name>commons-logging</name>
<version>1.0.4</version>
<group>commons-logging</group>
</info>
@@ -192,7 +193,7 @@

<resource>
<info>
- <name>oro</name>
+ <name>oro</name>
<version>2.0.6</version>
<group>oro</group>
</info>
@@ -221,4 +222,89 @@
<group>ognl</group>
</info>
</resource>
-</index>
+
+ <resource>
+ <info>
+ <group>jetty</group>
+ <name>org.mortbay.jetty</name>
+ <version>5.1.1</version>
+ <type>jar</type>
+ </info>
+ <dependencies>
+ <include key="servletapi" />
+ </dependencies>
+ </resource>
+
+ <resource>
+ <info>
+ <group>jetty</group>
+ <name>org.mortbay.jaas</name>
+ <version>5.1.1</version>
+ <type>jar</type>
+ </info>
+ </resource>
+
+ <resource>
+ <info>
+ <group>servletapi</group>
+ <name>servletapi</name>
+ <version>2.3</version>
+ <type>jar</type>
+ </info>
+ </resource>
+
+ <resource>
+ <info>
+ <group>tomcat</group>
+ <name>jasper-compiler</name>
+ <version>5.0.25</version>
+ <type>jar</type>
+ </info>
+ </resource>
+
+ <resource>
+ <info>
+ <group>tomcat</group>
+ <name>jasper-runtime</name>
+ <version>5.0.25</version>
+ <type>jar</type>
+ </info>
+ </resource>
+
+ <resource>
+ <info>
+ <group>tomcat</group>
+ <name>jsp-api</name>
+ <version>5.0.18</version>
+ <type>jar</type>
+ </info>
+ </resource>
+
+ <resource>
+ <info>
+ <group>commons-beanutils</group>
+ <name>commons-beanutils</name>
+ <version>1.7.0</version>
+ <type>jar</type>
+ </info>
+ </resource>
+
+ <resource>
+ <info>
+ <group>commons-beanutils</group>
+ <name>commons-beanutils</name>
+ <version>1.7.0</version>
+ <type>jar</type>
+ </info>
+ </resource>
+
+ <resource>
+ <info>
+ <group>commons-digester</group>
+ <name>commons-digester</name>
+ <version>1.6</version>
+ <type>jar</type>
+ </info>
+ </resource>
+
+</index>

Modified: development/planet/facilities/index.xml
==============================================================================
--- development/planet/facilities/index.xml (original)
+++ development/planet/facilities/index.xml Thu Apr 21 14:45:56 2005
@@ -19,79 +19,10 @@
<index>

<import uri="artifact:module:dpml/metro/dpml-metro#SNAPSHOT"/>
- <import index="./http/index.xml"/>
<import index="./reflector/blocks/index.xml"/>

<resource>
<info>
- <group>servletapi</group>
- <name>servletapi</name>
- <version>2.3</version>
- <type>jar</type>
- </info>
- </resource>
-
- 
-
- <resource>
- <info>
- <group>jetty</group>
- <name>org.mortbay.jetty</name>
- <version>5.1.1</version>
- <type>jar</type>
- </info>
- <dependencies>
- <include key="servletapi" />
- </dependencies>
- </resource>
-
- <resource>
- <info>
- <group>jetty</group>
- <name>org.mortbay.jaas</name>
- <version>5.1.1</version>
- <type>jar</type>
- </info>
- </resource>
-
- <resource>
- <info>
- <group>tomcat</group>
- <name>jasper-compiler</name>
- <version>5.0.25</version>
- <type>jar</type>
- </info>
- </resource>
-
- <resource>
- <info>
- <group>tomcat</group>
- <name>jasper-runtime</name>
- <version>5.0.25</version>
- <type>jar</type>
- </info>
- </resource>
-
- <resource>
- <info>
- <group>tomcat</group>
- <name>jsp-api</name>
- <version>5.0.18</version>
- <type>jar</type>
- </info>
- </resource>
-
- <resource>
- <info>
<group>geronimo-spec</group>
<name>geronimo-spec-jms</name>
<version>DEV</version>

svn commit: r2344 - in development/planet/facilities: . http http/blocks http/examples http/examples/hangman/app, niclas, 04/21/2005