svn commit: rev 21639 - in avalon/trunk: . tools/magic/src/main/org/apache/avalon/tools/model

Author: farra
Date: Thu Jun 24 08:37:17 2004
New Revision: 21639

Modified:
   avalon/trunk/README.txt
   avalon/trunk/build.properties
   avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/model/Magic.java
Log:
Fixed proxy support by changing all project.proxy.* to magic.proxy.*

Modified: avalon/trunk/README.txt
==============================================================================
--- avalon/trunk/README.txt	(original)
+++ avalon/trunk/README.txt	Thu Jun 24 08:37:17 2004
@@ -40,7 +40,20 @@
 run:
 
    ant setup               <-- only needed once to bootstrap magic
+   ant clean		   <-- deletes any 'dirty' content
    ant                     <-- builds entire Avalon platform
+
+Magic uses an environmental variable "MAGIC_HOME" which defaults
+to ${user.home}/.magic .  This directory contains artifact
+and document caches.
+
+Magic also uses a set of property files for handling default behavior.
+You may want to copy the contents of the 'build.properties' file into
+a new file named 'user.properties' which you can then use to override
+any default build values (such as HTTP proxies).
+
+The 'setup' tasks requires internet access to download the latest
+plugins and dependencies. [fixme: offline setup instructions]
 
 
 What is the repository layout?

Modified: avalon/trunk/build.properties
==============================================================================
--- avalon/trunk/build.properties	(original)
+++ avalon/trunk/build.properties	Thu Jun 24 08:37:17 2004
@@ -18,10 +18,10 @@
 
 # HTTP/FTP Proxy values
  
-# project.proxy.host = 127.0.0.l
-# project.proxy.port = 80
-# project.proxy.user = username
-# project.proxy.password = password
+# magic.proxy.host = 127.0.0.l
+# magic.proxy.port = 80
+# magic.proxy.user = username
+# magic.proxy.password = password
 
 
 #======================================================================

Modified: avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/model/Magic.java
==============================================================================
--- avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/model/Magic.java	(original)
+++ avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/model/Magic.java	Thu Jun 24 08:37:17 2004
@@ -51,10 +51,10 @@
     public static final String DOCS_CACHE_KEY = "magic.docs";
     public static final String TEMPLATES_KEY = "magic.templates";
 
-    public static final String PROXY_HOST_KEY = "project.proxy.host";
-    public static final String PROXY_PORT_KEY = "project.proxy.port";
-    public static final String PROXY_USERNAME_KEY = "project.proxy.username";
-    public static final String PROXY_PASSWORD_KEY = "project.proxy.password";
+    public static final String PROXY_HOST_KEY = "magic.proxy.host";
+    public static final String PROXY_PORT_KEY = "magic.proxy.port";
+    public static final String PROXY_USERNAME_KEY = "magic.proxy.username";
+    public static final String PROXY_PASSWORD_KEY = "magic.proxy.password";
 
     private static Magic SYSTEM;
     private static Repository MAIN;