DO NOT REPLY [Bug 34000] New: - the attribute url-pattern of web.xml doesn't work properly on mapping by extenstions
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=34000. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=34000 Summary: the attribute url-pattern of web.xml doesn't work properly on mapping by extenstions Product: Tomcat 5 Version: 5.0.28 Platform: PC OS/Version: Windows XP Status: NEW Severity: critical Priority: P2 Component: Unknown AssignedTo: tomcat-dev@jakarta.apache.org ReportedBy: [EMAIL PROTECTED] create a servlet map servlet-mapping servlet-namejavascript/servlet-name url-pattern*.js/url-pattern /servlet-mapping Expected result: it should process only *.js, not *.js* (like JSP, JSPF, JSF etc.) Real result: the servlet processes all of requested resources with extensions js* , i.e. it takes *.jsp, *.js, *.jspf like if url-pattern was set to url-pattern*.js*/url-pattern -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_status.c
mturk 2005/03/14 00:04:04 Modified:jk/native/common jk_status.c Log: Use jk:status instead jk:manager tag. Revision ChangesPath 1.29 +3 -3 jakarta-tomcat-connectors/jk/native/common/jk_status.c Index: jk_status.c === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_status.c,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- jk_status.c 14 Mar 2005 07:52:53 - 1.28 +++ jk_status.c 14 Mar 2005 08:04:04 - 1.29 @@ -44,9 +44,9 @@ #define JK_STATUS_HEND /body\n/html\n #define JK_STATUS_XMLH ?xml version=\1.0\ encoding=\UTF-8\ ?\n \ - jk:manager xmlns:jk=\http://jakarta.apache.org\;\n + jk:status xmlns:jk=\http://jakarta.apache.org\;\n -#define JK_STATUS_XMLE /jk:manager\n +#define JK_STATUS_XMLE /jk:status\n #define JK_STATUS_TEXTUPDATE_RESPONCE OK - jk status worker updated\n - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 34001] New: - NamingException
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=34001. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=34001 Summary: NamingException Product: Tomcat 5 Version: 5.5.7 Platform: PC OS/Version: Windows 2000 Status: NEW Keywords: ErrorMessage Severity: blocker Priority: P2 Component: Catalina AssignedTo: tomcat-dev@jakarta.apache.org ReportedBy: [EMAIL PROTECTED] CC: [EMAIL PROTECTED] Hi, I've discovered a new bug in Tomcat 5.5. Calling a mail resource simply won't work. Below a full example on when it fails. The CATALINA/localhost/lio2.xml contains the following code: Resource name=mail/session type=javax.mail.Session mail.smtp.host=localhost/ The Servlet contains following code inside the init(): -- mailSession = ( javax.mail.Session ) new InitialContext().lookup (java:comp/env/mail/session); The outcome on the server shows: --- SEVERE: Servlet /lio2 threw load() exception javax.naming.NamingException: Cannot create resource instance at org.apache.naming.factory.ResourceFactory.getObjectInstance (ResourceFactory.java:132) at javax.naming.spi.NamingManager.getObjectInstance(Unknown Source) at org.apache.naming.NamingContext.lookup(NamingContext.java:792) at org.apache.naming.NamingContext.lookup(NamingContext.java:139) at org.apache.naming.NamingContext.lookup(NamingContext.java:780) at org.apache.naming.NamingContext.lookup(NamingContext.java:139) at org.apache.naming.NamingContext.lookup(NamingContext.java:780) at org.apache.naming.NamingContext.lookup(NamingContext.java:139) at org.apache.naming.NamingContext.lookup(NamingContext.java:780) at org.apache.naming.NamingContext.lookup(NamingContext.java:152) at org.apache.naming.SelectorContext.lookup(SelectorContext.java:136) at javax.naming.InitialContext.lookup(Unknown Source) at com.lio.servlet.CreateAdServlet.init(CreateAdServlet.java:66) Interesting enough if you test this for a database connection then it works. Cheers Tony -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_status.c
mturk 2005/03/14 00:12:35 Modified:jk/native/common jk_status.c Log: Add jk:id for balancer members Revision ChangesPath 1.30 +2 -1 jakarta-tomcat-connectors/jk/native/common/jk_status.c Index: jk_status.c === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_status.c,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- jk_status.c 14 Mar 2005 08:04:04 - 1.29 +++ jk_status.c 14 Mar 2005 08:12:35 - 1.30 @@ -640,6 +640,7 @@ worker_record_t *wr = (lb-lb_workers[j]); ajp_worker_t *a = (ajp_worker_t *)wr-w-worker_private; jk_puts(s, jk:member\n); +jk_printf(s, jk:id%d/jk:id\n, j); jk_putv(s, jk:name, wr-s-name, /jk:name\n, NULL); jk_putv(s, jk:type, status_worker_type(wr-w-type), /jk:type\n, NULL); - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 34000] - the attribute url-pattern of web.xml doesn't work properly on mapping by extenstions
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=34000. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=34000 [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||INVALID --- Additional Comments From [EMAIL PROTECTED] 2005-03-14 10:41 --- This works for me with the current 5.5.x builds. As the mapper has not changed significantly since those builds, I have to think it works as well on 5.0.x. -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[GUMP@brutus]: Project jakarta-tomcat-jk-native (in module jakarta-tomcat-connectors) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at [EMAIL PROTECTED] Project jakarta-tomcat-jk-native has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 7 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - jakarta-tomcat-jk-native : Connectors to various web servers Full details are available at: http://brutus.apache.org/gump/public/jakarta-tomcat-connectors/jakarta-tomcat-jk-native/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -INFO- Failed with reason build failed The following work was performed: http://brutus.apache.org/gump/public/jakarta-tomcat-connectors/jakarta-tomcat-jk-native/gump_work/build_jakarta-tomcat-connectors_jakarta-tomcat-jk-native.html Work Name: build_jakarta-tomcat-connectors_jakarta-tomcat-jk-native (Type: Build) Work ended in a state of : Failed Elapsed: Command Line: make [Working Directory: /usr/local/gump/public/workspace/jakarta-tomcat-connectors/jk/native] - Making all in common make[1]: Entering directory `/home/gump/workspaces2/public/workspace/jakarta-tomcat-connectors/jk/native/common' /bin/sh /usr/local/gump/public/workspace/apache-httpd/dest-14032005/build/libtool --silent --mode=compile gcc -I/usr/local/gump/public/workspace/apache-httpd/dest-14032005/include -g -O2 -g -O2 -pthread -DHAVE_APR -I/usr/local/gump/public/workspace/apr/dest-14032005/include/apr-1 -g -O2 -DLINUX=2 -D_REENTRANT -D_GNU_SOURCE -D_LARGEFILE64_SOURCE -I/home/gump/workspaces2/public/workspace/apache-httpd/srclib/pcre -I /opt/jdk1.4/include -I /opt/jdk1.4/include/ -c jk_ajp12_worker.c /usr/local/gump/public/workspace/apache-httpd/dest-14032005/build/libtool: /usr/local/gump/public/workspace/apache-httpd/dest-14032005/build/libtool: No such file or directory make[1]: *** [jk_ajp12_worker.lo] Error 127 make[1]: Leaving directory `/home/gump/workspaces2/public/workspace/jakarta-tomcat-connectors/jk/native/common' make: *** [all-recursive] Error 1 - To subscribe to this information via syndicated feeds: - RSS: http://brutus.apache.org/gump/public/jakarta-tomcat-connectors/jakarta-tomcat-jk-native/rss.xml - Atom: http://brutus.apache.org/gump/public/jakarta-tomcat-connectors/jakarta-tomcat-jk-native/atom.xml == Gump Tracking Only === Produced by Gump version 2.2. Gump Run 2214032005, brutus:brutus-public:2214032005 Gump E-mail Identifier (unique within run) #30. -- Apache Gump http://gump.apache.org/ [Instance: brutus] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 34004] New: - A non necessary synchronized block while execute JSP
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://issues.apache.org/bugzilla/show_bug.cgi?id=34004.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.
http://issues.apache.org/bugzilla/show_bug.cgi?id=34004
Summary: A non necessary synchronized block while execute JSP
Product: Tomcat 5
Version: 5.0.28
Platform: PC
OS/Version: Windows XP
Status: NEW
Severity: normal
Priority: P2
Component: Jasper
AssignedTo: tomcat-dev@jakarta.apache.org
ReportedBy: [EMAIL PROTECTED]
The class org.apache.jasper.JspCompilationContext contains the following
synchronized block:
static Object outputDirLock = new Object();
private void makeOutputDir() {
synchronized(outputDirLock) {
File outDirFile = new File(outputDir);
outDirFile.mkdirs();
}
}
This block is executed each time a JSP is executed. This cause a serialization
of the JSP execution.
A lot of synchronization can be avoided if the code is changed to the following:
private void makeOutputDir()
{
File outDirFile = new File(outputDir);
if (!outDirFile.exists())
{
synchronized(outputDirLock)
{
outDirFile.mkdirs();
}
}
}
The synchronized block is entered if the requested directory does not exists.
The JSP are executed in parallel otherwise.
--
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 34004] - A non necessary synchronized block while execute JSP
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=34004. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=34004 [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||WONTFIX --- Additional Comments From [EMAIL PROTECTED] 2005-03-14 11:29 --- In production, please set development to false, as detailed in the documentation. In 5.5.x, compilation checks are also not done on every access by default. -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[JK] Releasing 1.2.9
Hi, I wish to release the 1.2.9 as beta when Peter updates the jkstatus ant task for manager :). I think that the amount of work done last couple of months since 1.2.8 was released, deserves that. What's left is updating documentation, that I wish to finish during the beta release. Comments? Regards, Mladen. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 34000] - the attribute url-pattern of web.xml doesn't work properly on mapping by extenstions
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=34000. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=34000 --- Additional Comments From [EMAIL PROTECTED] 2005-03-14 11:41 --- I am sorry, but the bug exists for me. Our deployment descriptor is here, as I notice nothing conflicts with my declaration of the servlet mapping: ?xml version=1.0 encoding=ISO-8859-1? !DOCTYPE web-app PUBLIC -//Sun Microsystems, Inc.//DTD Web Application 2.3//EN http://java.sun.com/dtd/web-app_2_3.dtd; web-app !-- Compression filters -- filter filter-nameCleaner Filter/filter-name filter- classcom.supportwizard.gui2.servlets.system.GUIHTMLCleaner/filter-class /filter filter filter-nameCompression Filter/filter-name filter- classcom.supportwizard.gui2.servlets.system.CompressionFilter/filter-class init-param param-namecompressionThreshold/param-name param-value8192/param-value /init-param /filter filter filter-nameNDCFilter/filter-name filter-classcom.supportwizard.gui2.servlets.system.NDCFilter/filter- class /filter !-- Cactus filter redirector -- filter filter-nameFilterRedirector/filter-name filter-classorg.apache.cactus.server.FilterTestRedirector/filter-class /filter filter-mapping filter-nameFilterRedirector/filter-name url-pattern/tests/FilterRedirector/url-pattern /filter-mapping filter-mapping filter-nameCompression Filter/filter-name url-pattern/styles/url-pattern /filter-mapping filter-mapping filter-nameCleaner Filter/filter-name url-pattern/*/url-pattern /filter-mapping filter-mapping filter-nameNDCFilter/filter-name url-pattern/*/url-pattern /filter-mapping !-- GUIAction Servlet Configuration -- servlet servlet-nameaction/servlet-name servlet- classcom.supportwizard.gui2.servlets.system.GUIActionServlet/servlet-class init-param param-nameapplication/param-name param-valuecom.supportwizard.gui2.GUI2/param-value /init-param init-param param-nameconfig/param-name param-value/WEB-INF/struts-config.xml/param-value /init-param init-param param-nameconfig/admin/param-name param-value/WEB-INF/admin-struts-config.xml/param-value /init-param init-param param-namedebug/param-name param-value2/param-value /init-param init-param param-namedetail/param-name param-value2/param-value /init-param init-param param-namevalidate/param-name param-valuetrue/param-value /init-param init-param param-namemultipartClass/param-name param-valueorg.apache.struts.upload.DiskMultipartRequestHandler/param- value /init-param load-on-startup2/load-on-startup /servlet servlet servlet-namesetup/servlet-name servlet-classcom.supportwizard.gui2.servlets.SetupServlet/servlet-class load-on-startup1/load-on-startup /servlet servlet servlet-nameattachment/servlet-name servlet- classcom.supportwizard.gui2.servlets.auxiliary.GUIAttachGetter/servlet-class /servlet servlet servlet-namereportRun/servlet-name servlet- classcom.supportwizard.gui2.servlets.auxiliary.ReportRunGetter/servlet-class /servlet servlet servlet-namenls/servlet-name servlet- classcom.supportwizard.gui2.servlets.auxiliary.NLSGetter/servlet-class /servlet servlet servlet-nameimages/servlet-name servlet- classcom.supportwizard.gui2.servlets.imagereg.GUIImageGetter/servlet-class /servlet servlet servlet-namestyles/servlet-name servlet-classcom.supportwizard.gui2.servlets.css.GUICSSServlet/servlet- class /servlet servlet servlet-namejavascript/servlet-name servlet-classcom.supportwizard.gui2.servlets.system.GUIJsGetter/servlet- class /servlet servlet servlet-namesettings/servlet-name servlet- classcom.supportwizard.gui2.servlets.auxiliary.GUISettingsSetter/servlet- class /servlet servlet servlet-nameBugSubmitter/servlet-name servlet- classcom.supportwizard.gui2.servlets.auxiliary.BugSubmitter/servlet-class /servlet servlet servlet-nameDeleteAction/servlet-name servlet- classcom.supportwizard.gui2.servlets.workflow.DeleteAction/servlet-class /servlet servlet servlet-nameDeleteGuard/servlet-name servlet- classcom.supportwizard.gui2.servlets.workflow.DeleteGuard/servlet-class /servlet !-- Servlets for communicating with workflow applet -- servlet servlet-nameLogServlet/servlet-name servlet- classcom.supportwizard.gui2.servlets.workflow.LogServlet/servlet-class /servlet servlet servlet-nameGetWF/servlet-name servlet-classcom.supportwizard.gui2.servlets.workflow.GetWF/servlet- class /servlet servlet servlet-nameSaveWF/servlet-name
DO NOT REPLY [Bug 34006] New: - Undeploy of webapps with antiResourceLocking in META-INF\context.xml fails after Tomcat restart
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=34006. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=34006 Summary: Undeploy of webapps with antiResourceLocking in META- INF\context.xml fails after Tomcat restart Product: Tomcat 5 Version: 5.5.7 Platform: PC OS/Version: Windows XP Status: NEW Severity: normal Priority: P2 Component: Catalina AssignedTo: tomcat-dev@jakarta.apache.org ReportedBy: [EMAIL PROTECTED] We have a webapp that needs to be dynamically redeployed on Windows, so we turned the antiResourceLocking option on in a context.xml file in its META-INF directory. Deployment/undeployment from a clean Tomcat works fine. However after stopping the Tomcat service and starting it again, we find that although the webapp is autoDeploy-ed correctly on startup (and unpacked into the \temp\ directory), it cannot be undeployed. The manager webapp reports a successful undeploy and there is no error message in any of the Tomcat logs; however the Manager's application list still includes the webapp, which appears to have been stopped but not undeployed. This behaviour seems to be the same whether or not antiResourceLocking is turned on globally. However if we either i) set antiResourceLocking=true in the global conf\context.xml file and remove the entire context.xml file from the webapp or ii) set antiResourceLocking=false in the webapp context.xml file, undeployment succeeds. (NB: unfortunately this does not provide a workaround for us, as we need antiResourceLocking=false globally to make other webapps work correctly) To demonstrate that this is a Tomcat problem and not specific to our apps, I have reproduced it using only the Manager webapp for the deploy/undeploy operations, with a stripped down webapp containing only a single JSP page, web.xml and the context.xml file. I'll upload this example .war shortly. I suspect the problem is related to the context files stored in the conf\enginename\host folder, as I note that deleting the webapp's context file from this folder seems to allow the undeployment to work correctly (whether it is deleted before or after starting Tomcat for the second time). -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 34006] - Undeploy of webapps with antiResourceLocking in META-INF\context.xml fails after Tomcat restart
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=34006. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=34006 --- Additional Comments From [EMAIL PROTECTED] 2005-03-14 11:56 --- Created an attachment (id=14485) -- (http://issues.apache.org/bugzilla/attachment.cgi?id=14485action=view) Example .war that cannot be undeployed after deployment and a Tomcat restart -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
ROOT special case
Hi developers As a jakarta tomcat user I began wondering why ROOT folder is treated a special case. I'm sure there is probably a good reason why it is so, but I seem to be unable to figure it out. I have a probably misguided idea that ROOT could be treated like any other webapp and that making it docRoot in Tomcat distribution could just be a configuration issue. From a short glance at source it seems that this could even save a few lines of code. I am sure I am probably missing something obvious, please enlighten me. Kind regards Jan H. Hansen P.S. This is my first post to this mailing list I hope I haven't made any gross violations of netiqette, if I have please accept my sincere apology in advance.
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup HostConfig.java
remm2005/03/14 03:52:04
Modified:catalina/src/share/org/apache/catalina/startup
HostConfig.java
Log:
- 34006: If antiResourceLocking was used, the old code considered the path as
external (bad).
- Simplify code a lot, as the case where the docBase is an external path is
handled in the beginning before starting the context.
Revision ChangesPath
1.59 +14 -38
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.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- HostConfig.java 17 Feb 2005 00:46:14 - 1.58
+++ HostConfig.java 14 Mar 2005 11:52:04 - 1.59
@@ -614,46 +614,22 @@
(contextXml.getAbsolutePath(), new
Long(contextXml.lastModified()));
addWatchedResources(deployedApp,
expandedDocBase.getAbsolutePath(), context);
} else {
-if (context.getDocBase() != null) {
-// If the context is outside of the Host appBase,
removing the xml
-// should remove the webapp
-boolean external = false;
-File docBase = new File(context.getDocBase());
-if (!docBase.isAbsolute()) {
-docBase = new File(appBase(), context.getDocBase());
-}
-try {
-docBase = docBase.getCanonicalFile();
-if
(!docBase.getAbsolutePath().startsWith(appBase().getAbsolutePath())) {
-external = true;
-deployedApp.redeployResources.put
-(contextXml.getAbsolutePath(), new
Long(contextXml.lastModified()));
-}
-} catch (IOException e) {
-// Ignore
-}
-if (!external) {
-// Find an existing matching war and expanded folder
-if (warDocBase.exists()) {
-
deployedApp.redeployResources.put(warDocBase.getAbsolutePath(),
-new Long(warDocBase.lastModified()));
-}
-if (expandedDocBase.exists()) {
-
deployedApp.redeployResources.put(expandedDocBase.getAbsolutePath(),
-new
Long(expandedDocBase.lastModified()));
-addWatchedResources(deployedApp,
-expandedDocBase.getAbsolutePath(),
context);
-}
-// Add the context XML to the list of files which
should trigger a redeployment
-deployedApp.redeployResources.put
-(contextXml.getAbsolutePath(), new
Long(contextXml.lastModified()));
-}
+// Find an existing matching war and expanded folder
+if (warDocBase.exists()) {
+
deployedApp.redeployResources.put(warDocBase.getAbsolutePath(),
+new Long(warDocBase.lastModified()));
+}
+if (expandedDocBase.exists()) {
+
deployedApp.redeployResources.put(expandedDocBase.getAbsolutePath(),
+new Long(expandedDocBase.lastModified()));
+addWatchedResources(deployedApp,
+expandedDocBase.getAbsolutePath(), context);
} else {
-// Add the context XML to the list of files which should
trigger a redeployment
-deployedApp.redeployResources.put
-(contextXml.getAbsolutePath(), new
Long(contextXml.lastModified()));
addWatchedResources(deployedApp, null, context);
}
+// Add the context XML to the list of files which should
trigger a redeployment
+deployedApp.redeployResources.put
+(contextXml.getAbsolutePath(), new
Long(contextXml.lastModified()));
}
} catch (Throwable t) {
log.error(sm.getString(hostConfig.deployDescriptor.error,
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 34006] - Undeploy of webapps with antiResourceLocking in META-INF\context.xml fails after Tomcat restart
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=34006. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=34006 [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Additional Comments From [EMAIL PROTECTED] 2005-03-14 12:55 --- Ok, using antiResourceLocking (which modifies the docBase) caused a bad registration of the resources. -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 34004] - A non necessary synchronized block while execute JSP
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=34004. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=34004 --- Additional Comments From [EMAIL PROTECTED] 2005-03-14 13:29 --- (In reply to comment #1) In production, please set development to false, as detailed in the documentation. I do not follow on this. 1. The development mode should be as close as possible to the production mode. As result the synchronization should be avoided if possible. Testing in development mode may hide problems which can occur in production because of the different thread handling. 2. The tested CMS app creates and/or changes JSP files on the fly. These changes need to be visible for the app user immediately (uncached recompile, execute). This failed if the development mode is disabled. -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 34004] - A non necessary synchronized block while execute JSP
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=34004. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=34004 --- Additional Comments From [EMAIL PROTECTED] 2005-03-14 13:37 --- 1. Not possible. As I said in the previous reply which you did not read, 5.5.x does not do the checks on every access. 2. That's called a bad decision, as JSP was never designed to allow doing this. JSP is not an interpreted template language, and must be compiled. This compilation time is long, and as a result, your software will not run well. - WONTFIX -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 33959] - UndeployTask does not work
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=33959. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=33959 [EMAIL PROTECTED] changed: What|Removed |Added Status|RESOLVED|REOPENED Resolution|INVALID | --- Additional Comments From [EMAIL PROTECTED] 2005-03-14 14:06 --- How is this invalid? Could you please provide more information. I deffinately maneged to reproduce the bug, although does not allways happen: you have to run it a coupple of times to show up (the ant script). I used Eclipse 3.0.1 as IDE. -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 33959] - UndeployTask does not work
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=33959. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=33959 [EMAIL PROTECTED] changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution||INVALID -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 33959] - UndeployTask does not work
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=33959. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=33959 [EMAIL PROTECTED] changed: What|Removed |Added Status|RESOLVED|CLOSED --- Additional Comments From [EMAIL PROTECTED] 2005-03-14 14:15 --- My mistake, I just read the FAQ on windows locking. -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 33959] - UndeployTask does not work
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=33959. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=33959 --- Additional Comments From [EMAIL PROTECTED] 2005-03-14 14:17 --- Note that a related bug was just reported today (and fixed), although it probably won't affect you: bug 34006. -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 32445] - Administration tool is not opened on browser at all.
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=32445. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=32445 [EMAIL PROTECTED] changed: What|Removed |Added CC||[EMAIL PROTECTED] -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Tomcat and Eclipse
Hi all, I am using Tomcat 5.5.4 and JDK1.5, and Eclipse as IDE. I am using a plugin of Tomcat Eclipse. and I can launch tomcafrom Eclipse. All this works until today : WhenI try to launch tomcat the server is not started. I don't know what happened. Can someone help me. Thanks
cvs commit: jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11 Http11Processor.java Http11Protocol.java
remm2005/03/14 07:33:11
Modified:util/java/org/apache/tomcat/util/net PoolTcpEndpoint.java
http11/src/java/org/apache/coyote/http11
Http11Processor.java Http11Protocol.java
Log:
- The new thread pool currently uses the endpoint to store its stuff.
- Allocate a worker before accepting. If the pool is full, wait 100ms. This
should allow taking advantage of the acceptCount.
- Fix setting a reduced socket timeout.
Revision ChangesPath
1.44 +14 -8
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/PoolTcpEndpoint.java
Index: PoolTcpEndpoint.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/PoolTcpEndpoint.java,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- PoolTcpEndpoint.java 29 Jan 2005 19:30:44 - 1.43
+++ PoolTcpEndpoint.java 14 Mar 2005 15:33:10 - 1.44
@@ -626,21 +626,27 @@
// Ignore
}
}
-
-// Accept the next incoming connection from the server socket
-Socket socket = acceptSocket();
-// Hand this socket off to an appropriate processor
+// Allocate a new worker thread
MasterSlaveWorkerThread workerThread = createWorkerThread();
if (workerThread == null) {
try {
-log.warn(sm.getString(endpoint.noProcessor));
-socket.close();
-} catch (IOException e) {
-;
+// Wait a little for load to go down: as a result,
+// no accept will be made until the concurrency is
+// lower than the specified maxThreads, and current
+// connections will wait for a little bit instead of
+// failing right away.
+Thread.sleep(100);
+} catch (InterruptedException e) {
+// Ignore
}
continue;
}
+
+// Accept the next incoming connection from the server socket
+Socket socket = acceptSocket();
+
+// Hand this socket off to an appropriate processor
workerThread.assign(socket);
// The processor will recycle itself when it finishes
1.119 +36 -5
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.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- Http11Processor.java 27 Feb 2005 18:18:02 - 1.118
+++ Http11Processor.java 14 Mar 2005 15:33:10 - 1.119
@@ -49,6 +49,7 @@
import org.apache.tomcat.util.buf.MessageBytes;
import org.apache.tomcat.util.http.FastHttpDateFormat;
import org.apache.tomcat.util.http.MimeHeaders;
+import org.apache.tomcat.util.net.PoolTcpEndpoint;
import org.apache.tomcat.util.net.SSLSupport;
import org.apache.tomcat.util.threads.ThreadPool;
import org.apache.tomcat.util.threads.ThreadWithAttributes;
@@ -298,6 +299,12 @@
/**
+ * Associated endpoint.
+ */
+protected PoolTcpEndpoint endpoint;
+
+
+/**
* Allow a customized the server header for the tin-foil hat folks.
*/
protected String server = null;
@@ -356,6 +363,12 @@
this.threadPool = threadPool;
}
+
+public void setEndpoint(PoolTcpEndpoint endpoint) {
+this.endpoint = endpoint;
+}
+
+
/**
* Add user-agent for which gzip compression didn't works
* The user agent String given will be exactly matched
@@ -764,15 +777,33 @@
int keepAliveLeft = maxKeepAliveRequests;
int soTimeout = socket.getSoTimeout();
+int oldSoTimeout = soTimeout;
-float threadRatio =
-(float) threadPool.getCurrentThreadsBusy()
-/ (float) threadPool.getMaxThreads();
-if ((threadRatio 0.33) (threadRatio = 0.66)) {
+int threadRatio = 0;
+if (threadPool.getCurrentThreadsBusy() 0) {
+threadRatio = (threadPool.getCurrentThreadsBusy() * 100)
+/ threadPool.getMaxThreads();
+} else {
+threadRatio = (endpoint.getCurrentThreadsBusy() * 100)
+/ endpoint.getMaxThreads();
+}
+if ((threadRatio 33) (threadRatio = 66)) {
soTimeout = soTimeout / 2;
-
Re: Progress with Jk-dev
On Thu, Feb 17, 2005 at 08:22:13PM +1100, NormW wrote: Greetings All, Have the mod_jk 1.2.9-dev up and running on NetWare 6 and AP 2.1.3 but doing much beyond a single worker is a little awkward. I can access the Tomcat html manager web app without visible issues. When I setup load balanced tomcats I number each manager context path name in server.xml then setup the apache config so it can route to each instance of tomcat using the following: # Manager mounts for load balanced workers JkMount /manager1/* tomcat1 JkMount /manager2/* tomcat2 JkMount /manager3/* tomcat3 That makes it easier to manage applications via http and apache. Regards, Glenn -- Glenn Nielsen [EMAIL PROTECTED] | /* Spelin donut madder| MOREnet System Programming | * if iz ina coment. | Missouri Research and Education Network | */ | -- - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [VOTE] Propose Jim Jagielski and William A. Rowe as JakartaTomcatConnectors commiters
A bit late but hear are my hearty +1's for both Jim and Bill. Glenn On Wed, Feb 23, 2005 at 08:56:13PM +0100, Mladen Turk wrote: So... [x] Yes, Jim is really a cool guy. [ ] No way. and.. [x] Sure, wellcome Bill. [ ] I think I know httpd better then him. -- Glenn Nielsen [EMAIL PROTECTED] | /* Spelin donut madder| MOREnet System Programming | * if iz ina coment. | Missouri Research and Education Network | */ | -- - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 30936] - Adding HTTPS Connector with Administration webapp mangles server.xml
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=30936. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=30936 [EMAIL PROTECTED] changed: What|Removed |Added CC||[EMAIL PROTECTED] --- Additional Comments From [EMAIL PROTECTED] 2005-03-14 18:23 --- One of my customers has experienced this problem lately. For them, server.xml is modified every time Tomcat is restarted. The only workaround I know of is to overwrite server.xml just before starting Tomcat, every time. -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 34011] New: - javax.print.PrintServiceLookup.lookupPrintServices(null, null) does not include network printers
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://issues.apache.org/bugzilla/show_bug.cgi?id=34011.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.
http://issues.apache.org/bugzilla/show_bug.cgi?id=34011
Summary: javax.print.PrintServiceLookup.lookupPrintServices(null,
null) does not include network printers
Product: Tomcat 5
Version: 5.0.28
Platform: PC
OS/Version: Windows NT
Status: NEW
Severity: trivial
Priority: P2
Component: Servlet JSP API
AssignedTo: tomcat-dev@jakarta.apache.org
ReportedBy: [EMAIL PROTECTED]
Install a printer on a Windows system that is shared out from a different
computer than the one running Tomcat.
Run the following code from Sun's JVM and again from a Servlet:
import javax.print.*
public class PrinterUtil {
public static void getPrintService() {
PrintService [] ps = PrintServiceLookup.lookupPrintServices(null, null);
for(int x = 0; x ps.length; x++)
System.out.println(ps[x].getName());
}
}
The servlet will not list any network printers that are shared out from a remote
machine.
I realize this is probably an extremely low priority 'bug', possibly by design.
If it will not be fixed for distribution, please advise so I can investigate
and fix my local build.
--
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 34012] New: - javax.print.PrintServiceLookup.lookupPrintServices(null, null) does not include network printers
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://issues.apache.org/bugzilla/show_bug.cgi?id=34012.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.
http://issues.apache.org/bugzilla/show_bug.cgi?id=34012
Summary: javax.print.PrintServiceLookup.lookupPrintServices(null,
null) does not include network printers
Product: Tomcat 5
Version: 5.0.28
Platform: PC
OS/Version: Windows NT
Status: NEW
Severity: trivial
Priority: P2
Component: Servlet JSP API
AssignedTo: tomcat-dev@jakarta.apache.org
ReportedBy: [EMAIL PROTECTED]
Install a printer on a Windows system that is shared out from a different
computer than the one running Tomcat.
Run the following code from Sun's JVM and again from a Servlet:
import javax.print.*
public class PrinterUtil {
public static void getPrintService() {
PrintService [] ps = PrintServiceLookup.lookupPrintServices(null, null);
for(int x = 0; x ps.length; x++)
System.out.println(ps[x].getName());
}
}
The servlet will not list any network printers that are shared out from a remote
machine.
I realize this is probably an extremely low priority 'bug', possibly by design.
If it will not be fixed for distribution, please advise so I can investigate
and fix my local build.
--
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: [VOTE] Propose Jim Jagielski and William A. Rowe as JakartaTomcatConnectors commiters
+1 for both of all. Should I understand they will works more on HTTPD related stuff and of course JK ?-) On Mon, 14 Mar 2005 11:20:27 -0600, Glenn Nielsen [EMAIL PROTECTED] wrote: A bit late but hear are my hearty +1's for both Jim and Bill. Glenn On Wed, Feb 23, 2005 at 08:56:13PM +0100, Mladen Turk wrote: So... [x] Yes, Jim is really a cool guy. [ ] No way. and.. [x] Sure, wellcome Bill. [ ] I think I know httpd better then him. -- Glenn Nielsen [EMAIL PROTECTED] | /* Spelin donut madder| MOREnet System Programming | * if iz ina coment. | Missouri Research and Education Network | */ | -- - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [VOTE] Propose Jim Jagielski and William A. Rowe as JakartaTomcatConnectors commiters
Henri Gomez wrote: +1 for both of all. Should I understand they will works more on HTTPD related stuff and of course JK ?-) Yep, that's my intent :) -- === Jim Jagielski [|] [EMAIL PROTECTED] [|] http://www.jaguNET.com/ There 10 types of people: those who read binary and everyone else. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_status.c
pero2005/03/14 12:41:09
Modified:jk/native/common jk_status.c
Log:
fix correct mime parameter parsing :-)
Revision ChangesPath
1.31 +16 -9 jakarta-tomcat-connectors/jk/native/common/jk_status.c
Index: jk_status.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_status.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- jk_status.c 14 Mar 2005 08:12:35 - 1.30
+++ jk_status.c 14 Mar 2005 20:41:09 - 1.31
@@ -760,14 +760,21 @@
{
if (!req)
return 0;
-else if (!strncmp(req, mime=html, 9))
-return 0;
-else if (!strncmp(req, mime=xml, 8))
-return 1;
-else if (!strncmp(req, mime=txt, 8))
-return 2;
-else
-return 0;
+else {
+char buf[32];
+char *mimetype = NULL;
+int ret = 0 ;
+if(status_cmd(mime, req, buf, sizeof(buf)) != NULL) {
+mimetype = strdup(buf) ;
+ if (!strncmp(mimetype, xml, 3))
+ ret = 1;
+ else if (!strncmp(mimetype, txt, 3))
+ ret = 2;
+}
+if (mimetype)
+free(mimetype);
+return ret ;
+}
}
static int JK_METHOD service(jk_endpoint_t *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/ant JKStatusUpdateTask.java
pero2005/03/14 12:42:22
Modified:catalina/src/share/org/apache/catalina/ant
JKStatusUpdateTask.java
Log:
fix to new jk status arg mine=txt and cmd=update
Revision ChangesPath
1.2 +6 -6
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ant/JKStatusUpdateTask.java
Index: JKStatusUpdateTask.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/ant/JKStatusUpdateTask.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JKStatusUpdateTask.java 13 Mar 2005 06:39:16 - 1.1
+++ JKStatusUpdateTask.java 14 Mar 2005 20:42:22 - 1.2
@@ -264,9 +264,9 @@
* Create JkStatus link
* ul
* libload balance example:
- * /bhttp://localhost/status?cmd=textupdatew=lblf=falsels=true/li
+ *
/bhttp://localhost/status?cmd=updatemime=txtw=lblf=falsels=true/li
* libworker example:
- * /bhttp://localhost/status?cmd=textupdatew=node1l=lbwf=1wd=false
+ *
/bhttp://localhost/status?cmd=updatemime=txtw=node1l=lbwf=1wd=false
* /li
* /ul
*
@@ -276,12 +276,12 @@
// Building URL
StringBuffer sb = new StringBuffer();
try {
-sb.append(?cmd=textupdate);
+sb.append(?cmd=updatemime=txt);
sb.append(w=);
sb.append(URLEncoder.encode(worker, getCharset()));
if (isLBMode) {
-
//http://localhost/status?cmd=onlyupdatew=lblf=falsels=true
+
//http://localhost/status?cmd=updatemime=txtw=lblf=falsels=true
if ((lbRetries != null)) { // 0
sb.append(lr=);
sb.append(lbRetries);
@@ -299,7 +299,7 @@
sb.append(lbForceSession);
}
} else {
-
//http://localhost/status?cmd=onlyupdatew=node1l=lbwf=1wd=false
+
//http://localhost/status?cmd=updatemime=txtw=node1l=lbwf=1wd=false
if ((workerLb != null)) { // must be configured
sb.append(l=);
sb.append(URLEncoder.encode(workerLb, getCharset()));
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: [JK] Releasing 1.2.9
Great, i have fix the JkStatusUpdateTask and hope I can implement a JkStatusListTask to parse the new xml output format. Only thing that I missing is that we can add a css style sheet to html output and xsl style sheet to xml output. worker.status.type=status worker.status.css=jkstatus.css or worker.status.css=http://host//jkstatus.css worker.status.xsl=jkstatus.xsl worker.status.xsl= http://host//jkstatus.xsl How the status worker parameter parsing work? Peter Mladen Turk schrieb: Hi, I wish to release the 1.2.9 as beta when Peter updates the jkstatus ant task for manager :). I think that the amount of work done last couple of months since 1.2.8 was released, deserves that. What's left is updating documentation, that I wish to finish during the beta release. Comments? Regards, Mladen. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 15682] - Java downward comaptibilty gives method signature errors
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=15682. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=15682 [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||WORKSFORME --- Additional Comments From [EMAIL PROTECTED] 2005-03-14 21:55 --- This works for me in the latest 4.1.x with a simple test case. Please test with this later version. If you still experience this problem please provide a simple test war that fails with 4.1.31 or later that I can use to investigate. -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 25919] - java.net.SocketException: socket closed
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=25919. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=25919 [EMAIL PROTECTED] changed: What|Removed |Added Status|UNCONFIRMED |RESOLVED OS/Version||All Resolution||INVALID --- Additional Comments From [EMAIL PROTECTED] 2005-03-14 22:11 --- Please review the mailing list archives for some of the root causes of exeptions such as this. If this does not answer your question pleaes follow up on the tomcat-user mailing list. If this bug is re-opened after the above actions you will need to provide a simple test case to reproduce this as it does not occur with a default clean installation. -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session DeltaRequest.java
pero2005/03/14 13:20:22
Modified:modules/cluster/src/share/org/apache/catalina/cluster/session
DeltaRequest.java
Log:
Fix new session creation ...
Revision ChangesPath
1.12 +2 -1
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaRequest.java
Index: DeltaRequest.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaRequest.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- DeltaRequest.java 19 Nov 2004 19:33:15 - 1.11
+++ DeltaRequest.java 14 Mar 2005 21:20:22 - 1.12
@@ -61,7 +61,8 @@
public DeltaRequest(String sessionId, boolean recordAllActions) {
this.recordAllActions=recordAllActions;
-setSessionId(sessionId);
+if(sessionId != null)
+setSessionId(sessionId);
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session JvmRouteBinderValve.java
pero2005/03/14 13:21:08 Modified:modules/cluster/src/share/org/apache/catalina/cluster/session JvmRouteBinderValve.java Log: Fix wrong attribute name Revision ChangesPath 1.3 +1 -1 jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/JvmRouteBinderValve.java Index: JvmRouteBinderValve.java === RCS file: /home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/JvmRouteBinderValve.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- JvmRouteBinderValve.java 11 Feb 2005 19:43:51 - 1.2 +++ JvmRouteBinderValve.java 14 Mar 2005 21:21:08 - 1.3 @@ -77,7 +77,7 @@ /** * The descriptive information about this implementation. */ -protected static final String info = org.apache.catalina.session.JvmRouteBinderValve/1.1; +protected static final String info = org.apache.catalina.cluster.session.JvmRouteBinderValve/1.1; /*--Instance Variables--*/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session LocalStrings.properties
pero2005/03/14 13:22:16
Modified:modules/cluster/src/share/org/apache/catalina/cluster/session
LocalStrings.properties
Log:
Fix correct address formatting
Revision ChangesPath
1.3 +3 -3
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/LocalStrings.properties
Index: LocalStrings.properties
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/LocalStrings.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LocalStrings.properties 11 Feb 2005 19:43:51 - 1.2
+++ LocalStrings.properties 14 Mar 2005 21:22:16 - 1.3
@@ -13,7 +13,7 @@
deltaManager.managerLoad=Exception loading sessions from persistent storage
deltaManager.noCluster=Starting... no cluster associated with this context:
({0})
deltaManager.noMembers=Manager [{0}]: skipping state transfer. No members
active in cluster group.
-deltaManager.noSessionState=Manager ({0)): No session state received, timing
out.
+deltaManager.noSessionState=Manager [{0}]: No session state received, timing
out.
deltaManager.notStarted=Manager has not yet been started
deltaManager.sendMessage.newSession=Manager [{0}] send new session ({1})
deltaManager.expireSessions=Manager [{0}] expiring sessions upon shutdown
@@ -21,7 +21,7 @@
deltaManager.receiveMessage.createNewSession=Manager [{0}]: received session
[{1}] created.
deltaManager.receiveMessage.delta=Manager [{0}]: received session [{1}]
delta.
deltaManager.receiveMessage.error=Manager [{0}]: Unable to receive message
through TCP channel
-deltaManager.receiveMessage.eventType=Manager [{0}]: Received SessionMessage
of type=({1}) from {2}
+deltaManager.receiveMessage.eventType=Manager [{0}]: Received SessionMessage
of type=({1}) from [{2}]
deltaManager.receiveMessage.expired=Manager [{0}]: received session [{1}]
expired.
deltaManager.receiveMessage.unloadingAfter=Manager [{0}]: unloading sessions
complete
deltaManager.receiveMessage.unloadingBegin=Manager [{0}]: start unloading
sessions
@@ -33,7 +33,7 @@
deltaManager.stopped=Manager [{0}] is stopping
deltaManager.unloading.ioe=IOException while saving persisted sessions: {0}
deltaManager.waitForSessionState=Manager [{0}], requesting session state
from {1}. This operation will timeout if no session state has been received
within 60 seconds.
-deltaSession.notifying=Notifying cluster of expiration primary={0}
sessionId[{1}]
+deltaSession.notifying=Notifying cluster of expiration primary={0} sessionId
[{1}]
deltaSession.valueBound.ex=Session bound listener throw an exception
deltaSession.valueBinding.ex=Session binding listener throw an exception
deltaSession.valueUnbound.ex=Session unbound listener throw an exception
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/util FastQueue.java IQueue.java LinkObject.java SingleRemoveSynchronizedAddLock.java
pero2005/03/14 13:24:30
Modified:modules/cluster/src/share/org/apache/catalina/cluster/tcp
AsyncSocketSender.java Constants.java
DataSender.java IDataSender.java
IDataSenderFactory.java LocalStrings.properties
mbeans-descriptors.xml
Added: modules/cluster/src/share/org/apache/catalina/cluster/util
FastQueue.java IQueue.java LinkObject.java
SingleRemoveSynchronizedAddLock.java
Log:
Add support to new fast async mode
submitted by Rainer Jung
Revision ChangesPath
1.11 +3 -4
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/AsyncSocketSender.java
Index: AsyncSocketSender.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/AsyncSocketSender.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- AsyncSocketSender.java15 Feb 2005 09:31:45 - 1.10
+++ AsyncSocketSender.java14 Mar 2005 21:24:30 - 1.11
@@ -36,7 +36,7 @@
*
* @author Filip Hanik
* @author Peter Rossbach
- * @version 1.2
+ * @version $Revision$ $Date$
*/
public class AsyncSocketSender extends DataSender {
@@ -89,7 +89,6 @@
public AsyncSocketSender(InetAddress host, int port) {
super(host, port);
checkThread();
-long a = Long.MAX_VALUE;
}
// -
Properties
@@ -169,7 +168,7 @@
queuedNrOfBytes += data.length;
if (log.isTraceEnabled())
log.trace(sm.getString(AsyncSocketSender.queue.message,
-getAddress(), new Integer(getPort()), messageid, new
Long(
+getAddress().getHostAddress(), new Integer(getPort()),
messageid, new Long(
data.length)));
}
@@ -188,7 +187,7 @@
*/
public String toString() {
StringBuffer buf = new StringBuffer(AsyncSocketSender[);
-buf.append(getAddress()).append(:).append(getPort()).append(]);
+
buf.append(getAddress().getHostAddress()).append(:).append(getPort()).append(]);
return buf.toString();
}
1.2 +1 -0
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/Constants.java
Index: Constants.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/Constants.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Constants.java15 Feb 2005 09:26:19 - 1.1
+++ Constants.java14 Mar 2005 21:24:30 - 1.2
@@ -22,6 +22,7 @@
* package.
*
* @author Peter Rossbach
+ * @version $Revision$ $Date$
*/
public class Constants {
1.3 +7 -7
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/DataSender.java
Index: DataSender.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/DataSender.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DataSender.java 26 Feb 2005 09:12:26 - 1.2
+++ DataSender.java 14 Mar 2005 21:24:30 - 1.3
@@ -29,7 +29,7 @@
*
* @author Peter Rossbach
* @author Filip Hanik
- * @version 1.2
+ * @version $Revision$ $Date$
*/
public class DataSender implements IDataSender {
@@ -268,7 +268,7 @@
public void connect() throws java.io.IOException {
connectCounter++;
if (log.isDebugEnabled())
-log.debug(sm.getString(IDataSender.connect, address,
+log.debug(sm.getString(IDataSender.connect,
address.getHostAddress(),
new Integer(port)));
openSocket();
}
@@ -283,7 +283,7 @@
public void disconnect() {
disconnectCounter++;
if (log.isDebugEnabled())
-log.debug(sm.getString(IDataSender.disconnect, address,
+log.debug(sm.getString(IDataSender.disconnect,
address.getHostAddress(),
new Integer(port)));
closeSocket();
}
@@ -350,7 +350,7 @@
protected void openSocket() throws IOException, SocketException {
socketOpenCounter++;
if (log.isDebugEnabled())
-log.debug(sm.getString(IDataSender.openSocket, address, new
Integer(
+log.debug(sm.getString(IDataSender.openSocket,
address.getHostAddress(), new Integer(
cvs commit: jakarta-tomcat-catalina/modules/cluster to-do.txt
pero2005/03/14 13:27:03 Modified:modules/cluster to-do.txt Log: Update todo's Revision ChangesPath 1.9 +4 -0 jakarta-tomcat-catalina/modules/cluster/to-do.txt Index: to-do.txt === RCS file: /home/cvs/jakarta-tomcat-catalina/modules/cluster/to-do.txt,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- to-do.txt 27 Dec 2004 09:30:36 - 1.8 +++ to-do.txt 14 Mar 2005 21:27:03 - 1.9 @@ -39,3 +39,7 @@ 10. Add single sign on support 11. Add Keep Alive and WaitForAck at async mode implementation. Make this feature configurable to Sender element at server.xml + Is include with 5.5.8 +12. Add support to new Async Mode from Rainer Jung + Integrated with 5.5.9 + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
pero2005/03/14 13:46:51 Modified:webapps/docs changelog.xml Log: Add new fastsyncqueue cluster replication mode, submitted by Rainer Jung Revision ChangesPath 1.243 +14 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.242 retrieving revision 1.243 diff -u -r1.242 -r1.243 --- changelog.xml 13 Mar 2005 06:40:02 - 1.242 +++ changelog.xml 14 Mar 2005 21:46:51 - 1.243 @@ -78,6 +78,20 @@ /fix /changelog /subsection + subsection name=Cluster +changelog + fix + Fix JvmRouteBinderValve primary failover attribute to + org.apache.catalina.cluster.session.JvmRouteOrignalSessionID (pero) + /fix + add + Integrate new fastasyncqueue cluster sender mode. + Support queue size limitation, + get all queued objects and send it to the backup node, + no queue thread lock contention under high replication load, + submitted by Rainer Jung (pero) + /add + /subsection subsection name=Webapps changelog update - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 21802] - Tomcat 4.1.x not working under JDK 1.2.2
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=21802. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=21802 [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED OS/Version||All Resolution||INVALID --- Additional Comments From [EMAIL PROTECTED] 2005-03-15 00:30 --- It looks like the problem you are seeing is a known JVM/OS/hardware compatibility issue. A search of the tomcat-user archive identified this http://marc.theaimsgroup.com/?l=tomcat-userm=105188860401750w=2 which may help. -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [VOTE] Propose Jim Jagielski and William A. Rowe as JakartaTomcatConnectors commiters
At 02:09 PM 3/14/2005, Jim Jagielski wrote: Henri Gomez wrote: +1 for both of all. Should I understand they will works more on HTTPD related stuff and of course JK ?-) Yep, that's my intent :) Yes - I'm also interested in the AJP 14 implementation from the p.o.v. of ASP.NET backends. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 33465] - StandardSession.removeAttriube throws NullPointerException
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=33465. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=33465 [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||INVALID --- Additional Comments From [EMAIL PROTECTED] 2005-03-15 01:00 --- There has been no response after a month so I am closing this as invalid. I have reviewed the relevant source code and can't see a path where manager could be null in normal usage. I suggest that the best place to follow up on this is the tomcat-user mailing list (with the full stack trace as a starting point). If that discussion concludes that there is a bug, this bug report can always be re-opened. -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 34000] - the attribute url-pattern of web.xml doesn't work properly on mapping by extenstions
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://issues.apache.org/bugzilla/show_bug.cgi?id=34000.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.
http://issues.apache.org/bugzilla/show_bug.cgi?id=34000
--- Additional Comments From [EMAIL PROTECTED] 2005-03-15 03:59 ---
here is the GUIJsGetter servlet
/*
* SupportWizard 2
*
* Copyright (C) 2001 ISC corp. All Rights Reserved.
*
* $Id: GUIJsGetter,v 1.44 2005/02/03 15:24:34 grig Exp $
*/
package com.supportwizard.gui2.servlets.system;
import com.supportwizard.utils.RevisionHelper;
import java.io.*;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.log4j.Category;
import org.apache.log4j.Logger;
/**
* javascript getter
* @author Grigory Danileyko
*/
public class GUIJsGetter extends HttpServlet {
private final static String CONTENT_TYPE_VALUE = text/javascript;
private static final String CACHE_CONTROL_KEY = Cache-Control;
private static final String PRIVATE_CACHE_VALUE = private;
private static final String STORING_RULES = max-age= + 1 + , must-
revalidate;
/**
* logger instance
*/
private final static Category log = Logger.getInstance(GUIJsGetter.class);
protected void doPost(HttpServletRequest request, HttpServletResponse
response) throws IOException {
response.sendError(HttpServletResponse.SC_METHOD_NOT_ALLOWED);
}
/**
* do get
* @param request
* @param response
* @throws ServletException
* @throws IOException
*/
protected void doGet(HttpServletRequest request, HttpServletResponse
response) throws ServletException, IOException {
final File file = getFileInfo(request);
if (!file.getPath().endsWith(.js)) {
log.warn(file.getPath() + is not javascript page.);
throw new ServletException(it is not a javascript page);
} else {
log.warn(doGet for + file.getPath());
if (file.exists()) {
try {
doContentInfo(response, file.length());
doFile(file, response);
} catch (IOException e) {
log.error(e);
response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
}
} else {
log.error(the requested file + file.getPath() + not found);
response.sendError(HttpServletResponse.SC_NOT_FOUND);
}
}
}
private final File getFileInfo(final HttpServletRequest newRequest) {
final String path = getServletContext().getRealPath
(newRequest.getServletPath());
return new File(path);
}
protected void doHead(HttpServletRequest request, HttpServletResponse
response) throws ServletException, IOException {
final File file = getFileInfo(request);
log.warn(doHead for + file.getPath());
if (file.exists()) {
doContentInfo(response, file.length());
} else {
response.sendError(HttpServletResponse.SC_NOT_FOUND);
}
}
/**
* reads the requested file and put out it to browser.
* @param newFile
* @param response
* @throws IOException
*/
private static final void doFile(final File newFile, final
HttpServletResponse response) throws IOException {
final PrintWriter out = response.getWriter();
final BufferedReader reader = new BufferedReader(new FileReader(newFile));
try {
String line;
while ((line = reader.readLine()) != null)
out.println(line);
} finally {
reader.close();
}
}
protected long getLastModified(final HttpServletRequest request) {
final String path = getServletContext().getRealPath(request.getServletPath
());
final File file = new File(path);
log.warn(getLastModified for + path);
return Math.max(RevisionHelper.getBuildDateUtc(), file.lastModified());
}
private final static void doContentInfo(final HttpServletResponse response,
final long newLength) {
response.setContentLength((int) newLength);
response.setContentType(CONTENT_TYPE_VALUE);
response.setHeader(CACHE_CONTROL_KEY, PRIVATE_CACHE_VALUE);
response.setHeader(CACHE_CONTROL_KEY, STORING_RULES);
}
}
--
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 34000] - the attribute url-pattern of web.xml doesn't work properly on mapping by extenstions
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=34000. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=34000 --- Additional Comments From [EMAIL PROTECTED] 2005-03-15 04:07 --- The abstract picture that describes my test (I do not want to write down the original code because it's too long and won't clarify anything more) --test.jsp- script src=html:rewrite page=/myattachment.js //script script src=html:rewrite page=/myattachment.jsp //script --- --myattachment.jsp-- some jsp/javascript code --my attachment.js-- some text/javascript code Expected result : GUIJsGetter should process the first attachment only. The second one should be done by the default servlet (org.apache.struts.action.ActionServlet of Struts 2.3). Actual result : GUIJsGetter has to deal with both the GET's despite I set to work only with *.js, not *.js* Please let me know if I should explain it more detailed. Thanks. -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 34000] - the attribute url-pattern of web.xml doesn't work properly on mapping by extenstions
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=34000. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=34000 --- Additional Comments From [EMAIL PROTECTED] 2005-03-15 04:09 --- SUN JDK 1.4.2-03 -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Anne-Sophie Brichard/EUZ/ChubbMail is out of the office.
I will be out of the office starting 15/03/2005 and will not return until 22/03/2005. En cas d'urgence, merci de bien vouloir contacter Carine Firan ([EMAIL PROTECTED]) au 01 70 36 65 94 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 34000] - the attribute url-pattern of web.xml doesn't work properly on mapping by extenstions
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=34000. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=34000 [EMAIL PROTECTED] changed: What|Removed |Added Status|RESOLVED|REOPENED Resolution|INVALID | -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_status.c
mturk 2005/03/14 22:04:58
Modified:jk/native/common jk_status.c
Log:
No need to strdup param that already uses stack buffer.
Revision ChangesPath
1.32 +11 -17jakarta-tomcat-connectors/jk/native/common/jk_status.c
Index: jk_status.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_status.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- jk_status.c 14 Mar 2005 20:41:09 - 1.31
+++ jk_status.c 15 Mar 2005 06:04:58 - 1.32
@@ -758,23 +758,17 @@
static int status_mime_type(const char *req)
{
-if (!req)
-return 0;
-else {
-char buf[32];
-char *mimetype = NULL;
-int ret = 0 ;
-if(status_cmd(mime, req, buf, sizeof(buf)) != NULL) {
-mimetype = strdup(buf) ;
- if (!strncmp(mimetype, xml, 3))
- ret = 1;
- else if (!strncmp(mimetype, txt, 3))
- ret = 2;
+int ret = 0 ;
+if (req) {
+char mimetype[32];
+if (status_cmd(mime, req, mimetype, sizeof(mimetype)) != NULL) {
+if (!strcmp(mimetype, xml))
+ret = 1;
+else if (!strcmp(mimetype, txt))
+ret = 2;
}
-if (mimetype)
-free(mimetype);
-return ret ;
}
+return ret ;
}
static int JK_METHOD service(jk_endpoint_t *e,
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_status.c
mturk 2005/03/14 22:24:22
Modified:jk/native/common jk_status.c
Log:
Added .css property to jkstatus so we can set custom stylesheet.
Revision ChangesPath
1.33 +13 -6 jakarta-tomcat-connectors/jk/native/common/jk_status.c
Index: jk_status.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_status.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- jk_status.c 15 Mar 2005 06:04:58 - 1.32
+++ jk_status.c 15 Mar 2005 06:24:22 - 1.33
@@ -38,10 +38,10 @@
#define JK_STATUS_HEAD !DOCTYPE HTML PUBLIC \-//W3C// \
DTD HTML 3.2 Final//EN\\n \
- htmlheadtitleJK Status
Manager/title/head\n \
- body\n
+ htmlheadtitleJK Status Manager/title
-#define JK_STATUS_HEND /body\n/html\n
+#define JK_STATUS_HEND /head\nbody\n
+#define JK_STATUS_BEND /body\n/html\n
#define JK_STATUS_XMLH ?xml version=\1.0\ encoding=\UTF-8\ ?\n
\
jk:status xmlns:jk=\http://jakarta.apache.org\;\n
@@ -66,6 +66,7 @@
jk_pool_t p;
jk_pool_atom_tbuf[TINY_POOL_SIZE];
const char*name;
+const char*css;
jk_worker_t worker;
status_endpoint_t ep;
jk_worker_env_t *we;
@@ -807,7 +808,11 @@
if(mime == 0) {
s-start_response(s, 200, OK, headers_names, headers_vhtml, 3);
s-write(s, JK_STATUS_HEAD, sizeof(JK_STATUS_HEAD) - 1);
-
+if (p-s_worker-css) {
+jk_putv(s, \nlink rel=\stylesheet\ type=\text/css\
href=\,
+p-s_worker-css, \ /\n, NULL);
+}
+s-write(s, JK_STATUS_HEND, sizeof(JK_STATUS_HEND) - 1);
jk_puts(s, h1JK Status Manager for );
jk_puts(s, s-server_name);
jk_puts(s, /h1\n\n);
@@ -819,7 +824,7 @@
display_workers(s, p-s_worker, worker, l);
-s-write(s, JK_STATUS_HEND, sizeof(JK_STATUS_HEND) - 1);
+s-write(s, JK_STATUS_BEND, sizeof(JK_STATUS_BEND) - 1);
}
else if (mime == 1) {
@@ -883,6 +888,8 @@
if (pThis pThis-worker_private) {
status_worker_t *p = pThis-worker_private;
p-we = we;
+if (!jk_get_worker_str_prop(props, p-name, css, (p-css)))
+p-css = NULL;
}
JK_TRACE_EXIT(log);
return JK_TRUE;
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: [JK] Releasing 1.2.9
Peter Rossbach wrote: Only thing that I missing is that we can add a css style sheet to html output and xsl style sheet to xml output. worker.status.type=status worker.status.css=jkstatus.css or worker.status.css=http://host//jkstatus.css OK, I've implemented that. worker.status.xsl=jkstatus.xsl worker.status.xsl= http://host//jkstatus.xsl xml output is meant to be used by parsers. No need to add the xsl for that, because it will be used only by applications like manager tasks. How the status worker parameter parsing work? Not sure what do you mean by that. Regards, Mladen - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 34000] - the attribute url-pattern of web.xml doesn't work properly on mapping by extenstions
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=34000. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=34000 [EMAIL PROTECTED] changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution||INVALID --- Additional Comments From [EMAIL PROTECTED] 2005-03-15 08:11 --- Please provide a ready to test war with a *minimal* web.xml. I will not look into it otherwise, as I believe the report to be invalid. -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
