svn commit: r331649 - in /tomcat/site/trunk: docs/faq/bugs.html docs/faq/printer/bugs.html xdocs-faq/bugs.xml
Author: funkman Date: Mon Nov 7 16:31:47 2005 New Revision: 331649 URL: http://svn.apache.org/viewcvs?rev=331649&view=rev Log: link fix Modified: tomcat/site/trunk/docs/faq/bugs.html tomcat/site/trunk/docs/faq/printer/bugs.html tomcat/site/trunk/xdocs-faq/bugs.xml Modified: tomcat/site/trunk/docs/faq/bugs.html URL: http://svn.apache.org/viewcvs/tomcat/site/trunk/docs/faq/bugs.html?rev=331649&r1=331648&r2=331649&view=diff == --- tomcat/site/trunk/docs/faq/bugs.html (original) +++ tomcat/site/trunk/docs/faq/bugs.html Mon Nov 7 16:31:47 2005 @@ -6,7 +6,7 @@ " align="right" src="../images/tomcat.gif">LinksTomcat HomeFAQ HomeContentsBugsClass Not FoundClusteringConnectorsDatabaseDeploymentDevelopmentFDA Validationhttp://wiki.apache.org/tomcat/HowTo";>How do ILinux / UnixOther Operating SystemsLoggingMemoryMetaMiscellaneousMonitoring / Performancehttp://wiki.apache.org/tomcat/UsefulLinks";>Other ResourcesSecurityWhich VersionTomcat User Listhttp://wiki.apache.org/tomcat/";>WikiWindowsTomcat FAQBugsprint-friendlyversion Preface If you think you found a bug, -http://jakarta.apache.org/tomcat/bugreport.html";>read this page. +http://tomcat.apache.org/bugreport.html";>read this page. Questions @@ -26,7 +26,7 @@ Unless you have the source code reference in Tomcat which is wrong, it may not be a bug. E-mail the user list and confirm its a bug. Also -http://jakarta.apache.org/tomcat/bugreport.html";> +http://tomcat.apache.org/bugreport.html";> read this first from the tomcat site about reporting a bug. Modified: tomcat/site/trunk/docs/faq/printer/bugs.html URL: http://svn.apache.org/viewcvs/tomcat/site/trunk/docs/faq/printer/bugs.html?rev=331649&r1=331648&r2=331649&view=diff == --- tomcat/site/trunk/docs/faq/printer/bugs.html (original) +++ tomcat/site/trunk/docs/faq/printer/bugs.html Mon Nov 7 16:31:47 2005 @@ -5,7 +5,7 @@ Tomcat FAQ " align="right" src="../../images/tomcat.gif">Tomcat FAQBugsPreface If you think you found a bug, -http://jakarta.apache.org/tomcat/bugreport.html";>read this page. +http://tomcat.apache.org/bugreport.html";>read this page. Questions @@ -25,7 +25,7 @@ Unless you have the source code reference in Tomcat which is wrong, it may not be a bug. E-mail the user list and confirm its a bug. Also -http://jakarta.apache.org/tomcat/bugreport.html";> +http://tomcat.apache.org/bugreport.html";> read this first from the tomcat site about reporting a bug. Modified: tomcat/site/trunk/xdocs-faq/bugs.xml URL: http://svn.apache.org/viewcvs/tomcat/site/trunk/xdocs-faq/bugs.xml?rev=331649&r1=331648&r2=331649&view=diff == --- tomcat/site/trunk/xdocs-faq/bugs.xml (original) +++ tomcat/site/trunk/xdocs-faq/bugs.xml Mon Nov 7 16:31:47 2005 @@ -16,7 +16,7 @@ If you think you found a bug, -http://jakarta.apache.org/tomcat/bugreport.html";>read this page. +http://tomcat.apache.org/bugreport.html";>read this page. @@ -41,7 +41,7 @@ Unless you have the source code reference in Tomcat which is wrong, it may not be a bug. E-mail the user list and confirm its a bug. Also -http://jakarta.apache.org/tomcat/bugreport.html";> +http://tomcat.apache.org/bugreport.html";> read this first from the tomcat site about reporting a bug. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r331650 - in /tomcat/site/trunk: docs/faq/memory.html docs/faq/printer/memory.html xdocs-faq/memory.xml
Author: funkman Date: Mon Nov 7 16:32:44 2005 New Revision: 331650 URL: http://svn.apache.org/viewcvs?rev=331650&view=rev Log: add class loadloader leak link Modified: tomcat/site/trunk/docs/faq/memory.html tomcat/site/trunk/docs/faq/printer/memory.html tomcat/site/trunk/xdocs-faq/memory.xml Modified: tomcat/site/trunk/docs/faq/memory.html URL: http://svn.apache.org/viewcvs/tomcat/site/trunk/docs/faq/memory.html?rev=331650&r1=331649&r2=331650&view=diff == --- tomcat/site/trunk/docs/faq/memory.html (original) +++ tomcat/site/trunk/docs/faq/memory.html Mon Nov 7 16:32:44 2005 @@ -128,6 +128,13 @@ Not actually a reason - but on your particular platform, look at the java -X options. They may be VERY helpful. + +http://opensource2.atlassian.com/confluence/spring/pages/viewpage.action?pageId=2669";> +Your classloaders are not being garbage collected. + + + + Modified: tomcat/site/trunk/docs/faq/printer/memory.html URL: http://svn.apache.org/viewcvs/tomcat/site/trunk/docs/faq/printer/memory.html?rev=331650&r1=331649&r2=331650&view=diff == --- tomcat/site/trunk/docs/faq/printer/memory.html (original) +++ tomcat/site/trunk/docs/faq/printer/memory.html Mon Nov 7 16:32:44 2005 @@ -127,6 +127,13 @@ Not actually a reason - but on your particular platform, look at the java -X options. They may be VERY helpful. + +http://opensource2.atlassian.com/confluence/spring/pages/viewpage.action?pageId=2669";> +Your classloaders are not being garbage collected. + + + + Modified: tomcat/site/trunk/xdocs-faq/memory.xml URL: http://svn.apache.org/viewcvs/tomcat/site/trunk/xdocs-faq/memory.xml?rev=331650&r1=331649&r2=331650&view=diff == --- tomcat/site/trunk/xdocs-faq/memory.xml (original) +++ tomcat/site/trunk/xdocs-faq/memory.xml Mon Nov 7 16:32:44 2005 @@ -142,6 +142,13 @@ Not actually a reason - but on your particular platform, look at the java -X options. They may be VERY helpful. + +http://opensource2.atlassian.com/confluence/spring/pages/viewpage.action?pageId=2669";> +Your classloaders are not being garbage collected. + + + + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r331651 - /tomcat/site/trunk/README.txt
Author: funkman Date: Mon Nov 7 16:36:17 2005 New Revision: 331651 URL: http://svn.apache.org/viewcvs?rev=331651&view=rev Log: Fix directory for site s/jakarta/Apache/ Modified: tomcat/site/trunk/README.txt Modified: tomcat/site/trunk/README.txt URL: http://svn.apache.org/viewcvs/tomcat/site/trunk/README.txt?rev=331651&r1=331650&r2=331651&view=diff == --- tomcat/site/trunk/README.txt (original) +++ tomcat/site/trunk/README.txt Mon Nov 7 16:36:17 2005 @@ -1,6 +1,6 @@ $Id$ -The Jakarta Tomcat Website Instructions +The Apache Tomcat Website Instructions --- ***NOTE*** @@ -9,36 +9,36 @@ ***NOTE*** The Tomcat web site is based on .xml files which are transformed -into .html files using XSLT and Ant. +into .html files using XSLT and Ant. In order to make modifications to the Tomcat web site, you need to first check out the Tomcat site from SVN. To check out the Tomcat site into a sub-directory called tomcat-site in the current directory: -svn checkout http://svn.apache.org/repos/asf/tomcat/site/trunk tomcat-site +svn checkout https://svn.apache.org/repos/asf/tomcat/site/trunk tomcat-site -Once you have the site checked out locally, cd into your +Once you have the site checked out locally, cd into your tomcat-site directory and execute: ant -This will build the documentation into the docs/ directory. The output +This will build the documentation into the docs/ directory. The output will show you which files got re-generated. If you would like to make modifications to the web site documents, you simply need to edit the files in the xdocs/ and/or xdocs-faq/ directory. -The files in xdocs/stylesheets are the global files for the site. If you make a -modification to project.xml, it will affect the left side navigation for the +The files in xdocs/stylesheets are the global files for the site. If you make a +modification to project.xml, it will affect the left side navigation for the web site and all of your .html files will be re-generated. The xdocs-faq directory has its own project.xml and tomcat-faq.xsl Once you have built your documentation and confirmed that your changes are -ok, you can check your .xml and your .html files back into SVN. +ok, you can check your .xml and your .html files back into SVN. -Then, in the /www/jakarta.apache.org/tomcat/ directory, execute: +Then, in the /www/tomcat.apache.org/ directory, execute: svn up -to have the changes reflected on the Tomcat web site. \ No newline at end of file +to have the changes reflected on the Tomcat web site. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r357372 [2/2] - in /tomcat/site/trunk: docs/ docs/faq/ docs/faq/printer/ xdocs-faq/ xdocs/
Modified: tomcat/site/trunk/docs/faq/windows.html
URL:
http://svn.apache.org/viewcvs/tomcat/site/trunk/docs/faq/windows.html?rev=357372&r1=357371&r2=357372&view=diff
==
--- tomcat/site/trunk/docs/faq/windows.html (original)
+++ tomcat/site/trunk/docs/faq/windows.html Sat Dec 17 11:39:16 2005
@@ -1,7 +1,7 @@
Tomcat FAQ - Windows Questions
dt { font-size : larger; font-weight : bold }
dd {padding-bottom : 10px;}
-http://jakarta.apache.org/";>http://jakarta.apache.org//images/jakarta-logo.gif";>http://jakarta.apache.org/tomcat/";>http://jakarta.apache.org/";>http://jakarta.apache.org//images/jakarta-logo.gif";>http://tomcat.apache.org/faq/";>LinksTomcat
HomeFAQ
HomeContentsBugsClass Not
FoundClusteringConnectorsDatabaseDeploymentDevelopmentFDA Validationhttp://wiki.apache.org/tomcat/HowTo";>How do ILinux / UnixOther Operating SystemsLogging<
a href="memory.html">MemoryMetaMiscellaneousMonitoring / Performancehttp://wiki.apache.org/tomcat/UsefulLinks";>Other ResourcesSecurityWhich
VersionTomcat User Listhttp://wiki.apache.org/tomcat/";>WikiWindowsTomcat
FAQWindows Questionsprint-friendlyversion
Preface
@@ -77,7 +77,7 @@
-http://jakarta.apache.org/tomcat/tomcat-4.1-doc/config/resources.html";>
+http://tomcat.apache.org/tomcat-4.1-doc/config/resources.html";>
Yes
Modified: tomcat/site/trunk/xdocs-faq/classnotfound.xml
URL:
http://svn.apache.org/viewcvs/tomcat/site/trunk/xdocs-faq/classnotfound.xml?rev=357372&r1=357371&r2=357372&view=diff
==
--- tomcat/site/trunk/xdocs-faq/classnotfound.xml (original)
+++ tomcat/site/trunk/xdocs-faq/classnotfound.xml Sat Dec 17 11:39:16 2005
@@ -20,11 +20,11 @@
Classloader HOWTO pages:
-http://jakarta.apache.org/tomcat/tomcat-4.1-doc/class-loader-howto.html";>
+http://tomcat.apache.org/tomcat-4.1-doc/class-loader-howto.html";>
Tomcat 4.1,
-http://jakarta.apache.org/tomcat/tomcat-5.0-doc/class-loader-howto.html";>
+http://tomcat.apache.org/tomcat-5.0-doc/class-loader-howto.html";>
Tomcat 5.0,
-http://jakarta.apache.org/tomcat/tomcat-5.5-doc/class-loader-howto.html";>
+http://tomcat.apache.org/tomcat-5.5-doc/class-loader-howto.html";>
Tomcat 5.5.
Modified: tomcat/site/trunk/xdocs-faq/connectors.xml
URL:
http://svn.apache.org/viewcvs/tomcat/site/trunk/xdocs-faq/connectors.xml?rev=357372&r1=357371&r2=357372&view=diff
==
--- tomcat/site/trunk/xdocs-faq/connectors.xml (original)
+++ tomcat/site/trunk/xdocs-faq/connectors.xml Sat Dec 17 11:39:16 2005
@@ -26,7 +26,7 @@
-http://jakarta.apache.org/tomcat/connectors-doc/";>JK docs.
+http://tomcat.apache.org/connectors-doc/";>JK docs.
@@ -294,10 +294,10 @@
For a more complete description of the Connector config,
-http://jakarta.apache.org/tomcat/tomcat-5.0-doc/config/http.html";>see the
+http://tomcat.apache.org/tomcat-5.0-doc/config/http.html";>see the
HTTP Connector docs
or the
-http://jakarta.apache.org/tomcat/tomcat-5.0-doc/config/http.html";>see the
+http://tomcat.apache.org/tomcat-5.0-doc/config/http.html";>see the
AJP Connector docs.
@@ -311,7 +311,7 @@
You can't: you need to download the source and compile it
for your platform. The source distributions are available
-from the http://jakarta.apache.org/site/sourceindex.cgi";>standard
location.
+from the http://tomcat.apache.org/download-connectors.cgi";>standard location.
Note that JPackage.org has RPM distributions for the connectors
as well as tomcat itself: http://www.jpackage.org";>JPackage.org
Modified: tomcat/site/trunk/xdocs-faq/database.xml
URL:
http://svn.apache.org/viewcvs/tomcat/site/trunk/xdocs-faq/database.xml?rev=357372&r1=357371&r2=357372&view=diff
==
--- tomcat/site/trunk/xdocs-faq/database.xml (original)
+++ tomcat/site/trunk/xdocs-faq/database.xml Sat Dec 17 11:39:16 2005
@@ -49,7 +49,7 @@
Other Links of interest:
-http://jakarta.apache.org/tomcat/tomcat-4.1-doc/jndi-datasource-examples-howto.html";>
+http://tomcat.apache.org/tomcat-4.1-doc/jndi-datasource-examples-howto.html";>
JNDI Datasource HOW-TO
Modified: tomcat/site/trunk/xdocs-faq/fda-validation.xml
URL:
http://svn.apache.org/viewcvs/tomcat/site/trunk/xdocs-faq/fda-validation.xml?rev=357372&r1=357371&r2=357372&view=diff
==
--- tomcat/site/trunk/xdocs-faq/fda-validation.xml (original)
+++ tomcat/site/trunk/xdocs-faq/fda-validation.xml Sat Dec 17 11:39:16 200
svn commit: r367447 - in /tomcat/site/trunk: docs/lists.html xdocs/lists.xml
Author: funkman Date: Mon Jan 9 17:11:09 2006 New Revision: 367447 URL: http://svn.apache.org/viewcvs?rev=367447&view=rev Log: add Nabble for the archive links Modified: tomcat/site/trunk/docs/lists.html tomcat/site/trunk/xdocs/lists.xml Modified: tomcat/site/trunk/docs/lists.html URL: http://svn.apache.org/viewcvs/tomcat/site/trunk/docs/lists.html?rev=367447&r1=367446&r2=367447&view=diff == --- tomcat/site/trunk/docs/lists.html (original) +++ tomcat/site/trunk/docs/lists.html Mon Jan 9 17:11:09 2006 @@ -174,14 +174,15 @@ The following mailing lists relate to the Apache Tomcat -project. Users should consider subscribing to the -User Support mailing list. +project. Users should consider subscribing to the +User Support mailing list. The Developer list is for people interested in helping with the development and debugging of the server. Formatted archives are available in several places including http://mail-archives.apache.org/mod_mbox/";>the Apache Mail -Archives and http://marc.theaimsgroup.com/";>MARC. +Archives, http://marc.theaimsgroup.com/";>MARC, and +http://www.nabble.com/";>Nabble. You can also use the mail-to-news nntp://news.gmane.org/";>gateway offered by http://news.gmane.org/index.php?match=gmane.comp.apache";>GMANE to access most of the lists with a news reader. @@ -288,7 +289,7 @@ http://mail-archives.apache.org/mod_mbox/tomcat-users/";> at Apache, http://marc.theaimsgroup.com/?l=tomcat-user";>at MARC (searchable) -. +, and at http://www.nabble.com/Tomcat---User-f342.html";>Nabble. @@ -387,7 +388,8 @@ http://mail-archives.apache.org/mod_mbox/tomcat-dev/";> at Apache, http://marc.theaimsgroup.com/?l=tomcat-dev";>at MARC (searchable) -. + and at +http://www.nabble.com/Tomcat---Dev-f341.html";>Nabble. Modified: tomcat/site/trunk/xdocs/lists.xml URL: http://svn.apache.org/viewcvs/tomcat/site/trunk/xdocs/lists.xml?rev=367447&r1=367446&r2=367447&view=diff == --- tomcat/site/trunk/xdocs/lists.xml (original) +++ tomcat/site/trunk/xdocs/lists.xml Mon Jan 9 17:11:09 2006 @@ -8,15 +8,16 @@ The following mailing lists relate to the Apache Tomcat -project. Users should consider subscribing to the -User Support mailing list. +project. Users should consider subscribing to the +User Support mailing list. The Developer list is for people interested in helping with the development and debugging of the server. Formatted archives are available in several places including http://mail-archives.apache.org/mod_mbox/";>the Apache Mail -Archives and http://marc.theaimsgroup.com/";>MARC. +Archives, http://marc.theaimsgroup.com/";>MARC, and +http://www.nabble.com/";>Nabble. You can also use the mail-to-news nntp://news.gmane.org/";>gateway offered by http://news.gmane.org/index.php?match=gmane.comp.apache";>GMANE @@ -92,7 +93,7 @@ http://mail-archives.apache.org/mod_mbox/tomcat-users/";> at Apache, http://marc.theaimsgroup.com/?l=tomcat-user";>at MARC (searchable) -. +, and at http://www.nabble.com/Tomcat---User-f342.html";>Nabble. @@ -164,7 +165,8 @@ http://mail-archives.apache.org/mod_mbox/tomcat-dev/";> at Apache, http://marc.theaimsgroup.com/?l=tomcat-dev";>at MARC (searchable) -. + and at +http://www.nabble.com/Tomcat---Dev-f341.html";>Nabble. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r367453 - in /tomcat/site/trunk: docs/faq/misc.html docs/faq/printer/misc.html xdocs-faq/misc.xml
Author: funkman Date: Mon Jan 9 17:21:53 2006 New Revision: 367453 URL: http://svn.apache.org/viewcvs?rev=367453&view=rev Log: added shutdown and nondaemon threads Modified: tomcat/site/trunk/docs/faq/misc.html tomcat/site/trunk/docs/faq/printer/misc.html tomcat/site/trunk/xdocs-faq/misc.xml Modified: tomcat/site/trunk/docs/faq/misc.html URL: http://svn.apache.org/viewcvs/tomcat/site/trunk/docs/faq/misc.html?rev=367453&r1=367452&r2=367453&view=diff == --- tomcat/site/trunk/docs/faq/misc.html (original) +++ tomcat/site/trunk/docs/faq/misc.html Mon Jan 9 17:21:53 2006 @@ -169,6 +169,11 @@ I'm getting java.lang.ThreadDeath exceptions when reloading my webapp. + + +Help! Even though I run shutdown.sh (or shutdown.bat), Tomcat does not stop! + + @@ -765,6 +770,19 @@ See http://issues.apache.org/bugzilla/show_bug.cgi?id=26372";>Bugzilla discussion of this. + + + + +Help! Even though I run shutdown.sh (or shutdown.bat), Tomcat does not stop! + + + +Most likely, a non-daemon thread is running. JVM's do not shutdown until there are +0 non-daemon threads. You will need to perform a thread dump [kill -3 pid for Unix or +CTRL+Break for Windows] to determine the code which started the thread. + + http://www.google.com/search"; name="searchForm" method="GET">http://www.google.com/";>http://www.google.com/logos/Logo_40wht.gif";>http://jakarta.apache.org/tomcat/faq"; name="domains" type="hidden">http://jakarta.apache.org/tomcat/faq"; name="sitesearch" type="hidden"> Search the Tomcat FAQ Modified: tomcat/site/trunk/docs/faq/printer/misc.html URL: http://svn.apache.org/viewcvs/tomcat/site/trunk/docs/faq/printer/misc.html?rev=367453&r1=367452&r2=367453&view=diff == --- tomcat/site/trunk/docs/faq/printer/misc.html (original) +++ tomcat/site/trunk/docs/faq/printer/misc.html Mon Jan 9 17:21:53 2006 @@ -168,6 +168,11 @@ I'm getting java.lang.ThreadDeath exceptions when reloading my webapp. + + +Help! Even though I run shutdown.sh (or shutdown.bat), Tomcat does not stop! + + @@ -764,6 +769,19 @@ See http://issues.apache.org/bugzilla/show_bug.cgi?id=26372";>Bugzilla discussion of this. + + + + +Help! Even though I run shutdown.sh (or shutdown.bat), Tomcat does not stop! + + + +Most likely, a non-daemon thread is running. JVM's do not shutdown until there are +0 non-daemon threads. You will need to perform a thread dump [kill -3 pid for Unix or +CTRL+Break for Windows] to determine the code which started the thread. + + Copyright © 1999-2005, Apache Software Foundation Modified: tomcat/site/trunk/xdocs-faq/misc.xml URL: http://svn.apache.org/viewcvs/tomcat/site/trunk/xdocs-faq/misc.xml?rev=367453&r1=367452&r2=367453&view=diff == --- tomcat/site/trunk/xdocs-faq/misc.xml (original) +++ tomcat/site/trunk/xdocs-faq/misc.xml Mon Jan 9 17:21:53 2006 @@ -182,6 +182,11 @@ I'm getting java.lang.ThreadDeath exceptions when reloading my webapp. + + +Help! Even though I run shutdown.sh (or shutdown.bat), Tomcat does not stop! + + @@ -781,8 +786,20 @@ See http://issues.apache.org/bugzilla/show_bug.cgi?id=26372";>Bugzilla discussion of this. - + + + +Help! Even though I run shutdown.sh (or shutdown.bat), Tomcat does not stop! + + + +Most likely, a non-daemon thread is running. JVM's do not shutdown until there are +0 non-daemon threads. You will need to perform a thread dump [kill -3 pid for Unix or +CTRL+Break for Windows] to determine the code which started the thread. + + + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r375593 - /tomcat/site/trunk/xdocs-faq/tomcat-faq.xsl
Author: funkman Date: Tue Feb 7 05:11:10 2006 New Revision: 375593 URL: http://svn.apache.org/viewcvs?rev=375593&view=rev Log: fix google search jakarta --> tomcat Modified: tomcat/site/trunk/xdocs-faq/tomcat-faq.xsl Modified: tomcat/site/trunk/xdocs-faq/tomcat-faq.xsl URL: http://svn.apache.org/viewcvs/tomcat/site/trunk/xdocs-faq/tomcat-faq.xsl?rev=375593&r1=375592&r2=375593&view=diff == --- tomcat/site/trunk/xdocs-faq/tomcat-faq.xsl (original) +++ tomcat/site/trunk/xdocs-faq/tomcat-faq.xsl Tue Feb 7 05:11:10 2006 @@ -155,7 +155,7 @@ http://www.google.com/search";> - + @@ -166,8 +166,8 @@ -http://jakarta.apache.org/tomcat/faq"/> -http://jakarta.apache.org/tomcat/faq"/> +http://tomcat.apache.org/faq"/> +http://tomcat.apache.org/faq"/> Search the Tomcat FAQ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r375594 - /tomcat/site/trunk/xdocs-faq/logging.xml
Author: funkman Date: Tue Feb 7 05:11:44 2006 New Revision: 375594 URL: http://svn.apache.org/viewcvs?rev=375594&view=rev Log: fix bad link for printer friendly Modified: tomcat/site/trunk/xdocs-faq/logging.xml Modified: tomcat/site/trunk/xdocs-faq/logging.xml URL: http://svn.apache.org/viewcvs/tomcat/site/trunk/xdocs-faq/logging.xml?rev=375594&r1=375593&r2=375594&view=diff == --- tomcat/site/trunk/xdocs-faq/logging.xml (original) +++ tomcat/site/trunk/xdocs-faq/logging.xml Tue Feb 7 05:11:44 2006 @@ -2,7 +2,7 @@ ]> - + &project; - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r536554 - in /tomcat/tc6.0.x/trunk/webapps/ROOT: index.html index.jsp
Author: funkman Date: Wed May 9 07:53:40 2007 New Revision: 536554 URL: http://svn.apache.org/viewvc?view=rev&rev=536554 Log: bad link : s/tomcat-docs/docs/ Modified: tomcat/tc6.0.x/trunk/webapps/ROOT/index.html tomcat/tc6.0.x/trunk/webapps/ROOT/index.jsp Modified: tomcat/tc6.0.x/trunk/webapps/ROOT/index.html URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/ROOT/index.html?view=diff&rev=536554&r1=536553&r2=536554 == --- tomcat/tc6.0.x/trunk/webapps/ROOT/index.html (original) +++ tomcat/tc6.0.x/trunk/webapps/ROOT/index.html Wed May 9 07:53:40 2007 @@ -166,7 +166,7 @@ As you may have guessed by now, this is the default Tomcat home page. It can be found on the local filesystem at: $CATALINA_HOME/webapps/ROOT/index.html - where "$CATALINA_HOME" is the root of the Tomcat installation directory. If you're seeing this page, and you don't think you should be, then either you're either a user who has arrived at new installation of Tomcat, or you're an administrator who hasn't got his/her setup quite right. Providing the latter is the case, please refer to the Tomcat Documentation for more detailed setup and administration information than is found in the INSTALL file. + where "$CATALINA_HOME" is the root of the Tomcat installation directory. If you're seeing this page, and you don't think you should be, then either you're either a user who has arrived at new installation of Tomcat, or you're an administrator who hasn't got his/her setup quite right. Providing the latter is the case, please refer to the Tomcat Documentation for more detailed setup and administration information than is found in the INSTALL file. NOTE: For security reasons, using the administration webapp is restricted to users with role "admin". The manager webapp Modified: tomcat/tc6.0.x/trunk/webapps/ROOT/index.jsp URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/ROOT/index.jsp?view=diff&rev=536554&r1=536553&r2=536554 == --- tomcat/tc6.0.x/trunk/webapps/ROOT/index.jsp (original) +++ tomcat/tc6.0.x/trunk/webapps/ROOT/index.jsp Wed May 9 07:53:40 2007 @@ -180,7 +180,7 @@ As you may have guessed by now, this is the default Tomcat home page. It can be found on the local filesystem at: $CATALINA_HOME/webapps/ROOT/index.jsp - where "$CATALINA_HOME" is the root of the Tomcat installation directory. If you're seeing this page, and you don't think you should be, then either you're either a user who has arrived at new installation of Tomcat, or you're an administrator who hasn't got his/her setup quite right. Providing the latter is the case, please refer to the Tomcat Documentation for more detailed setup and administration information than is found in the INSTALL file. + where "$CATALINA_HOME" is the root of the Tomcat installation directory. If you're seeing this page, and you don't think you should be, then either you're either a user who has arrived at new installation of Tomcat, or you're an administrator who hasn't got his/her setup quite right. Providing the latter is the case, please refer to the Tomcat Documentation for more detailed setup and administration information than is found in the INSTALL file. NOTE: For security reasons, using the administration webapp is restricted to users with role "admin". The manager webapp - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r539787 - in /tomcat/tc6.0.x/trunk: java/org/apache/catalina/valves/AccessLogValve.java webapps/docs/changelog.xml
Author: funkman
Date: Sat May 19 11:31:09 2007
New Revision: 539787
URL: http://svn.apache.org/viewvc?view=rev&rev=539787
Log:
bug 42444: prevent NPE
Patch provided by Nils Hammar (funkman)
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/AccessLogValve.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/AccessLogValve.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/AccessLogValve.java?view=diff&rev=539787&r1=539786&r2=539787
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/AccessLogValve.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/AccessLogValve.java
Sat May 19 11:31:09 2007
@@ -1035,7 +1035,6 @@
buf.append(request.getProtocol());
} else {
buf.append("- - ");
-buf.append(request.getProtocol());
}
}
}
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?view=diff&rev=539787&r1=539786&r2=539787
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sat May 19 11:31:09 2007
@@ -18,6 +18,10 @@
+ 42444: prevent NPE
+ Patch provided by Nils Hammar (funkman)
+
+
42361: Handle multi-part forms when saving requests during
FORM authentication process. Patch provided by Peter Runge. (markt)
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r539907 - in /tomcat/tc6.0.x/trunk: java/org/apache/catalina/realm/JNDIRealm.java webapps/docs/changelog.xml
Author: funkman
Date: Sun May 20 11:33:16 2007
New Revision: 539907
URL: http://svn.apache.org/viewvc?view=rev&rev=539907
Log:
JNDIRealm does not catch NullPointerException for Sun's LDAP provider
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JNDIRealm.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JNDIRealm.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JNDIRealm.java?view=diff&rev=539907&r1=539906&r2=539907
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JNDIRealm.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/JNDIRealm.java Sun May
20 11:33:16 2007
@@ -808,6 +808,23 @@
// Authenticate the specified username if possible
principal = authenticate(context, username, credentials);
+} catch (NullPointerException e) {
+/* BZ 42449 - Kludge Sun's LDAP provider
+ with broken SSL
+*/
+// log the exception so we know it's there.
+containerLog.warn(sm.getString("jndiRealm.exception"), e);
+
+// close the connection so we know it will be reopened.
+if (context != null)
+close(context);
+
+// open a new directory context.
+context = open();
+
+// Try the authentication again.
+principal = authenticate(context, username, credentials);
+
} catch (CommunicationException e) {
// log the exception so we know it's there.
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?view=diff&rev=539907&r1=539906&r2=539907
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sun May 20 11:33:16 2007
@@ -18,7 +18,12 @@
- 42444: prevent NPE
+ 42449:
+ JNDIRealm does not catch NullPointerException for Sun's
+ LDAP provider (See bug for details) (funkman)
+
+
+ 42444: prevent NPE for AccessLogValve
Patch provided by Nils Hammar (funkman)
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r543460 - in /tomcat/site/trunk: docs/faq/connectors.html docs/faq/printer/connectors.html xdocs-faq/connectors.xml
Author: funkman Date: Fri Jun 1 04:28:14 2007 New Revision: 543460 URL: http://svn.apache.org/viewvc?view=rev&rev=543460 Log: jk2 update and other legacy cleanup Modified: tomcat/site/trunk/docs/faq/connectors.html tomcat/site/trunk/docs/faq/printer/connectors.html tomcat/site/trunk/xdocs-faq/connectors.xml Modified: tomcat/site/trunk/docs/faq/connectors.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/faq/connectors.html?view=diff&rev=543460&r1=543459&r2=543460 == --- tomcat/site/trunk/docs/faq/connectors.html (original) +++ tomcat/site/trunk/docs/faq/connectors.html Fri Jun 1 04:28:14 2007 @@ -13,7 +13,11 @@ -http://tomcat.apache.org/connectors-doc/";>JK docs. +Here is a link to the http://tomcat.apache.org/connectors-doc/";>JK Connectors. It contains +more configuration and installation information. + + +Please note, jk2 is no longer supported. Please use mod_jk instead. Questions @@ -38,14 +42,6 @@ At boot, is order of start up (Apache vs Tomcat) important? - - - JK2 doesn't seem to be using my settings in my - workers2.properties file - such as creating the shm file or mapping the URIs listed to Tomcat, - what's wrong? - - @@ -111,12 +107,14 @@ The alternative is mod_jk or mod_proxy_ajp. -mod_jk is great and should be used for production. It is getting -fixes as needed (which is now rare). +mod_jk is great and should be used for production. +It is still under active +development and also works for the apache 2.X series for cases where +you do not want to use mod_proxy_ajp. mod_proxy. A cheap way to proxy without the hassles of configuring JK. This solution lacks sticky session load balancing. If you don't -need some of the features of jk, jk2 - this is a very simple +need some of the features of jk - this is a very simple alternative. mod_proxy_ajp. With apache 2.2, mod_proxy was rewritten to support @@ -137,7 +135,7 @@ reasons why it should not be done too. Needless to say, everyone will disagree with the opinions here. -With the upcoming performance of Tomcat 5, performance reasons +With the performance of Tomcat 5 and 6, performance reasons become harder to justify. So here are the issues to discuss in integrating vs not. @@ -202,11 +200,6 @@ packets, invalid requests from invalid IP's, Apache does a better job at dropping these error conditions than JVM based program. (YMMV) - -http://marc.theaimsgroup.com/?l=tomcat-user&m=104874913017036&w=2";>Here -is a great response from Craig R. McClanahan. If you have free time, -read emails by him in any of the list archives. You'll learn a lot. - @@ -221,30 +214,6 @@ - - JK2 doesn't seem to be using my settings in my - workers2.properties file - such as creating the shm file or mapping the URIs listed to Tomcat, - what's wrong? - - - -JK2 is not finding your workers2.properties file. -Specify it's location in your httpd.conf file by adding: - - - -JkSet config.file /full/system/path/to/workers2.properties - - -http://marc.theaimsgroup.com/?t=10578489323&r=1&w=2";> -Thread which spawned this question. - -Please note the JK2 is unsupported. - - - - Is there any way to control the content of automatically generated mod_jk.conf-auto? I need my own specific commands added @@ -303,7 +272,7 @@ -In tomcat 5 - does your connector have Connector declaration have +Since tomcat 5 - does your connector have Connector declaration have URIEncoding="UTF-8". For example: <Connector port="80" Modified: tomcat/site/trunk/docs/faq/printer/connectors.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/faq/printer/connectors.html?view=diff&rev=543460&r1=543459&r2=543460 == --- tomcat/site/trunk/docs/faq/printer/connectors.html (original) +++ tomcat/site/trunk/docs/faq/printer/connectors.html Fri Jun 1 04:28:14 2007 @@ -12,7 +12,11 @@ -http://tomcat.apache.org/connectors-doc/";>JK docs. +Here is a link to the http://tomcat.apache.org/connectors-doc/";>JK Connectors. It contains +more configuration and installation information. + + +Please note, jk2 is no longer supported. Please use mod_jk instead. Questions @@ -37,14 +41,6 @@ At boot, is order of start up (Apache vs Tomcat) important?
svn commit: r568345 - /tomcat/tc6.0.x/trunk/webapps/docs/config/context.xml
Author: funkman Date: Tue Aug 21 17:59:43 2007 New Revision: 568345 URL: http://svn.apache.org/viewvc?rev=568345&view=rev Log: BZ - 20068 Patch by Wendy Smoak wsmoak at apache org Modified: tomcat/tc6.0.x/trunk/webapps/docs/config/context.xml Modified: tomcat/tc6.0.x/trunk/webapps/docs/config/context.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/config/context.xml?rev=568345&r1=568344&r2=568345&view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/config/context.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/config/context.xml Tue Aug 21 17:59:43 2007 @@ -75,7 +75,7 @@ host in individual files (with a ".xml" extension) in the $CATALINA_HOME/conf/[enginename]/[hostname]/ directory. - The name of the file (less the .xml) extension will be used as the + The name of the file (less the .xml extension) will be used as the context path. Multi-level context paths may be defined using #, e.g. context#path.xml. The default web application may be defined by using a file called ROOT.xml. @@ -95,9 +95,9 @@ The description below uses the variable name $CATALINA_HOME -to refer to the directory into which you have installed Tomcat 5, +to refer to the directory into which you have installed Tomcat 6, and is the base directory against which most relative paths are -resolved. However, if you have configured Tomcat 5 for multiple +resolved. However, if you have configured Tomcat 6 for multiple instances by setting a CATALINA_BASE directory, you should use $CATALINA_BASE instead of $CATALINA_HOME for each of these references. @@ -607,7 +607,9 @@ nesting a Listener element inside this element. The class name you specify must implement the org.apache.catalina.LifecycleListener interface, and -it will be notified about the occurrence of the coresponding +the class must be packaged in a jar and placed in the +$CATALINA_HOME/lib directory. +It will be notified about the occurrence of the corresponding lifecycle events. Configuration of such a listener looks like this: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r568346 - /tomcat/trunk/webapps/docs/config/context.xml
Author: funkman Date: Tue Aug 21 18:02:01 2007 New Revision: 568346 URL: http://svn.apache.org/viewvc?rev=568346&view=rev Log: BZ - 20068 Patch by Wendy Smoak wsmoak at apache org Modified: tomcat/trunk/webapps/docs/config/context.xml Modified: tomcat/trunk/webapps/docs/config/context.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/context.xml?rev=568346&r1=568345&r2=568346&view=diff == --- tomcat/trunk/webapps/docs/config/context.xml (original) +++ tomcat/trunk/webapps/docs/config/context.xml Tue Aug 21 18:02:01 2007 @@ -1,4 +1,20 @@ + ]> @@ -59,7 +75,7 @@ host in individual files (with a ".xml" extension) in the $CATALINA_HOME/conf/[enginename]/[hostname]/ directory. - The name of the file (less the .xml) extension will be used as the + The name of the file (less the .xml extension) will be used as the context path. Multi-level context paths may be defined using #, e.g. context#path.xml. The default web application may be defined by using a file called ROOT.xml. @@ -79,9 +95,9 @@ The description below uses the variable name $CATALINA_HOME -to refer to the directory into which you have installed Tomcat 5, +to refer to the directory into which you have installed Tomcat 6, and is the base directory against which most relative paths are -resolved. However, if you have configured Tomcat 5 for multiple +resolved. However, if you have configured Tomcat 6 for multiple instances by setting a CATALINA_BASE directory, you should use $CATALINA_BASE instead of $CATALINA_HOME for each of these references. @@ -591,7 +607,9 @@ nesting a Listener element inside this element. The class name you specify must implement the org.apache.catalina.LifecycleListener interface, and -it will be notified about the occurrence of the coresponding +the class must be packaged in a jar and placed in the +$CATALINA_HOME/lib directory. +It will be notified about the occurrence of the corresponding lifecycle events. Configuration of such a listener looks like this: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r568353 - /tomcat/tc6.0.x/trunk/webapps/ROOT/index.html
Author: funkman Date: Tue Aug 21 18:19:22 2007 New Revision: 568353 URL: http://svn.apache.org/viewvc?rev=568353&view=rev Log: 42569 Small grammar correction on default Tomcat index.html page Modified: tomcat/tc6.0.x/trunk/webapps/ROOT/index.html Modified: tomcat/tc6.0.x/trunk/webapps/ROOT/index.html URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/ROOT/index.html?rev=568353&r1=568352&r2=568353&view=diff == --- tomcat/tc6.0.x/trunk/webapps/ROOT/index.html (original) +++ tomcat/tc6.0.x/trunk/webapps/ROOT/index.html Tue Aug 21 18:19:22 2007 @@ -182,7 +182,7 @@ As you may have guessed by now, this is the default Tomcat home page. It can be found on the local filesystem at: $CATALINA_HOME/webapps/ROOT/index.html - where "$CATALINA_HOME" is the root of the Tomcat installation directory. If you're seeing this page, and you don't think you should be, then either you're either a user who has arrived at new installation of Tomcat, or you're an administrator who hasn't got his/her setup quite right. Providing the latter is the case, please refer to the Tomcat Documentation for more detailed setup and administration information than is found in the INSTALL file. + where "$CATALINA_HOME" is the root of the Tomcat installation directory. If you're seeing this page, and you don't think you should be, then you're either a user who has arrived at new installation of Tomcat, or you're an administrator who hasn't got his/her setup quite right. Providing the latter is the case, please refer to the Tomcat Documentation for more detailed setup and administration information than is found in the INSTALL file. NOTE: For security reasons, using the administration webapp is restricted to users with role "admin". The manager webapp - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r568355 - /tomcat/trunk/webapps/ROOT/index.html
Author: funkman Date: Tue Aug 21 18:20:17 2007 New Revision: 568355 URL: http://svn.apache.org/viewvc?rev=568355&view=rev Log: 42569 Small grammar correction on default Tomcat index.html page Modified: tomcat/trunk/webapps/ROOT/index.html Modified: tomcat/trunk/webapps/ROOT/index.html URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/ROOT/index.html?rev=568355&r1=568354&r2=568355&view=diff == --- tomcat/trunk/webapps/ROOT/index.html (original) +++ tomcat/trunk/webapps/ROOT/index.html Tue Aug 21 18:20:17 2007 @@ -166,7 +166,7 @@ As you may have guessed by now, this is the default Tomcat home page. It can be found on the local filesystem at: $CATALINA_HOME/webapps/ROOT/index.html - where "$CATALINA_HOME" is the root of the Tomcat installation directory. If you're seeing this page, and you don't think you should be, then either you're either a user who has arrived at new installation of Tomcat, or you're an administrator who hasn't got his/her setup quite right. Providing the latter is the case, please refer to the Tomcat Documentation for more detailed setup and administration information than is found in the INSTALL file. + where "$CATALINA_HOME" is the root of the Tomcat installation directory. If you're seeing this page, and you don't think you should be, then you're either a user who has arrived at new installation of Tomcat, or you're an administrator who hasn't got his/her setup quite right. Providing the latter is the case, please refer to the Tomcat Documentation for more detailed setup and administration information than is found in the INSTALL file. NOTE: For security reasons, using the administration webapp is restricted to users with role "admin". The manager webapp - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r568357 - /tomcat/trunk/bin/catalina.sh
Author: funkman Date: Tue Aug 21 18:25:09 2007 New Revision: 568357 URL: http://svn.apache.org/viewvc?rev=568357&view=rev Log: 43155 remove commons-logging-api.jar since it ain't there Modified: tomcat/trunk/bin/catalina.sh Modified: tomcat/trunk/bin/catalina.sh URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/catalina.sh?rev=568357&r1=568356&r2=568357&view=diff == --- tomcat/trunk/bin/catalina.sh (original) +++ tomcat/trunk/bin/catalina.sh Tue Aug 21 18:25:09 2007 @@ -116,7 +116,7 @@ # 2. owned by the PRIMARY group of the user # this will not work if the user belongs in secondary groups BASEDIR="$CATALINA_HOME" - . "$CATALINA_HOME"/bin/setclasspath.sh + . "$CATALINA_HOME"/bin/setclasspath.sh else if [ -r "$CATALINA_HOME"/bin/setclasspath.sh ]; then BASEDIR="$CATALINA_HOME" @@ -132,7 +132,7 @@ if [ -n "$JSSE_HOME" ]; then CLASSPATH="$CLASSPATH":"$JSSE_HOME"/lib/jcert.jar:"$JSSE_HOME"/lib/jnet.jar:"$JSSE_HOME"/lib/jsse.jar fi -CLASSPATH="$CLASSPATH":"$CATALINA_HOME"/bin/bootstrap.jar:"$CATALINA_HOME"/bin/commons-logging-api.jar +CLASSPATH="$CLASSPATH":"$CATALINA_HOME"/bin/bootstrap.jar if [ -z "$CATALINA_BASE" ] ; then CATALINA_BASE="$CATALINA_HOME" - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r568359 - /tomcat/tc6.0.x/trunk/bin/catalina.sh
Author: funkman Date: Tue Aug 21 18:26:43 2007 New Revision: 568359 URL: http://svn.apache.org/viewvc?rev=568359&view=rev Log: 43155 remove commons-logging-api.jar since it ain't there Modified: tomcat/tc6.0.x/trunk/bin/catalina.sh Modified: tomcat/tc6.0.x/trunk/bin/catalina.sh URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/bin/catalina.sh?rev=568359&r1=568358&r2=568359&view=diff == --- tomcat/tc6.0.x/trunk/bin/catalina.sh (original) +++ tomcat/tc6.0.x/trunk/bin/catalina.sh Tue Aug 21 18:26:43 2007 @@ -148,7 +148,7 @@ if [ -n "$JSSE_HOME" ]; then CLASSPATH="$CLASSPATH":"$JSSE_HOME"/lib/jcert.jar:"$JSSE_HOME"/lib/jnet.jar:"$JSSE_HOME"/lib/jsse.jar fi -CLASSPATH="$CLASSPATH":"$CATALINA_HOME"/bin/bootstrap.jar:"$CATALINA_HOME"/bin/commons-logging-api.jar +CLASSPATH="$CLASSPATH":"$CATALINA_HOME"/bin/bootstrap.jar if [ -z "$CATALINA_BASE" ] ; then CATALINA_BASE="$CATALINA_HOME" - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r568366 - /tomcat/tc6.0.x/trunk/webapps/docs/config/globalresources.xml
Author: funkman Date: Tue Aug 21 18:39:17 2007 New Revision: 568366 URL: http://svn.apache.org/viewvc?rev=568366&view=rev Log: 42466 globalresources.xml has a wrong link patch from Takayoshi Kimura takayoshi at gmails dt com Modified: tomcat/tc6.0.x/trunk/webapps/docs/config/globalresources.xml Modified: tomcat/tc6.0.x/trunk/webapps/docs/config/globalresources.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/config/globalresources.xml?rev=568366&r1=568365&r2=568366&view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/config/globalresources.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/config/globalresources.xml Tue Aug 21 18:39:17 2007 @@ -221,7 +221,7 @@ per-web-application contexts. Here is an example of making a custom factory available to all applications in the server, based on the example definition in the - + JNDI Resource HOW-TO: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r568367 - /tomcat/trunk/webapps/docs/config/globalresources.xml
Author: funkman Date: Tue Aug 21 18:42:35 2007 New Revision: 568367 URL: http://svn.apache.org/viewvc?rev=568367&view=rev Log: 42466 globalresources.xml has a wrong link patch from Takayoshi Kimura takayoshi at gmails dt com Modified: tomcat/trunk/webapps/docs/config/globalresources.xml Modified: tomcat/trunk/webapps/docs/config/globalresources.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/globalresources.xml?rev=568367&r1=568366&r2=568367&view=diff == --- tomcat/trunk/webapps/docs/config/globalresources.xml (original) +++ tomcat/trunk/webapps/docs/config/globalresources.xml Tue Aug 21 18:42:35 2007 @@ -205,7 +205,7 @@ per-web-application contexts. Here is an example of making a custom factory available to all applications in the server, based on the example definition in the - + JNDI Resource HOW-TO: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [VOTE] Send trunk to the sandbox
> Remy Maucherat wrote: > Yeah right. So to summarize, we have 3 committers who are happy campers > (2 of them which don't contribute much, as far as I know), and the rest > of the committers are either do not care or are unhappy. Most also want > a change in the development process, and as long as there's agreement on > that and it respects the ASF principles, we should be able to do that. > Bah. In neither angry nor happy. My impression was trunk was going to be wacky new stuff which broke existing api's and configurations with 6.0. Much like 5.0 --> 5.5. In reality that didn't happen - we just got some comet changes. (I'm not saying this is good or bad - it's just and observation) Now we are in a technical debate between comet implementation between Remy and Filips "designs". This has seemed to migrate into a personal attack in a subtle manner. Such is life when coding. Disagreements occur, feeling are hurt and email is the worst method of communicating an emotional topic since words are amplified. (Sometime on purpose, other times by accident). My hope is this too shall pass and all is good again. Personally - I am not very clueful on comet other than the basics. I'd love to get the clue - but I can't find and work related projects to justify the time. That leaves me out in the cold due to this conversation. I feel any vote by me would be a bad vote because of my ignorance on the topic. It seems others are in the same situation. All that being said - I'd love to see Remy and Filip agree on comet and remove trunk. It would be a shame to see either leave due to these disputes. -Tim (Away for training in Boston this week (Kendall Square)) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r575332 - in /tomcat/tc6.0.x/trunk: java/org/apache/naming/resources/FileDirContext.java webapps/docs/changelog.xml
Author: funkman
Date: Thu Sep 13 08:19:59 2007
New Revision: 575332
URL: http://svn.apache.org/viewvc?rev=575332&view=rev
Log:
Allow for Aliases at the resource level.
This is to prevent situations of relying on symlinks, or Filters
while still make outside directories appear as part of the webapp.
(A common feature request seen on the user list)
Example usage:
If the feature is NOT used - there is no additional overhead.
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/FileDirContext.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/FileDirContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/FileDirContext.java?rev=575332&r1=575331&r2=575332&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/FileDirContext.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/FileDirContext.java
Thu Sep 13 08:19:59 2007
@@ -108,6 +108,17 @@
protected boolean allowLinking = false;
+/**
+ * Aliases
+ */
+protected String aliases;
+
+
+/**
+ * Aliases in decoded form.
+ */
+protected Alias[] pathAliases;
+
// - Properties
@@ -123,22 +134,22 @@
*/
public void setDocBase(String docBase) {
-// Validate the format of the proposed document root
-if (docBase == null)
-throw new IllegalArgumentException
-(sm.getString("resources.null"));
+// Validate the format of the proposed document root
+if (docBase == null)
+throw new IllegalArgumentException
+(sm.getString("resources.null"));
-// Calculate a File object referencing this document base directory
-base = new File(docBase);
+// Calculate a File object referencing this document base directory
+base = new File(docBase);
try {
base = base.getCanonicalFile();
} catch (IOException e) {
// Ignore
}
-// Validate that the document base is an existing directory
-if (!base.exists() || !base.isDirectory() || !base.canRead())
-throw new IllegalArgumentException
+// Validate that the document base is an existing directory
+if (!base.exists() || !base.isDirectory() || !base.canRead())
+throw new IllegalArgumentException
(sm.getString("fileResources.base", docBase));
this.absoluteBase = base.getAbsolutePath();
super.setDocBase(docBase);
@@ -177,18 +188,69 @@
return allowLinking;
}
-
-// - Public Methods
+/**
+ * Get the alias string in use.
+ */
+public String getAliases(String aliases) {
+return aliases;
+}
/**
- * Release any resources allocated for this directory context.
+ * Set files system aliases. Aliases are of the form
+ * prefix=path,prefix2=path2
+ * For example:
+ *
+ * /images/=/tmp/images/,
+ * /pdf/=/usr/local/data/pdfs/
+ *
*/
-public void release() {
-super.release();
+public void setAliases(String aliases) {
+this.aliases = aliases;
+
+pathAliases = null;
+if (this.aliases!=null) {
+this.aliases = this.aliases.trim();
+}
+if (this.aliases==null||this.aliases.length()==0) {
+this.aliases=null;
+return;
+}
+
+String[] split1 = this.aliases.split(",");
+ArrayList aliasList = new ArrayList();
+for (int i=0; split1!=null && i0 && kvp[1].length()>0) {
+Alias alias = new Alias();
+alias.prefix=kvp[0];
+alias.basePath= new File(kvp[1]);
+alias.absPath=alias.basePath.getAbsolutePath();
+aliasList.add(alias);
+}
+}
+}
+
+if (aliasList.size()>0) {
+pathAliases = new Alias[aliasList.size()];
+for (int i=0; i= 0)
-normalized = normalized.replace('\\', '/');
-if (!normalized.startsWith("/"))
-normalized = "/" + normalized;
-
-// Resolve occurrences of "//" in the normalized path
-while (true) {
-int index = normalized.indexOf("//");
-if (index < 0)
-break;
-normalized = normalized.substring(0, index) +
-normalized.substring(index + 1);
-}
-
-// Resolve occurrences of "/./" in the normalized path
-while (true) {
-int index = normalized.indexOf("/./");
-if (index < 0)
-break;
-
svn commit: r575385 - /tomcat/tc6.0.x/trunk/webapps/docs/deployer-howto.xml
Author: funkman Date: Thu Sep 13 10:57:17 2007 New Revision: 575385 URL: http://svn.apache.org/viewvc?rev=575385&view=rev Log: BZ 43057 - Trivail doc fix Modified: tomcat/tc6.0.x/trunk/webapps/docs/deployer-howto.xml Modified: tomcat/tc6.0.x/trunk/webapps/docs/deployer-howto.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/deployer-howto.xml?rev=575385&r1=575384&r2=575385&view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/deployer-howto.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/deployer-howto.xml Thu Sep 13 10:57:17 2007 @@ -121,7 +121,7 @@ Context Descriptors not only help Tomcat to know how to configure -Contexts but other tools such as the Tomcat Manager and TDC often use +Contexts but other tools such as the Tomcat Manager and TCD often use these Context Descriptors to perform their roles properly. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r575390 - /tomcat/tc6.0.x/trunk/dist.xml
Author: funkman Date: Thu Sep 13 11:16:23 2007 New Revision: 575390 URL: http://svn.apache.org/viewvc?rev=575390&view=rev Log: Bug 42831 Permissions aren't set correctly on $CATALINA_HOME/bin/version.sh Modified: tomcat/tc6.0.x/trunk/dist.xml Modified: tomcat/tc6.0.x/trunk/dist.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/dist.xml?rev=575390&r1=575389&r2=575390&view=diff == --- tomcat/tc6.0.x/trunk/dist.xml (original) +++ tomcat/tc6.0.x/trunk/dist.xml Thu Sep 13 11:16:23 2007 @@ -573,6 +573,7 @@ + @@ -602,6 +603,7 @@ + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r575945 - in /tomcat/tc6.0.x/trunk: java/org/apache/naming/resources/FileDirContext.java webapps/docs/changelog.xml
Author: funkman
Date: Sat Sep 15 10:42:01 2007
New Revision: 575945
URL: http://svn.apache.org/viewvc?rev=575945&view=rev
Log:
undo 575332 (alias support) due to 2 vetos
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/FileDirContext.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/FileDirContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/FileDirContext.java?rev=575945&r1=575944&r2=575945&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/FileDirContext.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/FileDirContext.java
Sat Sep 15 10:42:01 2007
@@ -108,17 +108,6 @@
protected boolean allowLinking = false;
-/**
- * Aliases
- */
-protected String aliases;
-
-
-/**
- * Aliases in decoded form.
- */
-protected Alias[] pathAliases;
-
// - Properties
@@ -134,22 +123,22 @@
*/
public void setDocBase(String docBase) {
-// Validate the format of the proposed document root
-if (docBase == null)
-throw new IllegalArgumentException
-(sm.getString("resources.null"));
+// Validate the format of the proposed document root
+if (docBase == null)
+throw new IllegalArgumentException
+(sm.getString("resources.null"));
-// Calculate a File object referencing this document base directory
-base = new File(docBase);
+// Calculate a File object referencing this document base directory
+base = new File(docBase);
try {
base = base.getCanonicalFile();
} catch (IOException e) {
// Ignore
}
-// Validate that the document base is an existing directory
-if (!base.exists() || !base.isDirectory() || !base.canRead())
-throw new IllegalArgumentException
+// Validate that the document base is an existing directory
+if (!base.exists() || !base.isDirectory() || !base.canRead())
+throw new IllegalArgumentException
(sm.getString("fileResources.base", docBase));
this.absoluteBase = base.getAbsolutePath();
super.setDocBase(docBase);
@@ -188,69 +177,18 @@
return allowLinking;
}
-/**
- * Get the alias string in use.
- */
-public String getAliases(String aliases) {
-return aliases;
-}
+
+// - Public Methods
/**
- * Set files system aliases. Aliases are of the form
- * prefix=path,prefix2=path2
- * For example:
- *
- * /images/=/tmp/images/,
- * /pdf/=/usr/local/data/pdfs/
- *
+ * Release any resources allocated for this directory context.
*/
-public void setAliases(String aliases) {
-this.aliases = aliases;
-
-pathAliases = null;
-if (this.aliases!=null) {
-this.aliases = this.aliases.trim();
-}
-if (this.aliases==null||this.aliases.length()==0) {
-this.aliases=null;
-return;
-}
-
-String[] split1 = this.aliases.split(",");
-ArrayList aliasList = new ArrayList();
-for (int i=0; split1!=null && i0 && kvp[1].length()>0) {
-Alias alias = new Alias();
-alias.prefix=kvp[0];
-alias.basePath= new File(kvp[1]);
-alias.absPath=alias.basePath.getAbsolutePath();
-aliasList.add(alias);
-}
-}
-}
-
-if (aliasList.size()>0) {
-pathAliases = new Alias[aliasList.size()];
-for (int i=0; i= 0)
-normalized = normalized.replace('\\', '/');
-if (!normalized.startsWith("/"))
-normalized = "/" + normalized;
-
-// Resolve occurrences of "//" in the normalized path
-while (true) {
-int index = normalized.indexOf("//");
-if (index < 0)
-break;
-normalized = normalized.substring(0, index) +
-normalized.substring(index + 1);
-}
-
-// Resolve occurrences of "/./" in the normalized path
-while (true) {
-int index = normalized.indexOf("/./");
-if (index < 0)
-break;
-normalized = normalized.substring(0, index) +
-normalized.substring(index + 2);
-}
+String normalized = path;
-// Resolve occurrences of "/../" in the normalized path
-while (true) {
-int ind
svn commit: r578466 - in /tomcat/tc6.0.x/trunk: java/org/apache/el/lang/FunctionMapperImpl.java webapps/docs/changelog.xml
Author: funkman
Date: Sat Sep 22 11:05:54 2007
New Revision: 578466
URL: http://svn.apache.org/viewvc?rev=578466&view=rev
Log:
bug 41797: CNFE/NPE thrown from function mapper when externalizing
Patch by Tuomas Kiviaho- tuomas.kiviahos at ikis fi
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/el/lang/FunctionMapperImpl.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/java/org/apache/el/lang/FunctionMapperImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/el/lang/FunctionMapperImpl.java?rev=578466&r1=578465&r2=578466&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/el/lang/FunctionMapperImpl.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/el/lang/FunctionMapperImpl.java Sat
Sep 22 11:05:54 2007
@@ -144,7 +144,7 @@
public Method getMethod() {
if (this.m == null) {
try {
-Class t = Class.forName(this.owner);
+Class t = ReflectionUtil.forName(this.owner);
Class[] p = ReflectionUtil.toTypeArray(this.types);
this.m = t.getMethod(this.name, p);
} catch (Exception e) {
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=578466&r1=578465&r2=578466&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sat Sep 22 11:05:54 2007
@@ -98,6 +98,10 @@
43338: Support '*' servlet-name mapping at filter-mapping.
Patch provided by Keiichi Fujino. (pero)
+
+41797: CNFE/NPE thrown from function mapper when
externalizing
+Patch by Tuomas Kiviaho- tuomas.kiviahos at ikis fi
+
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r578610 - /tomcat/tc6.0.x/trunk/java/org/apache/el/lang/FunctionMapperImpl.java
Author: funkman
Date: Sun Sep 23 16:33:56 2007
New Revision: 578610
URL: http://svn.apache.org/viewvc?rev=578610&view=rev
Log:
bug 41797: CNFE/NPE thrown from function mapper when externalizing
Patch by Tuomas Kiviaho- tuomas.kiviahos at ikis fi
(submit part2 of the patch as seem in comment #3)
(Format police - help!!! I did my best)
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/el/lang/FunctionMapperImpl.java
Modified: tomcat/tc6.0.x/trunk/java/org/apache/el/lang/FunctionMapperImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/el/lang/FunctionMapperImpl.java?rev=578610&r1=578609&r2=578610&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/el/lang/FunctionMapperImpl.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/el/lang/FunctionMapperImpl.java Sun
Sep 23 16:33:56 2007
@@ -120,9 +120,16 @@
public void writeExternal(ObjectOutput out) throws IOException {
out.writeUTF((this.prefix != null) ? this.prefix : "");
out.writeUTF(this.localName);
-out.writeUTF(this.m.getDeclaringClass().getName());
-out.writeUTF(this.m.getName());
-
out.writeObject(ReflectionUtil.toTypeNameArray(this.m.getParameterTypes()));
+out.writeUTF((this.owner != null) ?
+ this.owner :
+ this.m.getDeclaringClass().getName());
+out.writeUTF((this.name != null) ?
+ this.name :
+ this.m.getName());
+out.writeObject((this.types != null) ?
+ this.types :
+
ReflectionUtil.toTypeNameArray(this.m.getParameterTypes()));
+
}
/*
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r578613 - in /tomcat/tc6.0.x/trunk: java/org/apache/catalina/core/StandardContext.java webapps/docs/changelog.xml
Author: funkman
Date: Sun Sep 23 16:53:05 2007
New Revision: 578613
URL: http://svn.apache.org/viewvc?rev=578613&view=rev
Log:
bug 43453: ClassCastException at
org.apache.catalina.core.StandardContext.findStatusPage(int)
In reality - I don't see anywhere that calls findStatusPage(). Is there a
chance (in the future)
to drop this method from StandardContext as well as the Context interface?
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java?rev=578613&r1=578612&r2=578613&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java Sun
Sep 23 16:53:05 2007
@@ -2938,7 +2938,11 @@
*/
public String findStatusPage(int status) {
-return ((String) statusPages.get(new Integer(status)));
+ErrorPage errorPage = (ErrorPage)statusPages.get(new Integer(status));
+if (errorPage!=null) {
+return errorPage.getLocation();
+}
+return null;
}
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=578613&r1=578612&r2=578613&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sun Sep 23 16:53:05 2007
@@ -100,7 +100,12 @@
41797: CNFE/NPE thrown from function mapper when
externalizing
-Patch by Tuomas Kiviaho- tuomas.kiviahos at ikis fi
+Patch by Tuomas Kiviaho- tuomas.kiviahos at ikis fi (funkman)
+
+
+43453: ClassCastException at
+org.apache.catalina.core.StandardContext.findStatusPage(int)
+ (funkman)
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r582924 - /tomcat/tc6.0.x/trunk/STATUS
Author: funkman Date: Mon Oct 8 11:18:14 2007 New Revision: 582924 URL: http://svn.apache.org/viewvc?rev=582924&view=rev Log: +1 proposals abstained from "Call StopAwait at StandardServer.stop as port==-1" since it was missing the patch in the status file Modified: tomcat/tc6.0.x/trunk/STATUS Modified: tomcat/tc6.0.x/trunk/STATUS URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS?rev=582924&r1=582923&r2=582924&view=diff == --- tomcat/tc6.0.x/trunk/STATUS (original) +++ tomcat/tc6.0.x/trunk/STATUS Mon Oct 8 11:18:14 2007 @@ -27,22 +27,22 @@ * Fix explicit flush before response commit in the org.apache.jk AJP connector. http://svn.apache.org/viewvc?view=rev&revision=580815 - +1: remm, pero + +1: remm, pero, funkman -1: * 43479: Memory leak cleaning up sendfile connections (submitted by the bug reporter) http://issues.apache.org/bugzilla/attachment.cgi?id=20883 - +1: remm, pero + +1: remm, pero, funkman -1: * 42925: No timeout for sendfile http://issues.apache.org/bugzilla/attachment.cgi?id=20930 - +1: remm, pero + +1: remm, pero, funkman -1: * Use newer eclipse jdt - old location is gone (reported by Jason Britian via email) update to jdt.loc=http://sunsite.informatik.rwth-aachen.de/eclipse/downloads/drops/R-3.3.1-200709211145/eclipse-JDT-3.3.1.zip - +1: pero + +1: pero, funkman -1: * Call StopAwait at StandardServer.stop as port==-1 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r584774 - /tomcat/tc6.0.x/trunk/STATUS
Author: funkman Date: Mon Oct 15 05:41:09 2007 New Revision: 584774 URL: http://svn.apache.org/viewvc?rev=584774&view=rev Log: webdav vote Modified: tomcat/tc6.0.x/trunk/STATUS Modified: tomcat/tc6.0.x/trunk/STATUS URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS?rev=584774&r1=584773&r2=584774&view=diff == --- tomcat/tc6.0.x/trunk/STATUS (original) +++ tomcat/tc6.0.x/trunk/STATUS Mon Oct 15 05:41:09 2007 @@ -88,5 +88,5 @@ * Fix important vulnerability when webdav is enabled for write Patch: http://marc.info/?l=tomcat-dev&m=119245116910632&w=2 - +1: markt + +1: markt,funkman -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r585189 - /tomcat/tc6.0.x/trunk/STATUS
Author: funkman
Date: Tue Oct 16 09:27:32 2007
New Revision: 585189
URL: http://svn.apache.org/viewvc?rev=585189&view=rev
Log:
+1 a few patches
Modified:
tomcat/tc6.0.x/trunk/STATUS
Modified: tomcat/tc6.0.x/trunk/STATUS
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS?rev=585189&r1=585188&r2=585189&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS (original)
+++ tomcat/tc6.0.x/trunk/STATUS Tue Oct 16 09:27:32 2007
@@ -34,12 +34,12 @@
* Add missing mbean descriptor
http://people.apache.org/~fhanik/patches/loader-mbean.patch
- +1: fhanik
+ +1: fhanik,funkman
-1:
* Proposed solution to http://issues.apache.org/bugzilla/show_bug.cgi?id=42693
Patch: http://issues.apache.org/bugzilla/attachment.cgi?id=20940
- +1: fhanik
+ +1: fhanik,funkman
-1:
* Fix important vulnerability when webdav is enabled for write
@@ -49,10 +49,10 @@
* Fix for JDT update: update jdt.jar in build.properties.default to:
jdt.jar=${jdt.lib}/org.eclipse.jdt.core_3.3.1.v_780_R33x.jar
- +1: remm, fhanik
+ +1: remm, fhanik,funkman
-1:
* Fix property setter for keystore type
http://issues.apache.org/bugzilla/show_bug.cgi?id=43634
- +1: fhanik
- -1:
\ No newline at end of file
+ +1: fhanik,funkman
+ -1:
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r586571 - /tomcat/tc6.0.x/trunk/STATUS
Author: funkman Date: Fri Oct 19 11:30:30 2007 New Revision: 586571 URL: http://svn.apache.org/viewvc?rev=586571&view=rev Log: +1 Modified: tomcat/tc6.0.x/trunk/STATUS Modified: tomcat/tc6.0.x/trunk/STATUS URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS?rev=586571&r1=586570&r2=586571&view=diff == --- tomcat/tc6.0.x/trunk/STATUS (original) +++ tomcat/tc6.0.x/trunk/STATUS Fri Oct 19 11:30:30 2007 @@ -29,7 +29,7 @@ * Connector is no longer an exception case. Any new component can still use setProperty and return a boolean * to accept or reject the property http://people.apache.org/~fhanik/patches/digester-attribute-warnings.patch - +1: fhanik, yoavs + +1: fhanik, yoavs,funkman -1: * IcedTea support. Upcoming Linux distributions will package a (working) open source JRE, @@ -70,11 +70,11 @@ escaping. This patch also tidies up ServerCookie to make it clearer what applies to which particular cookie spec. http://people.apache.org/~markt/patches/2007-10-18-cookies.patch - +1: markt, fhanik + +1: markt, fhanik,funkman -1: * Fix MD5 files for distribution http://issues.apache.org/bugzilla/attachment.cgi?id=21009&action=view - +1: fhanik + +1: fhanik,funkman -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r588095 - /tomcat/tc6.0.x/trunk/STATUS
Author: funkman
Date: Wed Oct 24 17:46:02 2007
New Revision: 588095
URL: http://svn.apache.org/viewvc?rev=588095&view=rev
Log:
some votes
Modified:
tomcat/tc6.0.x/trunk/STATUS
Modified: tomcat/tc6.0.x/trunk/STATUS
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS?rev=588095&r1=588094&r2=588095&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS (original)
+++ tomcat/tc6.0.x/trunk/STATUS Wed Oct 24 17:46:02 2007
@@ -29,26 +29,26 @@
Fixes the 100 Continue response, that got reversed through byte buffer
manipulation
last patch before tag, promise :)
http://people.apache.org/~fhanik/patches/bz-43653-complimentary.patch
- +1: fhanik
+ +1: fhanik, funkman
-1:
* Fix possible DoS condition for the experimental NIO/AJP module (reported by
William Leung via email)
http://issues.apache.org/bugzilla/show_bug.cgi?id=43621
- +1: billbarker,fhanik
+ +1: billbarker,fhanik,funkman
-1:
* Fix problem on a Forward when the outer most wrapper isn't a
HttpServletRequest/ResponseWrapper.
http://issues.apache.org/bugzilla/show_bug.cgi?id=43668
- +1: billbarker, remm
+ +1: billbarker, remm, funkman
-1:
* Tests for unit tests for the cookie issues.
http://people.apache.org/~jfclere/patches/CookiesTest.patch
- +1: fhanik
+ +1: fhanik, funkman
-1:
* Guess java location from the PATH environment.
http://people.apache.org/~jfclere/patches/setclasspath.sh.patch
And improve fix for 37284.
- +1: fhanik, remm
+ +1: fhanik, remm, funkman
-1:
* Harmonize with HTTP java.io code. Otherwise the socket is not closed.
http://people.apache.org/~jfclere/patches/AjpPro.patch
@@ -58,4 +58,6 @@
* Fix BZ 43588 - hard coded 127.0.0.1 for localhost
http://issues.apache.org/bugzilla/attachment.cgi?id=21039&action=view
+1:
- -1:
\ No newline at end of file
+ -1: funkman InetAddress.getLocalHost() != localhost - it should be
+InetAddress.getByName("localhost").getHostAddress()
+
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r600221 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: funkman Date: Sat Dec 1 17:01:34 2007 New Revision: 600221 URL: http://svn.apache.org/viewvc?rev=600221&view=rev Log: a few +1 votes Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=600221&r1=600220&r2=600221&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Dec 1 17:01:34 2007 @@ -38,7 +38,7 @@ * Add get/set methods for properties in the Tcp Failure detector http://people.apache.org/~fhanik/patches/tcpfaildet-getset.patch - +1: fhanik, pero + +1: fhanik, pero, funkman -1: * Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43706 @@ -56,24 +56,24 @@ * Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43757 Use SMAP info rather than string matching to ID line number in JSP http://svn.apache.org/viewvc?rev=599605&view=rev - +1: markt + +1: markt, funkman -1: * Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43622 Don't always overwrite min compression size with default http://svn.apache.org/viewvc?rev=599914&view=rev - +1: markt + +1: markt, funkman -1: * Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43611 Provide an error message when trying to upload a war if the context is defined in server.xml http://svn.apache.org/viewvc?rev=600177&view=rev - +1: markt + +1: markt, funkman -1: * Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43594 Use CATALINA_BASE (if set) for setenv http://svn.apache.org/viewvc?rev=600185&view=rev - +1: markt + +1: markt, funkman -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r600222 - in /tomcat/trunk: build.xml webapps/docs/funcspecs/project.xml webapps/docs/index.xml
Author: funkman Date: Sat Dec 1 17:11:50 2007 New Revision: 600222 URL: http://svn.apache.org/viewvc?rev=600222&view=rev Log: BZ 43530 Path inspired by Paul Shemansky : paul.shemansky at gmail com Modified: tomcat/trunk/build.xml tomcat/trunk/webapps/docs/funcspecs/project.xml tomcat/trunk/webapps/docs/index.xml Modified: tomcat/trunk/build.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=600222&r1=600221&r2=600222&view=diff == --- tomcat/trunk/build.xml (original) +++ tomcat/trunk/build.xml Sat Dec 1 17:11:50 2007 @@ -347,7 +347,7 @@ - + - <param name="relative-path" expression="../.."/> + <param name="relative-path" expression=".."/>
svn commit: r600223 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: funkman Date: Sat Dec 1 17:16:12 2007 New Revision: 600223 URL: http://svn.apache.org/viewvc?rev=600223&view=rev Log: for http://issues.apache.org/bugzilla/show_bug.cgi?id=43530 Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=600223&r1=600222&r2=600223&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Dec 1 17:16:12 2007 @@ -77,3 +77,9 @@ http://svn.apache.org/viewvc?rev=600185&view=rev +1: markt, funkman -1: + +* Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43530 + Fix bad links on docs home page + http://svn.apache.org/viewvc?view=rev&revision=600222 + +1: funkman + -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r601172 - in /tomcat/tc6.0.x/trunk: STATUS.txt build.xml webapps/docs/changelog.xml webapps/docs/funcspecs/project.xml webapps/docs/index.xml
Author: funkman Date: Tue Dec 4 16:45:41 2007 New Revision: 601172 URL: http://svn.apache.org/viewvc?rev=601172&view=rev Log: backport BZ 43530 per approved STATUS doc link fixes patch inspired by Paul Shemansky Modified: tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/build.xml tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml tomcat/tc6.0.x/trunk/webapps/docs/funcspecs/project.xml tomcat/tc6.0.x/trunk/webapps/docs/index.xml Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=601172&r1=601171&r2=601172&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Dec 4 16:45:41 2007 @@ -31,12 +31,6 @@ +1: jfclere -1: fhanik - Can we add the 'package' directive to make the package match the dir structure -* Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43530 - Fix bad links on docs home page - http://svn.apache.org/viewvc?view=rev&revision=600222 - +1: funkman, markt, pero, remm - -1: - * Port license fix from TC5 that got missed last time - sorry http://svn.apache.org/viewvc?rev=600993&view=rev +1: markt, fhanik Modified: tomcat/tc6.0.x/trunk/build.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.xml?rev=601172&r1=601171&r2=601172&view=diff == --- tomcat/tc6.0.x/trunk/build.xml (original) +++ tomcat/tc6.0.x/trunk/build.xml Tue Dec 4 16:45:41 2007 @@ -347,7 +347,7 @@ - + - <param name="relative-path" expression="../.."/> + <param name="relative-path" expression=".."/>
svn commit: r601180 - in /tomcat/trunk: build.xml webapps/docs/build.xml webapps/docs/tomcat-docs.xsl
Author: funkman Date: Tue Dec 4 17:08:54 2007 New Revision: 601180 URL: http://svn.apache.org/viewvc?rev=601180&view=rev Log: http://code.google.com/p/google-highly-open-participation-asf/issues/detail?id=23 Printer friendlize the docs Also discovered webapps/docs/build.xml is no longer used from the main build.xml. Can that be chucked? Modified: tomcat/trunk/build.xml tomcat/trunk/webapps/docs/build.xml tomcat/trunk/webapps/docs/tomcat-docs.xsl Modified: tomcat/trunk/build.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=601180&r1=601179&r2=601180&view=diff == --- tomcat/trunk/build.xml (original) +++ tomcat/trunk/build.xml Tue Dec 4 17:08:54 2007 @@ -90,7 +90,7 @@ - + @@ -115,8 +115,8 @@ - - + + @@ -184,7 +184,7 @@ - @@ -233,7 +233,7 @@ - + @@ -341,15 +341,15 @@ - - - - - + + + + <param name="relative-path" expression=".."/> - + <param name="relative-path" expression=".."/> - - - - - - - - - - - - - - - - - - - - - - <param name="relative-path" expression="./.."/> - <param name="project-menu" expression="nomenu"/> - - - <param name="relative-path" expression="../.."/> - <param name="project-menu" expression="nomenu"/> - - - <param name="relative-path" expression="../../.."/> - <param name="project-menu" expression="nomenu"/> - - - <param name="relative-path" expression="../.."/> - <param name="project-menu" expression="nomenu"/> - - - <param name="relative-path" expression="../.."/> - <param name="project-menu" expression="nomenu"/> - - @@ -475,14 +409,14 @@ - + - + @@ -502,29 +436,29 @@ - - - - - - + @@ -600,17 +534,17 @@ - + - + - - + description="Clean depend src components"> + + - + @@ -707,7 +641,7 @@ - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <param name="relative-path" expression="./.."/> - <param name="project-menu" expression="nomenu"/> - - - - - - - - - - - - - - - - - <param name="relative-path" expression="."/> - - - - - <param name="relative-path" expression=".."/> - - - - - - - - <param name="relative-path" expression="../.."/> - <param name="project-menu" expression="nomenu"/> - - - - - - - <param name="relative-path" expression="../.."/> - - - - <param name="relative-path" expression="../../.."/> - <param name="project-menu" expression="nomenu"/> - - - - - <param name="relative-path" expression=".."/> - - - - <param name="relative-path" expression="../.."/> - <param name="project-menu" expression="nomenu"/> - - - - - <param name="relative-path" expression=".."/> - - - - <param name="relative-path" expression="../.."/> - <param name="project-menu" expression="nomenu"/> - +I am no longer used and I need deleted !!! + - - - - - - - - - - - - - - - - - - - - - -
svn commit: r601182 - in /tomcat/site/trunk: docs/stylesheets/tomcat-printer.css xdocs/stylesheets/tomcat-site.xsl
Author: funkman
Date: Tue Dec 4 17:28:31 2007
New Revision: 601182
URL: http://svn.apache.org/viewvc?rev=601182&view=rev
Log:
http://code.google.com/p/google-highly-open-participation-asf/issues/detail?id=23
printer friendly support
patch by Vitezslav Smid
Added:
tomcat/site/trunk/docs/stylesheets/tomcat-printer.css (with props)
Modified:
tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl
Added: tomcat/site/trunk/docs/stylesheets/tomcat-printer.css
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/stylesheets/tomcat-printer.css?rev=601182&view=auto
==
--- tomcat/site/trunk/docs/stylesheets/tomcat-printer.css (added)
+++ tomcat/site/trunk/docs/stylesheets/tomcat-printer.css Tue Dec 4 17:28:31
2007
@@ -0,0 +1,3 @@
+.noPrint {display: none;}
+td#mainBody {width: 100%;}
+
Propchange: tomcat/site/trunk/docs/stylesheets/tomcat-printer.css
--
svn:eol-style = native
Propchange: tomcat/site/trunk/docs/stylesheets/tomcat-printer.css
--
svn:executable = *
Modified: tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl?rev=601182&r1=601181&r2=601182&view=diff
==
--- tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl (original)
+++ tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl Tue Dec 4 17:28:31 2007
@@ -56,6 +56,7 @@
+
-
+
http://www.google.com/search"; method="get">
@@ -106,14 +107,13 @@
-
LEFT SIDE NAVIGATION
-
+
RIGHT SIDE MAIN BODY
-
+
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r601188 - /tomcat/trunk/conf/web.xml
Author: funkman Date: Tue Dec 4 18:14:27 2007 New Revision: 601188 URL: http://svn.apache.org/viewvc?rev=601188&view=rev Log: 43993 - mime mapping for WS-Policy Patch by Fabian Ritzmann Modified: tomcat/trunk/conf/web.xml Modified: tomcat/trunk/conf/web.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/conf/web.xml?rev=601188&r1=601187&r2=601188&view=diff == --- tomcat/trunk/conf/web.xml (original) +++ tomcat/trunk/conf/web.xml Tue Dec 4 18:14:27 2007 @@ -1143,6 +1143,10 @@ x-world/x-vrml +wspolicy +application/wspolicy+xml + + Z application/x-compress - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r601189 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: funkman Date: Tue Dec 4 18:16:48 2007 New Revision: 601189 URL: http://svn.apache.org/viewvc?rev=601189&view=rev Log: proposal for 43993 - mime mapping for WS-Policy http://svn.apache.org/viewvc?rev=601188&view=rev Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=601189&r1=601188&r2=601189&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Dec 4 18:16:48 2007 @@ -33,5 +33,11 @@ * Port license fix from TC5 that got missed last time - sorry http://svn.apache.org/viewvc?rev=600993&view=rev - +1: markt, fhanik + +1: markt, fhanik, funkman -1: + +* 43993 - mime mapping for WS-Policy + http://svn.apache.org/viewvc?rev=601188&view=rev + +1: funkman + -1: + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: FAQ chucking alternatives
Cool. We'll need explicit mappings since the old names and new pages aren't the same. Like this: RewriteRule /faq/classnotfound.html http://wiki.apache.org/tomcat/FAQ/Class_Not_Found [R=301] Unless someone beats me - I'll try to do that this evening. (East Coast USA time) If mod_alias is available, this would work too: RedirectPermanent /faq/classnotfound.html http://wiki.apache.org/tomcat/FAQ/Class_Not_Found >From an admin point of view - I'm not sure if there is a preference. -Tim > Yoav Shapira wrote: >> RewriteEngine On >> RewriteRule /faq/(.*) http://wiki.apache.org/tomcat/FAQ/$1 [R=301] > > +1 > > I am not 100% the mapping will be this simple. It is is, great. If not, we > could either map each page or do: > RewriteRule /faq/(.*) http://wiki.apache.org/tomcat/FAQ [R=301] > - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r601796 - /tomcat/site/trunk/docs/faq/.htaccess
Author: funkman Date: Thu Dec 6 09:59:20 2007 New Revision: 601796 URL: http://svn.apache.org/viewvc?rev=601796&view=rev Log: FAQ move to the wiki Added: tomcat/site/trunk/docs/faq/.htaccess (with props) Added: tomcat/site/trunk/docs/faq/.htaccess URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/faq/.htaccess?rev=601796&view=auto == --- tomcat/site/trunk/docs/faq/.htaccess (added) +++ tomcat/site/trunk/docs/faq/.htaccess Thu Dec 6 09:59:20 2007 @@ -0,0 +1,23 @@ +# As part of FAQ move Dec 2007 +RedirectPermanent /faq/bugs.html http://wiki.apache.org/tomcat/FAQ/Bugs +RedirectPermanent /faq/classnotfound.html http://wiki.apache.org/tomcat/FAQ/Class_Not_Found +RedirectPermanent /faq/cluster.html http://wiki.apache.org/tomcat/FAQ/Clustering +RedirectPermanent /faq/connectors.html http://wiki.apache.org/tomcat/FAQ/Connectors +RedirectPermanent /faq/database.html http://wiki.apache.org/tomcat/FAQ/Database +RedirectPermanent /faq/deployment.html http://wiki.apache.org/tomcat/FAQ/Deployment +RedirectPermanent /faq/development.html http://wiki.apache.org/tomcat/FAQ/Developing +RedirectPermanent /faq/fda-validation.html http://wiki.apache.org/tomcat/FAQ/FDA_Validation +RedirectPermanent /faq/logging.html http://wiki.apache.org/tomcat/FAQ/Logging +RedirectPermanent /faq/memory.html http://wiki.apache.org/tomcat/FAQ/Memory +RedirectPermanent /faq/meta.html http://wiki.apache.org/tomcat/FAQ/About +RedirectPermanent /faq/misc.html http://wiki.apache.org/tomcat/FAQ/Miscellaneous +RedirectPermanent /faq/otherOperatingSystems.html http://wiki.apache.org/tomcat/FAQ/Other_Operating_Systems +RedirectPermanent /faq/performance.html http://wiki.apache.org/tomcat/FAQ/Performance_and_Monitoring +RedirectPermanent /faq/security.html http://wiki.apache.org/tomcat/FAQ/Security +RedirectPermanent /faq/tomcatuser.html http://wiki.apache.org/tomcat/FAQ/Tomcat_User +RedirectPermanent /faq/unix.html http://wiki.apache.org/tomcat/FAQ/Linux_Unix +RedirectPermanent /faq/windows.html http://wiki.apache.org/tomcat/FAQ/Windows +RedirectPermanent /faq/index.html http://wiki.apache.org/tomcat/FAQ +RedirectPermanent /faq/ http://wiki.apache.org/tomcat/FAQ + + Propchange: tomcat/site/trunk/docs/faq/.htaccess -- svn:eol-style = native - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r601950 - in /tomcat/tc6.0.x/trunk: STATUS.txt conf/web.xml webapps/docs/changelog.xml
Author: funkman Date: Thu Dec 6 17:06:13 2007 New Revision: 601950 URL: http://svn.apache.org/viewvc?rev=601950&view=rev Log: 43993 - mime mapping for WS-Policy Patch by Fabian Ritzmann Modified: tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/conf/web.xml tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=601950&r1=601949&r2=601950&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Dec 6 17:06:13 2007 @@ -36,8 +36,4 @@ +1: markt, fhanik, funkman, remm, pero -1: -* 43993 - mime mapping for WS-Policy - http://svn.apache.org/viewvc?rev=601188&view=rev - +1: funkman, remm, pero - -1: Modified: tomcat/tc6.0.x/trunk/conf/web.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/conf/web.xml?rev=601950&r1=601949&r2=601950&view=diff == --- tomcat/tc6.0.x/trunk/conf/web.xml (original) +++ tomcat/tc6.0.x/trunk/conf/web.xml Thu Dec 6 17:06:13 2007 @@ -1143,6 +1143,10 @@ x-world/x-vrml +wspolicy +application/wspolicy+xml + + Z application/x-compress Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=601950&r1=601949&r2=601950&view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Dec 6 17:06:13 2007 @@ -92,6 +92,9 @@ 43530 : doc link fixes provided by Paul Shemansky (funkman) + +43993: mime mapping for WS-Policy. Patch by Fabian Ritzmann (funkman) + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r601943 - /tomcat/site/trunk/docs/
Author: funkman Date: Thu Dec 6 17:01:14 2007 New Revision: 601943 URL: http://svn.apache.org/viewvc?rev=601943&view=rev Log: apply printer friendy to the html and update faq links (actually just ran the ant task) Modified: tomcat/site/trunk/docs/bugreport.html tomcat/site/trunk/docs/contact.html tomcat/site/trunk/docs/download-33.html tomcat/site/trunk/docs/download-41.html tomcat/site/trunk/docs/download-55.html tomcat/site/trunk/docs/download-60.html tomcat/site/trunk/docs/download-connectors.html tomcat/site/trunk/docs/findhelp.html tomcat/site/trunk/docs/getinvolved.html tomcat/site/trunk/docs/heritage.html tomcat/site/trunk/docs/index.html tomcat/site/trunk/docs/irc.html tomcat/site/trunk/docs/legal.html tomcat/site/trunk/docs/lists.html tomcat/site/trunk/docs/migration.html tomcat/site/trunk/docs/resources.html tomcat/site/trunk/docs/security-3.html tomcat/site/trunk/docs/security-4.html tomcat/site/trunk/docs/security-5.html tomcat/site/trunk/docs/security-6.html tomcat/site/trunk/docs/security-impact.html tomcat/site/trunk/docs/security-jk.html tomcat/site/trunk/docs/security.html tomcat/site/trunk/docs/svn.html tomcat/site/trunk/docs/whichversion.html tomcat/site/trunk/docs/whoweare.html Modified: tomcat/site/trunk/docs/bugreport.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/bugreport.html?rev=601943&r1=601942&r2=601943&view=diff == --- tomcat/site/trunk/docs/bugreport.html (original) +++ tomcat/site/trunk/docs/bugreport.html Thu Dec 6 17:01:14 2007 @@ -6,6 +6,7 @@ + @@ -30,7 +31,7 @@ - + http://www.google.com/search"; method="get"> @@ -46,7 +47,7 @@ - + Apache Tomcat @@ -175,7 +176,7 @@ - + Modified: tomcat/site/trunk/docs/contact.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/contact.html?rev=601943&r1=601942&r2=601943&view=diff == --- tomcat/site/trunk/docs/contact.html (original) +++ tomcat/site/trunk/docs/contact.html Thu Dec 6 17:01:14 2007 @@ -4,6 +4,7 @@ Apache Tomcat - Apache Tomcat -- Contact Information + @@ -28,7 +29,7 @@ - + http://www.google.com/search"; method="get"> @@ -44,7 +45,7 @@ - + Apache Tomcat @@ -173,7 +174,7 @@ - + Modified: tomcat/site/trunk/docs/download-33.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-33.html?rev=601943&r1=601942&r2=601943&view=diff == --- tomcat/site/trunk/docs/download-33.html (original) +++ tomcat/site/trunk/docs/download-33.html Thu Dec 6 17:01:14 2007 @@ -4,6 +4,7 @@ Apache Tomcat - Apache Tomcat 3 Downloads + @@ -28,7 +29,7 @@ - + http://www.google.com/search"; method="get"> @@ -44,7 +45,7 @@ - + Apache Tomcat @@ -173,7 +174,7 @@ - + Modified: tomcat/site/trunk/docs/download-41.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-41.html?rev=601943&r1=601942&r2=601943&view=diff == --- tomcat/site/trunk/docs/download-41.html (original) +++ tomcat/site/trunk/docs/download-41.html Thu Dec 6 17:01:14 2007 @@ -4,6 +4,7 @@ Apache Tomcat - Apache Tomcat 4 Downloads + @@ -28,7 +29,7 @@ - + http://www.google.com/search"; method="get"> @@ -44,7 +45,7 @@ - + Apache Tomcat @@ -173,7 +174,7 @@ - + Modified: tomcat/site/trunk/docs/download-55.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-55.html?rev=601943&r1=601942&r2=601943&view=diff == --- tomcat/site/trunk/docs/download-55.html (original) +++ tomcat/site/trunk/docs/download-55.html Thu Dec 6 17:01:14 2007 @@ -4,6 +4,7 @@ Apache Tomcat - Apache Tomcat 5 Downloads + @@ -28,7 +29,7 @@ - + http://www.google.com/search"; method="get"> @@ -44,7 +45,7 @@ - + Apache Tomcat @@ -173,7 +174,7 @@ - + Modified: tomcat/site/trunk/docs/download-60.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-60.html?rev=601943&r1=601942&r2=601943&view=diff == --- tomcat/site/trunk/docs/download-60.html (original) +++ tomcat/site/trunk/docs/download-60.html Thu Dec 6 17:01:14 2007 @@ -4,6 +4,7 @@ Apache Tomcat - Apache Tomcat 6 Downloads + @@ -28,7 +29,7 @@ - + http://www.google.com/search"; method="get"> @@ -44,7 +
svn commit: r601941 - in /tomcat/site/trunk/xdocs: findhelp.xml getinvolved.xml
Author: funkman Date: Thu Dec 6 16:56:40 2007 New Revision: 601941 URL: http://svn.apache.org/viewvc?rev=601941&view=rev Log: faq move to wiki Modified: tomcat/site/trunk/xdocs/findhelp.xml tomcat/site/trunk/xdocs/getinvolved.xml Modified: tomcat/site/trunk/xdocs/findhelp.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/findhelp.xml?rev=601941&r1=601940&r2=601941&view=diff == --- tomcat/site/trunk/xdocs/findhelp.xml (original) +++ tomcat/site/trunk/xdocs/findhelp.xml Thu Dec 6 16:56:40 2007 @@ -30,7 +30,7 @@ favourite search engine to try and find it. Answers to very common questions are documented on the -FAQ. +http://wiki.apache.org/tomcat/FAQ";>FAQ. The archives for the user mailing list are a rich source of useful information. Use the search features provided by one of them. A Modified: tomcat/site/trunk/xdocs/getinvolved.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/getinvolved.xml?rev=601941&r1=601940&r2=601941&view=diff == --- tomcat/site/trunk/xdocs/getinvolved.xml (original) +++ tomcat/site/trunk/xdocs/getinvolved.xml Thu Dec 6 16:56:40 2007 @@ -17,7 +17,7 @@ Answer questions posted to the mailing lists. - Contribute to the FAQ or + Contribute to the http://wiki.apache.org/tomcat/FAQ";>FAQ or http://wiki.apache.org/tomcat";>Wiki. Contribute other documentation patches, either for the website or for the Apache Tomcat user documentation. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r602196 - in /tomcat/site/trunk/docs/faq: ./ printer/
Author: funkman Date: Fri Dec 7 11:40:59 2007 New Revision: 602196 URL: http://svn.apache.org/viewvc?rev=602196&view=rev Log: faq to wiki deletes Removed: tomcat/site/trunk/docs/faq/bugs.html tomcat/site/trunk/docs/faq/classnotfound.html tomcat/site/trunk/docs/faq/cluster.html tomcat/site/trunk/docs/faq/connectors.html tomcat/site/trunk/docs/faq/database.html tomcat/site/trunk/docs/faq/deployment.html tomcat/site/trunk/docs/faq/development.html tomcat/site/trunk/docs/faq/fda-validation.html tomcat/site/trunk/docs/faq/index.html tomcat/site/trunk/docs/faq/logging.html tomcat/site/trunk/docs/faq/memory.html tomcat/site/trunk/docs/faq/meta.html tomcat/site/trunk/docs/faq/misc.html tomcat/site/trunk/docs/faq/otherOperatingSystems.html tomcat/site/trunk/docs/faq/performance.html tomcat/site/trunk/docs/faq/printer/ tomcat/site/trunk/docs/faq/security.html tomcat/site/trunk/docs/faq/tomcatuser.html tomcat/site/trunk/docs/faq/unix.html tomcat/site/trunk/docs/faq/windows.html - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r602195 - /tomcat/site/trunk/xdocs-faq/
Author: funkman Date: Fri Dec 7 11:39:55 2007 New Revision: 602195 URL: http://svn.apache.org/viewvc?rev=602195&view=rev Log: faq to wiki delete Removed: tomcat/site/trunk/xdocs-faq/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r602193 - /tomcat/site/tags/FAQ_MOVING_TO_WIKI/
Author: funkman Date: Fri Dec 7 11:36:41 2007 New Revision: 602193 URL: http://svn.apache.org/viewvc?rev=602193&view=rev Log: faq moving to wiki tag soon to be followed by some deletes Added: tomcat/site/tags/FAQ_MOVING_TO_WIKI/ - copied from r602192, tomcat/site/trunk/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r606649 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: funkman Date: Sun Dec 23 17:21:10 2007 New Revision: 606649 URL: http://svn.apache.org/viewvc?rev=606649&view=rev Log: votes Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=606649&r1=606648&r2=606649&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Dec 23 17:21:10 2007 @@ -39,17 +39,17 @@ * Fix CVE-2007-5342 JULI permissions need to be restricted http://svn.apache.org/viewvc?rev=606594&view=rev - +1: markt + +1: markt,funkman -1: * Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=44084 JASSRealm is broken for application provided Principals http://svn.apache.org/viewvc?rev=606621&view=rev - +1: markt + +1: markt,funkman -1: * Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=44088 Expire button on Manager web page doesn't work http://svn.apache.org/viewvc?rev=606633&view=rev - +1: markt + +1: markt,funkman -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r606988 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: funkman Date: Wed Dec 26 17:11:54 2007 New Revision: 606988 URL: http://svn.apache.org/viewvc?rev=606988&view=rev Log: some votes Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=606988&r1=606987&r2=606988&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Dec 26 17:11:54 2007 @@ -57,24 +57,24 @@ * Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43944 Use a message that exists to prevent a MissingResourceException http://svn.apache.org/viewvc?rev=606704&view=rev - +1: markt + +1: markt,funkman -1: * Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43909 Make sure locale maps to wrapped ELContext. Patch provided by Tuomas Kiviaho. http://svn.apache.org/viewvc?rev=606728&view=rev - +1: markt + +1: markt,funkman -1: * Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43839 URL based session tracking fails when session cookie from parent context is present. Based on a patch by Yuan Qingyun. http://svn.apache.org/viewvc?rev=606944&view=rev - +1: markt + +1: markt,funkman -1: * Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43914 Location headers must be encoded. Patch provided by Ivan Todoroski. http://svn.apache.org/viewvc?rev=606952&view=rev - +1: markt + +1: markt,funkman -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r606992 - in /tomcat/trunk: build.xml webapps/docs/cluster-howto.xml webapps/docs/introduction.xml webapps/docs/tribes/project.xml
Author: funkman
Date: Wed Dec 26 17:38:17 2007
New Revision: 606992
URL: http://svn.apache.org/viewvc?rev=606992&view=rev
Log:
FAQ links to wiki
use the xslt task instead of style task
Modified:
tomcat/trunk/build.xml
tomcat/trunk/webapps/docs/cluster-howto.xml
tomcat/trunk/webapps/docs/introduction.xml
tomcat/trunk/webapps/docs/tribes/project.xml
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=606992&r1=606991&r2=606992&view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Wed Dec 26 17:38:17 2007
@@ -350,55 +350,55 @@
-
<param name="relative-path" expression="."/>
-
-
+<xslt basedir="webapps/docs/appdev"
destdir="${tomcat.build}/webapps/docs/appdev"
extension=".html"
style="webapps/docs/tomcat-docs.xsl"
excludes="project.xml"
includes="*.xml">
<param name="relative-path" expression=".."/>
-
-
+<xslt basedir="webapps/docs/funcspecs"
destdir="${tomcat.build}/webapps/docs/funcspecs"
extension=".html"
style="webapps/docs/tomcat-docs.xsl"
excludes="project.xml"
includes="*.xml">
<param name="relative-path" expression=".."/>
-
-
+<xslt basedir="webapps/docs/config"
destdir="${tomcat.build}/webapps/docs/config"
extension=".html"
style="webapps/docs/tomcat-docs.xsl"
excludes="project.xml"
includes="*.xml">
<param name="relative-path" expression=".."/>
-
-
+<xslt basedir="webapps/docs/architecture"
destdir="${tomcat.build}/webapps/docs/architecture"
extension=".html"
style="webapps/docs/tomcat-docs.xsl"
excludes="project.xml"
includes="*.xml">
<param name="relative-path" expression=".."/>
-
+
-
<param name="relative-path" expression=".."/>
-
+
Modified: tomcat/trunk/webapps/docs/cluster-howto.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/cluster-howto.xml?rev=606992&r1=606991&r2=606992&view=diff
==
--- tomcat/trunk/webapps/docs/cluster-howto.xml (original)
+++ tomcat/trunk/webapps/docs/cluster-howto.xml Wed Dec 26 17:38:17 2007
@@ -693,7 +693,7 @@
-Please see http://tomcat.apache.org/faq/cluster.html";>the
clustering section of the FAQ.
+Please see http://wiki.apache.org/tomcat/FAQ/Clustering";>the
clustering section of the FAQ.
Modified: tomcat/trunk/webapps/docs/introduction.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/introduction.xml?rev=606992&r1=606991&r2=606992&view=diff
==
--- tomcat/trunk/webapps/docs/introduction.xml (original)
+++ tomcat/trunk/webapps/docs/introduction.xml Wed Dec 26 17:38:17 2007
@@ -115,7 +115,7 @@
to fully read the relevant documentation as it will save you much time
and effort. There's nothing like scouring the web only to find out that
the answer was right in front of you all along!
-http://tomcat.apache.org/faq/";>Tomcat FAQ as maintained by
the developers.
+http://wiki.apache.org/tomcat/FAQ";>Tomcat FAQ as maintained
by the developers.
http://wiki.apache.org/tomcat/";>Tomcat WIKI
Tomcat FAQ at http://www.jguru.com/faq/home.jsp?topic=Tomcat";>jGuru
Tomcat mailing list archives - numerous sites archive the Tomcat mailing
Modified: tomcat/trunk/webapps/docs/tribes/project.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/tribes/project.xml?rev=606992&r1=606991&r2=606992&view=diff
==
--- tomcat/trunk/webapps/docs/tribes/project.xml (original)
+++ tomcat/trunk/webapps/docs/tribes/project.xml Wed Dec 26 17:38:17 2007
@@ -27,7 +27,7 @@
-http://tomcat.apache.org/faq";
/>
+http://wiki.apache.org/tomcat/FAQ"; />
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r606994 - /tomcat/trunk/java/org/apache/naming/resources/FileDirContext.java
Author: funkman
Date: Wed Dec 26 17:57:02 2007
New Revision: 606994
URL: http://svn.apache.org/viewvc?rev=606994&view=rev
Log:
http://issues.apache.org/bugzilla/show_bug.cgi?id=42503
ServletContext.getResourceAsStream returns stale data
patch by Arvind Srinivasan
arvindDOTsrinivasan sun com
Modified:
tomcat/trunk/java/org/apache/naming/resources/FileDirContext.java
Modified: tomcat/trunk/java/org/apache/naming/resources/FileDirContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/resources/FileDirContext.java?rev=606994&r1=606993&r2=606994&view=diff
==
--- tomcat/trunk/java/org/apache/naming/resources/FileDirContext.java (original)
+++ tomcat/trunk/java/org/apache/naming/resources/FileDirContext.java Wed Dec
26 17:57:02 2007
@@ -986,6 +986,8 @@
public FileResourceAttributes(File file) {
this.file = file;
+getCreation();
+getLastModified();
}
// --- Member Variables
@@ -1036,7 +1038,7 @@
public long getCreation() {
if (creation != -1L)
return creation;
-creation = file.lastModified();
+creation = getLastModified();
return creation;
}
@@ -1048,7 +1050,7 @@
*/
public Date getCreationDate() {
if (creation == -1L) {
-creation = file.lastModified();
+creation = getCreation();
}
return super.getCreationDate();
}
@@ -1074,7 +1076,7 @@
*/
public Date getLastModifiedDate() {
if (lastModified == -1L) {
-lastModified = file.lastModified();
+lastModified = getLastModified();
}
return super.getLastModifiedDate();
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r606995 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: funkman Date: Wed Dec 26 17:59:02 2007 New Revision: 606995 URL: http://svn.apache.org/viewvc?rev=606995&view=rev Log: http://issues.apache.org/bugzilla/show_bug.cgi?id=42503 ServletContext.getResourceAsStream returns stale data Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=606995&r1=606994&r2=606995&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Dec 26 17:59:02 2007 @@ -78,3 +78,10 @@ http://svn.apache.org/viewvc?rev=606952&view=rev +1: markt,funkman -1: + +* Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=42503 + ServletContext.getResourceAsStream returns stale data + http://svn.apache.org/viewvc?rev=606994&view=rev + +1: funkman + -1: + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r606996 - /tomcat/trunk/java/org/apache/el/parser/AstValue.java
Author: funkman
Date: Wed Dec 26 18:10:38 2007
New Revision: 606996
URL: http://svn.apache.org/viewvc?rev=606996&view=rev
Log:
http://issues.apache.org/bugzilla/show_bug.cgi?id=43285
Missing EL Coercion causes argument type mismatch
Patch by Bernhard Huemer bernhard.huemers gmail com
Modified:
tomcat/trunk/java/org/apache/el/parser/AstValue.java
Modified: tomcat/trunk/java/org/apache/el/parser/AstValue.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/AstValue.java?rev=606996&r1=606995&r2=606996&view=diff
==
--- tomcat/trunk/java/org/apache/el/parser/AstValue.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstValue.java Wed Dec 26 18:10:38
2007
@@ -26,6 +26,7 @@
import javax.el.MethodInfo;
import javax.el.PropertyNotFoundException;
+import org.apache.el.lang.ELSupport;
import org.apache.el.lang.EvaluationContext;
import org.apache.el.util.MessageFactory;
import org.apache.el.util.ReflectionUtil;
@@ -127,7 +128,11 @@
throws ELException {
Target t = getTarget(ctx);
ctx.setPropertyResolved(false);
-ctx.getELResolver().setValue(ctx, t.base, t.property, value);
+ELResolver resolver = ctx.getELResolver();
+resolver.setValue(ctx, t.base, t.property,
+ // coerce to the expected type
+ ELSupport.coerceToType(value,
+ resolver.getType(ctx, t.base,
t.property)));
}
public MethodInfo getMethodInfo(EvaluationContext ctx, Class[] paramTypes)
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r606997 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: funkman Date: Wed Dec 26 18:15:39 2007 New Revision: 606997 URL: http://svn.apache.org/viewvc?rev=606997&view=rev Log: http://issues.apache.org/bugzilla/show_bug.cgi?id=43285 Missing EL Coercion causes argument type mismatch Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=606997&r1=606996&r2=606997&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Dec 26 18:15:39 2007 @@ -85,3 +85,8 @@ +1: funkman -1: +* Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43285 + Missing EL Coercion causes argument type mismatch + http://svn.apache.org/viewvc?rev=606996&view=rev + +1: funkman + -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r608313 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: funkman Date: Wed Jan 2 18:46:52 2008 New Revision: 608313 URL: http://svn.apache.org/viewvc?rev=608313&view=rev Log: some votes Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=608313&r1=608312&r2=608313&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jan 2 18:46:52 2008 @@ -52,25 +52,25 @@ Include user principal if possible when serializing / de-serializing http://svn.apache.org/viewvc?rev=607596&view=rev http://svn.apache.org/viewvc?rev=607597&view=rev - +1: markt + +1: markt, funkman -1: * Improve Jasper docs. Note rather than remove unused option, it will be deprecated in 6.0.x. http://svn.apache.org/viewvc?rev=607860&view=rev - +1: markt + +1: markt, funkman -1: * Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43800 Make link between APR and Native clearer http://svn.apache.org/viewvc?rev=607875&view=rev - +1: markt + +1: markt, funkman -1: Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43775 Don't change line endings for binary files http://svn.apache.org/viewvc?rev=607888&view=rev - +1: markt + +1: markt, funkman -1: Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43758 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r609246 - /tomcat/current/tc5.5.x/STATUS.txt
Author: funkman Date: Sat Jan 5 17:10:17 2008 New Revision: 609246 URL: http://svn.apache.org/viewvc?rev=609246&view=rev Log: votes and proposal for chucking the download for HttpClient since it is unused [and the download link is bad] Modified: tomcat/current/tc5.5.x/STATUS.txt Modified: tomcat/current/tc5.5.x/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=609246&r1=609245&r2=609246&view=diff == --- tomcat/current/tc5.5.x/STATUS.txt (original) +++ tomcat/current/tc5.5.x/STATUS.txt Sat Jan 5 17:10:17 2008 @@ -33,7 +33,7 @@ * Fix bug in CGI servlet that causes it to fail when included http://svn.apache.org/viewvc?view=rev&revision=595802 - +1: markt, fhanik + +1: markt, fhanik, funkman -1: * JDT location return 404 @@ -158,7 +158,7 @@ * Fix CVE-2007-5342 JULI permissions need to be restricted http://svn.apache.org/viewvc?rev=606594&view=rev - +1: markt, pero + +1: markt, pero, funkman -1: * Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=44084 @@ -178,5 +178,11 @@ present. Based on a patch by Yuan Qingyun. http://svn.apache.org/viewvc?rev=606944&view=rev http://svn.apache.org/viewvc?rev=609003&view=rev - +1: markt + +1: markt,funkman -1: + +* Remove unused dependency on HttpClient + http://people.apache.org/~funkman/tc5.5-build.properties.patch + +1: funkman + -1: + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r468957 - /tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/EngineRuleSet.java
Author: funkman Date: Sun Oct 29 11:28:37 2006 New Revision: 468957 URL: http://svn.apache.org/viewvc?view=rev&rev=468957 Log: There is no org.apache.catalina.Logger or setLogger anymore Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/EngineRuleSet.java Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/EngineRuleSet.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/EngineRuleSet.java?view=diff&rev=468957&r1=468956&r2=468957 == --- tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/EngineRuleSet.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/EngineRuleSet.java Sun Oct 29 11:28:37 2006 @@ -5,9 +5,9 @@ * The ASF licenses this file to You under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -120,13 +120,6 @@ "addLifecycleListener", "org.apache.catalina.LifecycleListener"); -digester.addObjectCreate(prefix + "Engine/Logger", - null, // MUST be specified in the element - "className"); -digester.addSetProperties(prefix + "Engine/Logger"); -digester.addSetNext(prefix + "Engine/Logger", -"setLogger", -"org.apache.catalina.Logger"); digester.addObjectCreate(prefix + "Engine/Realm", null, // MUST be specified in the element - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r475229 - in /tomcat/tc6.0.x/trunk/webapps/manager: 401.jsp WEB-INF/web.xml
Author: funkman
Date: Wed Nov 15 05:31:39 2006
New Revision: 475229
URL: http://svn.apache.org/viewvc?view=rev&rev=475229
Log:
Added a 401 page to let the user know what file to change to gain
access to the manager app in a stock install.
Added:
tomcat/tc6.0.x/trunk/webapps/manager/401.jsp (with props)
Modified:
tomcat/tc6.0.x/trunk/webapps/manager/WEB-INF/web.xml
Added: tomcat/tc6.0.x/trunk/webapps/manager/401.jsp
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/manager/401.jsp?view=auto&rev=475229
==
--- tomcat/tc6.0.x/trunk/webapps/manager/401.jsp (added)
+++ tomcat/tc6.0.x/trunk/webapps/manager/401.jsp Wed Nov 15 05:31:39 2006
@@ -0,0 +1,32 @@
+<%
+ response.setHeader("WWW-Authenticate", "Basic realm=\"Tomcat Manager
Application\"");
+%>
+
+
+ 401 Unauthorized
+
+<!--
+BODY
{font-family:Tahoma,Arial,sans-serif;color:black;background-color:white;font-size:12px;}
+H1
{font-family:Tahoma,Arial,sans-serif;color:white;background-color:#525D76;font-size:22px;}
+PRE, TT {border: 1px dotted #525D76}-->
+
+
+
+ 401 Unauthorized
+
+You are not authorized to view this page. If you have not changed
+any configuration files, please examine the file
+conf/tomcat-users.xml in your installation. That
+file will contain the credentials to let you use this webapp.
+
+
+You will need to add manager role to the config file listed above.
+For example:
+
+<role rolename="manager"/>
+<user username="tomcat" password="s3cret" roles="manager"/>
+
+
+
+
+
Propchange: tomcat/tc6.0.x/trunk/webapps/manager/401.jsp
--
svn:eol-style = native
Propchange: tomcat/tc6.0.x/trunk/webapps/manager/401.jsp
--
svn:executable = *
Modified: tomcat/tc6.0.x/trunk/webapps/manager/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/manager/WEB-INF/web.xml?view=diff&rev=475229&r1=475228&r2=475229
==
--- tomcat/tc6.0.x/trunk/webapps/manager/WEB-INF/web.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/manager/WEB-INF/web.xml Wed Nov 15 05:31:39
2006
@@ -24,7 +24,7 @@
Tomcat Manager Application
A scriptable management web application for the Tomcat Web Server;
- Manager lets you view, load/unload/etc particular web applications.
+Manager lets you view, load/unload/etc particular web applications.
svn commit: r475232 - /tomcat/tc6.0.x/trunk/webapps/docs/index.xml
Author: funkman Date: Wed Nov 15 05:37:51 2006 New Revision: 475232 URL: http://svn.apache.org/viewvc?view=rev&rev=475232 Log: tomcat - s/5.5/6/ servlet spec s/2.3/2.4/ jsp verion s/2.0/2.1/ Modified: tomcat/tc6.0.x/trunk/webapps/docs/index.xml Modified: tomcat/tc6.0.x/trunk/webapps/docs/index.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/index.xml?view=diff&rev=475232&r1=475231&r2=475232 == --- tomcat/tc6.0.x/trunk/webapps/docs/index.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/index.xml Wed Nov 15 05:37:51 2006 @@ -18,9 +18,9 @@ This is the top-level entry point of the documentation bundle for the -Apache Tomcat Servlet/JSP container. Apache Tomcat version 5.5 +Apache Tomcat Servlet/JSP container. Apache Tomcat version 6.0 implements the -Servlet 2.4 and JavaServer Pages 2.0 specifications from the +Servlet 2.5 and JavaServer Pages 2.1 specifications from the http://www.jcp.org";>Java Community Process, and includes many additional features that make it a useful platform for developing and deploying web applications and web services. @@ -35,7 +35,7 @@ The following documents will assist you in downloading, installing -Apache Tomcat 5, and using many of the Apache Tomcat features. +Apache Tomcat 6, and using many of the Apache Tomcat features. Introduction - A @@ -45,7 +45,7 @@ First web application - An introduction to the concepts of a web application as defined in the http://java.sun.com/products/servlet/download.html";>Servlet -2.3 Specification. Covers basic organization of your web application +2.4 Specification. Covers basic organization of your web application source tree, the structure of a web application archive, and an introduction to the web application deployment descriptor (/WEB-INF/web.xml). @@ -110,7 +110,7 @@ The following documents are aimed at System Administrators who -are responsible for installing, configuring, and operating a Apache Tomcat 5 server. +are responsible for installing, configuring, and operating a Apache Tomcat 6 server. Release notes @@ -118,7 +118,7 @@ Apache Tomcat Server Configuration Reference - Reference manual that documents all available elements and attributes - that may be placed into a Apache Tomcat 5 conf/server.xml file. + that may be placed into a Apache Tomcat 6 conf/server.xml file. http://tomcat.apache.org/connectors-doc/index.html";>JK Documentation - Complete documentation and HOWTOs on the JK native webserver connector, @@ -138,15 +138,15 @@ The following documents are for Java developers who wish to contribute to the development of the Apache Tomcat project. -Building from Source - -Details the steps necessary to download Apache Tomcat 5 source code (and the -other packages that it depends on), and build a binary distribution from +Building from Source - +Details the steps necessary to download Apache Tomcat 6 source code (and the +other packages that it depends on), and build a binary distribution from those sources. Changelog - Details the changes made to Apache Tomcat. -Status - Apache Tomcat development +Status - Apache Tomcat development status. Developers - List of active @@ -154,16 +154,16 @@ Functional Specifications - Requirements specifications for features of the Catalina servlet -container portion of Apache Tomcat 5. +container portion of Apache Tomcat 6. Catalina Javadocs - Javadoc API documentation for the Catalina servlet container and its dependencies. Jasper Javadocs - Javadoc API documentation for the Jasper JSP container -portion of Apache Tomcat 5. +portion of Apache Tomcat 6. Apache Tomcat Architecture - Documentation of the Apache Tomcat Server Architecture. - + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r475237 - /tomcat/tc6.0.x/trunk/webapps/manager/401.jsp
Author: funkman
Date: Wed Nov 15 05:51:16 2006
New Revision: 475237
URL: http://svn.apache.org/viewvc?view=rev&rev=475237
Log:
Link to the manager howto.
Modified:
tomcat/tc6.0.x/trunk/webapps/manager/401.jsp
Modified: tomcat/tc6.0.x/trunk/webapps/manager/401.jsp
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/manager/401.jsp?view=diff&rev=475237&r1=475236&r2=475237
==
--- tomcat/tc6.0.x/trunk/webapps/manager/401.jsp (original)
+++ tomcat/tc6.0.x/trunk/webapps/manager/401.jsp Wed Nov 15 05:51:16 2006
@@ -8,7 +8,9 @@
+PRE, TT {border: 1px dotted #525D76}
+A {color : black;}A.name {color : black;}
+-->
@@ -26,6 +28,10 @@
<role rolename="manager"/>
<user username="tomcat" password="s3cret" roles="manager"/>
+
+
+For more information - please see the
+Manager App HOW-TO.
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r481230 - in /tomcat/tc6.0.x/trunk/java/org/apache/jasper: compiler/ImplicitTagLibraryInfo.java compiler/PageDataImpl.java compiler/Validator.java resources/LocalStrings.properties resourc
Author: funkman
Date: Fri Dec 1 04:14:23 2006
New Revision: 481230
URL: http://svn.apache.org/viewvc?view=rev&rev=481230
Log:
Bug 41089 and JSP.6.3.2
Table JSP.6-2 Attributes for the standard action
version (required) The version of the JSP specification used in this
page. Valid values are "1.2", "2.0", and "2.1". It is a
translation error if the container does not support the
specified version.
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/ImplicitTagLibraryInfo.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/PageDataImpl.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Validator.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties
tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/ImplicitTagLibraryInfo.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/ImplicitTagLibraryInfo.java?view=diff&rev=481230&r1=481229&r2=481230
==
---
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/ImplicitTagLibraryInfo.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/ImplicitTagLibraryInfo.java
Fri Dec 1 04:14:23 2006
@@ -48,7 +48,7 @@
private static final String TAGX_FILE_SUFFIX = ".tagx";
private static final String TAGS_SHORTNAME = "tags";
private static final String TLIB_VERSION = "1.0";
-private static final String JSP_VERSION = "2.0";
+private static final String JSP_VERSION = "2.1";
private static final String IMPLICIT_TLD = "implicit.tld";
// Maps tag names to tag file paths
Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/PageDataImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/PageDataImpl.java?view=diff&rev=481230&r1=481229&r2=481230
==
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/PageDataImpl.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/PageDataImpl.java Fri
Dec 1 04:14:23 2006
@@ -48,7 +48,7 @@
*/
class PageDataImpl extends PageData implements TagConstants {
-private static final String JSP_VERSION = "2.0";
+private static final String JSP_VERSION = "2.1";
private static final String CDATA_START_SECTION = "\n";
Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Validator.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Validator.java?view=diff&rev=481230&r1=481229&r2=481230
==
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Validator.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Validator.java Fri Dec
1 04:14:23 2006
@@ -509,7 +509,7 @@
public void visit(Node.JspRoot n) throws JasperException {
JspUtil.checkAttributes("Jsp:root", n, jspRootAttrs, err);
String version = n.getTextAttribute("version");
-if (!version.equals("1.2") && !version.equals("2.0")) {
+if (!version.equals("1.2") && !version.equals("2.0") &&
!version.equals("2.1")) {
err.jspError(n, "jsp.error.jsproot.version.invalid", version);
}
visitBody(n);
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties?view=diff&rev=481230&r1=481229&r2=481230
==
---
tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties
Fri Dec 1 04:14:23 2006
@@ -93,7 +93,7 @@
jsp.error.unable.rename=Unable to rename class file {0} to {1}
jsp.error.mandatory.attribute={0}: Mandatory attribute {1} missing
jsp.error.flush=Exception occurred when flushing data
-jsp.engine.info=Jasper JSP 2.0 Engine
+jsp.engine.info=Jasper JSP 2.1 Engine
jsp.error.invalid.expression="{0}" contains invalid expression(s): {1}
jsp.error.invalid.attribute={0} has invalid attribute: {1}
jsp.error.usebean.class.notfound=Class: {0} not found
@@ -410,7 +410,7 @@
jsp.error.variable.alias=Both or none of the name-from-attribute and alias
attributes must be specified in a variable directive
jsp.error.attribute.null_name=Null attribute name
svn commit: r491805 - /tomcat/tc6.0.x/trunk/java/javax/el/LocalStrings.properties
Author: funkman
Date: Tue Jan 2 06:53:35 2007
New Revision: 491805
URL: http://svn.apache.org/viewvc?view=rev&rev=491805
Log:
Formatting bug with javax/el/LocalStrings.properties
http://issues.apache.org/bugzilla/show_bug.cgi?id=39409
patch by Jan Bartel janbs a t mortbay com
Modified:
tomcat/tc6.0.x/trunk/java/javax/el/LocalStrings.properties
Modified: tomcat/tc6.0.x/trunk/java/javax/el/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/javax/el/LocalStrings.properties?view=diff&rev=491805&r1=491804&r2=491805
==
--- tomcat/tc6.0.x/trunk/java/javax/el/LocalStrings.properties (original)
+++ tomcat/tc6.0.x/trunk/java/javax/el/LocalStrings.properties Tue Jan 2
06:53:35 2007
@@ -16,9 +16,9 @@
# Default localized string information
# Localized for Locale en_US
-propertyNotFound=Property '{1}' not found on type {0}
-propertyNotReadable=Property '{1}' not readable on type {0}
-propertyNotWritable=Property '{1}' not writable on type {0}
-propertyReadError=Error reading '{1}' on type {0}
-propertyWriteError=Error writing '{1}' on type {0}
-resolverNotWritable=ELResolver not writable for type {0}
\ No newline at end of file
+propertyNotFound=Property ''{1}' not found on type {0}
+propertyNotReadable=Property ''{1}'' not readable on type {0}
+propertyNotWritable=Property ''{1}'' not writable on type {0}
+propertyReadError=Error reading ''{1}'' on type {0}
+propertyWriteError=Error writing ''{1}'' on type {0}
+resolverNotWritable=ELResolver not writable for type {0}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r491813 - /tomcat/tc6.0.x/trunk/java/javax/el/LocalStrings.properties
Author: funkman
Date: Tue Jan 2 07:16:10 2007
New Revision: 491813
URL: http://svn.apache.org/viewvc?view=rev&rev=491813
Log:
doh - missed a '
-This line, and those below, will be ignored--
MLocalStrings.properties
Modified:
tomcat/tc6.0.x/trunk/java/javax/el/LocalStrings.properties
Modified: tomcat/tc6.0.x/trunk/java/javax/el/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/javax/el/LocalStrings.properties?view=diff&rev=491813&r1=491812&r2=491813
==
--- tomcat/tc6.0.x/trunk/java/javax/el/LocalStrings.properties (original)
+++ tomcat/tc6.0.x/trunk/java/javax/el/LocalStrings.properties Tue Jan 2
07:16:10 2007
@@ -16,7 +16,7 @@
# Default localized string information
# Localized for Locale en_US
-propertyNotFound=Property ''{1}' not found on type {0}
+propertyNotFound=Property ''{1}'' not found on type {0}
propertyNotReadable=Property ''{1}'' not readable on type {0}
propertyNotWritable=Property ''{1}'' not writable on type {0}
propertyReadError=Error reading ''{1}'' on type {0}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r491990 - /tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/JasperListener.java
Author: funkman
Date: Tue Jan 2 16:36:57 2007
New Revision: 491990
URL: http://svn.apache.org/viewvc?view=rev&rev=491990
Log:
http://issues.apache.org/bugzilla/show_bug.cgi?id=40820
Default JSP factory not initialized early enough
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/JasperListener.java
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/JasperListener.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/JasperListener.java?view=diff&rev=491990&r1=491989&r2=491990
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/JasperListener.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/JasperListener.java Tue
Jan 2 16:36:57 2007
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -46,7 +46,7 @@
protected StringManager sm =
StringManager.getManager(Constants.Package);
-
+
// -- LifecycleListener Methods
@@ -60,8 +60,9 @@
if (Lifecycle.INIT_EVENT.equals(event.getType())) {
try {
// Set JSP factory
-this.getClass().getClassLoader().loadClass
-("org.apache.jasper.compiler.JspRuntimeContext");
+Class.forName("org.apache.jasper.compiler.JspRuntimeContext",
+ true,
+ this.getClass().getClassLoader());
} catch (Throwable t) {
// Should not occur, obviously
log.warn("Couldn't initialize Jasper", t);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r491995 - in /tomcat/tc6.0.x/trunk/java/org/apache: catalina/loader/VirtualWebappLoader.java naming/resources/VirtualDirContext.java
Author: funkman
Date: Tue Jan 2 16:51:31 2007
New Revision: 491995
URL: http://svn.apache.org/viewvc?view=rev&rev=491995
Log:
http://issues.apache.org/bugzilla/show_bug.cgi?id=41260
[Contribution] WebAppLoader and DirContext implementations
for handling with expanded webapp during development
by Fabrizio Giustina
Added:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/VirtualWebappLoader.java
(with props)
tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/VirtualDirContext.java
(with props)
Added:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/VirtualWebappLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/VirtualWebappLoader.java?view=auto&rev=491995
==
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/VirtualWebappLoader.java
(added)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/VirtualWebappLoader.java
Tue Jan 2 16:51:31 2007
@@ -0,0 +1,96 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.catalina.loader;
+
+import java.io.File;
+import java.util.StringTokenizer;
+
+import org.apache.catalina.LifecycleException;
+
+/**
+ * Simple webapp classloader that allows a customized classpath to be added
+ * through configuration in context xml. Any additional classpath entry will be
+ * added to the default webapp classpath, making easy to emulate a standard
+ * webapp without the need for assembly all the webapp dependencies as jars in
+ * WEB-INF/lib.
+ *
+ *
+ * <Context docBase="\webapps\mydocbase">
+ * <Loader className="org.apache.catalina.loader.VirtualWebappLoader"
+ * virtualClasspath="\dir\classes;\somedir\somejar.jar"/>
+ * </Context>
+ *
+ * @author Fabrizio Giustina
+ * @version $Id: $
+ */
+public class VirtualWebappLoader extends WebappLoader {
+
+/**
+ * ; separated list of additional path elements.
+ */
+private String virtualClasspath;
+
+/**
+ * Construct a new WebappLoader with no defined parent class loader (so
that
+ * the actual parent will be the system class loader).
+ */
+public VirtualWebappLoader() {
+super();
+}
+
+/**
+ * Construct a new WebappLoader with the specified class loader to be
+ * defined as the parent of the ClassLoader we ultimately create.
+ *
+ * @param parent The parent class loader
+ */
+public VirtualWebappLoader(ClassLoader parent) {
+super(parent);
+}
+
+/**
+ * virtualClasspath attribute that will be automatically set
+ * from the Context virtualClasspath attribute
+ * from the context xml file.
+ * @param path ; separated list of path elements.
+ */
+public void setVirtualClasspath(String path) {
+virtualClasspath = path;
+}
+
+@Override
+public void start() throws LifecycleException {
+
+// just add any jar/directory set in virtual classpath to the
+// repositories list before calling start on the standard WebappLoader
+StringTokenizer tkn = new StringTokenizer(virtualClasspath, ";");
+while (tkn.hasMoreTokens()) {
+File file = new File(tkn.nextToken());
+if (!file.exists()) {
+continue;
+}
+if (file.isDirectory()) {
+addRepository("file:/" + file.getAbsolutePath() + "/");
+} else {
+addRepository("file:/" + file.getAbsolutePath());
+}
+}
+
+super.start();
+}
+
+}
Propchange:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/VirtualWebappLoader.java
--
svn:eol-style = native
Propchange:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/VirtualWebappLoader.java
--
svn:executable = *
Added:
tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/VirtualDirContext.java
URL:
http://svn
svn commit: r492112 - in /tomcat/tc6.0.x/trunk/java/org/apache: catalina/loader/VirtualWebappLoader.java naming/resources/VirtualDirContext.java
Author: funkman
Date: Wed Jan 3 03:59:32 2007
New Revision: 492112
URL: http://svn.apache.org/viewvc?view=rev&rev=492112
Log:
Update on http://issues.apache.org/bugzilla/show_bug.cgi?id=41260
Added warnings this should be for dev IDEs, not production.
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/VirtualWebappLoader.java
tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/VirtualDirContext.java
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/VirtualWebappLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/VirtualWebappLoader.java?view=diff&rev=492112&r1=492111&r2=492112
==
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/VirtualWebappLoader.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/VirtualWebappLoader.java
Wed Jan 3 03:59:32 2007
@@ -34,6 +34,14 @@
* virtualClasspath="\dir\classes;\somedir\somejar.jar"/>
* </Context>
*
+ *
+ *
+ * This is not meant to be used for production.
+ * Its meant to ease development with IDE's without the
+ * need for fully republishing jars in WEB-INF/lib
+ *
+ *
+ *
* @author Fabrizio Giustina
* @version $Id: $
*/
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/VirtualDirContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/VirtualDirContext.java?view=diff&rev=492112&r1=492111&r2=492112
==
---
tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/VirtualDirContext.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/VirtualDirContext.java
Wed Jan 3 03:59:32 2007
@@ -45,6 +45,13 @@
* virtualClasspath="\dir\classes;\somedir\somejar.jar"/>
* </Resources>
*
+ *
+ *
+ * This is not meant to be used for production.
+ * Its meant to ease development with IDE's without the
+ * need for fully republishing jars in WEB-INF/lib
+ *
+ *
* @author Fabrizio Giustina
* @version $Id: $
*/
@@ -57,6 +64,12 @@
private Map virtualMappings;
/**
+ * Map containing a mapping for tag files that should be loaded from the
+ * META-INF dir of referenced jar files.
+ */
+private Map tagfileMappings;
+
+/**
* ; separated list of virtual path elements.
*/
private String virtualClasspath;
@@ -79,6 +92,7 @@
super.allocate();
virtualMappings = new Hashtable();
+tagfileMappings = new Hashtable();
// looks into any META-INF dir found in classpath entries for tld
files.
StringTokenizer tkn = new StringTokenizer(virtualClasspath, ";");
@@ -110,6 +124,23 @@
if (virtualMappings.containsKey(tldName)) {
return new
FileResourceAttributes(virtualMappings.get(tldName));
}
+} else if (name.startsWith("/META-INF/tags") && name.endsWith(".tag")
+|| name.endsWith(".tagx")) {
+
+// already loaded tag file
+if (tagfileMappings.containsKey(name)) {
+return new FileResourceAttributes(tagfileMappings.get(name));
+}
+
+// unknown tagfile, search for it in virtualClasspath
+StringTokenizer tkn = new StringTokenizer(virtualClasspath, ";");
+while (tkn.hasMoreTokens()) {
+File file = new File(tkn.nextToken(), name);
+if (file.exists()) {
+tagfileMappings.put(name, file);
+return new FileResourceAttributes(file);
+}
+}
}
return super.getAttributes(name);
@@ -136,6 +167,15 @@
String tldName = name.substring(name.lastIndexOf("/") + 1);
if (virtualMappings.containsKey(tldName)) {
return new FileResource(virtualMappings.get(tldName));
+}
+} else if (name.startsWith("/META-INF/tags") && name.endsWith(".tag")
+|| name.endsWith(".tagx")) {
+
+// already loaded tag file: we are sure that getAttributes() has
+// already been called if we are here
+File tagFile = tagfileMappings.get(name);
+if (tagFile != null) {
+return new FileResource(tagFile);
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r492263 - /tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java
Author: funkman
Date: Wed Jan 3 11:29:52 2007
New Revision: 492263
URL: http://svn.apache.org/viewvc?view=rev&rev=492263
Log:
http://issues.apache.org/bugzilla/show_bug.cgi?id=41267
NPE in TagLibraryInfoImpl for a declared tag files not in jar files
Patch by
Fabrizio Giustina - fgiust at-apache:org
Modified:
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java
Modified:
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java?view=diff&rev=492263&r1=492262&r2=492263
==
---
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java
(original)
+++
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java
Wed Jan 3 11:29:52 2007
@@ -492,7 +492,11 @@
if (path.startsWith("/META-INF/tags")) {
// Tag file packaged in JAR
-ctxt.getTagFileJarUrls().put(path, jarFileUrl);
+// check if jarFileUrl is not null before adding it, or this will
+// cause a NPE.
+if (jarFileUrl != null) {
+ctxt.getTagFileJarUrls().put(path, jarFileUrl);
+}
} else if (!path.startsWith("/WEB-INF/tags")) {
err.jspError("jsp.error.tagfile.illegalPath", path);
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r513284 [2/2] - in /tomcat/site/trunk: docs/faq/ docs/faq/printer/ xdocs-faq/
Modified: tomcat/site/trunk/docs/faq/misc.html
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/faq/misc.html?view=diff&rev=513284&r1=513283&r2=513284
==
--- tomcat/site/trunk/docs/faq/misc.html (original)
+++ tomcat/site/trunk/docs/faq/misc.html Thu Mar 1 03:37:31 2007
@@ -1,7 +1,7 @@
Tomcat FAQ - Miscellaneous Questions
dt { font-size : larger; font-weight : bold }
dd {padding-bottom : 10px;}
-http://tomcat.apache.org/";>Apache
Tomcathttp://www.apache.org/";>http://www.apache.org/images/asf-logo.gif";>LinksTomcat
HomeFAQ
HomeContentsBugsClass
Not FoundClusteringConnectorsDatabaseDeploymentDevelopmentFDA Validationhttp://wiki.apache.org/tomcat/HowTo";>How do ILinux / UnixOther Operating SystemsLoggingMemoryMetaMiscellaneousMonitoring / Performancehttp://wiki.apache.org/tomcat/UsefulLinks";>Other ResourcesSecurityWhich
VersionTomcat User Listhttp://wiki.apa
che.org/tomcat/">WikiWindowsTomcat
FAQMiscellaneous Questionsprint-friendlyversion
+http://tomcat.apache.org/";>Apache
Tomcathttp://www.apache.org/";>http://www.apache.org/images/asf-logo.gif";>LinksTomcat
HomeFAQ
HomeContentsBugsClass
Not FoundClusteringConnectorsDatabaseDeploymentDevelopmentFDA Validationhttp://wiki.apache.org/tomcat/HowTo";>How do ILinux / UnixOther Operating SystemsLoggingMemoryMetaMiscellaneousMonitoring / Performancehttp://wiki.apache.org/tomcat/UsefulLinks";>Other ResourcesSecurityWhich
VersionTomcat User Listhttp://wi
ki.apache.org/tomcat/">WikiWindowsTomcat
FAQMiscellaneous Questionsprint-friendlyversion
Preface
This section contains various miscellaneous questions that are
asked frequently enough to be listed here.
Modified: tomcat/site/trunk/docs/faq/otherOperatingSystems.html
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/faq/otherOperatingSystems.html?view=diff&rev=513284&r1=513283&r2=513284
==
--- tomcat/site/trunk/docs/faq/otherOperatingSystems.html (original)
+++ tomcat/site/trunk/docs/faq/otherOperatingSystems.html Thu Mar 1 03:37:31
2007
@@ -1,7 +1,7 @@
Tomcat FAQ - Tomcat on Other Operating
Systems
dt { font-size : larger; font-weight : bold }
dd {padding-bottom : 10px;}
-http://tomcat.apache.org/";>Apache
Tomcathttp://www.apache.org/";>http://www.apache.org/images/asf-logo.gif";>LinksTomcat
HomeFAQ
HomeContentsBugsClass
Not FoundClusteringConnectorsDatabaseDeploymentDevelopmentFDA Validationhttp://wiki.apache.org/tomcat/HowTo";>How do ILinux / UnixOther Operating SystemsLoggingMemoryMetaMiscellaneousMonitoring / Performancehttp://wiki.apache.org/tomcat/UsefulLinks";>Other ResourcesSecurityWhich
VersionTomcat User Listhttp://wiki.apa
che.org/tomcat/">WikiWindowsTomcat
FAQTomcat on Other Operating Systemsprint-friendlyversion
+http://tomcat.apache.org/";>Apache
Tomcathttp://www.apache.org/";>http://www.apache.org/images/asf-logo.gif";>LinksTomcat
HomeFAQ
HomeContentsBugsClass
Not FoundClusteringConnectorsDatabaseDeploymentDevelopmentFDA Validationhttp://wiki.apache.org/tomcat/HowTo";>How do ILinux / UnixOther Operating SystemsLoggingMemoryMetaMiscellaneousMonitoring / Performancehttp://wiki.apache.org/tomcat/UsefulLinks";>Other ResourcesSecurityWhich
VersionTomcat User Listhttp://wi
ki.apache.org/tomcat/">WikiWindowsTomcat
FAQTomcat on Other Operating Systemsprint-friendlyversion
Preface
This section of the FAQ deals with running Tomcat on platforms
Modified: tomcat/site/trunk/docs/faq/performance.html
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/faq/performance.html?view=diff&rev=513284&r1=513283&r2=513284
==
--- tomcat/site/trunk/docs/faq/performance.html (original)
+++ tomcat/site/trunk/docs/faq/performance.html Thu Mar 1 03:37:31 2007
@@ -1,7 +1,7 @@
Tomcat FAQ - Performance and Monitoring
dt { font-size : larger; font-weight : bold }
dd {padding-bottom : 10px;}
-http://tomcat.apache.org/";>Apache
Tomcathttp://www.apache.org/";>http://www.apache.org/images/asf-logo.gif";>LinksTomcat
HomeFAQ
HomeContentsBugsClass
Not FoundClusteringConnectorsDatabaseDeploymentDevelopmentFDA Validationhttp://wiki.apache.org/tomcat/HowTo";>How do ILinux / UnixOther Operating SystemsLoggingMemoryMetaMiscellaneousMonitoring / Performancehttp://wiki.apache.org/tomcat/UsefulLinks";>Other ResourcesSecurityWhich
VersionTomcat User Listhttp://wiki.apa
che.org/tomcat/">WikiWindowsTomcat
FAQPerformance and Monitoringprint-friendlyversion
+http://tomcat.apache.org/";>Apache
Tomcathttp://www.apache.org/";>http://www.apache.org/images/asf-logo.gif";>LinksTomcat
HomeFAQ
HomeContentsBugsClass
Not FoundClusteringConnectorsDatabaseDeploymentDevelopmentFDA Validationhttp://wiki.apache.org/tomcat/HowTo";>How do ILinux
svn commit: r513286 - in /tomcat/site/trunk: docs/whichversion.html xdocs/whichversion.xml
Author: funkman Date: Thu Mar 1 03:49:48 2007 New Revision: 513286 URL: http://svn.apache.org/viewvc?view=rev&rev=513286 Log: Brief placeholder description about Tomcat 6 Modified: tomcat/site/trunk/docs/whichversion.html tomcat/site/trunk/xdocs/whichversion.xml Modified: tomcat/site/trunk/docs/whichversion.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/whichversion.html?view=diff&rev=513286&r1=513285&r2=513286 == --- tomcat/site/trunk/docs/whichversion.html (original) +++ tomcat/site/trunk/docs/whichversion.html Thu Mar 1 03:49:48 2007 @@ -3,20 +3,20 @@ Apache Tomcat - Apache Tomcat -- Which Version Do I Want? - - - - - + + + + + - - + + http://tomcat.apache.org/";> - + @@ -27,28 +27,28 @@ http://www.apache.org/";> -http://www.apache.org/images/asf-logo.gif"; align="right" alt="Apache Logo" border="0"/> +http://www.apache.org/images/asf-logo.gif"; /> -http://www.google.com/search"; method="get"> - - - +http://www.google.com/search";> + + + - + - + - + Apache Tomcat @@ -171,11 +171,11 @@ - - + + - + Apache Tomcat Versions @@ -193,59 +193,59 @@ - - + + Servlet/JSP Spec - - + + Apache Tomcat version - -2.5/2.1 + +2.5/2.1 - -6.0.x + +6.0.x - -2.4/2.0 + +2.4/2.0 - -5.5.x + +5.5.x - -2.3/1.2 + +2.3/1.2 - -4.1.x + +4.1.x - -2.2/1.1 + +2.2/1.1 - -3.3.x + +3.3.x -The releases are described in more detail below to help you determine -which one is right for you. More details about each release can be found in -the associated release notes. +The releases are described in more detail below to help you determine +which one is right for you. More details about each release can be found in +the associated release notes. Please note that alhough we offer downloads and documentation of older releases, such as Apache Tomcat 3.x and 4.x, we strongly encourage users to use the @@ -262,14 +262,14 @@ - + - + - + Alpha / Beta / Stable @@ -311,14 +311,46 @@ - + - + - + + +Apache Tomcat 6.x + + + + + + + + + + +Apache Tomcat 6.x. Apache Tomcat 6.x is the current focus of +development. It builds upon the improvements made in Tomcat 5.5.x and implements +the Servlet 2.5 and JSP 2.1 +specifications. + + + + + + + + + + + + + + + + Apache Tomcat 5.x @@ -331,8 +363,7 @@ -Apache Tomcat 5.5.x. Apache Tomcat 5.5 is the current focus of -development. While it supports the same Servlet and JSP +Apache Tomcat 5.5.x. It supports the same Servlet and JSP Specification versions as Apache Tomcat 5.0.x, there are significant changes in many areas under the hood, resulting in improved performance, stability, and total cost of ownership. Please refer to the Apache Tomcat 5.5 Changelog @@ -344,8 +375,8 @@ ways, including: Performance optimizations and reduced garbage collection -Refactored application deployer, with an optional standalone deployer -allowing validation and compilation of a web application before putting +Refactored application deployer, with an optional standalone deployer +allowing validation and compilation of a web application before putting it in production Complete server monitoring using JMX and the manager web application Scalability and reliability enhancements @@ -364,14 +395,14 @@ - + - + - + Apache Tomcat 4.x @@ -395,7 +426,7 @@ -Apache Tomcat 4.1.x. Apache Tomcat 4.1 is a refactoring +Apache Tomcat 4.1.x. Apache Tomcat 4.1 is a refactoring of Apache Tomcat 4.0.x, and contains significant enhancements, including: JMX based administration features @@ -403,9 +434,9 @@ New Coyote connector (HTTP/1.1, AJP 1.3 and JNI support) Rewritten Jasper JSP page compiler Performance and memory efficiency improvements -Enhanced manager application support for integration with development +Enhanced manager application support for integration with development tools -Custom Ant tasks to interact with the manager application directly +Custom Ant tasks to interact with the manager application directly from build.xml scripts @@ -430,14 +461,14 @@ - + - + - + Apache Tomcat 3.x @@ -470,33 +501,33 @@ -Apache Tomcat 3.3.x. Version 3.3.2 is the current production +Apache Tomcat 3.3.x. Version 3.3.2 is the current production quality release. It continues the refactoring that was begun in version 3.2 and carries it to its logical conclusion. Version 3.3 provides a much more modular design and allows the servlet container to be customized by adding and removing modules that control the processing of servlet requests. This version also -contains many performance improvements. +contains many performance improve
svn commit: r513752 - /tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Author: funkman Date: Fri Mar 2 05:37:24 2007 New Revision: 513752 URL: http://svn.apache.org/viewvc?view=rev&rev=513752 Log: fix gump complaint for xsl Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?view=diff&rev=513752&r1=513751&r2=513752 == --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Fri Mar 2 05:37:24 2007 @@ -22,6 +22,7 @@ value of zero. These are now the first servlets to be started. (markt) + @@ -40,7 +41,7 @@ Fix previous update to servlet 2.5 xsd to use correct declaration. (markt) - + @@ -116,15 +117,15 @@ Chris Halstead. (markt) -40524: request.getAuthType() now returns CLIENT_CERT rather +40524: request.getAuthType() now returns CLIENT_CERT rather than CLIENT-CERT. (markt) -40526: Return support for JPDA_OPTS to catalina.bat and add +40526: Return support for JPDA_OPTS to catalina.bat and add a new option JPDA_SUSPEND, submitted by by Kurt Roy. (markt) -41265: In embedded, remove the code that resets checkInterval +41265: In embedded, remove the code that resets checkInterval values of zero to 300. (markt) @@ -156,7 +157,7 @@ -41466: When using the NioChannel and SecureNioChannel its +41466: When using the NioChannel and SecureNioChannel its important to use the channels buffers. (fhanik) @@ -415,7 +416,7 @@ Add xsds for JSP 2.1 (remm) -41106: Update validation checks for EL to also include +41106: Update validation checks for EL to also include legacy 1.2 tags (remm) @@ -456,7 +457,7 @@ Fix passing of the keystore password for the NIO connector (fhanik) - + @@ -493,7 +494,7 @@ validation, bom encoding support (remm) - + @@ -509,7 +510,7 @@ Implement explicit flushing in AJP (mturk) - + @@ -534,7 +535,7 @@ Unifed EL 2.1 support (jhook) - + @@ -548,18 +549,18 @@ resources (costin) - + New cluster configuration and new documentation (fhanik) - + - + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r415610 - /tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/Bootstrap.java
Author: funkman
Date: Tue Jun 20 04:12:30 2006
New Revision: 415610
URL: http://svn.apache.org/viewvc?rev=415610&view=rev
Log:
Remove JMX warning message since java5 is required
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/Bootstrap.java
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/Bootstrap.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/Bootstrap.java?rev=415610&r1=415609&r2=415610&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/Bootstrap.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/Bootstrap.java Tue
Jun 20 04:12:30 2006
@@ -62,13 +62,6 @@
// --- Static Variables
-private static final String JMX_ERROR_MESSAGE =
-"This release of Apache Tomcat was packaged to run on J2SE 5.0 \n"
-+ "or later. It can be run on earlier JVMs by downloading and \n"
-+ "installing a compatibility package from the Apache Tomcat \n"
-+ "binary download page.";
-
-
/**
* Daemon object used by main.
*/
@@ -389,19 +382,6 @@
* @param args Command line arguments to be processed
*/
public static void main(String args[]) {
-
-try {
-// Attempt to load JMX class
-new ObjectName("test:foo=bar");
-} catch (Throwable t) {
-System.out.println(JMX_ERROR_MESSAGE);
-try {
-// Give users some time to read the message before exiting
-Thread.sleep(5000);
-} catch (Exception ex) {
-}
-return;
-}
if (daemon == null) {
daemon = new Bootstrap();
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r420935 - /tomcat/tc6.0.x/trunk/java/org/apache/jasper/el/VariableResolverImpl.java
Author: funkman
Date: Tue Jul 11 10:51:14 2006
New Revision: 420935
URL: http://svn.apache.org/viewvc?rev=420935&view=rev
Log:
40012 - Legacy EL Support not resolving variables correctly
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/jasper/el/VariableResolverImpl.java
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/jasper/el/VariableResolverImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/el/VariableResolverImpl.java?rev=420935&r1=420934&r2=420935&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/el/VariableResolverImpl.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/el/VariableResolverImpl.java
Tue Jul 11 10:51:14 2006
@@ -28,7 +28,7 @@
}
public Object resolveVariable(String pName) throws ELException {
- return this.ctx.getELResolver().getValue(this.ctx, pName, null);
+ return this.ctx.getELResolver().getValue(this.ctx, null, pName);
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r1214735 - /tomcat/tc5.5.x/trunk/STATUS.txt
Author: funkman Date: Thu Dec 15 12:50:25 2011 New Revision: 1214735 URL: http://svn.apache.org/viewvc?rev=1214735&view=rev Log: some votes Modified: tomcat/tc5.5.x/trunk/STATUS.txt Modified: tomcat/tc5.5.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=1214735&r1=1214734&r2=1214735&view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Thu Dec 15 12:50:25 2011 @@ -42,7 +42,7 @@ PATCHES PROPOSED TO BACKPORT: It is based on r1189256 and r1187027, r1198622 (r1189258, r1187029, r1198623 in TC7) http://people.apache.org/~kkolinko/patches/2011-11-08_tc55_RequestFilterValve_v4.patch - +1: kkolinko + +1: kkolinko,funkman -1: kkolinko: It does its work and prevents app from starting and working. Though @@ -75,7 +75,7 @@ PATCHES PROPOSED TO BACKPORT: svn propset svn:eol-style native connectors/util/java/org/apache/tomcat/util/http/LocalStrings.properties svn propset svn:eol-style native container/catalina/src/share/org/apache/catalina/filters/FailedRequestFilter.java svn propset svn:eol-style native container/webapps/docs/config/filter.xml - +1: kkolinko, markt + +1: kkolinko, markt, funkman -1: * Clean up handling multi-byte chars in the connectors plus makin @@ -84,7 +84,7 @@ PATCHES PROPOSED TO BACKPORT: and r1201452 from TC 6. TC 6 patch applies with small offsets: http://people.apache.org/~rjung/patches/connectors_multi-byte_handling_cleanup-v2.patch +1: rjung - +1: kkolinko (see 5.5 specific version below), markt + +1: kkolinko (see 5.5 specific version below), markt, funkman -1: kkolinko: 5.5 version of the above. No changes besides file paths and line numbers and absence of InternalNioOutputBuffer in TC55: @@ -92,7 +92,7 @@ PATCHES PROPOSED TO BACKPORT: * Align %2f handling between implementations of UDecoder.convert() http://svn.apache.org/viewvc?rev=1203091&view=rev - +1: kkolinko, markt + +1: kkolinko, markt, funkman -1: * Remove obsolete build.xml file that was used to download source tree. @@ -108,12 +108,12 @@ PATCHES PROPOSED TO BACKPORT: Fix ClassCastException in Alias added for existing host via JMX http://svn.apache.org/viewvc?rev=1204856&view=rev (without tests; it is r1204860 in TC7) - +1: kkolinko, markt + +1: kkolinko, markt, funkman -1: * Do not throw IllegalArgumentException from parseParameters() call when chunked POST request is too large, but treat it like an IO error. http://svn.apache.org/viewvc?rev=1206200&view=rev (without tests; it is r1206205 in TC7) - +1: kkolinko, markt + +1: kkolinko, markt,funkman -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1221266 - /tomcat/tc5.5.x/trunk/STATUS.txt
Author: funkman Date: Tue Dec 20 14:14:31 2011 New Revision: 1221266 URL: http://svn.apache.org/viewvc?rev=1221266&view=rev Log: vote Modified: tomcat/tc5.5.x/trunk/STATUS.txt Modified: tomcat/tc5.5.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=1221266&r1=1221265&r2=1221266&view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Tue Dec 20 14:14:31 2011 @@ -102,5 +102,5 @@ PATCHES PROPOSED TO BACKPORT: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52335 Only handle <\% and not \% as escaped in template text. http://svn.apache.org/viewvc?rev=1215121&view=rev - +1: markt + +1: markt, funkman -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1221274 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: funkman Date: Tue Dec 20 14:23:30 2011 New Revision: 1221274 URL: http://svn.apache.org/viewvc?rev=1221274&view=rev Log: some votes Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1221274&r1=1221273&r2=1221274&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Dec 20 14:23:30 2011 @@ -77,7 +77,7 @@ PATCHES PROPOSED TO BACKPORT: kkolinko: I tested only that it does not break things with the current released tcnative version 1.1.22 that does not have FIPS mode support. http://people.apache.org/~kkolinko/patches/2011-11-12_tc6_AprLifecycleListener.patch - +1: kkolinko, markt + +1: kkolinko, markt,funkman -1: * Fix autodeployment of applications that have configuration errors. @@ -102,37 +102,37 @@ PATCHES PROPOSED TO BACKPORT: * Reduce overhead from exception handling in UDecoder http://people.apache.org/~kkolinko/patches/2011-11-17_tc6_UDecoder.patch (r1203054 in TC7) - +1: kkolinko + +1: kkolinko,funkman -1: * Align %2f handling between implementations of UDecoder.convert() http://svn.apache.org/viewvc?rev=1203091&view=rev - +1: kkolinko + +1: kkolinko,funkman -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52225 Fix ClassCastException in Alias added for existing host via JMX http://svn.apache.org/viewvc?rev=1204856&view=rev (without tests; it is r1204860 in TC7) - +1: kkolinko, markt + +1: kkolinko, markt,funkman -1: * Do not throw IllegalArgumentException from parseParameters() call when chunked POST request is too large, but treat it like an IO error. http://svn.apache.org/viewvc?rev=1206200&view=rev (without tests; it is r1206205 in TC7) - +1: kkolinko + +1: kkolinko,funkman -1: * Update Commons Daemon to 1.0.8 Change is trivial so no patch provided - +1: mturk, markt + +1: mturk, markt,funkman -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=52335 Only handle <\% and not \% as escaped in template text. http://svn.apache.org/viewvc?rev=1215121&view=rev - +1: markt + +1: markt,funkman -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r790245 - /tomcat/current/tc5.5.x/STATUS.txt
Author: funkman Date: Wed Jul 1 16:10:56 2009 New Revision: 790245 URL: http://svn.apache.org/viewvc?rev=790245&view=rev Log: vote Modified: tomcat/current/tc5.5.x/STATUS.txt Modified: tomcat/current/tc5.5.x/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=790245&r1=790244&r2=790245&view=diff == --- tomcat/current/tc5.5.x/STATUS.txt (original) +++ tomcat/current/tc5.5.x/STATUS.txt Wed Jul 1 16:10:56 2009 @@ -51,6 +51,7 @@ updated from a previous proposal based on the comments of Konstantin. mark and konstatin: please vote again. +1: rjung, kkolinko, markt + -0: new Boolean bad, Boolean.valueOf() much better -1: * Make AccessLogValve thread safe - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r809575 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: funkman Date: Mon Aug 31 13:24:49 2009 New Revision: 809575 URL: http://svn.apache.org/viewvc?rev=809575&view=rev Log: some votes Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=809575&r1=809574&r2=809575&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Aug 31 13:24:49 2009 @@ -82,7 +82,7 @@ * Dont try to report thread counts when using an executor from outside http://people.apache.org/~fhanik/connector-thread-report.patch - +1: fhanik, kkolinko + +1: fhanik, kkolinko,funkman +1: markt - would 0 make more sense rather than -1? Happy with either -1: @@ -105,7 +105,7 @@ https://issues.apache.org/bugzilla/show_bug.cgi?id=37933 and implements an alternative that doesn't have the side effects described in 38797 http://svn.apache.org/viewvc?rev=791224&view=rev - +1: markt, kkolinko + +1: markt, kkolinko,funkman -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47478 @@ -150,7 +150,7 @@ * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47515 https://issues.apache.org/bugzilla/attachment.cgi?id=23973 - +1: fhanik, kkolinko, markt + +1: fhanik, kkolinko, markt,funkman -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47413 @@ -158,13 +158,13 @@ Without coercion, the concatenation of ((Object)null) + string results in "null" being printed. http://svn.apache.org/viewvc?rev=795466&view=rev - +1: kkolinko, markt, rjung + +1: kkolinko, markt, rjung, funkman -1: * Fix the JDBC driver clean-up http://svn.apache.org/viewvc?view=rev&revision=789389 See below for additional fix required - +1: markt, rjung + +1: markt, rjung, funkman -1: rjung: I don't really like the implicit 4KB class size limit. I understand your rationale, but we don't know enough about other JVMs @@ -174,13 +174,13 @@ * Fix NPE observed when unpackWARs="false" with above fix http://svn.apache.org/viewvc?view=rev&revision=805153 - +1: markt + +1: markt, funkman -1: * Port Active Directory improvements to JNDIREalm from trunk Patch testing successfully by willing volunteer on the users list http://people.apache.org/~markt/patches/2009-08-06-ADforJNDIRealm.patch - +1: markt, kkolinko + +1: markt, kkolinko, funkman -1: kkolinko: ( There are several (two) places with a loop printing containerLog.debug( @@ -237,14 +237,14 @@ * Expose filter configuration via JMX (read-only) Based on a patch by Xie Xiaodong as part of GSOC2009. http://svn.apache.org/viewvc?rev=802727&view=rev - +1: markt + +1: markt, funkman -1: * Use platform MBean server rather than creating a new one. Makes it possible to connect JConsole and other JMX tools to locally running Tomcat instances without any config changes to Tomcat http://svn.apache.org/viewvc?rev=677910&view=rev - +1: markt + +1: markt, funkman -1: * Add remote JMX listener. Enables JMX to be configured so that it can be used @@ -252,19 +252,19 @@ uses one fixed and one random port. Needs the platform MBean server fix above to be really useful http://people.apache.org/~markt/patches/2009-08-12-jmx-remote.patch - +1: markt + +1: markt, funkman -1: * Make context deployment error message more meaningful http://svn.apache.org/viewvc?rev=802940&view=rev - +1: markt, kkolinko + +1: markt, kkolinko, funkman -1: * Additional patch required for https://issues.apache.org/bugzilla/show_bug.cgi?id=47046 Clean up Jk components that only exist in the 6.0.x and were hence missed https://issues.apache.org/bugzilla/attachment.cgi?id=24125 - +1: markt + +1: markt, funkman -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45403 @@ -275,14 +275,14 @@ - test on linux in normal and failure modes http://svn.apache.org/viewvc?rev=804462&view=rev http://svn.apache.org/viewvc?rev=804544&view=rev - +1: kkolinko, markt + +1: kkolinko, markt, funkman -1: * Perform deserialization with the context class loader set. This ensures that code that actually executes Class.forName(...,classloader) during this phase works properly. http://svn.apache.org/viewvc?rev=804057&view=rev - +1: fhanik, markt, kkolinko + +1: fhanik, markt, kkolinko,funkman -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47158 @@ -299,7 +299,7 @@ simple tags and tags and can't find any regression issues. The TCK also passes. http://svn.apache.org/viewvc?rev=804734&view=rev - +1: markt + +1: markt, funkman -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47699 @@ -312,4 +312,5 @@ * Fix https://issues.apache.org/bugzilla/sho
svn commit: r809603 - /tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java
Author: funkman Date: Mon Aug 31 14:17:37 2009 New Revision: 809603 URL: http://svn.apache.org/viewvc?rev=809603&view=rev Log: https://issues.apache.org/bugzilla/show_bug.cgi?id=47705 ArithmeticException: / by zero when expiring sessions via manager Modified: tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java Modified: tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java?rev=809603&r1=809602&r2=809603&view=diff == --- tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java (original) +++ tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java Mon Aug 31 14:17:37 2009 @@ -1106,6 +1106,8 @@ int histoInterval = maxInactiveInterval / maxCount; if ( histoInterval * maxCount < maxInactiveInterval ) histoInterval++; +if (0==histoInterval) +histoInterval=1; maxCount = maxInactiveInterval / histoInterval; if ( histoInterval * maxCount < maxInactiveInterval ) maxCount++; - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r809605 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: funkman Date: Mon Aug 31 14:19:52 2009 New Revision: 809605 URL: http://svn.apache.org/viewvc?rev=809605&view=rev Log: add https://issues.apache.org/bugzilla/show_bug.cgi?id=47705 Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=809605&r1=809604&r2=809605&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Aug 31 14:19:52 2009 @@ -314,3 +314,10 @@ +1: markt 0: Where's the patch? -1: + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47705 + ArithmeticException: / by zero when expiring sessions via manager + http://svn.apache.org/viewvc?rev=809603&view=rev + +1: funkman + -1: + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r809596 - /tomcat/trunk/java/org/apache/tomcat/util/http/mapper/Mapper.java
Author: funkman
Date: Mon Aug 31 13:59:00 2009
New Revision: 809596
URL: http://svn.apache.org/viewvc?rev=809596&view=rev
Log:
Allow welcome files without a physical backing.
Inspired by this bug https://issues.apache.org/bugzilla/show_bug.cgi?id=47378
Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/mapper/Mapper.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/http/mapper/Mapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/mapper/Mapper.java?rev=809596&r1=809595&r2=809596&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/http/mapper/Mapper.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/mapper/Mapper.java Mon Aug 31
13:59:00 2009
@@ -804,6 +804,36 @@
}
+/* welcome file processing - take 2
+ * Now that we have looked for welcome files with a physical
+ * backing, now look for an extension mapping listed
+ * but may not have a physical backing to it. This is for
+ * the case of index.jsf, index.do, etc.
+ * A watered down version of rule 4
+ */
+if (mappingData.wrapper == null) {
+boolean checkWelcomeFiles = checkJspWelcomeFiles;
+if (!checkWelcomeFiles) {
+char[] buf = path.getBuffer();
+checkWelcomeFiles = (buf[pathEnd - 1] == '/');
+}
+if (checkWelcomeFiles) {
+for (int i = 0; (i < context.welcomeResources.length)
+ && (mappingData.wrapper == null); i++) {
+path.setOffset(pathOffset);
+path.setEnd(pathEnd);
+path.append(context.welcomeResources[i], 0,
+context.welcomeResources[i].length());
+path.setOffset(servletPath);
+internalMapExtensionWrapper(extensionWrappers,
+path, mappingData);
+}
+
+path.setOffset(servletPath);
+path.setEnd(pathEnd);
+}
+}
+
// Rule 7 -- Default servlet
if (mappingData.wrapper == null && !checkJspWelcomeFiles) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r832636 - in /tomcat/trunk/java/org/apache: catalina/ant/jmx/JMXAccessorTask.java catalina/tribes/transport/bio/BioReceiver.java catalina/valves/JDBCAccessLogValve.java tomcat/util/net/Nio
Author: funkman
Date: Wed Nov 4 00:54:02 2009
New Revision: 832636
URL: http://svn.apache.org/viewvc?rev=832636&view=rev
Log:
https://issues.apache.org/bugzilla/show_bug.cgi?id=46947
Code cleanup patch that removes some obsolete null checks
Modified:
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java
tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java
tomcat/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java
Modified: tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java?rev=832636&r1=832635&r2=832636&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java Wed Nov
4 00:54:02 2009
@@ -430,10 +430,8 @@
try {
jmxServerConnection = (MBeanServerConnection) pref;
} catch (ClassCastException cce) {
-if (project != null) {
-project.log("wrong object reference " + refId + " - "
+project.log("wrong object reference " + refId + " - "
+ pref.getClass());
-}
return null;
}
}
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java?rev=832636&r1=832635&r2=832636&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java
Wed Nov 4 00:54:02 2009
@@ -30,7 +30,7 @@
/**
*
* @author Filip Hanik
- * @version $Revision:$ $Date:$
+ * @version $Revision$ $Date$
*/
public class BioReceiver extends ReceiverBase implements Runnable,
ChannelReceiver, ListenCallback {
Modified: tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java?rev=832636&r1=832635&r2=832636&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java Wed
Nov 4 00:54:02 2009
@@ -462,17 +462,13 @@
getNext().invoke(request, response);
-String remoteHost = EMPTY;
+String remoteHost;
if(resolveHosts)
remoteHost = request.getRemoteHost();
else
remoteHost = request.getRemoteAddr();
-String user = EMPTY;
-if(request != null)
-user = request.getRemoteUser();
-String query="";
-if(request != null)
-query = request.getRequestURI();
+String user = request.getRemoteUser();
+String query=request.getRequestURI();
long bytes = response.getContentCountLong() ;
if(bytes < 0)
@@ -482,7 +478,7 @@
String method = EMPTY;
String referer = EMPTY;
String userAgent = EMPTY;
-if (pattern.equals("combined") && request != null) {
+if (pattern.equals("combined")) {
virtualHost = request.getServerName();
method = request.getMethod();
referer = request.getHeader("referer");
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java?rev=832636&r1=832635&r2=832636&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java Wed
Nov 4 00:54:02 2009
@@ -350,7 +350,7 @@
countDown(attachment.getWriteLatch());
}
}catch (CancelledKeyException ckx) {
-if (sk!=null) sk.cancel();
+sk.cancel();
countDown(attachment.getReadLatch());
countDown(attachment.getWriteLatch());
}
@@ -391,4 +391,4 @@
}
}
-}
\ No newline at end of file
+}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r832638 - /tomcat/trunk/java/org/apache/naming/NamingContext.java
Author: funkman
Date: Wed Nov 4 01:18:08 2009
New Revision: 832638
URL: http://svn.apache.org/viewvc?rev=832638&view=rev
Log:
Binding java.lang.reflect.Proxy to JNDI directory raises
java.lang.ClassCastException
https://issues.apache.org/bugzilla/show_bug.cgi?id=47512
Also acts as dead code removal
Modified:
tomcat/trunk/java/org/apache/naming/NamingContext.java
Modified: tomcat/trunk/java/org/apache/naming/NamingContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/NamingContext.java?rev=832638&r1=832637&r2=832638&view=diff
==
--- tomcat/trunk/java/org/apache/naming/NamingContext.java (original)
+++ tomcat/trunk/java/org/apache/naming/NamingContext.java Wed Nov 4 01:18:08
2009
@@ -794,13 +794,8 @@
}
} else if (entry.type == NamingEntry.REFERENCE) {
try {
-Object obj = NamingManager.getObjectInstance
+return NamingManager.getObjectInstance
(entry.value, name, this, env);
-if (obj != null) {
-entry.value = obj;
-entry.type = NamingEntry.ENTRY;
-}
-return obj;
} catch (NamingException e) {
throw e;
} catch (Exception e) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r832639 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: funkman Date: Wed Nov 4 01:20:33 2009 New Revision: 832639 URL: http://svn.apache.org/viewvc?rev=832639&view=rev Log: proposal for 47512 Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=832639&r1=832638&r2=832639&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Nov 4 01:20:33 2009 @@ -383,3 +383,11 @@ http://people.apache.org/~kkolinko/patches/2009-11-03_StringBuilder_o_a_c_valves_AccessLogValve.patch +1: kkolinko -1: + + +* Binding java.lang.reflect.Proxy to JNDI directory raises java.lang.ClassCastException + https://issues.apache.org/bugzilla/show_bug.cgi?id=47512 + http://svn.apache.org/viewvc?rev=832638&view=rev + +1: funkman + -1: + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r832589 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: funkman
Date: Tue Nov 3 22:50:50 2009
New Revision: 832589
URL: http://svn.apache.org/viewvc?rev=832589&view=rev
Log:
votes
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=832589&r1=832588&r2=832589&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Nov 3 22:50:50 2009
@@ -72,7 +72,7 @@
It is updated version of Mark's (since withdrawn) patch,
where the new method in JAASRealm calls the old one.
http://people.apache.org/~kkolinko/patches/2009-11-02_bug39231.patch
- +1: kkolinko, markt
+ +1: kkolinko, markt,funkman
-1:
* Improve NIO connector shutdown time by doing shutdowns in parallel
@@ -153,7 +153,7 @@
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47699
Better handling of PID files
https://issues.apache.org/bugzilla/attachment.cgi?id=24202
- +1: markt
+ +1: markt, funkman
+1: fhanik (although, on .sh, I think we could get rid of 'Bootstrap stop'
by now, shutdown hooks have been available for quite some time)
-1:
@@ -162,7 +162,7 @@
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44041
Threading issue in classloading. Adds a sync so please check performance
http://svn.apache.org/viewvc?rev=805182&view=rev
- +1: markt
+ +1: markt, funkman
0: jim
-1: fhanik, I would say a thread safe, yet concurrent implementation would do
synchronized (className.intern()) {
@@ -206,7 +206,7 @@
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47267
http://svn.apache.org/viewvc?rev=817822&view=rev
- +1: markt
+ +1: markt, funkman
-1:
rjung: Our dreaded multi platform build system is a bit fragile
w.r.t. fixcrlf. If you change the file to crlf in the installer
@@ -228,7 +228,7 @@
* Fix ReplicationValve CrossContext support
http://svn.apache.org/viewvc?rev=831718&view=rev
- +1: pero, rjung
+ +1: pero, rjung, funkman
-1:
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47331
@@ -410,5 +410,5 @@
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47918
Correct copy and paste in mbeans descriptions
http://svn.apache.org/viewvc?rev=832218&view=rev
- +1: markt, kkolinko
+ +1: markt, kkolinko, funkman
-1:
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r832792 - /tomcat/trunk/java/org/apache/naming/NamingContext.java
Author: funkman
Date: Wed Nov 4 16:40:16 2009
New Revision: 832792
URL: http://svn.apache.org/viewvc?rev=832792&view=rev
Log:
revert based on https://issues.apache.org/bugzilla/show_bug.cgi?id=47512#c4
Modified:
tomcat/trunk/java/org/apache/naming/NamingContext.java
Modified: tomcat/trunk/java/org/apache/naming/NamingContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/NamingContext.java?rev=832792&r1=832791&r2=832792&view=diff
==
--- tomcat/trunk/java/org/apache/naming/NamingContext.java (original)
+++ tomcat/trunk/java/org/apache/naming/NamingContext.java Wed Nov 4 16:40:16
2009
@@ -794,8 +794,13 @@
}
} else if (entry.type == NamingEntry.REFERENCE) {
try {
-return NamingManager.getObjectInstance
+Object obj = NamingManager.getObjectInstance
(entry.value, name, this, env);
+if (obj != null) {
+entry.value = obj;
+entry.type = NamingEntry.ENTRY;
+}
+return obj;
} catch (NamingException e) {
throw e;
} catch (Exception e) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r832793 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: funkman Date: Wed Nov 4 16:41:09 2009 New Revision: 832793 URL: http://svn.apache.org/viewvc?rev=832793&view=rev Log: withdrawl proposal based on feedback Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=832793&r1=832792&r2=832793&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Nov 4 16:41:09 2009 @@ -385,10 +385,4 @@ -1: -* Binding java.lang.reflect.Proxy to JNDI directory raises java.lang.ClassCastException - https://issues.apache.org/bugzilla/show_bug.cgi?id=47512 - http://svn.apache.org/viewvc?rev=832638&view=rev - +1: funkman - -1: kkolinko: -https://issues.apache.org/bugzilla/show_bug.cgi?id=47512#c4 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r833125 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: funkman Date: Thu Nov 5 18:51:37 2009 New Revision: 833125 URL: http://svn.apache.org/viewvc?rev=833125&view=rev Log: proposal for http://svn.apache.org/viewvc?rev=833121&view=rev https://issues.apache.org/bugzilla/show_bug.cgi?id=47495 Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=833125&r1=833124&r2=833125&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Nov 5 18:51:37 2009 @@ -387,4 +387,10 @@ -1: +* If server.xml not readable - be more explicit in letting the user know + http://svn.apache.org/viewvc?rev=833121&view=rev + https://issues.apache.org/bugzilla/show_bug.cgi?id=47495 + +1: funkman + -1: + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r833121 - /tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
Author: funkman
Date: Thu Nov 5 18:46:43 2009
New Revision: 833121
URL: http://svn.apache.org/viewvc?rev=833121&view=rev
Log:
https://issues.apache.org/bugzilla/show_bug.cgi?id=47495
If server.xml doesnt have read permission - let the user know
Modified:
tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Catalina.java?rev=833121&r1=833120&r2=833121&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/Catalina.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Catalina.java Thu Nov 5
18:46:43 2009
@@ -516,6 +516,9 @@
if ((inputStream == null) && (file != null)) {
log.warn("Can't load server.xml from " + file.getAbsolutePath());
+if (file.exists() && !file.canRead()) {
+log.warn("Permissions incorrect, read permission is not
allowed on the file.");
+}
return;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r833271 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: funkman Date: Fri Nov 6 01:49:50 2009 New Revision: 833271 URL: http://svn.apache.org/viewvc?rev=833271&view=rev Log: some votes Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=833271&r1=833270&r2=833271&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Nov 6 01:49:50 2009 @@ -230,6 +230,7 @@ Use StringBuilder instead of StringBuffer -0: markt for all SBuilder->SBuffer patches. Code cleanup is fine in trunk but no need to backport it + -0: funkman The patches, as well as patches for individual files inside them, are independent of each other. Vote for as many as you want. @@ -400,5 +401,5 @@ http://people.apache.org/~markt/patches/2009-11-05-bug47330-tc6.patch http://people.apache.org/~markt/patches/RemoteIpValve.java http://people.apache.org/~markt/patches/RemoteIpValveTest.java - +1: markt + +1: markt, funkman -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r618153 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: funkman Date: Sun Feb 3 18:19:43 2008 New Revision: 618153 URL: http://svn.apache.org/viewvc?rev=618153&view=rev Log: proposal for Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=44337 Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=618153&r1=618152&r2=618153&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Feb 3 18:19:43 2008 @@ -69,3 +69,11 @@ +1: markt +0: remm: do we really want to fix these sort of "bugs" ? -1: + +* Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=44337 + Dir listing crashes if no readme-file present + http://svn.apache.org/viewvc?rev=618150&view=rev + +1: funkman + -1: + + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r618150 - /tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
Author: funkman
Date: Sun Feb 3 18:10:39 2008
New Revision: 618150
URL: http://svn.apache.org/viewvc?rev=618150&view=rev
Log:
http://issues.apache.org/bugzilla/show_bug.cgi?id=44337
Dir listing crashes if no readme-file present
Catch NamingException on resource not found instead of checking for null
Modified:
tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
Modified: tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java?rev=618150&r1=618149&r2=618150&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java Sun Feb
3 18:10:39 2008
@@ -1415,7 +1415,10 @@
return buffer.toString();
}
} catch (NamingException e) {
-throw new ServletException("Error opening readme resource", e);
+if (debug > 10)
+log("readme '" + readmeFile + "' not found", e);
+
+return null;
}
}
@@ -1438,7 +1441,10 @@
return is;
}
} catch (NamingException e) {
-throw new ServletException("Error opening XSLT resource", e);
+if (debug > 10)
+log("localXsltFile '" + localXsltFile + "' not found", e);
+
+return null;
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r620848 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: funkman Date: Tue Feb 12 08:27:45 2008 New Revision: 620848 URL: http://svn.apache.org/viewvc?rev=620848&view=rev Log: addition of dupl listener removal and a vote Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=620848&r1=620847&r2=620848&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Feb 12 08:27:45 2008 @@ -88,5 +88,11 @@ * ExtendedAccessLogValve cs-uri not print empty querystring http://svn.apache.org/viewvc?rev=620778&view=rev - +1: pero + +1: pero,funkman + + +* Remove duplicate listner additions + http://svn.apache.org/viewvc?rev=620844&view=rev + +1: funkman -1: + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r620844 - /tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java
Author: funkman Date: Tue Feb 12 08:22:19 2008 New Revision: 620844 URL: http://svn.apache.org/viewvc?rev=620844&view=rev Log: Only add the listener once (to prevent the dup message from accidently appearing) related to http://issues.apache.org/bugzilla/show_bug.cgi?id=44268 Modified: tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java Modified: tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java?rev=620844&r1=620843&r2=620844&view=diff == --- tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java (original) +++ tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java Tue Feb 12 08:22:19 2008 @@ -204,9 +204,6 @@ digester.addCallMethod(prefix + "web-app/jsp-config/jsp-property-group/url-pattern", "addJspMapping", 0); -digester.addCallMethod(prefix + "web-app/listener/listener-class", - "addApplicationListener", 0); - digester.addRule(prefix + "web-app/login-config", loginConfig); - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r620842 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/servlets/DefaultServlet.java webapps/docs/changelog.xml
Author: funkman
Date: Tue Feb 12 08:13:54 2008
New Revision: 620842
URL: http://svn.apache.org/viewvc?rev=620842&view=rev
Log:
Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=44337
Dir listing crashes if no readme-file present
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=620842&r1=620841&r2=620842&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Feb 12 08:13:54 2008
@@ -70,12 +70,6 @@
+0: remm: do we really want to fix these sort of "bugs" ?
-1:
-* Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=44337
- Dir listing crashes if no readme-file present
- http://svn.apache.org/viewvc?rev=618150&view=rev
- +1: funkman, markt, fhanik, pero
- -1:
-
* Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43741
Correctly handle dependencies on tags in JARs
http://svn.apache.org/viewvc?rev=618481&view=rev
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java?rev=620842&r1=620841&r2=620842&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
Tue Feb 12 08:13:54 2008
@@ -1415,7 +1415,10 @@
return buffer.toString();
}
} catch (NamingException e) {
-throw new ServletException("Error opening readme resource", e);
+if (debug > 10)
+log("readme '" + readmeFile + "' not found", e);
+
+return null;
}
}
@@ -1438,7 +1441,10 @@
return is;
}
} catch (NamingException e) {
-throw new ServletException("Error opening XSLT resource", e);
+if (debug > 10)
+log("localXsltFile '" + localXsltFile + "' not found", e);
+
+return null;
}
}
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=620842&r1=620841&r2=620842&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue Feb 12 08:13:54 2008
@@ -32,6 +32,13 @@
+
+
+
+44337: Dir listing crashes if no readme-file present
(funkman)
+
+
+
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r628307 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/startup/WebRuleSet.java webapps/docs/changelog.xml
Author: funkman
Date: Sat Feb 16 06:40:24 2008
New Revision: 628307
URL: http://svn.apache.org/viewvc?rev=628307&view=rev
Log:
If listener declared in web.xml, only add it once. (per STATUS)
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/WebRuleSet.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=628307&r1=628306&r2=628307&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Feb 16 06:40:24 2008
@@ -80,10 +80,6 @@
http://svn.apache.org/viewvc?rev=620778&view=rev
+1: pero,funkman,markt
-* Remove duplicate listner additions
- http://svn.apache.org/viewvc?rev=620844&view=rev
- +1: funkman, pero, jfclere, markt, remm
-
* lib is relative to catalina home, not base
http://svn.apache.org/viewvc?rev=627602&view=rev
+1: markt, fhanik
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/WebRuleSet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/WebRuleSet.java?rev=628307&r1=628306&r2=628307&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/WebRuleSet.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/WebRuleSet.java Sat
Feb 16 06:40:24 2008
@@ -256,9 +256,6 @@
digester.addCallMethod(prefix +
"web-app/jsp-config/jsp-property-group/url-pattern",
"addJspMapping", 0);
-digester.addCallMethod(prefix + "web-app/listener/listener-class",
- "addApplicationListener", 0);
-
digester.addRule(prefix + "web-app/login-config",
loginConfig);
@@ -902,4 +899,4 @@
if (digester.getLogger().isDebugEnabled())
digester.getLogger().debug("pop SecurityRoleRef");
}
-}
\ No newline at end of file
+}
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=628307&r1=628306&r2=628307&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sat Feb 16 06:40:24 2008
@@ -38,6 +38,9 @@
44337: Dir listing crashes if no readme-file present
(funkman)
+
+If listener declared in web.xml, only add it once. (funkman)
+
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r684613 - /tomcat/current/tc4.1.x/STATUS.txt
Author: funkman Date: Sun Aug 10 16:50:06 2008 New Revision: 684613 URL: http://svn.apache.org/viewvc?rev=684613&view=rev Log: Followup on request to review Modified: tomcat/current/tc4.1.x/STATUS.txt Modified: tomcat/current/tc4.1.x/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/current/tc4.1.x/STATUS.txt?rev=684613&r1=684612&r2=684613&view=diff == --- tomcat/current/tc4.1.x/STATUS.txt (original) +++ tomcat/current/tc4.1.x/STATUS.txt Sun Aug 10 16:50:06 2008 @@ -28,17 +28,17 @@ * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44562 http://svn.apache.org/viewvc?rev=635294&view=rev (prior code clean up) http://svn.apache.org/viewvc?rev=635297&view=rev (the actual fix) - +1: markt, yoavs + +1: markt, yoavs, funkman -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=41217 This is CVE-2008-0128. http://people.apache.org/~markt/patches/2008-03-10-bug41217-tc4.patch - +1: markt, yoavs + +1: markt, yoavs, funkman -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45301 Remove a JDK 1.4 dep for the few users that still run TC4 on 1.3 JDKs http://people.apache.org/~markt/patches/2008-07-07-bug45301-tc4.patch - +1: markt, yoavs + +1: markt, yoavs, funkman -1: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r685530 - /tomcat/trunk/java/org/apache/catalina/core/StandardHost.java
Author: funkman
Date: Wed Aug 13 05:58:47 2008
New Revision: 685530
URL: http://svn.apache.org/viewvc?rev=685530&view=rev
Log:
Let the user know why errorReportValveClass was not loaded. Since it could
be ClassNotFound, invalid class version, (or other)
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardHost.java
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardHost.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardHost.java?rev=685530&r1=685529&r2=685530&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardHost.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardHost.java Wed Aug 13
05:58:47 2008
@@ -707,7 +707,7 @@
} catch (Throwable t) {
log.error(sm.getString
("standardHost.invalidErrorReportValveClass",
- errorReportValveClass));
+ errorReportValveClass), t);
}
}
if(log.isDebugEnabled()) {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r685535 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: funkman Date: Wed Aug 13 06:22:14 2008 New Revision: 685535 URL: http://svn.apache.org/viewvc?rev=685535&view=rev Log: some votes Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=685535&r1=685534&r2=685535&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Aug 13 06:22:14 2008 @@ -45,13 +45,13 @@ * Add in startup options, so that cluster can be started in TCP mode only, when using static membership Also document the multicast recovery options http://svn.apache.org/viewvc?rev=674125&view=rev - +1: fhanik, markt + +1: fhanik, markt, funkman -1: * Fix comet behavior Invoke READ when there is a body and make sure END is called if CometEvent.close is called during an invokation http://svn.apache.org/viewvc?rev=677473&view=rev - +1: fhanik + +1: fhanik, funkman 0: remm: no idea if it's better or worse (the fact that it's been closed is visible) -1: @@ -59,6 +59,8 @@ Include possible cause in error message since excpetion isn't that clear http://svn.apache.org/viewvc?rev=680710&view=rev +1: markt + -0: funkman ( Agree with Remy - just not as strongly (There is enough in the stacktrace that your fav search + engine can tell you what is wrong fairly quickly) -1: remm (this error seems to be displayed by Class.newInstance() which should be ok to use; I am not ok with the idea of working around every error message from JDKs) @@ -66,7 +68,7 @@ Add required sync to race condition Based on a patch by Santtu Hyrkk http://svn.apache.org/viewvc?rev=680725&view=rev - +1: markt, remm + +1: markt, remm, funkman -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45511 @@ -75,7 +77,7 @@ http://svn.apache.org/viewvc?rev=681735&view=rev (revert) http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/ELParser.jjt?r1=681735&r2=681789 (new fix) Note: Auto-generated files will also need to be updated - +1: markt, remm + +1: markt, remm, funkman -1: * Fix issue where the first request for a deleted JSPs returns as if the JSP @@ -88,26 +90,26 @@ * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45591 NPE on start-up failure in some cases. Based on a patch by Matt Passell http://svn.apache.org/viewvc?rev=683982&view=rev - +1: markt, remm + +1: markt, remm, funkman -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45585 Tomcat failed to start if using $CATALINA_BASE but not JULI. Patch based on a suggestion by Ian Ward Comfort http://svn.apache.org/viewvc?rev=684001&view=rev - +1: markt, remm + +1: markt, remm, funkman -1: * JAASMemoryLoginModule didn't conform to JAASRealm contract. This prevented any user from being assigned a role. http://svn.apache.org/viewvc?rev=684081&view=rev - +1: markt, remm + +1: markt, remm, funkman -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45576 Add support for DIGEST to the JAASRealm http://svn.apache.org/viewvc?rev=684234&view=rev - +1: markt, remm (the two people using digest could be interested) + +1: markt, funkman, remm (the two people using digest could be interested) -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=41407 @@ -115,7 +117,9 @@ https://issues.apache.org/bugzilla/show_bug.cgi?id=41407 +1: markt, remm -1: + 0: funkman - I see the bug URL twice with no patch + * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45528 Test the SSL socket for cert/cipher compatibility before returning it http://svn.apache.org/viewvc?rev=684559&view=rev - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
