svn commit: rev 22320 - in avalon/trunk/planet: . facilities/http facilities/http/impl facilities/http/test facilities/http/test/conf facilities/http/test/src/java/test/http tutorials/dynamics tutorials/hello

Author: mcconnell
Date: Wed Jun 30 04:24:24 2004
New Revision: 22320

Added:
   avalon/trunk/planet/facilities/http/test/build.properties   (contents, props changed)
   avalon/trunk/planet/facilities/http/test/build.xml
   avalon/trunk/planet/facilities/http/test/src/java/test/http/TestComponent.xprofile
Removed:
   avalon/trunk/planet/facilities/http/test/conf/
   avalon/trunk/planet/facilities/http/test/index.ent
   avalon/trunk/planet/facilities/http/test/maven.xml
   avalon/trunk/planet/facilities/http/test/project.xml
Modified:
   avalon/trunk/planet/facilities/http/README.TXT
   avalon/trunk/planet/facilities/http/impl/build.xml
   avalon/trunk/planet/facilities/http/test/   (props changed)
   avalon/trunk/planet/index.xml
   avalon/trunk/planet/tutorials/dynamics/build.xml
   avalon/trunk/planet/tutorials/hello/build.xml
Log:
Automate the avalon-http-impl block generation and put in place a generated test block for the test demo (using named profiles).

Modified: avalon/trunk/planet/facilities/http/README.TXT
==============================================================================
--- avalon/trunk/planet/facilities/http/README.TXT	(original)
+++ avalon/trunk/planet/facilities/http/README.TXT	Wed Jun 30 04:24:24 2004
@@ -1,8 +1,15 @@
+
+To build:
+
+  $ cd planet/facilities/http
+  $ ant
 
-After building merlin try the following:
+To start the http server:
 
-  $ cd avalon-components/facilities/http/test
-  $ merlin conf/test.block
+  $ cd test
+  $ merlin target/deliverables/blocks/avalon-http-test.block
+
+To see the result:
 
-The point you we browser to http://localhost:8080/test/primary
+  http://localhost:8080/test/primary
 

Modified: avalon/trunk/planet/facilities/http/impl/build.xml
==============================================================================
--- avalon/trunk/planet/facilities/http/impl/build.xml	(original)
+++ avalon/trunk/planet/facilities/http/impl/build.xml	Wed Jun 30 04:24:24 2004
@@ -6,5 +6,16 @@
   <property file="build.properties"/>
   <import file="${project.system}/build/standard.xml"/>
 
+  <target name="build" depends="standard.build">
+    <x:block name="http">
+      <x:component name="listener" 
+         class="org.apache.avalon.http.impl.DefaultModelListener"/>
+    </x:block>
+    <x:block name="http" embed="MAIN">
+      <x:component name="listener" 
+         class="org.apache.avalon.http.impl.DefaultModelListener"/>
+    </x:block>
+  </target>
+
 </project>
 

Added: avalon/trunk/planet/facilities/http/test/build.properties
==============================================================================
--- (empty file)
+++ avalon/trunk/planet/facilities/http/test/build.properties	Wed Jun 30 04:24:24 2004
@@ -0,0 +1,3 @@
+project.system = ../../../../central/system
+project.home = ../../..
+project.src.main = java

Added: avalon/trunk/planet/facilities/http/test/build.xml
==============================================================================
--- (empty file)
+++ avalon/trunk/planet/facilities/http/test/build.xml	Wed Jun 30 04:24:24 2004
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<project name="avalon-http-test" default="install" basedir="." 
+    xmlns:x="antlib:org.apache.avalon.tools">
+
+  <property file="build.properties"/>
+  <import file="${project.system}/build/standard.xml"/>
+
+  <target name="build" depends="standard.build">
+    <x:block name="test">
+      <x:component name="primary" profile="primary" 
+         class="test.http.TestComponent"/>
+      <x:component name="secondary" profile="secondary" 
+         class="test.http.TestComponent"/>
+      <x:component name="listener" 
+         class="org.apache.avalon.http.impl.DefaultModelListener"/>
+    </x:block>
+  </target>
+
+</project>
+

