avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcconn...@apache.org
Subject svn commit: rev 22461 - in avalon/trunk/planet/tutorials: . composition composition/application composition/application/impl composition/location composition/location/api composition/location/impl composition/publisher composition/publisher/api composition/publisher/impl composition/publisher/impl/conf configuration configuration/block configuration/defaults configuration/injection configuration/override context/alias context/avalon context/casting context/custom context/injection context/plus context/strategy
Date Fri, 02 Jul 2004 08:37:25 GMT
Author: mcconnell
Date: Fri Jul  2 01:37:24 2004
New Revision: 22461

Removed:
   avalon/trunk/planet/tutorials/composition/application/build.properties
   avalon/trunk/planet/tutorials/composition/application/impl/build.properties
   avalon/trunk/planet/tutorials/composition/build.properties
   avalon/trunk/planet/tutorials/composition/location/api/build.properties
   avalon/trunk/planet/tutorials/composition/location/impl/build.properties
   avalon/trunk/planet/tutorials/composition/publisher/api/build.properties
   avalon/trunk/planet/tutorials/composition/publisher/build.properties
   avalon/trunk/planet/tutorials/composition/publisher/impl/build.properties
   avalon/trunk/planet/tutorials/composition/publisher/impl/conf/
   avalon/trunk/planet/tutorials/configuration/block/build.properties
   avalon/trunk/planet/tutorials/configuration/build.properties
   avalon/trunk/planet/tutorials/configuration/defaults/build.properties
   avalon/trunk/planet/tutorials/configuration/injection/build.properties
   avalon/trunk/planet/tutorials/configuration/override/build.properties
   avalon/trunk/planet/tutorials/context/alias/index.xml
   avalon/trunk/planet/tutorials/context/avalon/index.xml
   avalon/trunk/planet/tutorials/context/casting/index.xml
   avalon/trunk/planet/tutorials/context/custom/index.xml
   avalon/trunk/planet/tutorials/context/injection/index.xml
   avalon/trunk/planet/tutorials/context/plus/index.xml
Modified:
   avalon/trunk/planet/tutorials/composition/application/build.xml
   avalon/trunk/planet/tutorials/composition/application/impl/build.xml
   avalon/trunk/planet/tutorials/composition/build.xml
   avalon/trunk/planet/tutorials/composition/location/api/build.xml
   avalon/trunk/planet/tutorials/composition/location/build.xml
   avalon/trunk/planet/tutorials/composition/location/impl/build.xml
   avalon/trunk/planet/tutorials/composition/publisher/api/build.xml
   avalon/trunk/planet/tutorials/composition/publisher/build.xml
   avalon/trunk/planet/tutorials/composition/publisher/impl/build.xml
   avalon/trunk/planet/tutorials/configuration/block/build.xml
   avalon/trunk/planet/tutorials/configuration/build.xml
   avalon/trunk/planet/tutorials/configuration/defaults/build.xml
   avalon/trunk/planet/tutorials/configuration/injection/build.xml
   avalon/trunk/planet/tutorials/configuration/override/build.xml
   avalon/trunk/planet/tutorials/context/alias/build.xml
   avalon/trunk/planet/tutorials/context/avalon/build.xml
   avalon/trunk/planet/tutorials/context/casting/build.xml
   avalon/trunk/planet/tutorials/context/custom/build.xml
   avalon/trunk/planet/tutorials/context/injection/build.xml
   avalon/trunk/planet/tutorials/context/plus/build.xml
   avalon/trunk/planet/tutorials/context/strategy/build.xml
   avalon/trunk/planet/tutorials/index.xml
Log:
Bring in the context tutorials into the main index and cleanup some redundant property files.

Modified: avalon/trunk/planet/tutorials/composition/application/build.xml
==============================================================================
--- avalon/trunk/planet/tutorials/composition/application/build.xml	(original)
+++ avalon/trunk/planet/tutorials/composition/application/build.xml	Fri Jul  2 01:37:24 2004
@@ -2,7 +2,7 @@
 
 <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"/>
