Author: mcconnell
Date: Thu Jul 1 05:40:02 2004
New Revision: 22410
Added:
avalon/trunk/planet/tutorials/composition/application/build.properties (contents,
props changed)
avalon/trunk/planet/tutorials/composition/application/build.xml
avalon/trunk/planet/tutorials/composition/application/impl/build.properties
(contents, props changed)
avalon/trunk/planet/tutorials/composition/application/impl/build.xml
avalon/trunk/planet/tutorials/composition/application/impl/conf/config.xml
- copied unchanged from rev 22276,
avalon/trunk/planet/tutorials/composition/application/impl/conf/debug.xml
avalon/trunk/planet/tutorials/composition/application/impl/src/main/
- copied from rev 22276,
avalon/trunk/planet/tutorials/composition/application/impl/src/java/
avalon/trunk/planet/tutorials/composition/application/impl/src/main/tutorial/
- copied from rev 22409,
avalon/trunk/planet/tutorials/composition/application/impl/src/java/tutorial/
avalon/trunk/planet/tutorials/composition/build.properties (contents, props
changed)
avalon/trunk/planet/tutorials/composition/build.xml
avalon/trunk/planet/tutorials/composition/location/api/build.properties
(contents, props changed)
avalon/trunk/planet/tutorials/composition/location/api/build.xml
avalon/trunk/planet/tutorials/composition/location/api/src/main/
- copied from rev 22276,
avalon/trunk/planet/tutorials/composition/location/api/src/java/
avalon/trunk/planet/tutorials/composition/location/api/src/main/tutorial/
- copied from rev 22409,
avalon/trunk/planet/tutorials/composition/location/api/src/java/tutorial/
avalon/trunk/planet/tutorials/composition/location/build.properties (contents,
props changed)
avalon/trunk/planet/tutorials/composition/location/build.xml
avalon/trunk/planet/tutorials/composition/location/impl/build.properties
(contents, props changed)
avalon/trunk/planet/tutorials/composition/location/impl/build.xml
avalon/trunk/planet/tutorials/composition/location/impl/src/main/
- copied from rev 22276,
avalon/trunk/planet/tutorials/composition/location/impl/src/java/
avalon/trunk/planet/tutorials/composition/location/impl/src/main/tutorial/
- copied from rev 22409,
avalon/trunk/planet/tutorials/composition/location/impl/src/java/tutorial/
avalon/trunk/planet/tutorials/composition/publisher/api/build.properties
(contents, props changed)
avalon/trunk/planet/tutorials/composition/publisher/api/build.xml
avalon/trunk/planet/tutorials/composition/publisher/api/src/main/
- copied from rev 22276,
avalon/trunk/planet/tutorials/composition/publisher/api/src/java/
avalon/trunk/planet/tutorials/composition/publisher/api/src/main/tutorial/
- copied from rev 22409,
avalon/trunk/planet/tutorials/composition/publisher/api/src/java/tutorial/
avalon/trunk/planet/tutorials/composition/publisher/build.properties (contents,
props changed)
avalon/trunk/planet/tutorials/composition/publisher/build.xml
avalon/trunk/planet/tutorials/composition/publisher/impl/build.properties
(contents, props changed)
avalon/trunk/planet/tutorials/composition/publisher/impl/build.xml
avalon/trunk/planet/tutorials/composition/publisher/impl/src/main/
- copied from rev 22276,
avalon/trunk/planet/tutorials/composition/publisher/impl/src/java/
avalon/trunk/planet/tutorials/composition/publisher/impl/src/main/tutorial/
- copied from rev 22409,
avalon/trunk/planet/tutorials/composition/publisher/impl/src/java/tutorial/
avalon/trunk/planet/tutorials/hello/src/main/
- copied from rev 22276, avalon/trunk/planet/tutorials/hello/src/java/
Removed:
avalon/trunk/planet/tutorials/composition/application/impl/conf/block.xml
avalon/trunk/planet/tutorials/composition/application/impl/conf/debug.xml
avalon/trunk/planet/tutorials/composition/application/impl/maven.xml
avalon/trunk/planet/tutorials/composition/application/impl/project.xml
avalon/trunk/planet/tutorials/composition/application/impl/src/java/
avalon/trunk/planet/tutorials/composition/location/api/maven.xml
avalon/trunk/planet/tutorials/composition/location/api/project.xml
avalon/trunk/planet/tutorials/composition/location/api/src/java/
avalon/trunk/planet/tutorials/composition/location/impl/maven.xml
avalon/trunk/planet/tutorials/composition/location/impl/project.xml
avalon/trunk/planet/tutorials/composition/location/impl/src/java/
avalon/trunk/planet/tutorials/composition/publisher/api/maven.xml
avalon/trunk/planet/tutorials/composition/publisher/api/project.xml
avalon/trunk/planet/tutorials/composition/publisher/api/src/java/
avalon/trunk/planet/tutorials/composition/publisher/impl/maven.xml
avalon/trunk/planet/tutorials/composition/publisher/impl/project.xml
avalon/trunk/planet/tutorials/composition/publisher/impl/src/java/
avalon/trunk/planet/tutorials/hello/src/java/
Modified:
avalon/trunk/planet/tutorials/build.properties
avalon/trunk/planet/tutorials/composition/README.txt
avalon/trunk/planet/tutorials/composition/application/impl/src/main/tutorial/application/Application.java
avalon/trunk/planet/tutorials/dynamics/README.txt
avalon/trunk/planet/tutorials/dynamics/build.properties
avalon/trunk/planet/tutorials/hello/build.properties
avalon/trunk/planet/tutorials/index.xml
Log:
Start on the migration of tutorials (a very long way still to go).
Modified: avalon/trunk/planet/tutorials/build.properties
==============================================================================
--- avalon/trunk/planet/tutorials/build.properties (original)
+++ avalon/trunk/planet/tutorials/build.properties Thu Jul 1 05:40:02 2004
@@ -1,3 +1,3 @@
-project.home = ..
+project.home = .
project.system = ../../central/system
Modified: avalon/trunk/planet/tutorials/composition/README.txt
==============================================================================
--- avalon/trunk/planet/tutorials/composition/README.txt (original)
+++ avalon/trunk/planet/tutorials/composition/README.txt Thu Jul 1 05:40:02
2004
@@ -21,8 +21,8 @@
---------------------------------
$ cd application/impl
- $ maven build
- $ merlin -execute target\*.jar -repository %MAVEN_HOME%
+ $ ant
+ $ merlin -execute target\deliverables\bars\*.*
[INFO ] (application.publisher.publisher): created
[INFO ] (application.location.info): location: Paris
@@ -39,7 +39,7 @@
Use the following command to include container debug level log entries for the
demanding developer.
- $ merlin -execute -repository %MAVEN_HOME% target\*.jar -config conf\debug.xml
+ $ merlin -execute target\deliverables\bars\*.* -config conf\config.xml
Summary
-------
Added: avalon/trunk/planet/tutorials/composition/application/build.properties
==============================================================================
--- (empty file)
+++ avalon/trunk/planet/tutorials/composition/application/build.properties Thu
Jul 1 05:40:02 2004
@@ -0,0 +1,3 @@
+project.home = ../..
+project.system = ../../../../central/system
+
Added: avalon/trunk/planet/tutorials/composition/application/build.xml
==============================================================================
--- (empty file)
+++ avalon/trunk/planet/tutorials/composition/application/build.xml Thu Jul 1
05:40:02 2004
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<project name="application-tutorial" default="default" basedir="."
xmlns:x="antlib:org.apache.avalon.tools">
+
+ <property file="build.properties"/>
+ <import file="${project.system}/build/reactor.xml"/>
+
+</project>
Added: avalon/trunk/planet/tutorials/composition/application/impl/build.properties
==============================================================================
--- (empty file)
+++ avalon/trunk/planet/tutorials/composition/application/impl/build.properties Thu
Jul 1 05:40:02 2004
@@ -0,0 +1,3 @@
+project.home = ../../..
+project.system = ../../../../../central/system
+
Added: avalon/trunk/planet/tutorials/composition/application/impl/build.xml
==============================================================================
--- (empty file)
+++ avalon/trunk/planet/tutorials/composition/application/impl/build.xml Thu
Jul 1 05:40:02 2004
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<project name="avalon-tutorial-application-impl"
+ 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:property property="location.spec"
+ key="avalon-tutorial-location-impl" feature="spec"/>
+ <x:property property="publisher.spec"
+ key="avalon-tutorial-publisher-impl" feature="spec"/>
+ <x:block name="application">
+ <x:include name="location" artifact="block:${location.spec}"/>
+ <x:include name="publisher" artifact="block:${publisher.spec}"/>
+ <x:component name="application"
+ class="tutorial.application.Application"/>
+ </x:block>
+ </target>
+
+</project>
Modified:
avalon/trunk/planet/tutorials/composition/application/impl/src/main/tutorial/application/Application.java
==============================================================================
---
avalon/trunk/planet/tutorials/composition/application/impl/src/java/tutorial/application/Application.java
(original)
+++
avalon/trunk/planet/tutorials/composition/application/impl/src/main/tutorial/application/Application.java
Thu Jul 1 05:40:02 2004
@@ -31,7 +31,7 @@
/**
* PublisherComponent from Merlin's Composition Tutorial
*
- * @avalon.component version="1.0" name="test"
+ * @avalon.component version="1.0" name="test" lifestyle="singleton"
* @author <a href="mailto:[EMAIL PROTECTED]">Avalon Development Team</a>
*/
public class Application extends AbstractLogEnabled implements Serviceable, Disposable
Added: avalon/trunk/planet/tutorials/composition/build.properties
==============================================================================
--- (empty file)
+++ avalon/trunk/planet/tutorials/composition/build.properties Thu Jul 1 05:40:02
2004
@@ -0,0 +1,3 @@
+project.home = ..
+project.system = ../../../central/system
+
Added: avalon/trunk/planet/tutorials/composition/build.xml
==============================================================================
--- (empty file)
+++ avalon/trunk/planet/tutorials/composition/build.xml Thu Jul 1 05:40:02 2004
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<project name="composition-tutorial" default="default" basedir="."
xmlns:x="antlib:org.apache.avalon.tools">
+
+ <property file="build.properties"/>
+ <import file="${project.system}/build/reactor.xml"/>
+
+</project>
Added: avalon/trunk/planet/tutorials/composition/location/api/build.properties
==============================================================================
--- (empty file)
+++ avalon/trunk/planet/tutorials/composition/location/api/build.properties Thu
Jul 1 05:40:02 2004
@@ -0,0 +1,3 @@
+project.home = ../../..
+project.system = ../../../../../central/system
+
Added: avalon/trunk/planet/tutorials/composition/location/api/build.xml
==============================================================================
--- (empty file)
+++ avalon/trunk/planet/tutorials/composition/location/api/build.xml Thu Jul 1
05:40:02 2004
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<project name="avalon-tutorial-location-api"
+ default="install" basedir="." xmlns:x="antlib:org.apache.avalon.tools">
+
+ <property file="build.properties"/>
+ <import file="${project.system}/build/standard.xml"/>
+
+</project>
Added: avalon/trunk/planet/tutorials/composition/location/build.properties
==============================================================================
--- (empty file)
+++ avalon/trunk/planet/tutorials/composition/location/build.properties Thu Jul 1
05:40:02 2004
@@ -0,0 +1,3 @@
+project.home = ../..
+project.system = ../../../../central/system
+
Added: avalon/trunk/planet/tutorials/composition/location/build.xml
==============================================================================
--- (empty file)
+++ avalon/trunk/planet/tutorials/composition/location/build.xml Thu Jul 1
05:40:02 2004
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<project name="location-tutorial" default="default" basedir="."
xmlns:x="antlib:org.apache.avalon.tools">
+
+ <property file="build.properties"/>
+ <import file="${project.system}/build/reactor.xml"/>
+
+</project>
Added: avalon/trunk/planet/tutorials/composition/location/impl/build.properties
==============================================================================
--- (empty file)
+++ avalon/trunk/planet/tutorials/composition/location/impl/build.properties Thu
Jul 1 05:40:02 2004
@@ -0,0 +1,3 @@
+project.home = ../../..
+project.system = ../../../../../central/system
+
Added: avalon/trunk/planet/tutorials/composition/location/impl/build.xml
==============================================================================
--- (empty file)
+++ avalon/trunk/planet/tutorials/composition/location/impl/build.xml Thu Jul 1
05:40:02 2004
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<project name="avalon-tutorial-location-impl"
+ 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="locator" embed="MAIN">
+ <x:service source="info"
+ type="tutorial.location.LocationService"/>
+ <x:component name="info"
+ class="tutorial.location.LocationComponent" profile="locator"/>
+ </x:block>
+ </target>
+
+</project>
Added: avalon/trunk/planet/tutorials/composition/publisher/api/build.properties
==============================================================================
--- (empty file)
+++ avalon/trunk/planet/tutorials/composition/publisher/api/build.properties Thu
Jul 1 05:40:02 2004
@@ -0,0 +1,3 @@
+project.home = ../../..
+project.system = ../../../../../central/system
+
Added: avalon/trunk/planet/tutorials/composition/publisher/api/build.xml
==============================================================================
--- (empty file)
+++ avalon/trunk/planet/tutorials/composition/publisher/api/build.xml Thu Jul 1
05:40:02 2004
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<project name="avalon-tutorial-publisher-api"
+ default="install" basedir="." xmlns:x="antlib:org.apache.avalon.tools">
+
+ <property file="build.properties"/>
+ <import file="${project.system}/build/standard.xml"/>
+
+</project>
Added: avalon/trunk/planet/tutorials/composition/publisher/build.properties
==============================================================================
--- (empty file)
+++ avalon/trunk/planet/tutorials/composition/publisher/build.properties Thu
Jul 1 05:40:02 2004
@@ -0,0 +1,3 @@
+project.home = ../..
+project.system = ../../../../central/system
+
Added: avalon/trunk/planet/tutorials/composition/publisher/build.xml
==============================================================================
--- (empty file)
+++ avalon/trunk/planet/tutorials/composition/publisher/build.xml Thu Jul 1
05:40:02 2004
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<project name="publisher-tutorial" default="default" basedir="."
xmlns:x="antlib:org.apache.avalon.tools">
+
+ <property file="build.properties"/>
+ <import file="${project.system}/build/reactor.xml"/>
+
+</project>
Added: avalon/trunk/planet/tutorials/composition/publisher/impl/build.properties
==============================================================================
--- (empty file)
+++ avalon/trunk/planet/tutorials/composition/publisher/impl/build.properties Thu
Jul 1 05:40:02 2004
@@ -0,0 +1,3 @@
+project.home = ../../..
+project.system = ../../../../../central/system
+
Added: avalon/trunk/planet/tutorials/composition/publisher/impl/build.xml
==============================================================================
--- (empty file)
+++ avalon/trunk/planet/tutorials/composition/publisher/impl/build.xml Thu Jul 1
05:40:02 2004
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<project name="avalon-tutorial-publisher-impl"
+ 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="publishing" embed="MAIN">
+ <x:service source="publisher"
+ type="tutorial.publisher.PublisherService"/>
+ <x:component name="publisher"
+ class="tutorial.publisher.PublisherComponent" />
+ </x:block>
+ </target>
+
+</project>
Modified: avalon/trunk/planet/tutorials/dynamics/README.txt
==============================================================================
--- avalon/trunk/planet/tutorials/dynamics/README.txt (original)
+++ avalon/trunk/planet/tutorials/dynamics/README.txt Thu Jul 1 05:40:02 2004
@@ -28,6 +28,6 @@
Runtime
-------
-$ merlin target\deliverables\jars\dynamics.jar -execute
+$ merlin target\deliverables\jars\avalon-tutorial-dynamics.jar -execute
Modified: avalon/trunk/planet/tutorials/dynamics/build.properties
==============================================================================
--- avalon/trunk/planet/tutorials/dynamics/build.properties (original)
+++ avalon/trunk/planet/tutorials/dynamics/build.properties Thu Jul 1 05:40:02
2004
@@ -1,6 +1,4 @@
project.system = ../../../central/system
project.home = ..
-project.name = avalon-tutorial-dynamics
-project.src.main = java
Modified: avalon/trunk/planet/tutorials/hello/build.properties
==============================================================================
--- avalon/trunk/planet/tutorials/hello/build.properties (original)
+++ avalon/trunk/planet/tutorials/hello/build.properties Thu Jul 1 05:40:02
2004
@@ -1,4 +1,3 @@
project.system = ../../../central/system
project.home = ..
project.name = avalon-tutorial-hello
-project.src.main = java
Modified: avalon/trunk/planet/tutorials/index.xml
==============================================================================
--- avalon/trunk/planet/tutorials/index.xml (original)
+++ avalon/trunk/planet/tutorials/index.xml Thu Jul 1 05:40:02 2004
@@ -6,13 +6,13 @@
href="http://svn.apache.org/repos/asf/avalon/trunk/runtime/index.xml"/>
<!--
- Avalon Tutorials.
+ Hello Tutorial.
-->
- <project basedir="hello" key="avalon-tutorial-hello">
+ <project basedir="hello">
<info>
<group>avalon/tutorial</group>
- <name>hello</name>
+ <name>avalon-tutorial-hello</name>
</info>
<dependencies>
<include key="avalon-framework-api" runtime="false"/>
@@ -22,14 +22,85 @@
</plugins>
</project>
- <project basedir="dynamics" key="avalon-tutorial-dynamics">
+ <!--
+ Dynamics Tutorial.
+ -->
+
+ <project basedir="dynamics">
<info>
<group>avalon/tutorial</group>
- <name>dynamics</name>
+ <name>avalon-tutorial-dynamics</name>
</info>
<dependencies>
<include key="avalon-composition-api" runtime="false"/>
<include key="avalon-framework-impl"/>
+ </dependencies>
+ <plugins>
+ <include key="avalon-meta-tools"/>
+ </plugins>
+ </project>
+
+ <!--
+ Composition Tutorial.
+ -->
+
+ <project basedir="composition/publisher/api">
+ <info>
+ <group>avalon/tutorial</group>
+ <name>avalon-tutorial-publisher-api</name>
+ </info>
+ <dependencies>
+ <include key="avalon-framework-api"/>
+ </dependencies>
+ </project>
+
+ <project basedir="composition/publisher/impl">
+ <info>
+ <group>avalon/tutorial</group>
+ <name>avalon-tutorial-publisher-impl</name>
+ </info>
+ <dependencies>
+ <include key="avalon-framework-impl"/>
+ <include key="avalon-tutorial-publisher-api"/>
+ </dependencies>
+ <plugins>
+ <include key="avalon-meta-tools"/>
+ </plugins>
+ </project>
+
+ <project basedir="composition/location/api">
+ <info>
+ <group>avalon/tutorial</group>
+ <name>avalon-tutorial-location-api</name>
+ </info>
+ <dependencies>
+ <include key="avalon-framework-api"/>
+ </dependencies>
+ </project>
+
+ <project basedir="composition/location/impl">
+ <info>
+ <group>avalon/tutorial</group>
+ <name>avalon-tutorial-location-impl</name>
+ </info>
+ <dependencies>
+ <include key="avalon-framework-impl"/>
+ <include key="avalon-tutorial-location-api"/>
+ <include key="avalon-tutorial-publisher-api"/>
+ </dependencies>
+ <plugins>
+ <include key="avalon-meta-tools"/>
+ </plugins>
+ </project>
+
+ <project basedir="composition/application/impl">
+ <info>
+ <group>avalon/tutorial</group>
+ <name>avalon-tutorial-application-impl</name>
+ </info>
+ <dependencies>
+ <include key="avalon-tutorial-location-impl"/>
+ <include key="avalon-tutorial-publisher-impl"/>
</dependencies>
<plugins>
<include key="avalon-meta-tools"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