Added: avalon/trunk/planet/facilities/http/test/src/java/test/http/TestComponent.xprofile
==============================================================================
--- (empty file)
+++ avalon/trunk/planet/facilities/http/test/src/java/test/http/TestComponent.xprofile	Wed Jun 30 04:24:24 2004
@@ -0,0 +1,19 @@
+<profiles>
+
+  <profile name="primary">
+    <configuration>
+      <name>Primary</name>
+      <message>I'm an avalon component.</message>
+      <link>/test/secondary</link>
+    </configuration>
+  </profile>
+
+  <profile name="secondary">
+    <configuration>
+      <name>Secondary</name>
+      <message>I'm an avalon component too!</message>
+      <link>/test/primary</link>
+    </configuration>
+  </profile>
+
+</profiles>
\ No newline at end of file

Modified: avalon/trunk/planet/index.xml
==============================================================================
--- avalon/trunk/planet/index.xml	(original)
+++ avalon/trunk/planet/index.xml	Wed Jun 30 04:24:24 2004
@@ -86,7 +86,7 @@
     </info>
     <dependencies>
       <include key="avalon-http-api"/>
-      <include key="avalon-composition-api"/>
+      <include key="avalon-composition-api" runtime="false"/>
     </dependencies>
   </project>
 
@@ -115,9 +115,22 @@
     <dependencies>
       <include key="avalon-http-spi"/>
       <include key="avalon-http-util"/>
-      <include key="avalon-composition-api"/>
-      <include key="org.mortbay.jetty"/>
+      <include key="avalon-composition-api" runtime="false"/>
       <include key="avalon-util-configuration"/>
+      <include key="org.mortbay.jetty"/>
+    </dependencies>
+    <plugins>
+      <include key="avalon-meta-tools"/>
+    </plugins>
+  </project>
+
+  <project basedir="facilities/http/test">
+    <info>
+      <group>avalon/http</group>
+      <name>avalon-http-test</name>
+    </info>
+    <dependencies>
+      <include key="avalon-http-impl"/>
     </dependencies>
     <plugins>
       <include key="avalon-meta-tools"/>

Modified: avalon/trunk/planet/tutorials/dynamics/build.xml
==============================================================================
--- avalon/trunk/planet/tutorials/dynamics/build.xml	(original)
+++ avalon/trunk/planet/tutorials/dynamics/build.xml	Wed Jun 30 04:24:24 2004
@@ -6,10 +6,6 @@
   <property file="build.properties"/>
   <import file="${project.system}/build/standard.xml"/>
 
-  <x:path id="runtime"/>
-  <pathconvert refid="runtime" targetos="windows" property="myprop"/>
-  <echo>${myprop}</echo>
-
   <target name="init" depends="standard.init">
     <x:filter key="avalon-tutorial-dynamics" feature="uri" 
        token="DYNAMICS-SPEC"/>

Modified: avalon/trunk/planet/tutorials/hello/build.xml
==============================================================================
--- avalon/trunk/planet/tutorials/hello/build.xml	(original)
+++ avalon/trunk/planet/tutorials/hello/build.xml	Wed Jun 30 04:24:24 2004
@@ -6,28 +6,5 @@
   <property file="build.properties"/>
   <import file="${project.system}/build/standard.xml"/>
 
-  <x:property property="afw.version" key="avalon-framework-api" feature="version"/>
-  <echo>${afw.version}</echo>
-
-  <!--
-  <x:property ns="framework" key="avalon-framework-api"/>
-  <echo>${framework.name}</echo>
-  <echo>${framework.version}</echo>
-  -->
-
-      <!--
-  <target name="javadoc" depends="prepare">
-    <x:javadoc>
-      <x:link href="http://java.sun.com/j2se/1.4/docs/api" />
-      <x:link key="avalon-runtime"
-        href="http://www.apache.org/~mcconnell/docs/avalon/runtime/3.3.0/api"/>
-      <x:link key="avalon-runtime"
-        href="./../../../../../avalon/runtime/3.3.0/api"/>
-      <x:link key="avalon-runtime"
-        href="http://@DOC-ROOT@/avalon/runtime/3.3.0/api"/>
-    </x:javadoc>
-  </target>
-      -->
-
 </project>