svn commit: rev 21415 - in avalon/trunk/central/system: . build setup

Author: mcconnell
Date: Fri Jun 18 04:00:17 2004
New Revision: 21415

Modified:
   avalon/trunk/central/system/build/standard.xml
   avalon/trunk/central/system/index.properties
   avalon/trunk/central/system/index.xml
   avalon/trunk/central/system/setup/setup.xml
Log:
update property names to be more consistent:
avalon.cache --> project.main.cache
avalon.hosts --> project.hosts

Modified: avalon/trunk/central/system/build/standard.xml
==============================================================================
--- avalon/trunk/central/system/build/standard.xml	(original)
+++ avalon/trunk/central/system/build/standard.xml	Fri Jun 18 04:00:17 2004
@@ -39,5 +39,9 @@
 
   <target name="dist" depends="install,site"/>
 
+  <target name="javadoc" depends="prepare">
+    <x:javadoc/>
+  </target>
+
 </project>
 

Modified: avalon/trunk/central/system/index.properties
==============================================================================
--- avalon/trunk/central/system/index.properties	(original)
+++ avalon/trunk/central/system/index.properties	Fri Jun 18 04:00:17 2004
@@ -8,7 +8,8 @@
 # Value may be an absolute or relative filename. Relative 
 # filenames will be resolved relative to ${project.home}.
 
-#avalon.cache = .cache
+#project.main.cache = .cache
+project.docs.cache = .docs
 
 #
 # Optional proxy settings.
@@ -25,5 +26,5 @@
 java.repo = http://www.apache.org/dist/java-repository
 ibiblio.org = http://www.ibiblio.org/maven
 
-avalon.hosts = ${dpml.net}/;${java.repo}/;${ibiblio.org}/maven/
+project.hosts = ${dpml.net}/;${java.repo}/;${ibiblio.org}/maven/
 avalon.tools.bar.url = ${dpml.net}/avalon/tools/bars/avalon-tools.bar

Modified: avalon/trunk/central/system/index.xml
==============================================================================
--- avalon/trunk/central/system/index.xml	(original)
+++ avalon/trunk/central/system/index.xml	Fri Jun 18 04:00:17 2004
@@ -773,6 +773,32 @@
       </dependencies>
     </project>
 
+    <project basedir="../../runtime/main">
+      <info>
+        <group>avalon/runtime</group>
+        <name>avalon-runtime-main</name>
+        <version>3.3.0</version>
+      </info>
+      <dependencies>
+        <include key="avalon-framework-api" tag="api"/>
+        <include key="avalon-util-lifecycle" tag="api"/>
+        <include key="avalon-util-extension-api" tag="spi"/>
+        <include key="avalon-merlin-api" tag="spi"/>
+        <include key="avalon-repository-api" tag="spi"/>
+        <include key="avalon-meta-spi" tag="spi"/>
+        <include key="avalon-repository-spi" tag="spi"/>
+        <include key="avalon-logging-spi" tag="spi"/>
+        <include key="avalon-composition-spi" tag="spi"/>
+        <include key="avalon-composition-impl" tag="impl"/>
+        <include key="avalon-util-configuration" tag="impl"/>
+        <include key="avalon-repository-main" runtime="false"/>
+        <include key="avalon-activation-impl" build="false" test="false" runtime="false"/>
+        <include key="avalon-merlin-api" tag="spi"/>
+        <include key="avalon-merlin-impl"/>
+        <include key="avalon-merlin-cli"/>
+      </dependencies>
+    </project>
+
     <project basedir="../../planet/tutorials/hello" key="avalon-tutorial-hello">
       <info>
         <group>avalon/tutorial</group>
@@ -784,6 +810,9 @@
       <plugins>
         <include key="avalon-meta-tools"/>
       </plugins>
+      <links>
+        <link key="avalon-runtime"/>
+      </links>
     </project>
 
     <project basedir="../../planet/tutorials/dynamics" key="avalon-tutorial-dynamics">

Modified: avalon/trunk/central/system/setup/setup.xml
==============================================================================
--- avalon/trunk/central/system/setup/setup.xml	(original)
+++ avalon/trunk/central/system/setup/setup.xml	Fri Jun 18 04:00:17 2004
@@ -13,8 +13,8 @@
 
   <property file="index.properties"/>
 
-  <condition property="avalon.cache.declared" value="false">
-    <isset property="avalon.cache"/>
+  <condition property="project.main.cache.declared" value="false">
+    <isset property="project.main.cache"/>
   </condition>
 
   <condition property="project.proxy.declared" value="false">
@@ -26,7 +26,7 @@
   </target>
 
   <target name="setup-cache-properties" depends="setup-avalon-cache,test-cache">
-    <property name="cache.dir" value="${avalon.cache}"/>
+    <property name="cache.dir" value="${project.main.cache}"/>
     <property name="cache.tools.dir" value="${cache.dir}/avalon/tools"/>
     <property name="cache.tools.bars.dir" value="${cache.tools.dir}/bars"/>
     <property name="ant.lib" value="${user.home}/.ant/lib"/>
@@ -57,16 +57,16 @@
     </copy>
   </target>
 
-  <target name="setup-avalon-cache" unless="avalon.cache.declared">
+  <target name="setup-avalon-cache" unless="project.main.cache.declared">
     <property environment="ENV"/>
-    <property name="avalon.cache" value="${ENV.AVALON_HOME}/repository"/>
+    <property name="project.main.cache" value="${ENV.AVALON_HOME}/repository"/>
     <condition property="avalon.home.undeclared" value="true">
-      <contains string="${avalon.cache}" substring="{" />
+      <contains string="${project.main.cache}" substring="{" />
     </condition>
   </target>
 
   <target name="test-cache" if="avalon.home.undeclared">
-    <property name="avalon.cache" value=".cache"/>
+    <property name="project.main.cache" value=".cache"/>
   </target>
 
   <target name="setup-proxy" if="project.proxy.declared">