Re: Tomcat 7 Maven Artifacts
Thanks a lot Mark! --Gurkan From: Mark Thomas ma...@apache.org To: Tomcat Developers List dev@tomcat.apache.org Sent: Tue, July 13, 2010 11:14:42 PM Subject: Re: Tomcat 7 Maven Artifacts On 13/07/2010 15:51, Mark Thomas wrote: On 13/07/2010 13:43, Mark Thomas wrote: On 13/07/2010 13:12, Gurkan Erdogdu wrote: Hello Mark; Where is the location? Not able to find http://repo2.maven.org/maven2/org/apache/tomcat/ It looks like the script we have for generating stuff isn't quite right. Henk runs a script that regularly scans the repo for errors and it picked up quite a few with Tomcat 7. I'll see what I can do to fix them but we might end up with some errors remaining for 7.0.0 I know what went wrong and am currently trying to fix it. I'm using the snapshot repo as a test bed since that needs fixing too. It does mean that the snapshot repo is going to get deleted and recreated a few times in the process. I'll drop another note to the list when it is stable again. The 7.0 snapshot is now stable. Also using a new version number of 7.0 rather than 7.0.0. That seemed to make more sense for the snapshots since you end up with 7.0-timestamp On to fixing the 7.0.0 files... Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r963956 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Wed Jul 14 06:24:18 2010 New Revision: 963956 URL: http://svn.apache.org/viewvc?rev=963956view=rev Log: 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=963956r1=963955r2=963956view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jul 14 06:24:18 2010 @@ -174,11 +174,11 @@ PATCHES PROPOSED TO BACKPORT: classes http://svn.apache.org/viewvc?rev=961948view=rev http://svn.apache.org/viewvc?rev=963106view=rev - +1: markt + +1: markt, kkolinko -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48960 Disable exec in SSI by default and provide new option to enable it http://svn.apache.org/viewvc?rev=963868view=rev - +1: markt + +1: markt, kkolinko -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49401] Do not set to null fields in loaded classes when stopping the container
https://issues.apache.org/bugzilla/show_bug.cgi?id=49401 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution||WONTFIX --- Comment #1 from Mark Thomas ma...@apache.org 2010-07-14 03:07:48 EDT --- The code runs on context stop. Differentiating between a context stop and a container stop is going to be tricky and likely to add more complexity than benefit gained. For a well behaved web application (that doesn't leak memory on reload) on a recent JVM there should be no problems with setting: WebappClassLoader.ENABLE_CLEAR_REFERENCES=false -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49402] juli.jar published twice in Maven repository
https://issues.apache.org/bugzilla/show_bug.cgi?id=49402 --- Comment #2 from Marc Guillemot mguille...@yahoo.fr 2010-07-14 03:04:31 EDT --- In fact for 6.0.28 org.apache.tomcat.extras juli still contains the content of org.apache.tomcat juli. Is it intentional? This looks strange to me. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49402] juli.jar published twice in Maven repository
https://issues.apache.org/bugzilla/show_bug.cgi?id=49402 --- Comment #3 from Rainer Jung rainer.j...@kippdata.de 2010-07-14 05:04:18 EDT --- I definitely don't know enough about maven, but I checked the following places: In directory /www/people.apache.org/repo/m2-ibiblio-rsync-repository/org/apache/tomcat of the ASF distribution host people.apache.org I find: $ ls -l extras/juli/6.0.28/juli-6.0.28.jar juli/6.0.28/juli-6.0.28.jar ... 62756 Jul 9 20:46 extras/juli/6.0.28/juli-6.0.28.jar ... 26484 Jul 9 20:45 juli/6.0.28/juli-6.0.28.jar And on the web I checked: http://mirrors.ibiblio.org/pub/mirrors/maven2/org/apache/tomcat/juli/6.0.28/ juli-6.0.28.jar 09-Jul-2010 16:45 26K and http://mirrors.ibiblio.org/pub/mirrors/maven2/org/apache/tomcat/extras/juli/6.0.28/ juli-6.0.28.jar09-Jul-2010 16:46 61K So the 2 jars are different and correct at least at those places. Don't know your source for the jars or your md5 or similar though :( Regards, Rainer -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49402] juli.jar published twice in Maven repository
https://issues.apache.org/bugzilla/show_bug.cgi?id=49402 --- Comment #4 from Rainer Jung rainer.j...@kippdata.de 2010-07-14 05:15:52 EDT --- ... and the timestamps of the directories on people.apache.org are: ... 12 Jul 11 08:34 extras/juli/6.0.28/ ... 12 Jul 11 08:34 juli/6.0.28/ I don't know how long replication takes. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49402] juli.jar published twice in Maven repository
https://issues.apache.org/bugzilla/show_bug.cgi?id=49402 --- Comment #5 from Marc Guillemot mguille...@yahoo.fr 2010-07-14 05:25:14 EDT --- Seems that I haven't been clear in my question. I try again. http://mirrors.ibiblio.org/pub/mirrors/maven2/org/apache/tomcat/extras/juli/6.0.28/juli-6.0.28.jar contains classes from following packages: org.apache.juli org.apache.juli.logging org.apache.juli.logging.impl and http://mirrors.ibiblio.org/pub/mirrors/maven2/org/apache/tomcat/juli/6.0.28/juli-6.0.28.jar contains classes from following packages org.apache.juli org.apache.juli.logging This means (as far as I can see, I haven't verified each single class file) that the classes from packages org.apache.juli and org.apache.juli.logging are in both jars. In other words, this means that the second jar is useless when you use the first one. Are these duplications intended? -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49402] juli.jar published twice in Maven repository
https://issues.apache.org/bugzilla/show_bug.cgi?id=49402 --- Comment #6 from Rainer Jung rainer.j...@kippdata.de 2010-07-14 06:08:40 EDT --- In previous versions of TC 6 the jars in the maven repos were indeeed *identical*. I assume you really referred to that problem when you wrote Exactly (look at the md5) the same juli.jar in your original report. The different observation you are now referring to, namely that some classes in the two jars are identical, is right and that's intended: The non-extras jar contains a self-contained implementation of Tomcat JULI logging linking directly to the JDK logging. The extras jars contain an alternative implementation, namely a repackaged commons-logging. The repackaging helps in avoiding conflicts with webapp provided commons-logging. More information is contained in the docs: http://tomcat.apache.org/tomcat-6.0-doc/logging.html Regards, Rainer -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49402] juli.jar published twice in Maven repository
https://issues.apache.org/bugzilla/show_bug.cgi?id=49402 --- Comment #7 from Marc Guillemot mguille...@yahoo.fr 2010-07-14 06:20:06 EDT --- Thanks for the explanation. This packaging choice is a bit strange as a dependency between two jars without intersection would be a more natural maven way but why not... -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Update of PoweredBy by Bruno
Dear Wiki user,
You have subscribed to a wiki page or wiki category on Tomcat Wiki for change
notification.
The PoweredBy page has been changed by Bruno.
http://wiki.apache.org/tomcat/PoweredBy?action=diffrev1=261rev2=262
--
{{http://www.metawerx.net/images/logo/logo256smlspc.gif}}
[[http://www.metawerx.net/default2.htm|MetaWerx.net]] - Australia's first and
largest Java hosting provider
=== SempiHost ===
- {{http://www.sempihost.com.br/images/logo-sempihost.jpg}}
[[http://www.sempihost.com.br/|SempiHost - Hospedagem de Sites]] provides
webhosting with JSP/Servlets support using Tomcat 5.0, 5.5 and 6.0.
+ {{http://www.sempihost.com.br/images/logo-sempihost.jpg}}
[[http://www.sempihost.com.br/|Hospedagem de Sites]] provides webhosting with
JSP/Servlets support using Tomcat 5.0, 5.5 and 6.0.
=== MIVITEC GmbH (German Internet Service Provider) ===
{{http://mivitec.de/mirsky-new/mivitec_web.gif}}
[[http://www.mivitec.de|MIVITEC GmbH - ISP from Germany / Munich]] - One of the
leading business hosting providers in Germany, uses Tomcat and Tomcat clusters
for client's sites, CMS systems like OpenCMS and Magnolia etc.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r964049 - /tomcat/trunk/webapps/docs/developers.xml
Author: kkolinko Date: Wed Jul 14 13:54:43 2010 New Revision: 964049 URL: http://svn.apache.org/viewvc?rev=964049view=rev Log: Add myself to the list. Modified: tomcat/trunk/webapps/docs/developers.xml Modified: tomcat/trunk/webapps/docs/developers.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/developers.xml?rev=964049r1=964048r2=964049view=diff == --- tomcat/trunk/webapps/docs/developers.xml (original) +++ tomcat/trunk/webapps/docs/developers.xml Wed Jul 14 13:54:43 2010 @@ -50,6 +50,7 @@ liFilip Hanik (fhanik): Clustering, Release Manager/li liJean-Frederic Clere (jfclere): Connectors/li liJim Jagielski (jim): Connectors/li + liKonstantin Kolinko (kkolinko): Catalina/li liMark Thomas (markt): CGI, SSI, WebDAV, bug fixing/li liMladen Turk (mturk): Connectors/li liPeter Rossbach (pero): Catalina, Clustering, JMX/li - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Using svn bugtraq?
On 13.07.2010 22:11, Mark Thomas wrote:
On 13/07/2010 19:57, Rainer Jung wrote:
I had a look at BZ46451. It suggests adding subversion properties to
enable the use of subversion bugtraq. This allows a better integration
of BZ into subversion commit messages and retrieval when looking at svn
logs.
Comments?
I was playing with this a while ago here:
http://svn.apache.org/viewvc/tomcat/sandbox/bz-svn/
Feel free to play with the settings there.
I don't recall why I lost interest in this but if you can get it working +1.
I did a little mining for the trunk log and now have a regexp that seems
to work pretty well. It finds about 1000 bug references (as far as I can
see correctly) and misses about 30, many of those are not direct
references. Those first tests I did using perl and parsing the log output.
For further testing I used turtoisesvn, checked out trunk, and added the
properties to my local repository without committing them. That's
enough, because the properties are looked after only in the working copy.
I used the following properties:
bugtraq:url
https://issues.apache.org/bugzilla/show_bug.cgi?id=%BUGID%
bugtraq:number
yes
bugtraq:label
BZ
bugtraq:logregex
(^|\W)(issues\.apache\.org\/bugzilla\/show_bug\.cgi\?id=|Buzilla|bugzilla|BZ|bz|pr|PR|bug|Bug|Fix|fix|fix
of|Fix of|fix for|Fix for|patch for|Patch
for|issue|Issue|defect|Defect|fixed|Fixed|^\-?)[\:#\-\s]*(\d{3,})
(\d{3,})
For the last property it is important, that everything except for the
final (\d{3,}) is in one line, and only this part is on the second line.
When I now look at the log with turtoise I have a new column named BZ
containing the IDs if found, even containing multiple ones if there are
multiple references, and if one opens a log entry with such a reference,
the matched part in the log is a hyperlink to the issue.
So: seems to work well. The regexp is maybe a bit complicated, but it
finds most bug references, and at least turtoise still seems to be fast
when showing the log.
Anyone trying with eclipe?
I will wait a bit and if no one opposes, I will commit the properties.
If someone has a problem later, we can easily remove them again.
Keep in mind, that since we are using a regexp, you will still have to
enter the issue ID when preparing a new log message.
Regards,
Rainer
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: New joiner - where to start
Thanks, Konstantin I already checked out, and setted up dev environment. Also I've read How Apache works etc. I know, how to do patches, I have a lot of experience with Tomcat, but mostly as user. I've seen a lot of Bugzilla entries, but there are a lot of them in database, so I don't know, where to start. If someone has issues, which can be handled to novice, please send them to me (I understand, that without app knowledge I can't do complex works, but I'm ready to do dirty jobs as well). Only exception - official documentation writing (I'm not native English speaker, so my writing skills are poor). Kind Regards, Alexander Shirkov On 14.07.10 1:57, Konstantin Kolinko knst.koli...@gmail.com wrote: 2010/7/14 Alexander Shirkov sgdr...@gmail.com: I really need advice and guidance: where to start my path. Hi, Alexander! You are welcome. Here are some links: http://tomcat.apache.org/getinvolved.html http://tomcat.apache.org/tomcat-7.0-doc/building.html http://tomcat.apache.org/tomcat-7.0-doc/BUILDING.txt Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: New joiner - where to start
On 14/07/2010 20:38, Alexander Shirkov wrote: Thanks, Konstantin I already checked out, and setted up dev environment. Also I've read How Apache works etc. I know, how to do patches, I have a lot of experience with Tomcat, but mostly as user. I've seen a lot of Bugzilla entries, but there are a lot of them in database, so I don't know, where to start. If someone has issues, which can be handled to novice, please send them to me (I understand, that without app knowledge I can't do complex works, but I'm ready to do dirty jobs as well). Only exception - official documentation writing (I'm not native English speaker, so my writing skills are poor). General comments: - Where appropriate provide patches against the latest 7.0.x code - Patches should be in diff -u format against the standard source tree (svn should do this for you) Here are some to get started along with some comments based on a *very* quick review of the code: 1. https://issues.apache.org/bugzilla/show_bug.cgi?id=49591 Look in the svn history for the quoted code to see why the call to response.flushBuffer() was added in the first place. [1] is useful for this. It may well be there is a good reason for the current behaviour. 2. https://issues.apache.org/bugzilla/show_bug.cgi?id=49589 Could be simple (remove the call(s) that trigger the re-initialisation) / could be tricky (the JSP generation code often is). 3. https://issues.apache.org/bugzilla/show_bug.cgi?id=49428 The patch needs work - it doesn't add D: to all the elements. Use the litmus test suite to check. 4. https://issues.apache.org/bugzilla/show_bug.cgi?id=49165 Could be performance sensitive. Hope that is enough to get you started. Just ask a question on the dev list if you need help. Mark [1] http://svn.apache.org/viewvc/tomcat/trunk/ Kind Regards, Alexander Shirkov On 14.07.10 1:57, Konstantin Kolinko knst.koli...@gmail.com wrote: 2010/7/14 Alexander Shirkov sgdr...@gmail.com: I really need advice and guidance: where to start my path. Hi, Alexander! You are welcome. Here are some links: http://tomcat.apache.org/getinvolved.html http://tomcat.apache.org/tomcat-7.0-doc/building.html http://tomcat.apache.org/tomcat-7.0-doc/BUILDING.txt Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r964208 - in /tomcat/trunk: bin/setclasspath.bat bin/setclasspath.sh webapps/docs/changelog.xml
Author: markt Date: Wed Jul 14 21:24:45 2010 New Revision: 964208 URL: http://svn.apache.org/viewvc?rev=964208view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49182 Align setclasspath comments with reality. Based on a patch provided by sebb. Modified: tomcat/trunk/bin/setclasspath.bat tomcat/trunk/bin/setclasspath.sh tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/bin/setclasspath.bat URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/setclasspath.bat?rev=964208r1=964207r2=964208view=diff == --- tomcat/trunk/bin/setclasspath.bat (original) +++ tomcat/trunk/bin/setclasspath.bat Wed Jul 14 21:24:45 2010 @@ -15,7 +15,9 @@ rem See the License for the specific lan rem limitations under the License. rem --- -rem Set CLASSPATH and Java options +rem Set JAVA_HOME or JRE_HOME if not already set, ensure any provided settings +rem are valid and consistent with the selected start-up options and set up the +rem endorsed directory. rem rem $Id$ rem --- Modified: tomcat/trunk/bin/setclasspath.sh URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/setclasspath.sh?rev=964208r1=964207r2=964208view=diff == --- tomcat/trunk/bin/setclasspath.sh (original) +++ tomcat/trunk/bin/setclasspath.sh Wed Jul 14 21:24:45 2010 @@ -16,7 +16,9 @@ # limitations under the License. # - -# Set CLASSPATH and Java options +# Set JAVA_HOME or JRE_HOME if not already set, ensure any provided settings +# are valid and consistent with the selected start-up options and set up the +# endorsed directory. # # $Id$ # - Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=964208r1=964207r2=964208view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Wed Jul 14 21:24:45 2010 @@ -70,6 +70,10 @@ one of them fails, do not ignore the others. (markt/kkolinko) /fix fix +bug49182/bug: Align comments in setclasspath.[sh|bat] with +behaviour. Based on a patch provided by sebb. (markt) + /fix + fix bug49230/bug: Enhance JRE leak prevention listener with protection for the keep-alive thread started by codesun.net.www.http.HttpClient/code. Based on a patch provided by - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r964211 - in /tomcat/trunk: res/tomcat.nsi webapps/docs/changelog.xml
Author: markt
Date: Wed Jul 14 21:29:44 2010
New Revision: 964211
URL: http://svn.apache.org/viewvc?rev=964211view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49130
Better describe the core package
Patch provided by sebb.
Modified:
tomcat/trunk/res/tomcat.nsi
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/res/tomcat.nsi
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/tomcat.nsi?rev=964211r1=964210r2=964211view=diff
==
--- tomcat/trunk/res/tomcat.nsi (original)
+++ tomcat/trunk/res/tomcat.nsi Wed Jul 14 21:29:44 2010
@@ -93,7 +93,7 @@ ${StrRep}
;Component-selection page
;Descriptions
LangString DESC_SecTomcat ${LANG_ENGLISH} Install the Tomcat Servlet
container.
-LangString DESC_SecTomcatCore ${LANG_ENGLISH} Install the Tomcat Servlet
container core.
+LangString DESC_SecTomcatCore ${LANG_ENGLISH} Install the Tomcat Servlet
container core and create the Windows service.
LangString DESC_SecTomcatService ${LANG_ENGLISH} Automatically start
Tomcat when the computer is started.
LangString DESC_SecTomcatNative ${LANG_ENGLISH} Install APR based Tomcat
native .dll for better performance and scalability in production environments.
LangString DESC_SecMenu ${LANG_ENGLISH} Create a Start Menu program group
for Tomcat.
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=964211r1=964210r2=964211view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Jul 14 21:29:44 2010
@@ -239,6 +239,15 @@
/fix
/changelog
/subsection
+ subsection name=Other
+changelog
+ fix
+bug49130/bug: Better describe the core package in the Windows
+installer, making it clear that the service will be installed. Patch
+provided by sebb. (markt)
+ /fix
+/changelog
+ /subsection
/section
section name=Tomcat 7.0.0 (markt) rtext=beta, 2010-06-29
subsection name=Catalina
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49182] Documentation patch for setclasspath.sh
https://issues.apache.org/bugzilla/show_bug.cgi?id=49182 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #1 from Mark Thomas ma...@apache.org 2010-07-14 17:25:52 EDT --- Alternative patch based on the supplied patch applied to both .sh and .bat files in 7.0.x. Will be included in 7.0.1 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r964215 - in /tomcat/trunk: java/org/apache/catalina/loader/WebappClassLoader.java webapps/docs/changelog.xml
Author: markt
Date: Wed Jul 14 21:35:37 2010
New Revision: 964215
URL: http://svn.apache.org/viewvc?rev=964215view=rev
Log:
Fxi https://issues.apache.org/bugzilla/show_bug.cgi?id=49128
Don't swallow exceptions unnecessarily
Modified:
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java?rev=964215r1=964214r2=964215view=diff
==
--- tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java Wed Jul
14 21:35:37 2010
@@ -1811,7 +1811,7 @@ public class WebappClassLoader
String encoding = null;
try {
encoding = System.getProperty(file.encoding);
-} catch (Exception e) {
+} catch (SecurityException e) {
return;
}
if (encoding.indexOf(EBCDIC)!=-1) {
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=964215r1=964214r2=964215view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Jul 14 21:35:37 2010
@@ -70,6 +70,10 @@
one of them fails, do not ignore the others. (markt/kkolinko)
/fix
fix
+bug49128/bug: Don't swallow exceptions unnecessarily in
+codeWebappClassLoader.start()/code. (markt)
+ /fix
+ fix
bug49182/bug: Align comments in setclasspath.[sh|bat] with
behaviour. Based on a patch provided by sebb. (markt)
/fix
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49128] loader.WebappClassLoader.start() ignores Exception
https://issues.apache.org/bugzilla/show_bug.cgi?id=49128 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #1 from Mark Thomas ma...@apache.org 2010-07-14 17:36:20 EDT --- Fixed in 7.0.x and will be in 7.0.1 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49130] NSIS - clarify that service is always installed
https://issues.apache.org/bugzilla/show_bug.cgi?id=49130 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #1 from Mark Thomas ma...@apache.org 2010-07-14 17:30:35 EDT --- Thanks. Patch applied to trunk (with one additional word). Will be included in 7.0.1 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49127] SimpleTcpReplicationManager.startInternal() ignores Exception
https://issues.apache.org/bugzilla/show_bug.cgi?id=49127 Mark Thomas ma...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #1 from Mark Thomas ma...@apache.org 2010-07-14 17:40:19 EDT --- Fixed in 7.0.x will be in 7.0.1 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r964216 - in /tomcat/trunk: java/org/apache/catalina/ha/session/SimpleTcpReplicationManager.java webapps/docs/changelog.xml
Author: markt
Date: Wed Jul 14 21:39:40 2010
New Revision: 964216
URL: http://svn.apache.org/viewvc?rev=964216view=rev
Log:
Fxi https://issues.apache.org/bugzilla/show_bug.cgi?id=49127
Don't swallow exceptions unnecessarily
Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/SimpleTcpReplicationManager.java
tomcat/trunk/webapps/docs/changelog.xml
Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/SimpleTcpReplicationManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/SimpleTcpReplicationManager.java?rev=964216r1=964215r2=964216view=diff
==
---
tomcat/trunk/java/org/apache/catalina/ha/session/SimpleTcpReplicationManager.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/ha/session/SimpleTcpReplicationManager.java
Wed Jul 14 21:39:40 2010
@@ -520,7 +520,7 @@ public class SimpleTcpReplicationManager
do {
try {
Thread.sleep(100);
-}catch ( Exception sleep) {}
+} catch (InterruptedException sleep) { /* Ignore */ }
reqNow = System.currentTimeMillis();
isTimeout=((reqNow-reqStart)(1000*60));
} while ( (!isStateTransferred()) (!isTimeout));
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=964216r1=964215r2=964216view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Jul 14 21:39:40 2010
@@ -190,6 +190,10 @@
subsection name=Cluster
changelog
fix
+bug49127/bug: Don't swallow exceptions unnecessarily in
+codeSimpleTcpReplicationManager.startInternal()/code. (markt)
+ /fix
+ fix
bug49445/bug: When session ID is changed after authentication,
ensure the DeltaManager replicates the change in ID to the other nodes
in the cluster. (kfujino)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r964219 [2/2] - in /tomcat/trunk: java/org/apache/catalina/filters/ test/org/apache/catalina/filters/ webapps/docs/ webapps/docs/config/
Modified: tomcat/trunk/webapps/docs/config/filter.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/filter.xml?rev=964219r1=964218r2=964219view=diff
==
--- tomcat/trunk/webapps/docs/config/filter.xml (original)
+++ tomcat/trunk/webapps/docs/config/filter.xml Wed Jul 14 22:11:30 2010
@@ -159,6 +159,406 @@
/section
+section name=Expires Filter
+
+ subsection name=Introduction
+
+p
+ExpiresFilter is a Java Servlet API port of a
+href=http://httpd.apache.org/docs/2.2/mod/mod_expires.html;Apache
+mod_expires/a.
+This filter controls the setting of the ttExpires/tt HTTP header and
the
+ttmax-age/tt directive of the ttCache-Control/tt HTTP header in
+server responses. The expiration date can set to be relative to either the
+time the source file was last modified, or to the time of the client
access.
+/p
+
+p
+These HTTP headers are an instruction to the client about the
document#x27;s
+validity and persistence. If cached, the document may be fetched from the
+cache rather than from the source until this time has passed. After that,
the
+cache copy is considered quot;expiredquot; and invalid, and a new copy
must
+be obtained from the source.
+/p
+p
+To modify ttCache-Control/tt directives other than ttmax-age/tt
(see
+a href=http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.9;
RFC
+2616 section 14.9/a), you can use other servlet filters or a
+href=http://httpd.apache.org/docs/2.2/mod/mod_headers.html; Apache Httpd
+mod_headers/a module.
+/p
+
+ /subsection
+
+ subsection name=Basic configuration sample
+p
+Basic configuration to add 'ttExpires/tt' and 'ttCache-Control:
max-age=/tt'
+headers to images, css and javascript.
+/p
+
+source
+lt;filtergt;
+ lt;filter-namegt;ExpiresFilterlt;/filter-namegt;
+
lt;filter-classgt;org.apache.catalina.filters.ExpiresFilterlt;/filter-classgt;
+ lt;init-paramgt;
+lt;param-namegt;ExpiresByType imagelt;/param-namegt;
+lt;param-valuegt;access plus 10 minuteslt;/param-valuegt;
+ lt;/init-paramgt;
+ lt;init-paramgt;
+lt;param-namegt;ExpiresByType text/csslt;/param-namegt;
+lt;param-valuegt;access plus 10 minuteslt;/param-valuegt;
+ lt;/init-paramgt;
+ lt;init-paramgt;
+lt;param-namegt;ExpiresByType text/javascriptlt;/param-namegt;
+lt;param-valuegt;access plus 10 minuteslt;/param-valuegt;
+ lt;/init-paramgt;
+lt;/filtergt;
+...
+lt;filter-mappinggt;
+ lt;filter-namegt;ExpiresFilterlt;/filter-namegt;
+ lt;url-patterngt;/*lt;/url-patterngt;
+ lt;dispatchergt;REQUESTlt;/dispatchergt;
+lt;/filter-mappinggt;
+
+/source
+
+ /subsection
+
+ subsection name=Alternate Syntax
+p
+The ttExpiresDefault/tt and ttExpiresByType/tt directives can also
be
+defined in a more readable syntax of the form:
+/p
+
+source
+lt;init-paramgt;
+ lt;param-namegt;ExpiresDefaultlt;/param-namegt;
+ lt;param-valuegt;lt;basegt; [plus] {lt;numgt;
lt;typegt;}*lt;/param-valuegt;
+lt;/init-paramgt;
+
+lt;init-paramgt;
+ lt;param-namegt;ExpiresByType typelt;/param-namegt;
+ lt;param-valuegt;lt;basegt; [plus] {lt;numgt;
lt;typegt;}*lt;/param-valuegt;
+lt;/init-paramgt;
+
+lt;init-paramgt;
+ lt;param-namegt;ExpiresByType type;encodinglt;/param-namegt;
+ lt;param-valuegt;lt;basegt; [plus] {lt;numgt;
lt;typegt;}*lt;/param-valuegt;
+lt;/init-paramgt;
+/source
+p
+where ttlt;basegt;/tt is one of:
+ul
+littaccess/tt/li
+littnow/tt (equivalent to #x27;ttaccess/tt#x27;)/li
+littmodification/tt/li
+/ul
+/p
+p
+The ttplus/tt keyword is optional. ttlt;numgt;/tt should be an
+integer value (acceptable to ttInteger.parseInt()/tt), and
+ttlt;typegt;/tt is one of:
+ul
+littyears/tt/li
+littmonths/tt/li
+littweeks/tt/li
+littdays/tt/li
+litthours/tt/li
+littminutes/tt/li
+littseconds/tt/li
+/ul
+For example, any of the following directives can be used to make documents
+expire 1 month after being accessed, by default:
+/p
+
+source
+lt;init-paramgt;
+ lt;param-namegt;ExpiresDefaultlt;/param-namegt;
+ lt;param-valuegt;access plus 1 monthlt;/param-valuegt;
+lt;/init-paramgt;
+
+lt;init-paramgt;
+ lt;param-namegt;ExpiresDefaultlt;/param-namegt;
+ lt;param-valuegt;access plus 4 weekslt;/param-valuegt;
+lt;/init-paramgt;
+
+lt;init-paramgt;
+ lt;param-namegt;ExpiresDefaultlt;/param-namegt;
+ lt;param-valuegt;access plus 30 dayslt;/param-valuegt;
+lt;/init-paramgt;
+/source
+p
+The expiry time can be fine-tuned by adding several #x27;
+ttlt;numgt; lt;typegt;/tt#x27; clauses:
+/p
+
+source
+lt;init-paramgt;
+ lt;param-namegt;ExpiresByType text/htmllt;/param-namegt;
+ lt;param-valuegt;access plus 1 month 15 days 2 hourslt;/param-valuegt;
+lt;/init-paramgt;
+
+lt;init-paramgt;
+ lt;param-namegt;ExpiresByType
svn commit: r964222 - in /tomcat/trunk: java/org/apache/catalina/filters/ExpiresFilter.java java/org/apache/catalina/filters/LocalStrings.properties test/org/apache/catalina/filters/TestExpiresFilter.
Author: markt
Date: Wed Jul 14 22:15:50 2010
New Revision: 964222
URL: http://svn.apache.org/viewvc?rev=964222view=rev
Log:
Remove the ExpiresActive option. Just comment it out if you don't want to use
it.
Modified:
tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java
tomcat/trunk/java/org/apache/catalina/filters/LocalStrings.properties
tomcat/trunk/test/org/apache/catalina/filters/TestExpiresFilter.java
tomcat/trunk/webapps/docs/config/filter.xml
Modified: tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java?rev=964222r1=964221r2=964222view=diff
==
--- tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java Wed Jul 14
22:15:50 2010
@@ -1059,8 +1059,6 @@ public class ExpiresFilter extends Filte
private static final Log log = LogFactory.getLog(ExpiresFilter.class);
-private static final String PARAMETER_EXPIRES_ACTIVE = ExpiresActive;
-
private static final String PARAMETER_EXPIRES_BY_TYPE = ExpiresByType;
private static final String PARAMETER_EXPIRES_DEFAULT = ExpiresDefault;
@@ -1197,11 +1195,6 @@ public class ExpiresFilter extends Filte
}
/**
- * @see #isActive()
- */
-private boolean active = true;
-
-/**
* Default Expires configuration.
*/
private ExpiresConfiguration defaultExpiresConfiguration;
@@ -1231,7 +1224,7 @@ public class ExpiresFilter extends Filte
httpRequest.getRequestURL()));
}
chain.doFilter(request, response);
-} else if (active) {
+} else {
XHttpServletResponse xResponse = new XHttpServletResponse(
httpRequest, httpResponse);
chain.doFilter(request, xResponse);
@@ -1240,12 +1233,6 @@ public class ExpiresFilter extends Filte
// onBeforeWriteResponseBody()
onBeforeWriteResponseBody(httpRequest, xResponse);
}
-} else {
-if (log.isDebugEnabled()) {
-log.debug(sm.getString(expiresFilter.filterNotActive,
-httpRequest.getRequestURL()));
-}
-chain.doFilter(request, response);
}
} else {
chain.doFilter(request, response);
@@ -1411,9 +1398,6 @@ public class ExpiresFilter extends Filte
} else if (name.equalsIgnoreCase(PARAMETER_EXPIRES_DEFAULT)) {
ExpiresConfiguration expiresConfiguration =
parseExpiresConfiguration(value);
this.defaultExpiresConfiguration = expiresConfiguration;
-} else if (name.equalsIgnoreCase(PARAMETER_EXPIRES_ACTIVE)) {
-this.active = On.equalsIgnoreCase(value) ||
-Boolean.valueOf(value).booleanValue();
} else if
(name.equalsIgnoreCase(PARAMETER_EXPIRES_EXCLUDED_RESPONSE_STATUS_CODES)) {
this.excludedResponseStatusCodes =
commaDelimitedListToIntArray(value);
} else {
@@ -1433,14 +1417,6 @@ public class ExpiresFilter extends Filte
}
/**
- * Indicates that the filter is active. If codefalse/code, the filter
is
- * pass-through. Default is codetrue/code.
- */
-public boolean isActive() {
-return active;
-}
-
-/**
*
* p
* codeprotected/code for extension.
@@ -1651,10 +1627,6 @@ public class ExpiresFilter extends Filte
return new ExpiresConfiguration(startingPoint, durations);
}
-public void setActive(boolean active) {
-this.active = active;
-}
-
public void setDefaultExpiresConfiguration(
ExpiresConfiguration defaultExpiresConfiguration) {
this.defaultExpiresConfiguration = defaultExpiresConfiguration;
@@ -1671,8 +1643,7 @@ public class ExpiresFilter extends Filte
@Override
public String toString() {
-return getClass().getSimpleName() + [active= + this.active +
-, excludedResponseStatusCode=[ +
+return getClass().getSimpleName() + [excludedResponseStatusCode=[ +
intsToCommaDelimitedString(this.excludedResponseStatusCodes) +
], default= + this.defaultExpiresConfiguration + , byType=
+
this.expiresConfigurationByContentType + ];
Modified: tomcat/trunk/java/org/apache/catalina/filters/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/LocalStrings.properties?rev=964222r1=964221r2=964222view=diff
==
---
Re: [taglibs] XPath support
On Jul 12, 2010, at 7:04 PM, Jeremy Boynes wrote: I'm going to ping Xalan about the increase in time taken as expressions are evaluated as I would assume I'm doing something silly. I looked into the Xalan implementation and the problem appears to be in creation of the DTM used by the underlying implementation. To evaluate the expression it walks up the DOM tree to the parent and then iterates forward over the tree until it reaches the initial context node. This leads to a linear increase in execution time as the context node progresses through the NodeList from the forEach. I changed x:forEach and x:out to use Jaxen and did not see this issue. The execution time for xpath evalutation over 1000 iterations was constant and substantially faster than with Xalan: total of 62ms reparsing each time or 21ms if precompiled, down from 1800ms. In light of this I'd like to propose we switch to Jaxen and add it as a dependency. Thanks Jeremy - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Bug 49165 - Allow %{TIME_FORMAT}t As Configuration for AccessLogValve
Hello,
I¹m working on Bug 49164 (
https://issues.apache.org/bugzilla/show_bug.cgi?id=49165)
Have a question:
Any hidden reasons, why following construction was used for creating %t
pattern?:
private SimpleDateFormat dayFormatter = new SimpleDateFormat(dd);
private SimpleDateFormat monthFormatter = new SimpleDateFormat(MM);
private SimpleDateFormat yearFormatter = new SimpleDateFormat();
private SimpleDateFormat timeFormatter = new SimpleDateFormat(HH:mm:ss);
...
StringBuilder current = new StringBuilder(32);
current.append('[');
current.append(struct.dayFormatter.format(date));
current.append('/');
current.append(lookup(struct.monthFormatter.format(date)));
current.append('/');
current.append(struct.yearFormatter.format(date));
current.append(':');
current.append(struct.timeFormatter.format(date));
current.append(' ');
current.append(getTimeZone(date));
current.append(']');
struct.currentDateString = current.toString();
Instead of this one:
private SimpleDateFormat timeFormatter = new
SimpleDateFormat([dd/MMM/:HH:mm:ss]);
...
struct.currentDateString = struct.timeFormatter.format(date);
I¹ve added one more test with this structure to
org.apache.catalina.valves.Benchmarks and looks like the last solution the
shortest and fastest option. Plus we can pass any pattern from configuration
(#49165 enhancement intention):
TimeDateElementBenchmarkTest_Sync: 5 threads and 1000 iterations using
Syncs took 3392ms
TimeDateElementBenchmarkTest_Local: 5 threads and 1000 iterations using
ThreadLocals took 2551ms
TimeDateElementBenchmarkTest_LocalStruct: 5 threads and 1000 iterations
using single ThreadLocal took 2237ms
TimeDateElementBenchmarkTest_LocalStruct_SBuilder: 5 threads and 1000
iterations using single ThreadLocal, with StringBuilder took 2196ms
TimeDateElementBenchmarkTest_LocalStruct_SimpleDateFormat: 5 threads and
1000 iterations using single ThreadLocal SimpleDateFormat took 2152ms
P. S. My thanks to Mark Thomas for buglist to start.
