You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by co...@locus.apache.org on 2000/01/08 15:50:42 UTC
cvs commit: jakarta-tomcat/src/tests testlist.txt
costin 00/01/08 06:50:42
Modified: src/share/org/apache/tomcat/core LocalStrings.properties
Response.java
src/share/org/apache/tomcat/server LocalStrings.properties
src/share/org/apache/tomcat/util RequestUtil.java
StringManager.java
src/tests testlist.txt
Log:
- fixed minor bug in yesterday move of RequestUtil ( sm )
- added a printStackTrace to StringManager - if it can't find the
string, something is really bad and we can't ignore it
- as a result, added a missing message - it has to be cleaned up!
- tests - added runclient.sh - you can start the server with tomcat start,
then run runclient as many times as you want or use a browser to do
individual tests.
- temporary commented out y2k - it has to be rewriten, it shouldn't depend
on tomcat internals ( HttpDate ) on the client side, all other tests are
on the server side.
Revision Changes Path
1.5 +6 -1 jakarta-tomcat/src/share/org/apache/tomcat/core/LocalStrings.properties
Index: LocalStrings.properties
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/LocalStrings.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- LocalStrings.properties 2000/01/07 21:11:37 1.4
+++ LocalStrings.properties 2000/01/08 14:50:39 1.5
@@ -1,4 +1,4 @@
-# $Id: LocalStrings.properties,v 1.4 2000/01/07 21:11:37 costin Exp $
+# $Id: LocalStrings.properties,v 1.5 2000/01/08 14:50:39 costin Exp $
#
# Localized strings for package org.apache.tomcat.core
@@ -43,6 +43,11 @@
serverReponse.outputStream.ise=getWriter() has already been called
serverResponse.ise.writer.ise=getOutputStream() has already been called
+
+serverRequest.inputStream.npe=input stream is null
+serverRequest.urlDecode.nfe=illegal number format: {0}
+serverResponse.outputStream.ise=Writer is already being used for this request
+serverResponse.writer.ise=OutputStream is already being used for this request
servletLoader.load.mfue=trouble resolving class name: {0}
servletLoader.load.ioe=trouble reading class file: {0}
1.6 +5 -4 jakarta-tomcat/src/share/org/apache/tomcat/core/Response.java
Index: Response.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/Response.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Response.java 1999/12/21 03:15:20 1.5
+++ Response.java 2000/01/08 14:50:39 1.6
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/Response.java,v 1.5 1999/12/21 03:15:20 bergsten Exp $
- * $Revision: 1.5 $
- * $Date: 1999/12/21 03:15:20 $
+ * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/Response.java,v 1.6 2000/01/08 14:50:39 costin Exp $
+ * $Revision: 1.6 $
+ * $Date: 2000/01/08 14:50:39 $
*
* ====================================================================
*
@@ -396,7 +396,8 @@
public void writeHeaders() throws IOException {
if(omitHeaders)
return;
- resA.setStatus( status, RequestUtil.getStatusString(status));
+
+ resA.setStatus( status, sm.getString("sc."+ status ));
fixHeaders();
resA.addMimeHeaders( headers );
}
1.3 +1 -5 jakarta-tomcat/src/share/org/apache/tomcat/server/LocalStrings.properties
Index: LocalStrings.properties
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/server/LocalStrings.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LocalStrings.properties 1999/10/31 19:28:07 1.2
+++ LocalStrings.properties 2000/01/08 14:50:40 1.3
@@ -1,4 +1,4 @@
-# $Id: LocalStrings.properties,v 1.2 1999/10/31 19:28:07 costin Exp $
+# $Id: LocalStrings.properties,v 1.3 2000/01/08 14:50:40 costin Exp $
#
# Localized strings for package org.apache.tomcat.server
@@ -17,10 +17,6 @@
server.workDir.npe=work dir is null
-serverRequest.inputStream.npe=input stream is null
-serverRequest.urlDecode.nfe=illegal number format: {0}
-serverResponse.outputStream.ise=Writer is already being used for this request
-serverResponse.writer.ise=OutputStream is already being used for this request
servletOutputStreamImpl.write.iae=invalid write length: {0}
servletOutputStreamImpl.fmt.not_iso8859_1=Not an ISO 8859_1 character:{0}
servletOutputStreamImpl.reset.ise=can't reset buffer after writing to client
1.2 +0 -6 jakarta-tomcat/src/share/org/apache/tomcat/util/RequestUtil.java
Index: RequestUtil.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/RequestUtil.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RequestUtil.java 2000/01/07 21:21:15 1.1
+++ RequestUtil.java 2000/01/08 14:50:41 1.2
@@ -351,10 +351,4 @@
return encoding;
}
- static StringManager sm = StringManager.getManager(Constants.Package);
-
- public static String getStatusString(int status ) {
- return sm.getString("sc."+ status );
- }
-
}
1.3 +4 -3 jakarta-tomcat/src/share/org/apache/tomcat/util/StringManager.java
Index: StringManager.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/StringManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- StringManager.java 1999/12/08 01:37:20 1.2
+++ StringManager.java 2000/01/08 14:50:41 1.3
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/StringManager.java,v 1.2 1999/12/08 01:37:20 rubys Exp $
- * $Revision: 1.2 $
- * $Date: 1999/12/08 01:37:20 $
+ * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/StringManager.java,v 1.3 2000/01/08 14:50:41 costin Exp $
+ * $Revision: 1.3 $
+ * $Date: 2000/01/08 14:50:41 $
*
* ====================================================================
*
@@ -134,6 +134,7 @@
str = bundle.getString(key);
} catch (MissingResourceException mre) {
str = "cannot find message associated with key : " + key;
+ mre.printStackTrace();
}
return str;
1.4 +3 -1 jakarta-tomcat/src/tests/testlist.txt
Index: testlist.txt
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/tests/testlist.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- testlist.txt 1999/11/11 22:08:20 1.3
+++ testlist.txt 2000/01/08 14:50:41 1.4
@@ -12,7 +12,9 @@
tests.dispatch.IncludeMismatch2
tests.dispatch.SimpleRedirect
tests.dispatch.PrintWriterTest
-tests.y2k.HttpDateTest
+## Y2K is over, we can now rewrite this test - it
+## shouldn't depend on tomcat internals on the client side
+## tests.y2k.HttpDateTest
tests.request.Get
tests.request.Post
tests.request.RequestMap