+  <property name="project.home" value="../.."/>
+  <import file="${project.home}/reactor.xml"/>
 
 </project>

Modified: avalon/trunk/planet/tutorials/composition/application/impl/build.xml
==============================================================================
--- avalon/trunk/planet/tutorials/composition/application/impl/build.xml	(original)
+++ avalon/trunk/planet/tutorials/composition/application/impl/build.xml	Fri Jul  2 01:37:24
2004
@@ -3,8 +3,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"/>
+  <property name="project.home" value="../../.."/>
+  <import file="${project.home}/standard.xml"/>
 
   <target name="build" depends="standard.build">
     <x:property property="location.spec" 

Modified: avalon/trunk/planet/tutorials/composition/build.xml
==============================================================================
--- avalon/trunk/planet/tutorials/composition/build.xml	(original)
+++ avalon/trunk/planet/tutorials/composition/build.xml	Fri Jul  2 01:37:24 2004
@@ -2,7 +2,7 @@
 
 <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"/>
+  <property name="project.home" value=".."/>
+  <import file="${project.home}/reactor.xml"/>
 
 </project>

Modified: avalon/trunk/planet/tutorials/composition/location/api/build.xml
==============================================================================
--- avalon/trunk/planet/tutorials/composition/location/api/build.xml	(original)
+++ avalon/trunk/planet/tutorials/composition/location/api/build.xml	Fri Jul  2 01:37:24 2004
@@ -3,7 +3,7 @@
 <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"/>
+  <property name="project.home" value="../../.."/>
+  <import file="${project.home}/standard.xml"/>
 
 </project>

Modified: avalon/trunk/planet/tutorials/composition/location/build.xml
==============================================================================
--- avalon/trunk/planet/tutorials/composition/location/build.xml	(original)
+++ avalon/trunk/planet/tutorials/composition/location/build.xml	Fri Jul  2 01:37:24 2004
@@ -2,7 +2,7 @@
 
 <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"/>
+  <property name="project.home" value="../.."/>
+  <import file="${project.home}/reactor.xml"/>
 
 </project>

Modified: avalon/trunk/planet/tutorials/composition/location/impl/build.xml
==============================================================================
--- avalon/trunk/planet/tutorials/composition/location/impl/build.xml	(original)
+++ avalon/trunk/planet/tutorials/composition/location/impl/build.xml	Fri Jul  2 01:37:24
2004
@@ -3,8 +3,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"/>
+  <property name="project.home" value="../../.."/>
+  <import file="${project.home}/standard.xml"/>
 
   <target name="build" depends="standard.build">
     <x:block name="locator" embed="MAIN">

Modified: avalon/trunk/planet/tutorials/composition/publisher/api/build.xml
==============================================================================
--- avalon/trunk/planet/tutorials/composition/publisher/api/build.xml	(original)
+++ avalon/trunk/planet/tutorials/composition/publisher/api/build.xml	Fri Jul  2 01:37:24
2004
@@ -3,7 +3,7 @@
 <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"/>
+  <property name="project.home" value="../../.."/>
+  <import file="${project.home}/standard.xml"/>
 
 </project>

Modified: avalon/trunk/planet/tutorials/composition/publisher/build.xml
==============================================================================
--- avalon/trunk/planet/tutorials/composition/publisher/build.xml	(original)
+++ avalon/trunk/planet/tutorials/composition/publisher/build.xml	Fri Jul  2 01:37:24 2004
@@ -2,7 +2,7 @@
 
 <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"/>
+  <property name="project.home" value="../.."/>
+  <import file="${project.home}/reactor.xml"/>
 
 </project>

Modified: avalon/trunk/planet/tutorials/composition/publisher/impl/build.xml
==============================================================================
--- avalon/trunk/planet/tutorials/composition/publisher/impl/build.xml	(original)
+++ avalon/trunk/planet/tutorials/composition/publisher/impl/build.xml	Fri Jul  2 01:37:24
2004
@@ -3,8 +3,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"/>
+  <property name="project.home" value="../../.."/>
+  <import file="${project.home}/standard.xml"/>
 
   <target name="build" depends="standard.build">
     <x:block name="publishing" embed="MAIN">

