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/20 22:49:36 UTC
cvs commit: avalon-excalibur/monitor/src/java/org/apache/avalon/excalibur/monitor/impl ActiveMonitor.java PassiveMonitor.java
bloritsch 2003/05/20 13:49:35
Modified: monitor build.xml default.properties
monitor/src/java/org/apache/avalon/excalibur/monitor/impl
ActiveMonitor.java PassiveMonitor.java
Log:
add meta info attributes
Revision Changes Path
1.34 +11 -0 avalon-excalibur/monitor/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/avalon-excalibur/monitor/build.xml,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- build.xml 19 May 2003 16:53:02 -0000 1.33
+++ build.xml 20 May 2003 20:49:35 -0000 1.34
@@ -388,4 +388,15 @@
<delete dir="${dist.base}" />
</target>
+ <!-- ===================================================================== -->
+ <!-- Fix Whitespace problems in source code -->
+ <!-- ===================================================================== -->
+ <target name="fixCRLF">
+ <fixcrlf srcdir="."
+ includes="**/*.java,**/*.xml,*.xml,*.properties,**/*.properties"
+ eol="lf"
+ tab="remove"
+ tablength="4"
+ eof="remove"/>
+ </target>
</project>
1.20 +1 -1 avalon-excalibur/monitor/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/avalon-excalibur/monitor/default.properties,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- default.properties 31 Mar 2003 15:34:45 -0000 1.19
+++ default.properties 20 May 2003 20:49:35 -0000 1.20
@@ -57,7 +57,7 @@
# ----- Excalibur collections, version 1.0 or later -----
excalibur-compatibility.home=${basedir}/../compatibility/dist
excalibur-compatibility.lib=${excalibur-compatibility.home}
-excalibur-compatibility.jar=${excalibur-compatibility.lib}/excalibur-compatibility-1.0.jar
+excalibur-compatibility.jar=${excalibur-compatibility.lib}/excalibur-compatibility-1.1.jar
# ----- Excalibur container, version 1.0 or later -----
excalibur-container.home=${basedir}/../container/dist
1.8 +6 -1 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ActiveMonitor.java 22 Mar 2003 12:46:50 -0000 1.7
+++ ActiveMonitor.java 20 May 2003 20:49:35 -0000 1.8
@@ -53,6 +53,11 @@
* The ActiveMonitor is used to actively check a set of resources to see if they have
* 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>
1.7 +6 -1 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- PassiveMonitor.java 22 Mar 2003 12:46:50 -0000 1.6
+++ PassiveMonitor.java 20 May 2003 20:49:35 -0000 1.7
@@ -58,6 +58,11 @@
/**
* 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>
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org
Re[2]: cvs ... monitor ... [PATCH] improved
Posted by Anton Tagunov <at...@mail.cnt.ru>.
... have found that the inline docs should have better
been upgraded too
This [PATCH] replaces the previous [PATCH].
- wbr, Anton
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>
- * <monitor>
+ * <active-monitor id="first-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: 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>
- * <monitor>
+ * <passive-monitor id="second-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>
+ * </passive-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: 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
Re: cvs commit: avalon-excalibur/monitor... [PATCH] -- get away dogs and put in cats
Posted by Anton Tagunov <at...@mail.cnt.ru>.
Hello, Berin!
1. Just have seen the patches you have applied - great! :-)
I see that until a subproject for tools is created
FortressRoleManager can not be decommissioned.. :-/
2. Just by chance ran agains this -- probably the meta info
should be slapped over different classes (the ones it
gotten over now are not Configurable)
Warmest greetings from me! :-)
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:25:36.000000000 +0400
@@ -74,6 +74,11 @@
* </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: 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:26:00.000000000 +0400
@@ -72,6 +72,11 @@
* </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: 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