svn commit: rev 21419 - avalon/trunk

Author: farra
Date: Fri Jun 18 06:21:11 2004
New Revision: 21419

Modified:
   avalon/trunk/README.txt
   avalon/trunk/build.properties
Log:
added documentation comments to the build.properties

Modified: avalon/trunk/README.txt
==============================================================================
--- avalon/trunk/README.txt	(original)
+++ avalon/trunk/README.txt	Fri Jun 18 06:21:11 2004
@@ -48,18 +48,47 @@
 A brief explanation of the source respository structure.  For more
 info, see each subproject's own README documentation:
 
-   central
-   discovery
-   planet
-   runtime
-   studio
-   tools
+   central              
+     laboratory         <--  code sandbox, latest developme# magic system home directory
 
-     
+project.home = central/systemnts
+     site               <--  XML source site documentation
+     system             <--  site transformation (XSL) resources
+   discovery            <--  service publishing and delivery system
+   planet               <--  service and component library
+     cornerstone        <--  component block library
+     facilities         <--  container extensions
+     tutorials          <--  tutorial source code
+   runtime              <--  core Avalon platform source code
+     activation         <--  service activation library
+     buildsystem        <--  (old) build system resources
+     composition        <--  service composition library
+     framework          <--  core Avalon framework
+     logging            <--  Avalon logging framework
+     logkit             <--  Avalon LogKit framework
+     merlin             <--  core merlin container runtime source
+     meta               <--  Avalon meta framework
+     repository         <--  Avalon repository framework
+     util               <--  Avalon utilities source code
+     versioning         <--  source code versioning entity documents
+   studio               <--  Avalon IDE Studio
+   tools                <--  Avalon tools
+     magic              <--  Avalon Magic Build System
 
 
-
-Where did the Avalon-Framework subproject go?
+Where did the XXXX subproject go?
 =============================================
-Don't worry, it didn't move very far. The framework sources have been
-relocated to the framework subdirectory.
+There's been quite a bit of reorganization and somethings have been
+moved, depricated, or archived.
+
+    excalibur/ecm   -->  http://excalibur.apache.org
+    fortress	    -->  http://excalibur.apache.org
+    phoenix	    -->  http://loom.codehaus.org
+
+A CVS snapshot can be found in SVN at:
+
+   https://svn.apache.org/repos/asf/avalon/cvs-migration-snapshot/
+
+More information on Avalon legacy software can be found at:
+
+   http://avalon.apache.org/products/legacy/index.html
\ No newline at end of file

Modified: avalon/trunk/build.properties
==============================================================================
--- avalon/trunk/build.properties	(original)
+++ avalon/trunk/build.properties	Fri Jun 18 06:21:11 2004
@@ -1,2 +1,48 @@
+<<<<<<< .mine
+#=======================================================================
+#           __
+#          /  \    Apache
+#         /    \__________________________________
+#        /  /\  \  \/  /    \ |  |  /   \|   \|  |
+#       /  /  \  \    /  /\  \|  |_|  O  |  \ \  |
+#      /__/    \__\__/__/  \__\_____\__ /|__|\___|
+#
+#                               MAGIC BUILD SYSTEM
+#======================================================================
+#
+#   DO NOT EDIT THIS FILE
+#
+#  rather, copy the contents of this file into a new file
+#  named user.properties and adjust the values as needed
+#======================================================================
+
+
+# HTTP/FTP Proxy values
+ 
+# project.proxy.host = 127.0.0.l
+# project.proxy.port = 80
+# project.proxy.user = username
+# project.proxy.password = password
+
+
+#======================================================================
+# Default System Settings
+# Settings below this line will generally not need to be edited
+#======================================================================
+
+
+# magic system home directory
 project.home = central/system
+
+# Cache directory into which build artifacts are registered.
+# Value may be an absolute or relative filename. Relative 
+# filenames will be resolved relative to ${project.home}.
+
+#project.main.cache = .cache
+#project.docs.cache = .docs
+
+# A sequence of remote repositories used to resolve artifacts
+# requested as part of the build process.
+# project.hosts = ${dpml.net}/;${java.repo}/;${ibiblio.org}/maven/
+