remm 02/01/03 00:52:57
Modified: catalina/src/share/org/apache/catalina/cluster
LocalStrings.properties MulticastReceiver.java
catalina/src/share/org/apache/catalina/servlets
DefaultServlet.java WebdavServlet.java
catalina/src/share/org/apache/catalina/session
DistributedManager.java LocalStrings.properties
catalina/src/share/org/apache/catalina/util/ssi
SsiConfig.java
Log:
- Fix bug 5568: occured -> occurred.
- Submitted by Jeff Turner <jeff at socialchange.net.au>
Revision Changes Path
1.2 +3 -3
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/cluster/LocalStrings.properties
Index: LocalStrings.properties
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/cluster/LocalStrings.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LocalStrings.properties 13 May 2001 02:27:22 -0000 1.1
+++ LocalStrings.properties 3 Jan 2002 08:52:56 -0000 1.2
@@ -6,6 +6,6 @@
standardCluster.createReceiver=Creating a new receiver for {0}
standardCluster.createSender=Creating a new sender for {0}
standardCluster.invalidAddress=Invalid multicastAddress {0}
-standardCluster.joinException=An error occured when trying to join group {0}
-standardCluster.leaveException=An error occured when trying to leave group {0}
-multicastSender.sendException=An error occured when trying to replicate {0}
\ No newline at end of file
+standardCluster.joinException=An error occurred when trying to join group {0}
+standardCluster.leaveException=An error occurred when trying to leave group {0}
+multicastSender.sendException=An error occurred when trying to replicate {0}
\ No newline at end of file
1.5 +8 -7
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/cluster/MulticastReceiver.java
Index: MulticastReceiver.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/cluster/MulticastReceiver.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MulticastReceiver.java 7 Nov 2001 05:21:06 -0000 1.4
+++ MulticastReceiver.java 3 Jan 2002 08:52:56 -0000 1.5
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/cluster/MulticastReceiver.java,v
1.4 2001/11/07 05:21:06 remm Exp $
- * $Revision: 1.4 $
- * $Date: 2001/11/07 05:21:06 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/cluster/MulticastReceiver.java,v
1.5 2002/01/03 08:52:56 remm Exp $
+ * $Revision: 1.5 $
+ * $Date: 2002/01/03 08:52:56 $
*
* ====================================================================
*
@@ -84,7 +84,7 @@
* it onto an internal stack and let it be picked up when needed.
*
* @author Bip Thelin
- * @version $Revision: 1.4 $, $Date: 2001/11/07 05:21:06 $
+ * @version $Revision: 1.5 $, $Date: 2002/01/03 08:52:56 $
*/
public final class MulticastReceiver
@@ -214,7 +214,8 @@
threadStop();
}
- // --------------------------------------------------------- Private Methods
+
+ // -------------------------------------------------------- Private Methods
/**
* Check our multicast socket for new data and determine if the
@@ -235,10 +236,10 @@
if(obj.getSenderId().equals(this.senderId))
stack.add(obj);
} catch (IOException e) {
- log("An error occured when trying to replicate: "+
+ log("An error occurred when trying to replicate: "+
e.toString());
} catch (ClassNotFoundException e) {
- log("An error occured when trying to replicate: "+
+ log("An error occurred when trying to replicate: "+
e.toString());
}
}
1.49 +8 -8
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java
Index: DefaultServlet.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- DefaultServlet.java 1 Jan 2002 21:30:48 -0000 1.48
+++ DefaultServlet.java 3 Jan 2002 08:52:56 -0000 1.49
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java,v
1.48 2002/01/01 21:30:48 remm Exp $
- * $Revision: 1.48 $
- * $Date: 2002/01/01 21:30:48 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java,v
1.49 2002/01/03 08:52:56 remm Exp $
+ * $Revision: 1.49 $
+ * $Date: 2002/01/03 08:52:56 $
*
* ====================================================================
*
@@ -125,7 +125,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
- * @version $Revision: 1.48 $ $Date: 2002/01/01 21:30:48 $
+ * @version $Revision: 1.49 $ $Date: 2002/01/03 08:52:56 $
*/
public class DefaultServlet
@@ -2040,7 +2040,7 @@
*
* @param istream The input stream to read from
* @param ostream The output stream to write to
- * @return Exception which occured during processing
+ * @return Exception which occurred during processing
*/
private IOException copyRange(InputStream istream,
ServletOutputStream ostream) {
@@ -2073,7 +2073,7 @@
*
* @param reader The reader to read from
* @param writer The writer to write to
- * @return Exception which occured during processing
+ * @return Exception which occurred during processing
*/
private IOException copyRange(Reader reader, PrintWriter writer) {
@@ -2107,7 +2107,7 @@
* @param ostream The output stream to write to
* @param start Start of the range which will be copied
* @param end End of the range which will be copied
- * @return Exception which occured during processing
+ * @return Exception which occurred during processing
*/
private IOException copyRange(InputStream istream,
ServletOutputStream ostream,
@@ -2159,7 +2159,7 @@
* @param writer The writer to write to
* @param start Start of the range which will be copied
* @param end End of the range which will be copied
- * @return Exception which occured during processing
+ * @return Exception which occurred during processing
*/
private IOException copyRange(Reader reader, PrintWriter writer,
long start, long end) {
1.26 +6 -6
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/WebdavServlet.java
Index: WebdavServlet.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/WebdavServlet.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- WebdavServlet.java 14 Sep 2001 16:45:33 -0000 1.25
+++ WebdavServlet.java 3 Jan 2002 08:52:56 -0000 1.26
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/WebdavServlet.java,v
1.25 2001/09/14 16:45:33 remm Exp $
- * $Revision: 1.25 $
- * $Date: 2001/09/14 16:45:33 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/WebdavServlet.java,v
1.26 2002/01/03 08:52:56 remm Exp $
+ * $Revision: 1.26 $
+ * $Date: 2002/01/03 08:52:56 $
*
* ====================================================================
*
@@ -126,7 +126,7 @@
* are handled by the DefaultServlet.
*
* @author Remy Maucherat
- * @version $Revision: 1.25 $ $Date: 2001/09/14 16:45:33 $
+ * @version $Revision: 1.26 $ $Date: 2002/01/03 08:52:56 $
*/
public class WebdavServlet
@@ -1657,7 +1657,7 @@
* Copy a collection.
*
* @param resources Resources implementation to be used
- * @param errorList Hashtable containing the list of errors which occured
+ * @param errorList Hashtable containing the list of errors which occurred
* during the copy operation
* @param source Path of the resource to be copied
* @param dest Destination path
@@ -1839,7 +1839,7 @@
*
* @param resources Resources implementation associated with the context
* @param path Path to the collection to be deleted
- * @param errorList Contains the list of the errors which occured
+ * @param errorList Contains the list of the errors which occurred
*/
private void deleteCollection(HttpServletRequest req,
DirContext resources,
1.5 +7 -7
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/DistributedManager.java
Index: DistributedManager.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/DistributedManager.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DistributedManager.java 22 Jul 2001 20:25:12 -0000 1.4
+++ DistributedManager.java 3 Jan 2002 08:52:57 -0000 1.5
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/DistributedManager.java,v
1.4 2001/07/22 20:25:12 pier Exp $
- * $Revision: 1.4 $
- * $Date: 2001/07/22 20:25:12 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/DistributedManager.java,v
1.5 2002/01/03 08:52:57 remm Exp $
+ * $Revision: 1.5 $
+ * $Date: 2002/01/03 08:52:57 $
*
* ====================================================================
*
@@ -90,7 +90,7 @@
* Store to make Sessions persistence.
*
* @author Bip Thelin
- * @version $Revision: 1.4 $, $Date: 2001/07/22 20:25:12 $
+ * @version $Revision: 1.5 $, $Date: 2002/01/03 08:52:57 $
*/
public final class DistributedManager extends PersistentManagerBase {
@@ -167,7 +167,7 @@
if(debug > 0)
log("Replicating Session: "+session.getId());
} catch (IOException e) {
- log("An error occured when replicating Session: "+session.getId());
+ log("An error occurred when replicating Session: "+session.getId());
}
return (session);
@@ -233,10 +233,10 @@
if (debug > 0)
log("Loading replicated session: "+_session.getId());
} catch (IOException e) {
- log("Error occured when trying to read replicated session: "+
+ log("Error occurred when trying to read replicated session: "+
e.toString());
} catch (ClassNotFoundException e) {
- log("Error occured when trying to read replicated session: "+
+ log("Error occurred when trying to read replicated session: "+
e.toString());
} finally {
if (ois != null) {
1.11 +2 -2
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/LocalStrings.properties
Index: LocalStrings.properties
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/LocalStrings.properties,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- LocalStrings.properties 14 Sep 2001 17:48:59 -0000 1.10
+++ LocalStrings.properties 3 Jan 2002 08:52:57 -0000 1.11
@@ -13,7 +13,7 @@
JDBCStore.SQLException=SQL Error {0}
JDBCStore.checkConnectionDBClosed=The database connection is null or was found to
be closed. Trying to re-open it.
JDBCStore.checkConnectionDBReOpenFail=The re-open on the database failed. The
database could be down.
-JDBCStore.checkConnectionSQLException=A SQL exception occured {0}
+JDBCStore.checkConnectionSQLException=A SQL exception occurred {0}
JDBCStore.checkConnectionClassNotFoundException=JDBC driver class not found {0}
managerBase.complete=Seeding of random number generator has been completed
managerBase.getting=Getting message digest component for algorithm {0}
@@ -55,7 +55,7 @@
persistentManager.serializeError=Error serializing Session {0}: {1}
persistentManager.swapMaxIdle=Swapping session {0} to Store, idle for {1} seconds
persistentManager.backupMaxIdle=Backing up session {0} to Store, idle for {1}
seconds
-persistentManager.backupException=Exception occured when backing up Session {0}: {1}
+persistentManager.backupException=Exception occurred when backing up Session {0}:
{1}
persistentManager.tooManyActive=Too many active sessions, {0}, looking for idle
sessions to swap out
persistentManager.swapTooManyActive=Swapping out session {0}, idle for {1} seconds
too many sessions active
persistentManager.processSwaps=Checking for sessions to swap out, {0} active
sessions in memory
1.6 +5 -5
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/util/ssi/SsiConfig.java
Index: SsiConfig.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/util/ssi/SsiConfig.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SsiConfig.java 29 Nov 2001 03:41:26 -0000 1.5
+++ SsiConfig.java 3 Jan 2002 08:52:57 -0000 1.6
@@ -1,8 +1,8 @@
/*
* SsiConfig.java
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/util/ssi/SsiConfig.java,v
1.5 2001/11/29 03:41:26 amyroh Exp $
- * $Revision: 1.5 $
- * $Date: 2001/11/29 03:41:26 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/util/ssi/SsiConfig.java,v
1.6 2002/01/03 08:52:57 remm Exp $
+ * $Revision: 1.6 $
+ * $Date: 2002/01/03 08:52:57 $
*
* ====================================================================
*
@@ -70,11 +70,11 @@
/**
* Implementation of the SsiCommand config, example of usage:
- * <!--#config sizefmt="abbrev" errmsg="An error occured!"-->
+ * <!--#config sizefmt="abbrev" errmsg="An error occurred!"-->
*
* @author Bip Thelin
* @author Paul Speed
- * @version $Revision: 1.5 $, $Date: 2001/11/29 03:41:26 $
+ * @version $Revision: 1.6 $, $Date: 2002/01/03 08:52:57 $
*/
public final class SsiConfig extends AbstractSsiCommand {
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
