svn commit: rev 46212 - in avalon/trunk: planet/facilities/finder/test/etc planet/facilities/finder/test/etc/test planet/facilities/jmx/mx4j/src/main/org/apache/avalon/jmx/mx4j planet/tutorials/hello/etc planet/tutorials/hello/etc/test planet/tutorials/main/etc/test tools/magic

Author: niclas
Date: Thu Sep 16 14:08:18 2004
New Revision: 46212

Added:
   avalon/trunk/planet/facilities/finder/test/etc/
   avalon/trunk/planet/facilities/finder/test/etc/test/
   avalon/trunk/planet/facilities/finder/test/etc/test/merlin.properties   (contents, props changed)
   avalon/trunk/planet/tutorials/hello/etc/
   avalon/trunk/planet/tutorials/hello/etc/test/
   avalon/trunk/planet/tutorials/hello/etc/test/merlin.properties   (contents, props changed)
Modified:
   avalon/trunk/planet/facilities/jmx/mx4j/src/main/org/apache/avalon/jmx/mx4j/MX4JComponentRegistrationManager.java
   avalon/trunk/planet/tutorials/main/etc/test/demo.properties
   avalon/trunk/tools/magic/build.xml
Log:
Various changes sitting on my system....

Added: avalon/trunk/planet/facilities/finder/test/etc/test/merlin.properties
==============================================================================
--- (empty file)
+++ avalon/trunk/planet/facilities/finder/test/etc/test/merlin.properties	Thu Sep 16 14:08:18 2004
@@ -0,0 +1,2 @@
+avalon.repository.online = false
+

Modified: avalon/trunk/planet/facilities/jmx/mx4j/src/main/org/apache/avalon/jmx/mx4j/MX4JComponentRegistrationManager.java
==============================================================================
--- avalon/trunk/planet/facilities/jmx/mx4j/src/main/org/apache/avalon/jmx/mx4j/MX4JComponentRegistrationManager.java	(original)
+++ avalon/trunk/planet/facilities/jmx/mx4j/src/main/org/apache/avalon/jmx/mx4j/MX4JComponentRegistrationManager.java	Thu Sep 16 14:08:18 2004
@@ -37,6 +37,7 @@
 import org.apache.avalon.framework.parameters.Parameters;
 import org.apache.avalon.framework.context.Context;
 
+import org.apache.avalon.jmx.ComponentRegistrationManager;
 import org.apache.avalon.jmx.spi.AbstractJMXComponentRegistrationManager;
 
 import org.apache.avalon.util.i18n.ResourceManager;

Added: avalon/trunk/planet/tutorials/hello/etc/test/merlin.properties
==============================================================================
--- (empty file)
+++ avalon/trunk/planet/tutorials/hello/etc/test/merlin.properties	Thu Sep 16 14:08:18 2004
@@ -0,0 +1,2 @@
+avalon.repository.online = false
+

Modified: avalon/trunk/planet/tutorials/main/etc/test/demo.properties
==============================================================================
--- avalon/trunk/planet/tutorials/main/etc/test/demo.properties	(original)
+++ avalon/trunk/planet/tutorials/main/etc/test/demo.properties	Thu Sep 16 14:08:18 2004
@@ -1,3 +1,4 @@
+avalon.repository.online = false
 
 merlin.info = false
 merlin.debug = false

Modified: avalon/trunk/tools/magic/build.xml
==============================================================================
--- avalon/trunk/tools/magic/build.xml	(original)
+++ avalon/trunk/tools/magic/build.xml	Thu Sep 16 14:08:18 2004
@@ -4,7 +4,7 @@
     xmlns:x="antlib:org.apache.avalon.tools"
 >
   <property file="build.properties"/>
-  <x:home/>
+  <x:home index="../index.xml" />
   <import file="${magic.templates}/standard.xml"/>
 
   <target name="javadoc" depends="prepare">