Modified: avalon/trunk/planet/tutorials/configuration/block/build.xml
==============================================================================
--- avalon/trunk/planet/tutorials/configuration/block/build.xml	(original)
+++ avalon/trunk/planet/tutorials/configuration/block/build.xml	Fri Jul  2 01:37:24 2004
@@ -3,8 +3,8 @@
 <project name="avalon-tutorial-config-block" default="install" basedir="." 
     xmlns:x="antlib:org.apache.avalon.tools">
 
-  <property file="build.properties"/>
-  <import file="${project.system}/build/standard.xml"/>
+  <property name="project.home" value="../.."/>
+  <import file="${project.home}/standard.xml"/>
 
   <target name="init" depends="standard.init">
     <x:filter key="avalon-framework-impl" feature="spec" 

Modified: avalon/trunk/planet/tutorials/configuration/build.xml
==============================================================================
--- avalon/trunk/planet/tutorials/configuration/build.xml	(original)
+++ avalon/trunk/planet/tutorials/configuration/build.xml	Fri Jul  2 01:37:24 2004
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
-<project name="configuration-tutorial" default="default" basedir="." xmlns:x="antlib:org.apache.avalon.tools">
+<project name="configuration-tutorial" default="default" basedir="." 
+    xmlns:x="antlib:org.apache.avalon.tools">
 
-  <property file="build.properties"/>
-  <import file="${project.system}/build/reactor.xml"/>
+  <property name="project.home" value=".."/>
+  <import file="${project.home}/reactor.xml"/>
 
 </project>

Modified: avalon/trunk/planet/tutorials/configuration/defaults/build.xml
==============================================================================
--- avalon/trunk/planet/tutorials/configuration/defaults/build.xml	(original)
+++ avalon/trunk/planet/tutorials/configuration/defaults/build.xml	Fri Jul  2 01:37:24 2004
@@ -3,8 +3,8 @@
 <project name="avalon-tutorial-config-defaults" default="install" basedir="." 
     xmlns:x="antlib:org.apache.avalon.tools">
 
-  <property file="build.properties"/>
-  <import file="${project.system}/build/standard.xml"/>
+  <property name="project.home" value="../.."/>
+  <import file="${project.home}/standard.xml"/>
 
   <target name="init" depends="standard.init">
     <x:filter key="avalon-framework-impl" feature="spec" 

Modified: avalon/trunk/planet/tutorials/configuration/injection/build.xml
==============================================================================
--- avalon/trunk/planet/tutorials/configuration/injection/build.xml	(original)
+++ avalon/trunk/planet/tutorials/configuration/injection/build.xml	Fri Jul  2 01:37:24 2004
@@ -3,8 +3,8 @@
 <project name="avalon-tutorial-config-injection" default="install" basedir="." 
     xmlns:x="antlib:org.apache.avalon.tools">
 
-  <property file="build.properties"/>
-  <import file="${project.system}/build/standard.xml"/>
+  <property name="project.home" value="../.."/>
+  <import file="${project.home}/standard.xml"/>
 
   <target name="build" depends="standard.build">
     <x:block name="tutorial" embed="MAIN">

Modified: avalon/trunk/planet/tutorials/configuration/override/build.xml
==============================================================================
--- avalon/trunk/planet/tutorials/configuration/override/build.xml	(original)
+++ avalon/trunk/planet/tutorials/configuration/override/build.xml	Fri Jul  2 01:37:24 2004
@@ -3,8 +3,8 @@
 <project name="avalon-tutorial-config-override" default="install" basedir="." 
     xmlns:x="antlib:org.apache.avalon.tools">
 
-  <property file="build.properties"/>
-  <import file="${project.system}/build/standard.xml"/>
+  <property name="project.home" value="../.."/>
+  <import file="${project.home}/standard.xml"/>
 
   <target name="build" depends="standard.build">
     <x:block name="tutorial">

