You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by bl...@apache.org on 2003/05/23 19:41:04 UTC
cvs commit: avalon-excalibur/monitor/src/java/org/apache/avalon/excalibur/monitor PassiveMonitor.java ActiveMonitor.java
bloritsch 2003/05/23 10:41:04
Modified: monitor/src/java/org/apache/avalon/excalibur/monitor/impl
AbstractMonitor.java ActiveMonitor.java
PassiveMonitor.java
monitor/src/java/org/apache/avalon/excalibur/monitor
PassiveMonitor.java ActiveMonitor.java
Log:
Apply Patch #6 from Anton Tagunov
Revision Changes Path
1.11 +2 -1 avalon-excalibur/monitor/src/java/org/apache/avalon/excalibur/monitor/impl/AbstractMonitor.java
Index: AbstractMonitor.java
===================================================================
RCS file: /home/cvs/avalon-excalibur/monitor/src/java/org/apache/avalon/excalibur/monitor/impl/AbstractMonitor.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- AbstractMonitor.java 22 Mar 2003 12:46:50 -0000 1.10
+++ AbstractMonitor.java 23 May 2003 17:41:04 -0000 1.11
@@ -55,6 +55,7 @@
import org.apache.avalon.excalibur.monitor.Monitor;
import org.apache.avalon.excalibur.monitor.Resource;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
/**
* The AbstractMonitor class is a useful base class which all Monitors
1.9 +1 -6 avalon-excalibur/monitor/src/java/org/apache/avalon/excalibur/monitor/impl/ActiveMonitor.java
Index: ActiveMonitor.java
===================================================================
RCS file: /home/cvs/avalon-excalibur/monitor/src/java/org/apache/avalon/excalibur/monitor/impl/ActiveMonitor.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ActiveMonitor.java 20 May 2003 20:49:35 -0000 1.8
+++ ActiveMonitor.java 23 May 2003 17:41:04 -0000 1.9
@@ -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$
1.8 +1 -6 avalon-excalibur/monitor/src/java/org/apache/avalon/excalibur/monitor/impl/PassiveMonitor.java
Index: PassiveMonitor.java
===================================================================
RCS file: /home/cvs/avalon-excalibur/monitor/src/java/org/apache/avalon/excalibur/monitor/impl/PassiveMonitor.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- PassiveMonitor.java 20 May 2003 20:49:35 -0000 1.7
+++ PassiveMonitor.java 23 May 2003 17:41:04 -0000 1.8
@@ -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$ $Date$
1.16 +8 -3 avalon-excalibur/monitor/src/java/org/apache/avalon/excalibur/monitor/PassiveMonitor.java
Index: PassiveMonitor.java
===================================================================
RCS file: /home/cvs/avalon-excalibur/monitor/src/java/org/apache/avalon/excalibur/monitor/PassiveMonitor.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- PassiveMonitor.java 22 Mar 2003 12:46:50 -0000 1.15
+++ PassiveMonitor.java 23 May 2003 17:41:04 -0000 1.16
@@ -63,14 +63,19 @@
* looks like this:
*
* <pre>
- * <monitor>
+ * <passive-monitor>
* <init-resources>
* <-- This entry can be repeated for every resource you want to register immediately -->
*
* <resource key="<i>file:./myfile.html</i>" class="<i>org.apache.avalon.excalibur.monitor.FileMonitor</i>"/>
* </init-resources>
- * </monitor>
+ * </pasive-monitor>
* </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$
1.20 +8 -3 avalon-excalibur/monitor/src/java/org/apache/avalon/excalibur/monitor/ActiveMonitor.java
Index: ActiveMonitor.java
===================================================================
RCS file: /home/cvs/avalon-excalibur/monitor/src/java/org/apache/avalon/excalibur/monitor/ActiveMonitor.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ActiveMonitor.java 22 Mar 2003 12:46:50 -0000 1.19
+++ ActiveMonitor.java 23 May 2003 17:41:04 -0000 1.20
@@ -64,15 +64,20 @@
* looks like this:
*
* <pre>
- * <monitor>
+ * <active-monitor>
* <thread priority="<i>5</i>" frequency="<i>60000</i>"/>
* <init-resources>
* <-- This entry can be repeated for every resource you want to register immediately -->
*
* <resource key="<i>file:./myfile.html</i>" class="<i>org.apache.avalon.excalibur.monitor.FileResource</i>"/>
* </init-resources>
- * </monitor>
+ * </active-monitor>
* </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$
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org