pero2004/12/01 01:41:11
Modified:modules/cluster/src/share/org/apache/catalina/cluster/deploy
FarmWarDeployer.java FileMessageFactory.java
WarWatcher.java
modules/cluster/src/share/org/apache/catalina/cluster/tcp
ReplicationTransmitter.java SimpleTcpCluster.java
Log:
Fix some log.
Change some names
Revision ChangesPath
1.6 +8 -8
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/deploy/FarmWarDeployer.java
Index: FarmWarDeployer.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/deploy/FarmWarDeployer.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- FarmWarDeployer.java 27 Nov 2004 21:16:14 - 1.5
+++ FarmWarDeployer.java 1 Dec 2004 09:41:11 - 1.6
@@ -82,11 +82,11 @@
private int count = 0;
/**
- * Frequency of the Form deploydir check. Cluster wide deployment will be
+ * Frequency of the Farm watchDir check. Cluster wide deployment will be
* done once for the specified amount of backgrondProcess calls (ie, the
* lower the amount, the most often the checks will occur).
*/
-protected int processExpiresFrequency = 2;
+protected int processDeployFrequency = 2;
/**
* Path where context descriptors should be deployed.
@@ -562,7 +562,7 @@
*/
public void backgroundProcess() {
if (started) {
-count = (count + 1) % processExpiresFrequency;
+count = (count + 1) % processDeployFrequency;
if (count == 0 watchEnabled) {
watcher.check();
}
@@ -666,24 +666,24 @@
/**
* Return the frequency of watcher checks.
*/
-public int getProcessExpiresFrequency() {
+public int getProcessDeployFrequency() {
-return (this.processExpiresFrequency);
+return (this.processDeployFrequency);
}
/**
* Set the watcher checks frequency.
*
- * @param processExpiresFrequency
+ * @param processDeployFrequency
*the new manager checks frequency
*/
-public void setProcessExpiresFrequency(int processExpiresFrequency) {
+public void setProcessDeployFrequency(int processExpiresFrequency) {
if (processExpiresFrequency = 0) {
return;
}
-this.processExpiresFrequency = processExpiresFrequency;
+this.processDeployFrequency = processExpiresFrequency;
}
/**
1.3 +180 -124
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/deploy/FileMessageFactory.java
Index: FileMessageFactory.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/deploy/FileMessageFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FileMessageFactory.java 27 Nov 2004 21:10:20 - 1.2
+++ FileMessageFactory.java 1 Dec 2004 09:41:11 - 1.3
@@ -15,19 +15,24 @@
*/
package org.apache.catalina.cluster.deploy;
+
import java.io.File;
import java.io.IOException;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.FileNotFoundException;
+
/**
- * This factory is used to read files and write files by splitting them up
into smaller
- * messages. So that entire files don't have to be read into memory.BR
+ * This factory is used to read files and write files by splitting them up
into
+ * smaller messages. So that entire files don't have to be read into memory.
+ * BR
* The factory can be used as a reader or writer but not both at the same
time.
- * When done reading or writing the factory will close the input or output
streams
- * and mark the factory as closed. It is not possible to use it after
that.BR
- * To force a cleanup, call cleanup() from the calling object.BR
- * This class is not thread safe.
+ * When done reading or writing the factory will close the input or output
+ * streams and mark the factory as closed. It is not possible to use it after
+ * that. BR
+ * To force a cleanup, call cleanup() from the calling object. BR
+ * This class is not thread safe.
+ *
* @author Filip Hanik
* @version 1.0
*/
@@ -35,122 +40,138 @@
/*--Static Variables*/
public static org.apache.commons.logging.Log log =
org.apache.commons.logging.LogFactory
.getLog(FileMessageFactory.class);
-
+
/**
* The number of