Modified: avalon/trunk/planet/tutorials/context/alias/build.xml
==============================================================================
--- avalon/trunk/planet/tutorials/context/alias/build.xml	(original)
+++ avalon/trunk/planet/tutorials/context/alias/build.xml	Fri Jul  2 01:37:24 2004
@@ -3,7 +3,8 @@
 <project name="avalon-tutorial-context-alias" default="install" basedir="." 
     xmlns:x="antlib:org.apache.avalon.tools">
 
-  <import file="../../standard.xml"/>
+  <property name="project.home" value="../.."/>
+  <import file="${project.home}/standard.xml"/>
 
   <target name="build" depends="standard.build">
     <x:block name="alias" embed="MAIN">

Modified: avalon/trunk/planet/tutorials/context/avalon/build.xml
==============================================================================
--- avalon/trunk/planet/tutorials/context/avalon/build.xml	(original)
+++ avalon/trunk/planet/tutorials/context/avalon/build.xml	Fri Jul  2 01:37:24 2004
@@ -3,7 +3,8 @@
 <project name="avalon-tutorial-context-avalon" default="install" basedir="." 
     xmlns:x="antlib:org.apache.avalon.tools">
 
-  <import file="../../standard.xml"/>
+  <property name="project.home" value="../.."/>
+  <import file="${project.home}/standard.xml"/>
 
   <target name="build" depends="standard.build">
     <x:block name="classic" embed="MAIN">

Modified: avalon/trunk/planet/tutorials/context/casting/build.xml
==============================================================================
--- avalon/trunk/planet/tutorials/context/casting/build.xml	(original)
+++ avalon/trunk/planet/tutorials/context/casting/build.xml	Fri Jul  2 01:37:24 2004
@@ -3,7 +3,8 @@
 <project name="avalon-tutorial-context-casting" default="install" basedir="." 
     xmlns:x="antlib:org.apache.avalon.tools">
 
-  <import file="../../standard.xml"/>
+  <property name="project.home" value="../.."/>
+  <import file="${project.home}/standard.xml"/>
 
   <target name="build" depends="standard.build">
     <x:block name="hello" embed="MAIN">

Modified: avalon/trunk/planet/tutorials/context/custom/build.xml
==============================================================================
--- avalon/trunk/planet/tutorials/context/custom/build.xml	(original)
+++ avalon/trunk/planet/tutorials/context/custom/build.xml	Fri Jul  2 01:37:24 2004
@@ -3,7 +3,8 @@
 <project name="avalon-tutorial-context-custom" default="install" basedir="." 
     xmlns:x="antlib:org.apache.avalon.tools">
 
-  <import file="../../standard.xml"/>
+  <property name="project.home" value="../.."/>
+  <import file="${project.home}/standard.xml"/>
 
   <target name="build" depends="standard.build">
     <x:block name="hello" embed="MAIN">

Modified: avalon/trunk/planet/tutorials/context/injection/build.xml
==============================================================================
--- avalon/trunk/planet/tutorials/context/injection/build.xml	(original)
+++ avalon/trunk/planet/tutorials/context/injection/build.xml	Fri Jul  2 01:37:24 2004
@@ -3,7 +3,8 @@
 <project name="avalon-tutorial-context-injection" default="install" basedir="." 
     xmlns:x="antlib:org.apache.avalon.tools">
 
-  <import file="../../standard.xml"/>
+  <property name="project.home" value="../.."/>
+  <import file="${project.home}/standard.xml"/>
 
   <target name="build" depends="standard.build">
     <x:block name="classic" embed="MAIN">

Modified: avalon/trunk/planet/tutorials/context/plus/build.xml
==============================================================================
--- avalon/trunk/planet/tutorials/context/plus/build.xml	(original)
+++ avalon/trunk/planet/tutorials/context/plus/build.xml	Fri Jul  2 01:37:24 2004
@@ -3,7 +3,8 @@
 <project name="avalon-tutorial-context-plus" default="install" basedir="." 
     xmlns:x="antlib:org.apache.avalon.tools">
 
-  <import file="../../standard.xml"/>
+  <property name="project.home" value="../.."/>
+  <import file="${project.home}/standard.xml"/>
 
   <target name="build" depends="standard.build">
     <x:block name="hello" embed="MAIN">

