Patch #6

[Anton Tagunov <at...@mail.cnt.ru>]

I have already sent this patch before, but to put all my patches
together I'm giving it a number and sending again.

diff -ru src.orig/java/org/apache/avalon/excalibur/monitor/ActiveMonitor.java src/java/org/apache/avalon/excalibur/monitor/ActiveMonitor.java
--- src.orig/java/org/apache/avalon/excalibur/monitor/ActiveMonitor.java        2003-03-22 15:46:50.000000000 +0300
+++ src/java/org/apache/avalon/excalibur/monitor/ActiveMonitor.java     2003-05-21 11:41:57.000000000 +0400
@@ -64,16 +64,21 @@
  * looks like this:
  *
  * <pre>
- *   &lt;monitor&gt;
+ *   &lt;active-monitor id="first-monitor"&gt;
  *     &lt;thread priority="<i>5</i>" frequency="<i>60000</i>"/&gt;
  *     &lt;init-resources&gt;
  *       &lt;-- This entry can be repeated for every resource you want to register immediately --&gt;
  *
  *       &lt;resource key="<i>file:./myfile.html</i>" class="<i>org.apache.avalon.excalibur.monitor.FileResource</i>"/&gt;
  *     &lt;/init-resources&gt;
- *   &lt;/monitor&gt;
+ *   &lt;/active-monitor&gt;
  * </pre>
  *
+ * @avalon.component
+ * @avalon.service type=org.apache.avalon.excalibur.monitor.Monitor
+ * @x-avalon.info name=active-monitor
+ * @x-avalon.lifestyle type=singleton
+ *
  * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
  * @version $Id: ActiveMonitor.java,v 1.19 2003/03/22 12:46:50 leosimons Exp $
  */
diff -ru src.orig/java/org/apache/avalon/excalibur/monitor/PassiveMonitor.java src/java/org/apache/avalon/excalibur/monitor/PassiveMonitor.java
--- src.orig/java/org/apache/avalon/excalibur/monitor/PassiveMonitor.java       2003-03-22 15:46:50.000000000 +0300
+++ src/java/org/apache/avalon/excalibur/monitor/PassiveMonitor.java    2003-05-21 11:42:05.000000000 +0400
@@ -63,15 +63,20 @@
  * looks like this:
  *
  * <pre>
- *   &lt;monitor&gt;
+ *   &lt;passive-monitor id="second-monitor"&gt;
  *     &lt;init-resources&gt;
  *       &lt;-- This entry can be repeated for every resource you want to register immediately --&gt;
  *
  *       &lt;resource key="<i>file:./myfile.html</i>" class="<i>org.apache.avalon.excalibur.monitor.FileMonitor</i>"/&gt;
  *     &lt;/init-resources&gt;
- *   &lt;/monitor&gt;
+ *   &lt;/passive-monitor&gt;
  * </pre>
  *
+ * @avalon.component
+ * @avalon.service type=org.apache.avalon.excalibur.monitor.Monitor
+ * @x-avalon.info name=passive-monitor
+ * @x-avalon.lifestyle type=singleton
+ *
  * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
  * @version $Id: PassiveMonitor.java,v 1.15 2003/03/22 12:46:50 leosimons Exp $
  */
diff -ru src.orig/java/org/apache/avalon/excalibur/monitor/impl/ActiveMonitor.java src/java/org/apache/avalon/excalibur/monitor/impl/ActiveMonitor.java
--- src.orig/java/org/apache/avalon/excalibur/monitor/impl/ActiveMonitor.java   2003-05-21 11:00:26.000000000 +0400
+++ src/java/org/apache/avalon/excalibur/monitor/impl/ActiveMonitor.java        2003-05-21 11:25:24.000000000 +0400
@@ -54,11 +54,6 @@
  * changed. It will poll the resources with a frequency as specified or if
  * unspecified with the default (60 seconds).
  * 
- * @avalon.component
- * @avalon.service type=org.apache.avalon.excalibur.monitor.Monitor
- * @x-avalon.info name=active-monitor
- * @x-avalon.lifestyle type=singleton
- *
  * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
  * @author <a href="mailto:peter at apache.org">Peter Donald</a>
  * @version $Id: ActiveMonitor.java,v 1.8 2003/05/20 20:49:35 bloritsch Exp $
diff -ru src.orig/java/org/apache/avalon/excalibur/monitor/impl/PassiveMonitor.java src/java/org/apache/avalon/excalibur/monitor/impl/PassiveMonitor.java
--- src.orig/java/org/apache/avalon/excalibur/monitor/impl/PassiveMonitor.java  2003-05-21 11:00:28.000000000 +0400
+++ src/java/org/apache/avalon/excalibur/monitor/impl/PassiveMonitor.java       2003-05-21 11:25:50.000000000 +0400
@@ -59,11 +59,6 @@
  * A passive monitor will check the reosurce each time it
  * is accessed.
  * 
- * @avalon.component
- * @avalon.service type=org.apache.avalon.excalibur.monitor.Monitor
- * @x-avalon.info name=passive-monitor
- * @x-avalon.lifestyle type=singleton
- *
  * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
  * @author <a href="mailto:peter at apache.org">Peter Donald</a>
  * @version $Revision: 1.7 $ $Date: 2003/05/20 20:49:35 $


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