cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core LocalStrings.properties
remm2003/08/17 01:30:44
Modified:catalina/src/share/org/apache/catalina/core
LocalStrings.properties
Log:
- Rework the wording of the context config file deployment message.
Revision ChangesPath
1.9 +1 -1
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/LocalStrings.properties
Index: LocalStrings.properties
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/LocalStrings.properties,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- LocalStrings.properties 19 Jul 2003 14:30:07 - 1.8
+++ LocalStrings.properties 17 Aug 2003 08:30:44 - 1.9
@@ -99,7 +99,7 @@
standardHost.installBase=Only web applications in the Host web application
directory can be installed
standardHost.installing=Installing web application at context path {0} from URL {1}
standardHost.installingWAR=Installing web application from URL {0}
-standardHost.installingXML=Installing web application from Config file URL {0}
+standardHost.installingXML=Processing Context configuration file URL {0}
standardHost.installError=Error deploying application at context path {0}
standardHost.invalidErrorReportValveClass=Couldn't load specified error report
valve class: {0}
standardHost.docBase=Document base directory {0} already exists
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-5/resources/deployer build.xml
remm2003/08/17 01:31:08
Modified:resources/deployer build.xml
Log:
- default login/pass to tomcat/tomcat.
Revision ChangesPath
1.2 +2 -2 jakarta-tomcat-5/resources/deployer/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-5/resources/deployer/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.xml 14 May 2003 17:39:59 - 1.1
+++ build.xml 17 Aug 2003 08:31:08 - 1.2
@@ -11,8 +11,8 @@
!-- Configure properties to access the Manager application --
property name=url value=http://localhost:8080/manager/
- property name=username value=myusername/
- property name=password value=mypassword/
+ property name=username value=tomcat/
+ property name=password value=tomcat/
property name=webapp.path value=${build}/webapp${path}/
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup HostConfig.java
remm2003/08/17 01:32:53
Modified:catalina/src/share/org/apache/catalina/startup
HostConfig.java
Log:
- Found a way to avoid the extra restart caused by the web.xml tracker, when
the webapp was deployed by an outside source, such as the manager
servlet.
Revision ChangesPath
1.22 +15 -6
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/HostConfig.java
Index: HostConfig.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/HostConfig.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- HostConfig.java 4 Aug 2003 19:02:30 - 1.21
+++ HostConfig.java 17 Aug 2003 08:32:53 - 1.22
@@ -771,15 +771,24 @@
ResourceAttributes webXmlAttributes =
(ResourceAttributes)
resources.getAttributes(/WEB-INF/web.xml);
+ResourceAttributes webInfAttributes =
+(ResourceAttributes)
+resources.getAttributes(/WEB-INF);
long newLastModified = webXmlAttributes.getLastModified();
+long webInfLastModified = webInfAttributes.getLastModified();
Long lastModified = (Long) webXmlLastModified.get(contextName);
if (lastModified == null) {
webXmlLastModified.put
(contextName, new Long(newLastModified));
} else {
if (lastModified.longValue() != newLastModified) {
-webXmlLastModified.remove(contextName);
-restartContext(context);
+if (newLastModified (webInfLastModified + 5000)) {
+webXmlLastModified.remove(contextName);
+restartContext(context);
+} else {
+webXmlLastModified.put
+(contextName, new Long(newLastModified));
+}
}
}
} catch (NamingException e) {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/loader LocalStrings.properties WebappClassLoader.java
remm2003/08/17 01:36:14
Modified:catalina/src/share/org/apache/catalina/loader
LocalStrings.properties WebappClassLoader.java
Log:
- Improve error message, so that it is more explanatory.
Revision ChangesPath
1.2 +1 -0
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/loader/LocalStrings.properties
Index: LocalStrings.properties
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/loader/LocalStrings.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LocalStrings.properties 18 Jul 2002 16:48:03 - 1.1
+++ LocalStrings.properties 17 Aug 2003 08:36:14 - 1.2
@@ -13,6 +13,7 @@
standardLoader.removeRepository=Removing repository {0}
standardLoader.starting=Starting this Loader
standardLoader.stopping=Stopping this Loader
+webappClassLoader.stopped=Illegal access: this web application instance has been
stopped already (the eventual following stack trace is caused by an error thrown for
debugging purposes as well as to attempt to terminate the thread which caused the
illegal access, and has no functional impact)
webappLoader.addRepository=Adding repository {0}
webappLoader.deploy=Deploying class repositories to work directory {0}
webappLoader.jarDeploy=Deploy JAR {0} to {1}
1.19 +12 -3
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java
Index: WebappClassLoader.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- WebappClassLoader.java6 Aug 2003 08:58:19 - 1.18
+++ WebappClassLoader.java17 Aug 2003 08:36:14 - 1.19
@@ -99,10 +99,12 @@
import javax.naming.NameClassPair;
import org.apache.tomcat.util.compat.JdkCompat;
+
import org.apache.catalina.Lifecycle;
import org.apache.catalina.LifecycleEvent;
import org.apache.catalina.LifecycleException;
import org.apache.catalina.LifecycleListener;
+import org.apache.catalina.util.StringManager;
import org.apache.naming.JndiPermission;
import org.apache.naming.resources.ResourceAttributes;
@@ -205,6 +207,13 @@
};
+/**
+ * The string manager for this package.
+ */
+protected static final StringManager sm =
+StringManager.getManager(Constants.Package);
+
+
// --- Constructors
@@ -1247,7 +1256,7 @@
// Don't load classes if class loader is stopped
if (!started) {
-log.debug(Lifecycle error : CL stopped);
+log.info(sm.getString(webappClassLoader.stopped));
throw new IncompatibleClassChangeError(name);
}
@@ -1691,7 +1700,7 @@
protected ResourceEntry findResourceInternal(String name, String path) {
if (!started) {
-log.info(Lifecycle error : CL stopped);
+log.info(sm.getString(webappClassLoader.stopped));
return null;
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 22478] - Ant manager deploy causing webapp to initialize twice
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22478. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22478 Ant manager deploy causing webapp to initialize twice [EMAIL PROTECTED] changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution||FIXED --- Additional Comments From [EMAIL PROTECTED] 2003-08-17 08:43 --- Your bug is misleading (not too surprising), but has merit: I knew about the extra restarts which were occurring after a manager deploy, but they have nothing to do with a double deployment of the webapp (what actually happens is that the webapp gets deployed, then restarted right away - because of the web.xml tracking code). I found a way to improve that code to avoid this scenario, so the issue will be fixed in 5.0.8. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs html-manager-howto.xml manager-howto.xml
remm2003/08/17 04:16:02 Modified:webapps/docs html-manager-howto.xml manager-howto.xml Log: - Fix typos. Revision ChangesPath 1.4 +4 -4 jakarta-tomcat-catalina/webapps/docs/html-manager-howto.xml Index: html-manager-howto.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/html-manager-howto.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- html-manager-howto.xml2 Aug 2003 17:51:15 - 1.3 +++ html-manager-howto.xml17 Aug 2003 11:16:02 - 1.4 @@ -147,9 +147,9 @@ stopped on a list applications command./p pIf this command succeeds, you will see a Message like this:/p -source +source OK - Stopped application at context path /examples -/source +/source pOtherwise, the Message will start with codeFAIL/code and include an error message. Possible causes for problems include: @@ -253,9 +253,9 @@ in the HTML manager./p pIf this command succeeds, you will see a Message like this:/p -source +source OK - Undeployed application at context path /examples -/source +/source pOtherwise, the Message will start with codeFAIL/code and include an error message. Possible causes for problems include: 1.8 +12 -12jakarta-tomcat-catalina/webapps/docs/manager-howto.xml Index: manager-howto.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/manager-howto.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- manager-howto.xml 30 Jul 2003 18:37:06 - 1.7 +++ manager-howto.xml 17 Aug 2003 11:16:02 - 1.8 @@ -1020,9 +1020,9 @@ subsection name=JMX Query command This takes the form: -source +source http://webserver/manager/jmxproxy/?qry=STUFF -/source +/source Where codeSTUFF/code is the JMX query you wish to perform. For example, here are some queries you might wish to run: ul @@ -1052,9 +1052,9 @@ subsection name=JMX Set command Now that you can query an MBean, its time to muck with Tomcat's internals! The general form of the set command is : -source +source http://webserver/manager/jmxproxy/?set=BEANNAMEamp;att=MYATTRIBUTEamp;val=NEWVALUE -/source +/source So you need to provide 3 request parameters: ol licodeset/code: The full bean name/li @@ -1064,25 +1064,25 @@ If all goes ok, then it will say OK, otherwise an error message will be shown. For example, lets say we wish to turn up debugging on the fly for the codeErrorReportValve/code. The following will set debugging to 10. -source +source http://localhost:8080/manager/jmxproxy/ ?set=Catalina%3Atype%3DValve%2Cname%3DErrorReportValve%2Chost%3Dlocalhostamp;att=debugamp;val=10 -/source +/source and my result is (YMMV): -source +source Result: ok -/source +/source Here is what I see if I pass in a bad value. Here is the URL I used, I try set debugging equal to 'cowbell': -source +source http://localhost:8080/manager/jmxproxy/ ?set=Catalina%3Atype%3DValve%2Cname%3DErrorReportValve%2Chost%3Dlocalhostamp;att=debugamp;val=cowbell -/source +/source When I try that, my result is -source +source Error: java.lang.NumberFormatException: For input string: cowbell -/source +/source /subsection - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Bug report for Tomcat 3 [2003/08/17]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=CriticalMAJ=Major | | | | MIN=Minor NOR=Normal ENH=Enhancement | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | | 258|Unc|Nor|2000-11-27|response.SendRedirect() resets/destroys Cookies th| | 2350|Ver|Nor|2001-06-27|ServletConfig.getInitParameter() requires url-patt| | 2478|Opn|Cri|2001-07-06|Passing Session variables between JSP's and Servle| | 4551|Opn|Nor|2001-10-31|Ctx( /tt01 ): IOException in: R( /tt01 + /com/abc/| | 4893|Unc|Blk|2001-11-15|Tomcat dies with following error..| | 4980|New|Min|2001-11-20|Startup message indicates incorrect log file | | 4994|New|Nor|2001-11-21|Tomcat needs a mechanism for clean and certain shu| | 5064|New|Cri|2001-11-25|Socket write error when include files is more than| | 5108|New|Maj|2001-11-26|Docs for Tomcat 3.2.x appear to be for Tomcat 3.3 | | 5137|New|Nor|2001-11-27|Null pointer in class loader after attempting to r| | 5160|Unc|Maj|2001-11-28|'IllegalStateException' | | 5331|New|Nor|2001-12-09|getPathInfo vs URL normalization | | 5510|New|Blk|2001-12-19|How to call ejb deployed in JBoss from Tomcat serv| | 5756|New|Nor|2002-01-08|jspc.bat exits with wrong ERRORLEVEL | | 5797|New|Nor|2002-01-10|UnCatched ? StringIndexOutOfBoundsException: Strin| | 6027|New|Maj|2002-01-25|Tomcat Automatically shuts down as service | | 6168|New|Blk|2002-02-01|IllegalStateException | | 6451|New|Cri|2002-02-14|Stackoverflow | | 6478|New|Enh|2002-02-14|Default Tomcat Encoding | | 6488|Ver|Maj|2002-02-15|Error: 304. Apparent bug in default ErrorHandler c| | 6648|New|Nor|2002-02-25|jakarta-servletapi build with java 1.4 javadoc err| | 6702|New|Cri|2002-02-27|win 2k services not working | | 6796|New|Cri|2002-03-01|Tomcat dies periodically | | 6989|New|Maj|2002-03-08|Unable to read tld file during parallel JSP compil| | 7008|Opn|Maj|2002-03-10|facade.HttpServletRequestFacade.getParameter(HttpS| | 7013|New|Cri|2002-03-10|Entering a servlet path with non-ISO8859-1 charact| | 7227|New|Nor|2002-03-19|error-code directive don't work | | 7236|New|Blk|2002-03-19|Permission denied to do thread.stop | | 7626|New|Nor|2002-03-29|classloader not working properly | | 7652|New|Cri|2002-04-01|Tomcat stalls periodically| | 7762|New|Enh|2002-04-05|stdout logfile handling | | 7785|New|Blk|2002-04-06|tomcat bug in context reloading | | 7789|New|Maj|2002-04-06|JSP Cookie Read/Write Fails With DNS Names| | 7863|New|Maj|2002-04-09|I have a problem when running Tomcat with IIS | | 8154|New|Nor|2002-04-16|logrotate script in RPM rotates non-existing file | | 8155|New|Nor|2002-04-16|Tomcat from RPM doesn't do logrotate | | 8187|New|Cri|2002-04-17|Errors when Tomcat used with MS Access database | | 8239|New|Cri|2002-04-18|Resource temporary unavailable| | 8263|New|Cri|2002-04-18|url-pattern easy to circumvent| | 8634|New|Nor|2002-04-30|no way to specify different modules.xml file | | 8992|New|Blk|2002-05-10|IE6/XP: Limitation of POST Area within HTTP reques| | 9086|New|Enh|2002-05-14|NPE org.apache.tomcat.core.ServerSession.setAttrib| | 9250|New|Maj|2002-05-20|outOfMemoryError | | 9362|New|Nor|2002-05-23|compiilation of JSP that includes a non-existant f| | 9367|New|Maj|2002-05-23|HttpSessionBindingEvent not thrown for HttpSession| | 9390|New|Nor|2002-05-24|jasper compilation error in tomcat| | 9480|New|Nor|2002-05-29|Data connection pooling | | 9607|New|Maj|2002-06-04|precompile JSP| | 9737|New|Nor|2002-06-10|ArrayIndexOutOfBoundsException when sending just p| |1|New|Cri|2002-06-19|IOException Broken Pipe when authenticating JDBCRe| |10039|New|Nor|2002-06-20|TimeStamp will not work correctly.|
Bug report for Tomcat 4 [2003/08/17]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=CriticalMAJ=Major | | | | MIN=Minor NOR=Normal ENH=Enhancement | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | | 218|Unc|Nor|2000-11-02|IIS in-process tomcat BugRat Report#333 | | 234|New|Nor|2000-11-10|Can't set multiple cookies in servlet response hea| | 2885|Opn|Maj|2001-07-30|JspCompiler does not recompile changed JSP's | | 3098|Opn|Maj|2001-08-11|RequestDispatcher on relative (to request path) | | 3614|Opn|Nor|2001-09-14|bug in manager webapp | | 3755|Opn|Nor|2001-09-20|freezes at shutdown | | 3888|Opn|Blk|2001-09-30|WebappClassLoader: Lifecycle error : CL stopped | | 4138|Opn|Nor|2001-10-12|Processor threads have inconsistent ClassLoader st| | 4350|Ass|Nor|2001-10-22|SSLAuthenticator did not associate SSO session| | 4352|Ass|Nor|2001-10-22|JDBCRealm does not work with CLIENT-CERT auth-meth| | 5329|New|Nor|2001-12-08|NT Service exits startup before Tomcat is finished| | 5598|Opn|Maj|2001-12-27|(JSP Problem) RequestDispatcher doesn't include HT| | 5704|Ass|Maj|2002-01-05|CgiServlet corrupting images? | | 5715|Opn|Nor|2002-01-07|response.setContentType() in Filter.doFilter not c| | 5759|Opn|Maj|2002-01-09|CGI servlet mapping by extension *.cgi does not wo| | 5762|Opn|Maj|2002-01-09|CGI servlet misses to include port number in HTTP_| | 5795|New|Enh|2002-01-10|Catalina Shutdown relies on localhost causing prob| | 5829|New|Enh|2002-01-13|StandardManager needs to cope with sessions throwi| | 5858|New|Enh|2002-01-15|Add tomcat dir to java.library.path | | 5952|Opn|Nor|2002-01-22|Refence to $JAVACMD in tomcat.conf incorrect in R| | 5985|New|Enh|2002-01-23|Tomcat should perform a more restrictive validatio| | 6218|Opn|Nor|2002-02-04|Relative links broken for servlets| | 6229|New|Enh|2002-02-04|Need way to specify where to write catalina.out | | 6399|New|Nor|2002-02-12|unknown protocol: https | | 6408|New|Enh|2002-02-12|Starting tomcat from a cygwin bash shell using 'st| | 6582|New|Min|2002-02-20|Sample code does not match behavior | | 6600|Opn|Enh|2002-02-20|enodeURL adds 'jsession' when 'isRequestedSessionI| | 6614|New|Enh|2002-02-21|Have Bootstrap and StandardClassLoader use the sam| | 6649|New|Nor|2002-02-25|jakarta-servletapi-4 build using java 1.4 javadoc | | 6659|New|Nor|2002-02-25|HttpUtils.getRequestURL gives incorrect URL with w| | 6671|New|Enh|2002-02-25|Simple custom tag example uses old declaration sty| | 7043|New|Enh|2002-03-12|database user and password for JDBC Based Store | | 7080|New|Maj|2002-03-13|Interbase JDBCRealm - Bug # 5564 - Have a safe fix| | 7116|New|Min|2002-03-14|JDBC realm doesn't handle NULLpasswords | | 7190|New|Nor|2002-03-18|GenericServlet spurious log's in init(), destroy()| | 7207|New|Nor|2002-03-18|Redeployment Problem under Tomcat 4.0.2 | | 7360|New|Nor|2002-03-22|res-sharing-scope not supported | | 7366|New|Enh|2002-03-22|ISAPI Redirector Replacement | | 7374|New|Enh|2002-03-22|Apache Tomcat/4.0.1 message on standard output| | 7506|New|Nor|2002-03-27|Reading InputStream returned in the following sena| | 7571|New|Nor|2002-03-28|DataInputStream readLong() Problem| | 7588|New|Nor|2002-03-28|Session cannot be established if there are multipl| | 7676|New|Enh|2002-04-02|Allow name property to use match experssions in h| | 7689|New|Min|2002-04-02|Performance problem with Xerces parser| | 7702|New|Enh|2002-04-03|[PATCH] Speed up Tomcat a tiny bit| | 7723|New|Enh|2002-04-03|[patch] additional factory for org.apache.naming.f| | 7831|New|Nor|2002-04-08|[PATCH] JNDIRealm does not work with CLIENT-CERT a| | 7880|Ver|Cri|2002-04-09|If a TLV flags flags an error during the translati| | 8026|New|Enh|2002-04-12|Exceptions in StandardHostDeployer.addChild are lo| | 8079|New|Enh|2002-04-15|Tomcat cannot start if appBase directory is access| | 8091|Opn|Min|2002-04-15|JDBCRealm makes Tomcat unusable if the database is| |
Bug report for Watchdog [2003/08/17]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=CriticalMAJ=Major | | | | MIN=Minor NOR=Normal ENH=Enhancement | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | | 278|Unc|Nor|2000-12-04|Bug in GetParameterValuesTestServlet.java file Bug| | 279|Unc|Nor|2000-12-04|Logical Error in GetParameterValuesTestServlet Bug| | 469|Unc|Nor|2001-01-17|in example-taglib.tld urn should be uri BugRat| | 470|Unc|Nor|2001-01-17|FAIL positiveForward.jsp and positiveInclude.jsp B| | 9634|New|Enh|2002-06-05|No tests exist for ServletContext.getResourcePaths| |10703|New|Enh|2002-07-11|Need to test getRequestURI after RequestDispatcher| |11336|New|Enh|2002-07-31|Test wrapped path methods with RD.foward()| |11663|New|Maj|2002-08-13|JSP precompile tests rely on Jasper specific behav| |11664|New|Maj|2002-08-13|A sweep is needed of all Watchdog 4.0 tag librarie| |11665|New|Maj|2002-08-13|ServletToJSPErrorPageTest and ServletToServletErro| |11666|New|Maj|2002-08-13|SetBufferSize_1TestServlet is invalid.| |14004|New|Maj|2002-10-28|Incorrent behaviour of all attribute-related lifec| |15504|New|Nor|2002-12-18|JSP positiveGetValues test relies on order preserv| +-+---+---+--+--+ | Total 13 bugs | +---+ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager StatusManagerServlet.java
remm2003/08/17 07:50:25
Modified:webapps/manager/WEB-INF/classes/org/apache/catalina/manager
StatusManagerServlet.java
Log:
- Display byte sizes and times using sensible units (KB and MB, s and ms).
- Display the remote host when in keepalive status, as well as the elapsed time
(it corresponds mostly to the amount of time since the start of the previous
request).
Revision ChangesPath
1.10 +125 -40
jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusManagerServlet.java
Index: StatusManagerServlet.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/StatusManagerServlet.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- StatusManagerServlet.java 4 Aug 2003 15:33:08 - 1.9
+++ StatusManagerServlet.java 17 Aug 2003 14:50:24 - 1.10
@@ -355,11 +355,15 @@
writer.print(p);
writer.print( Free memory: );
-writer.print(Runtime.getRuntime().freeMemory());
+writer.print(formatSize(new Long(Runtime.getRuntime().freeMemory()),
+true));
writer.print( Total memory: );
-writer.print(Runtime.getRuntime().totalMemory());
+writer.print(formatSize(new Long(Runtime.getRuntime().totalMemory()),
+true));
writer.print( Max memory: );
-writer.print(JdkCompat.getJdkCompat().getMaxMemory());
+writer.print(formatSize
+ (new Long(JdkCompat.getJdkCompat().getMaxMemory()),
+ true));
writer.print(/p);
}
@@ -405,17 +409,21 @@
}
writer.print( Max processing time: );
-writer.print(mBeanServer.getAttribute(grpName, maxTime));
-writer.print( Processing time:);
-writer.print(mBeanServer.getAttribute(grpName, processingTime));
+writer.print(formatTime(mBeanServer.getAttribute
+(grpName, maxTime), false));
+writer.print( Processing time: );
+writer.print(formatTime(mBeanServer.getAttribute
+(grpName, processingTime), true));
writer.print( Request count: );
writer.print(mBeanServer.getAttribute(grpName, requestCount));
writer.print( Error count: );
writer.print(mBeanServer.getAttribute(grpName, errorCount));
writer.print( Bytes received: );
-writer.print(mBeanServer.getAttribute(grpName, bytesReceived));
+writer.print(formatSize(mBeanServer.getAttribute
+(grpName, bytesReceived), true));
writer.print( Bytes sent: );
-writer.print(mBeanServer.getAttribute(grpName, bytesSent));
+writer.print(formatSize(mBeanServer.getAttribute
+(grpName, bytesSent), true));
writer.print(/p);
writer.print(table border=\0\trthStage/ththTime/ththB
Sent/ththB Recv/ththClient/ththVHost/ththRequest/th/tr);
@@ -449,6 +457,7 @@
(Integer) mBeanServer.getAttribute(pName, stage);
int stage = stageValue.intValue();
boolean fullStatus = true;
+boolean showRequest = true;
writer.write(tdstrong);
@@ -477,7 +486,8 @@
break;
case (6/*org.apache.coyote.Constants.STAGE_KEEPALIVE*/):
writer.write(K);
-fullStatus = false;
+fullStatus = true;
+showRequest = false;
break;
case (0/*org.apache.coyote.Constants.STAGE_NEW*/):
writer.write(R);
@@ -493,34 +503,52 @@
if (fullStatus) {
writer.write(td);
-writer.print(mBeanServer.getAttribute
- (pName, requestProcessingTime));
+writer.print(formatTime(mBeanServer.getAttribute
+(pName, requestProcessingTime), false));
writer.write(/td);
writer.write(td);
-writer.print(mBeanServer.getAttribute
- (pName, requestBytesSent));
+if (showRequest) {
+writer.print(formatSize(mBeanServer.getAttribute
+(pName, requestBytesSent), false));
+} else {
+writer.write(?);
+}
writer.write(/td);
writer.write(td);
-writer.print(mBeanServer.getAttribute
- (pName, requestBytesReceived));
+if (showRequest) {
+writer.print(formatSize(mBeanServer.getAttribute
+
cvs commit: jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11 Http11Processor.java
remm2003/08/17 07:52:30
Modified:http11/src/java/org/apache/coyote/http11
Http11Processor.java
Log:
- Use less aggressive socket timout reduction.
- Fix calculation of a request processing time (it must not include the time
waiting for data in keepalive mode, or the time waiting for data for an initial
request on a connection).
Revision ChangesPath
1.74 +3 -3
jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11Processor.java
Index: Http11Processor.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11Processor.java,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- Http11Processor.java 5 Aug 2003 12:26:54 - 1.73
+++ Http11Processor.java 17 Aug 2003 14:52:30 - 1.74
@@ -593,9 +593,9 @@
(float) threadPool.getCurrentThreadsBusy()
/ (float) threadPool.getMaxThreads();
if ((threadRatio 0.33) (threadRatio = 0.66)) {
-soTimeout = soTimeout / 5;
+soTimeout = soTimeout / 2;
} else if (threadRatio 0.66) {
-soTimeout = soTimeout / 10;
+soTimeout = soTimeout / 5;
keepAliveLeft = 1;
}
@@ -603,11 +603,11 @@
while (started !error keepAlive) {
try {
-request.setStartTime(System.currentTimeMillis());
if( !disableUploadTimeout keptAlive soTimeout 0 ) {
socket.setSoTimeout(soTimeout);
}
inputBuffer.parseRequestLine();
+request.setStartTime(System.currentTimeMillis());
thrA.setParam( threadPool, request.requestURI() );
keptAlive = true;
if (!disableUploadTimeout) {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler Generator.java
kinman 2003/08/17 14:54:36
Modified:jasper2/src/share/org/apache/jasper/compiler Generator.java
Log:
- The out in the Fragment helper functions is now JspWriter instead of
java.io.Writer, so that it won't trigger errors when a fragment contains
include actions.
Revision ChangesPath
1.196 +5 -5
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java
Index: Generator.java
===
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -r1.195 -r1.196
--- Generator.java14 Aug 2003 21:16:52 - 1.195
+++ Generator.java17 Aug 2003 21:54:36 - 1.196
@@ -3515,7 +3515,7 @@
} else {
out.printin(public void invoke);
}
- out.println(result.getId() + ( + java.io.Writer out ) );
+ out.println(result.getId() + ( + JspWriter out ) );
out.pushIndent();
// Note: Throwable required because methods like _jspx_meth_*
// throw Throwable.
@@ -3558,7 +3558,7 @@
out.popIndent();
out.printil( { );
out.pushIndent();
- out.printil( java.io.Writer out = null; );
+ out.printil( JspWriter out = null; );
out.printil( if( writer != null ) { );
out.pushIndent();
out.printil( out = this.jspContext.pushBody(writer); );
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 22494] New: - logVerbosityLevel not used anymore
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22494. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22494 logVerbosityLevel not used anymore Summary: logVerbosityLevel not used anymore Product: Tomcat 5 Version: Nightly Build Platform: All OS/Version: All Status: NEW Severity: Minor Priority: Other Component: Jasper2 AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] I don't believe Jasper's logVerbosityLevel initialization parameter is used anymore. At least, I note the following: 1) Jasper's logging is configurable via a log4j.properties file 2) Changing logVerbosityLevel doesn't have any effect that I can see 3) I can't find any reference to logVerbosityLevel in the code If logVerbosityLevel really isn't used anymore, it should be taken out of Tomcat's web.xml and jasper-howto.xml. I will attach a patch that implements this, and corrects some minor spelling mistakes in both files. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 22494] - logVerbosityLevel not used anymore
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22494. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22494 logVerbosityLevel not used anymore --- Additional Comments From [EMAIL PROTECTED] 2003-08-17 23:24 --- Created an attachment (id=7861) Proposed patch - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 22494] - logVerbosityLevel not used anymore
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22494. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22494 logVerbosityLevel not used anymore [EMAIL PROTECTED] changed: What|Removed |Added Keywords||PatchAvailable - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 22478] - Ant manager deploy causing webapp to initialize twice
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22478. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=22478 Ant manager deploy causing webapp to initialize twice --- Additional Comments From [EMAIL PROTECTED] 2003-08-18 03:21 --- Remy, I've tested your fix and it seems to have solved the duplicate initialization. I will look into how it is that Log4j seems to be accessing a stopped class classloader even when I call LogManager.shutdown() in the contextDestroyed() method of my servlet context listener. Maybe shutdown() is not doing everything it should be doing? Anyway, I'll look into it. I am still seeing the Digester error upon initial deploy. Here is how it looks now.. 82437 [http8080-Processor25] INFO org.apache.catalina.core.StandardHostDeployer - Processing Context configuration file URL file:/D:/Java/Apache/Jakarta/tomcat-5-20030817/conf/Catalina/localhost/Barracuda.xml 82437 [http8080-Processor25] INFO org.apache.catalina.core.StandardHostDeployer - Installing web application from URL jar:file:/D:/Java/Apache/Jakarta/tomcat-5-20030817/webapps/Barracuda.war!/ 104078 [ContainerBackgroundProcessor[StandardEngine[Catalina]]] INFO org.apache.catalina.core.StandardHostDeployer - Processing Context configuration file URL file:D:\Java\Apache\Jakarta\tomcat-5-20030817\conf\Catalina\localhost\Barracuda.xml 104093 [ContainerBackgroundProcessor[StandardEngine[Catalina]]] ERROR org.apache.commons.digester.Digester - End event threw exception Notice how Tomcat processes the context configuration file after the context has already been installed? I also see the following in the log for my particular webapp after an undeploy, then deploy... 2003-08-17 17:48:50 createObjectName with StandardEngine[Catalina].StandardHost[localhost].StandardContext[/Barracuda] 2003-08-17 17:50:35 createObjectName with StandardEngine[Catalina].StandardHost[localhost].StandardContext[/Barracuda] The first line was logged at the end of an undeploy and the second at the beginning of a deploy. It seems fishy to me that it would do a createObjectName after an undeploy when the very same thing is done again upon a deploy. I don't know if this is significant or not. If it isn't, just say so. Jake - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
