This is the second time bugzilla has refused to let me attach a patch..
"No file was provided, or it was empty.", on Mozilla 0.9.3 and ns4.77.
Oh well, it's attached here.
--Jeff
? occurred.patch
Index: catalina/src/share/org/apache/catalina/cluster/LocalStrings.properties
===================================================================
RCS file:
/home/cvspublic/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/cluster/LocalStrings.properties,v
retrieving revision 1.1
diff -u -r1.1 LocalStrings.properties
--- catalina/src/share/org/apache/catalina/cluster/LocalStrings.properties
2001/05/13 02:27:22 1.1
+++ catalina/src/share/org/apache/catalina/cluster/LocalStrings.properties
+2001/12/22 10:25:37
@@ -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}
Index: catalina/src/share/org/apache/catalina/cluster/MulticastReceiver.java
===================================================================
RCS file:
/home/cvspublic/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/cluster/MulticastReceiver.java,v
retrieving revision 1.4
diff -u -r1.4 MulticastReceiver.java
--- catalina/src/share/org/apache/catalina/cluster/MulticastReceiver.java
2001/11/07 05:21:06 1.4
+++ catalina/src/share/org/apache/catalina/cluster/MulticastReceiver.java
+2001/12/22 10:25:38
@@ -235,10 +235,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());
}
}
Index: catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java
===================================================================
RCS file:
/home/cvspublic/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java,v
retrieving revision 1.47
diff -u -r1.47 DefaultServlet.java
--- catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java 2001/12/21
21:15:45 1.47
+++ catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java 2001/12/22
+10:26:02
@@ -2033,7 +2033,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) {
@@ -2066,7 +2066,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) {
@@ -2100,7 +2100,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,
@@ -2152,7 +2152,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) {
Index: catalina/src/share/org/apache/catalina/servlets/WebdavServlet.java
===================================================================
RCS file:
/home/cvspublic/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/WebdavServlet.java,v
retrieving revision 1.25
diff -u -r1.25 WebdavServlet.java
--- catalina/src/share/org/apache/catalina/servlets/WebdavServlet.java 2001/09/14
16:45:33 1.25
+++ catalina/src/share/org/apache/catalina/servlets/WebdavServlet.java 2001/12/22
+10:26:13
@@ -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,
Index: catalina/src/share/org/apache/catalina/session/DistributedManager.java
===================================================================
RCS file:
/home/cvspublic/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/DistributedManager.java,v
retrieving revision 1.4
diff -u -r1.4 DistributedManager.java
--- catalina/src/share/org/apache/catalina/session/DistributedManager.java
2001/07/22 20:25:12 1.4
+++ catalina/src/share/org/apache/catalina/session/DistributedManager.java
+2001/12/22 10:26:14
@@ -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) {
Index: catalina/src/share/org/apache/catalina/session/LocalStrings.properties
===================================================================
RCS file:
/home/cvspublic/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/LocalStrings.properties,v
retrieving revision 1.10
diff -u -r1.10 LocalStrings.properties
--- catalina/src/share/org/apache/catalina/session/LocalStrings.properties
2001/09/14 17:48:59 1.10
+++ catalina/src/share/org/apache/catalina/session/LocalStrings.properties
+2001/12/22 10:26:15
@@ -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
Index: catalina/src/share/org/apache/catalina/util/ssi/SsiConfig.java
===================================================================
RCS file:
/home/cvspublic/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/util/ssi/SsiConfig.java,v
retrieving revision 1.5
diff -u -r1.5 SsiConfig.java
--- catalina/src/share/org/apache/catalina/util/ssi/SsiConfig.java 2001/11/29
03:41:26 1.5
+++ catalina/src/share/org/apache/catalina/util/ssi/SsiConfig.java 2001/12/22
+10:26:15
@@ -70,7 +70,7 @@
/**
* 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
Index: jasper/src/share/org/apache/jasper/compiler/KjcJavaCompiler.java
===================================================================
RCS file:
/home/cvspublic/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/KjcJavaCompiler.java,v
retrieving revision 1.2
diff -u -r1.2 KjcJavaCompiler.java
--- jasper/src/share/org/apache/jasper/compiler/KjcJavaCompiler.java 2001/12/03
21:32:27 1.2
+++ jasper/src/share/org/apache/jasper/compiler/KjcJavaCompiler.java 2001/12/22
+10:26:17
@@ -198,7 +198,7 @@
return false;
} catch (Exception e){
try {
- out.write(":unknown error occured while compiling jsp with
kjc.".getBytes());
+ out.write(":unknown error occurred while compiling jsp with
+kjc.".getBytes());
} catch (Exception e2) {
}
return false;
Index: jasper/src/share/org/apache/jasper/resources/messages.properties
===================================================================
RCS file:
/home/cvspublic/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/resources/messages.properties,v
retrieving revision 1.23
diff -u -r1.23 messages.properties
--- jasper/src/share/org/apache/jasper/resources/messages.properties 2001/12/03
15:47:39 1.23
+++ jasper/src/share/org/apache/jasper/resources/messages.properties 2001/12/22
+10:26:20
@@ -85,7 +85,7 @@
jsp.error.param.novalue=No value in PARAM tag
jsp.error.beans.nullbean=Attempted a bean operation on a null object.
jsp.error.beans.nobeaninfo=No BeanInfo for the bean of type ''{0}'' could be found,
the class likely does not exist.
-jsp.error.beans.introspection=An exception occured while introspecting the read
method of property ''{0}'' in a bean of type ''{1}'':\n{2}
+jsp.error.beans.introspection=An exception occurred while introspecting the read
+method of property ''{0}'' in a bean of type ''{1}'':\n{2}
jsp.error.beans.nomethod=Cannot find a method to read property ''{0}'' in a bean of
type ''{1}''
jsp.error.beans.nomethod.setproperty=Can''t find a method to write property ''{0}''
in a bean of type ''{1}''
jsp.error.beans.noproperty=Cannot find any information on property ''{0}'' in a bean
of type ''{1}''
@@ -242,5 +242,5 @@
jsp.error.needAlternateJavaEncoding=Default java encoding {0} is invalid on your java
platform. An alternate can be specified via the 'javaEncoding' parameter of JspServlet.
#Error when compiling, used for jsp line number error messages
jsp.error.single.line.number=\n\nAn error occurred at line: {0} in the jsp file:
{1}\n\n
-jsp.error.multiple.line.number=\n\nAn error occured between lines: {0} and {1} in the
jsp file: {2}\n\n
+jsp.error.multiple.line.number=\n\nAn error occurred between lines: {0} and {1} in
+the jsp file: {2}\n\n
jsp.error.corresponding.servlet=Generated servlet error:\n
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