Modified: avalon/trunk/planet/tutorials/context/strategy/build.xml
==============================================================================
--- avalon/trunk/planet/tutorials/context/strategy/build.xml	(original)
+++ avalon/trunk/planet/tutorials/context/strategy/build.xml	Fri Jul  2 01:37:24 2004
@@ -3,7 +3,8 @@
 <project name="avalon-tutorial-context-strategy" default="install" basedir="." 
     xmlns:x="antlib:org.apache.avalon.tools">
 
-  <import file="../../standard.xml"/>
+  <property name="project.home" value="../.."/>
+  <import file="${project.home}/standard.xml"/>
 
   <target name="build" depends="standard.build">
     <x:block name="strategy" embed="MAIN">

Modified: avalon/trunk/planet/tutorials/index.xml
==============================================================================
--- avalon/trunk/planet/tutorials/index.xml	(original)
+++ avalon/trunk/planet/tutorials/index.xml	Fri Jul  2 01:37:24 2004
@@ -23,6 +23,109 @@
   </project>
 
   <!--
+  Context Tutorials.
+  -->
+
+  <project basedir="context/alias">
+    <info>
+      <group>avalon/tutorial</group>
+      <name>avalon-tutorial-context-alias</name>
+      <type>jar</type>
+    </info>
+    <dependencies>
+      <include key="avalon-framework-api"/>
+    </dependencies>
+    <plugins>
+      <include key="avalon-meta-tools"/>
+    </plugins>
+  </project>
+
+  <project basedir="context/avalon">
+    <info>
+      <group>avalon/tutorial</group>
+      <name>avalon-tutorial-context-avalon</name>
+      <type>jar</type>
+    </info>
+    <dependencies>
+      <include key="avalon-framework-api"/>
+    </dependencies>
+    <plugins>
+      <include key="avalon-meta-tools"/>
+    </plugins>
+  </project>
+
+  <project basedir="context/casting">
+    <info>
+      <group>avalon/tutorial</group>
+      <name>avalon-tutorial-context-casting</name>
+      <type>jar</type>
+    </info>
+    <dependencies>
+      <include key="avalon-framework-impl"/>
+    </dependencies>
+    <plugins>
+      <include key="avalon-meta-tools"/>
+    </plugins>
+  </project>
+
+  <project basedir="context/custom">
+    <info>
+      <group>avalon/tutorial</group>
+      <name>avalon-tutorial-context-custom</name>
+      <type>jar</type>
+    </info>
+    <dependencies>
+      <include key="avalon-framework-impl"/>
+    </dependencies>
+    <plugins>
+      <include key="avalon-meta-tools"/>
+    </plugins>
+  </project>
+
+  <project basedir="context/injection">
+    <info>
+      <group>avalon/tutorial</group>
+      <name>avalon-tutorial-context-injection</name>
+      <type>jar</type>
+    </info>
+    <dependencies>
+      <include key="avalon-framework-api"/>
+    </dependencies>
+    <plugins>
+      <include key="avalon-meta-tools"/>
+    </plugins>
+  </project>
+
+  <project basedir="context/plus">
+    <info>
+      <group>avalon/tutorial</group>
+      <name>avalon-tutorial-context-plus</name>
+      <type>jar</type>
+    </info>
+    <dependencies>
+      <include key="avalon-framework-impl"/>
+    </dependencies>
+    <plugins>
+      <include key="avalon-meta-tools"/>
+    </plugins>
+  </project>
+
+  <project basedir="context/strategy">
+    <info>
+      <group>avalon/tutorial</group>
+      <name>avalon-tutorial-context-strategy</name>
+      <type>jar</type>
+    </info>
+    <dependencies>
+      <include key="avalon-framework-impl"/>
+      <include key="avalon-composition-api"/>
+    </dependencies>
+    <plugins>
+      <include key="avalon-meta-tools"/>
+    </plugins>
+  </project>
+
+  <!--
   Dynamics Tutorial.
   -->
 

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org


Mime
View raw message