Re: [ANN] New committer: Tim Whittington
Thanks Rainer, and thanks everyone for the welcome (and the work you've put into Tomcat over the years). cheers tim - "Rainer Jung" wrote: > On behalf of the Tomcat committers I am pleased to announce that Tim > Whittington has been voted in as a new Tomcat committer. > > Please join me in welcoming him. > > Regards, > > Rainer > > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > >
Re: svn commit: r898126 - /tomcat/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java
On 12/01/2010 01:45, Konstantin Kolinko wrote:
> 2010/1/12 :
>> Author: markt
>> Date: Tue Jan 12 00:10:46 2010
>> New Revision: 898126
>>
>> URL: http://svn.apache.org/viewvc?rev=898126&view=rev
>> Log:
>> Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47977
>> Using a body with tags specified to have empty body content should cause an
>> error
>>
>> Modified:
>>tomcat/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java
>>
>
>> @@ -426,9 +430,10 @@
>> if (scriptlessBodyNode == null
>> &&
>> bodyType.equalsIgnoreCase(TagInfo.BODY_CONTENT_SCRIPTLESS)) {
>> scriptlessBodyNode = node;
>> -}
>> -else if
>> (TagInfo.BODY_CONTENT_TAG_DEPENDENT.equalsIgnoreCase(bodyType)) {
>> +} else if
>> (TagInfo.BODY_CONTENT_TAG_DEPENDENT.equalsIgnoreCase(bodyType)) {
>> tagDependentPending = true;
>> +} else if (TagInfo.BODY_CONTENT_EMPTY.equals(bodyType)) {
>> +tagEmptyBody = node;
>> }
>> }
>> }
>
> Why there is equalsIgnoreCase() in the old code? Did the specification
> ever allow wrong-cased values there? If yes, then maybe the added
> clause should also use equalsIgnoreCase.
The spec consistently uses the same case for all possible values of
. Since XML is case sensitive one could argue it should
always be "empty" in this case. That said, I think being lenient here is
the pragmatic thing to do so I'll make the check case-insensitive.
Mark
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r898256 - /tomcat/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java
Author: markt
Date: Tue Jan 12 08:59:08 2010
New Revision: 898256
URL: http://svn.apache.org/viewvc?rev=898256&view=rev
Log:
Make the check case insensitive. A strict reading of the specification requires
case sensitivity but be pragmatic.
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java
Modified: tomcat/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java?rev=898256&r1=898255&r2=898256&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java Tue Jan
12 08:59:08 2010
@@ -432,7 +432,7 @@
scriptlessBodyNode = node;
} else if
(TagInfo.BODY_CONTENT_TAG_DEPENDENT.equalsIgnoreCase(bodyType)) {
tagDependentPending = true;
-} else if (TagInfo.BODY_CONTENT_EMPTY.equals(bodyType)) {
+} else if
(TagInfo.BODY_CONTENT_EMPTY.equalsIgnoreCase(bodyType)) {
tagEmptyBody = node;
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r898257 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Tue Jan 12 09:00:39 2010 New Revision: 898257 URL: http://svn.apache.org/viewvc?rev=898257&view=rev Log: Modify proposal 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=898257&r1=898256&r2=898257&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Jan 12 09:00:39 2010 @@ -211,5 +211,6 @@ * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47977 Using a body with a tag that has an empty body should cause an error http://svn.apache.org/viewvc?rev=898126&view=rev + http://svn.apache.org/viewvc?rev=898256&view=rev (case insensitivity) +1: markt -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Several new system properties
On 12/01/2010 02:56, Konstantin Kolinko wrote: > = > First, there is a patch currently in STATUS for TC5.5 and already > applied to TC6, > "Prevent session fixation by changing session ID" > (fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=45255) > > As of now, I would agree with Rainer's comment to keep it disabled by > default in TC 5.5. > > How about if we implement a system property, that will provide the > default value for AuthentificatorBase.changeSessionIdOnAuthentication > field? > > If so, I will agree to have it 'true' by default in TC 5.5, like we > have in TC 6 now since 6.0.21. -0.5. I dislike having system properties where we don't absolutely need them. Removing as many system properties as possible is on my todo list for Tomcat 7. I'm happy with a default of false for Tomcat 5.5.x with the option to enable it per context if required. > = > Second, there is a feature currently enabled by setting > STRICT_SERVLET_COMPLIANCE=true: > > [cite ref="/config/systemprops.html"] > a call to Response.getWriter() if no character encoding has been > specified will result in subsequent calls to > Response.getCharacterEncoding() returning ISO-8859-1 and the > Content-Type response header will include a charset=ISO-8859-1 > component. (SRV.15.2.22.1) > [/cite] > > It is implemented in o.a.catalina.connector.Response#getWriter(). > > I think it would be reasonable to have a separate system property for > this feature, independent from STRICT_SERVLET_COMPLIANCE, and to set > the default value for the new property to be "true" (instead of the > current effective value of "false"). +1. That is the other part of my Tomcat 7 system property to-do: split out STRICT_SERVLET_COMPLIANCE into separate properties along the lines of what I did for org.apache.tomcat.util.http.ServerCookie.ALWAYS_ADD_EXPIRES, FWD_SLASH_IS_SEPARATOR & STRICT_NAMING > The behavior of Response#getWriter() is similar in its effect to > AddDefaultCharsetFilter of TC7, but approach implemented by > AddDefaultCharsetFilter is different: it adds charset to any text/* > mimetype. It will affect static html files as well, which can contain > a tag specifying their encoding. Only if you map the filter to /*. > If encoding specified in > tag does not match the one provided by Content-Type header, > even if it is just uppercase/lowercase mismatch, certain browsers may > enable content encoding autodetection, thus breaking things. Pure genius. > Thus when I tried applying AddDefaultCharsetFilter to our examples > webapp in rev.893496 I used a trick to add encoding value to > mappings for html files in its web.xml. The filter applies > the encoding in upper case, while *.html files in the examples have it > in lowercase. > http://svn.apache.org/viewvc?view=revision&revision=893496 That is probably worthy of some additional comment, either in the web.xml or may be the svn commit message. > I think that Response#getWriter() is more clear in its behavior, as it > does not affect static resources. Again, it depends what you map the filter to. Given the filter mapping rules, some apps will find it a lot easier than others to avoid static resources. > Of course, another filter can be implemented instead of > AddDefaultCharsetFilter to mimic Response#getWriter(), but maybe we > can just reuse what is already implemented, just changing the property > that is used there? It is a spec compliance issue so I think a separate system property is the way to go. > If there are any problems there, they are already exposed by those > running with STRICT_SERVLET_COMPLIANCE=true. Indeed. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r898275 - in /tomcat/trunk/java: javax/el/ org/apache/catalina/loader/ org/apache/el/lang/ org/apache/el/parser/ org/apache/naming/resources/
Author: markt
Date: Tue Jan 12 10:31:03 2010
New Revision: 898275
URL: http://svn.apache.org/viewvc?rev=898275&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48517
Reduce scope of @SupressWarnings and document reasoning
Based on a patch by sebb
Modified:
tomcat/trunk/java/javax/el/BeanELResolver.java
tomcat/trunk/java/javax/el/ELContext.java
tomcat/trunk/java/javax/el/ResourceBundleELResolver.java
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
tomcat/trunk/java/org/apache/el/lang/ELSupport.java
tomcat/trunk/java/org/apache/el/lang/EvaluationContext.java
tomcat/trunk/java/org/apache/el/parser/AstIdentifier.java
tomcat/trunk/java/org/apache/el/parser/AstValue.java
tomcat/trunk/java/org/apache/el/parser/SimpleNode.java
tomcat/trunk/java/org/apache/naming/resources/VirtualDirContext.java
Modified: tomcat/trunk/java/javax/el/BeanELResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/BeanELResolver.java?rev=898275&r1=898274&r2=898275&view=diff
==
--- tomcat/trunk/java/javax/el/BeanELResolver.java (original)
+++ tomcat/trunk/java/javax/el/BeanELResolver.java Tue Jan 12 10:31:03 2010
@@ -37,8 +37,8 @@
private final boolean readOnly;
- private final ConcurrentCache cache = new
ConcurrentCache(
- 1000);
+ private final ConcurrentCache cache =
+ new ConcurrentCache(1000);
public BeanELResolver() {
this.readOnly = false;
@@ -230,8 +230,8 @@
this.type = descriptor.getPropertyType();
}
- @SuppressWarnings("unchecked") // Can't use Class because
API needs to match specification
-public Class getPropertyType() {
+ // Can't use Class because API needs to match specification
+public @SuppressWarnings("unchecked") Class getPropertyType() {
return this.type;
}
Modified: tomcat/trunk/java/javax/el/ELContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/ELContext.java?rev=898275&r1=898274&r2=898275&view=diff
==
--- tomcat/trunk/java/javax/el/ELContext.java (original)
+++ tomcat/trunk/java/javax/el/ELContext.java Tue Jan 12 10:31:03 2010
@@ -39,16 +39,17 @@
this.resolved = false;
}
-@SuppressWarnings("unchecked") // Can't use Class because API needs to
match specification
-public Object getContext(Class key) {
+// Can't use Class because API needs to match specification
+public Object getContext(@SuppressWarnings("unchecked") Class key) {
if (this.map == null) {
return null;
}
return this.map.get(key);
}
-@SuppressWarnings("unchecked") // Can't use Class because API needs to
match specification
-public void putContext(Class key, Object contextObject) throws
NullPointerException {
+// Can't use Class because API needs to match specification
+public void putContext(@SuppressWarnings("unchecked") Class key,
+Object contextObject) throws NullPointerException {
if (key == null || contextObject == null) {
throw new NullPointerException();
}
Modified: tomcat/trunk/java/javax/el/ResourceBundleELResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/ResourceBundleELResolver.java?rev=898275&r1=898274&r2=898275&view=diff
==
--- tomcat/trunk/java/javax/el/ResourceBundleELResolver.java (original)
+++ tomcat/trunk/java/javax/el/ResourceBundleELResolver.java Tue Jan 12
10:31:03 2010
@@ -100,8 +100,9 @@
}
@Override
-@SuppressWarnings("unchecked") // Can't use Iterator
because API needs to match specification
-public Iterator getFeatureDescriptors(ELContext context, Object base) {
+// Can't use Iterator because API needs to match
specification
+public @SuppressWarnings("unchecked") Iterator getFeatureDescriptors(
+ELContext context, Object base) {
if (base instanceof ResourceBundle) {
List feats = new
ArrayList();
Enumeration e = ((ResourceBundle)
base).getKeys();
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=898275&r1=898274&r2=898275&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java Tue Jan
12 10:31:03 2010
@@ -1788,7 +1788,7 @@
defineClass("org.apache.cata
DO NOT REPLY [Bug 48517] @SuppressWarnings("unchecked") - document and reduce scope
https://issues.apache.org/bugzilla/show_bug.cgi?id=48517 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #1 from Mark Thomas 2010-01-12 02:31:08 GMT --- Patch applied with a few modifications - mainly moving comments outside of the parameter list - to improve code readability. -- 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
Maven Depolyment Tomcat Java Heap Space
Hi i want to deploy my application on Tomcat with Maven 2.0.
I think my pom.xml is correct.
When i enter "mvn tomcat:deploy" in the console, the deployment starts but i
get an Java Heap Space.
view plaincopy to clipboardprint?
1.
2. [INFO] Scanning for projects...
3. [INFO]
4. [INFO] Building routes
5. [INFO]task-segment: [tomcat:deploy]
6. [INFO]
7. [INFO] Preparing tomcat:deploy
8. [INFO] [resources:resources]
9. [WARNING] Using platform encoding (UTF-8 actually) to copy filtered
resources, i.e. build is platform dependent!
10. [INFO] Copying 165 resources
11. [INFO] [compiler:compile]
12. [INFO] Nothing to compile - all classes are up to date
13. [INFO] [jspc:compile {execution: jspc}]
14. [INFO] [resources:testResources]
15. [WARNING] Using platform encoding (UTF-8 actually) to copy filtered
resources, i.e. build is platform dependent!
16. [INFO] skip non existing resourceDirectory
/home/tboss/workspace_routenspecial/route_special/src/test/resources
17. [INFO] [compiler:testCompile]
18. [INFO] No sources to compile
19. [INFO] [surefire:test]
20. [INFO] No tests to run.
21. [INFO] [war:war]
22. [INFO] Exploding webapp...
23. [INFO] Copy webapp webResources to
/home/tboss/workspace_routenspecial/route_special/target/bmw-routes_maven
24. [INFO] Copy webapp webResources to
/home/tboss/workspace_routenspecial/route_special/target/bmw-routes_maven
25. [INFO] Assembling webapp route_special in
/home/tboss/workspace_routenspecial/route_special/target/bmw-routes_maven
26. [INFO] Generating war
/home/tboss/workspace_routenspecial/route_special/target/bmw-routes_maven.war
27. [INFO] Building war:
/home/tboss/workspace_routenspecial/route_special/target/bmw-routes_maven.war
28. [INFO] [tomcat:deploy]
29. [INFO] Deploying war to http://localhost:8080/bmw-routes_maven
30. [INFO]
31. [ERROR] FATAL ERROR
32. [INFO]
33. [INFO] Java heap space
34. [INFO]
35. [INFO] Trace
36. java.lang.OutOfMemoryError: Java heap space
37. at
java.io.ByteArrayOutputStream.write(ByteArrayOutputStream.java:95)
38. at
sun.net.www.http.PosterOutputStream.write(PosterOutputStream.java:61)
39. at
java.io.BufferedOutputStream.flushBuffer(BufferedOutputStream.java:65)
40. at
java.io.BufferedOutputStream.write(BufferedOutputStream.java:109)
41. at
org.codehaus.mojo.tomcat.TomcatManager.pipe(TomcatManager.java:718)
42. at
org.codehaus.mojo.tomcat.TomcatManager.invoke(TomcatManager.java:616)
43. at
org.codehaus.mojo.tomcat.TomcatManager.deployImpl(TomcatManager.java:680)
44. at
org.codehaus.mojo.tomcat.TomcatManager.deploy(TomcatManager.java:302)
45. at
org.codehaus.mojo.tomcat.DeployMojo.deployWar(DeployMojo.java:84)
46. at
org.codehaus.mojo.tomcat.AbstractDeployMojo.invokeManager(AbstractDeployMojo.java:83)
47. at
org.codehaus.mojo.tomcat.AbstractCatalinaMojo.execute(AbstractCatalinaMojo.java:132)
48. at
org.codehaus.mojo.tomcat.AbstractWarCatalinaMojo.execute(AbstractWarCatalinaMojo.java:59)
49. at
org.apache.maven.plugin.DefaultPluginManager.executeMojo(DefaultPluginManager.java:483)
50. at
org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoals(DefaultLifecycleExecutor.java:678)
51. at
org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeStandaloneGoal(DefaultLifecycleExecutor.java:553)
52. at
org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoal(DefaultLifecycleExecutor.java:523)
53. at
org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoalAndHandleFailures(DefaultLifecycleExecutor.java:371)
54. at
org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeTaskSegments(DefaultLifecycleExecutor.java:332)
55. at
org.apache.maven.lifecycle.DefaultLifecycleExecutor.execute(DefaultLifecycleExecutor.java:181)
56. at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:356)
57. at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:137)
58. at org.apache.maven.cli.MavenCli.main(MavenCli.java:356)
59. at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
60. at
sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
61. at
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
62. at java.lang.reflect.Method.invoke(Method.java:592)
63. at
org.codehaus.classworlds.Launcher.launchEnhanced(Launcher.java:315
Re: Maven Depolyment Tomcat Java Heap Space
On 12/01/2010 10:37, thobos wrote: > Has anyone an idea? This is a question for the users list, not the dev list. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r898279 - in /tomcat/trunk/java/org/apache: catalina/realm/ catalina/startup/ jasper/resources/ tomcat/util/net/res/
Author: markt
Date: Tue Jan 12 11:09:18 2010
New Revision: 898279
URL: http://svn.apache.org/viewvc?rev=898279&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48523
Resolve duplicate keys
Modified:
tomcat/trunk/java/org/apache/catalina/realm/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/realm/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties
tomcat/trunk/java/org/apache/tomcat/util/net/res/LocalStrings_es.properties
Modified: tomcat/trunk/java/org/apache/catalina/realm/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/LocalStrings.properties?rev=898279&r1=898278&r2=898279&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/realm/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/realm/LocalStrings.properties Tue Jan
12 11:09:18 2010
@@ -28,8 +28,6 @@
jaasRealm.loginException=Login exception authenticating username "{0}"
jaasRealm.unexpectedError=Unexpected error
jaasRealm.loginContextCreated=JAAS LoginContext created for username "{0}"
-jaasRealm.userPrincipalSuccess=Subject for username "{0}" returned user
Principal "{1}"
-jaasRealm.userPrincipalFailure=Subject for username "{0}" did not return a
valid user Principal
jaasRealm.cachePrincipal=User Principal "{0}" cached; has {1} role Principal(s)
jaasRealm.checkPrincipal=Checking Principal "{0}" [{1}]
jaasRealm.userPrincipalSuccess=Principal "{0}" is a valid user class. We will
use this as the user Principal.
Modified: tomcat/trunk/java/org/apache/catalina/realm/LocalStrings_es.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/LocalStrings_es.properties?rev=898279&r1=898278&r2=898279&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/realm/LocalStrings_es.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/realm/LocalStrings_es.properties Tue
Jan 12 11:09:18 2010
@@ -24,8 +24,6 @@
jaasRealm.loginException = Excepci\u00F3n de Login autenticando nombre de
usuario {0}
jaasRealm.unexpectedError = Error inesperado
jaasRealm.loginContextCreated = JAAS LoginContext creado para nombre de
usuario "{0}"
-jaasRealm.userPrincipalSuccess = El asunto para el nombre de usuario "{0}"
devolvi\u00F3 usuario Principal "{1}"
-jaasRealm.userPrincipalFailure = El asunto para el nombre de usuario "{0}" no
devolvi\u00F3 un usuario Principal v\u00E1lido
jaasRealm.cachePrincipal = Usuario Principal "{0}" en cach\u00E9; tiene {1}
papel de Principal
jaasRealm.checkPrincipal = Revisando Principal "{0}" [{1}]
jaasRealm.userPrincipalSuccess = El Principal "{0}" es una clase v\u00E1lida
de usuario. La vamos a usar como usuario Principal.
Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=898279&r1=898278&r2=898279&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Tue Jan 12
11:09:18 2010
@@ -1541,7 +1541,7 @@
DirContextURLConnection dcUrlConn;
if (!(urlConn instanceof DirContextURLConnection)) {
// This should never happen
-sm.getString("contextConfig.jndiUrl", url);
+sm.getString("contextConfig.jndiUrlNotDirContextConn", url);
return;
}
Modified: tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties?rev=898279&r1=898278&r2=898279&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties Tue
Jan 12 11:09:18 2010
@@ -39,10 +39,10 @@
contextConfig.inputStreamFile=Unable to process file [{0}] for annotations
contextConfig.inputStreamJar=Unable to process Jar entry [{0}] from Jar [{1}]
for annotations
contextConfig.inputStreamJndi=Unable to process resource element [{0}] for
annotations
-contextConfig.jndiUrl=Unable to process JNDI URL [{0}] for annotations
contextConfig.
DO NOT REPLY [Bug 48523] Duplicate property keys in various files
https://issues.apache.org/bugzilla/show_bug.cgi?id=48523 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #1 from Mark Thomas 2010-01-12 03:10:04 GMT --- These have been fixed in trunk. Thanks for the report. -- 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 48524] Property keys not present in the default file
https://issues.apache.org/bugzilla/show_bug.cgi?id=48524 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #2 from Mark Thomas 2010-01-12 03:42:41 GMT --- Fixed in trunk. Thanks for the report. -- 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: r898289 - in /tomcat/trunk/java/org/apache: catalina/core/ catalina/manager/host/ catalina/realm/ jasper/resources/
Author: markt
Date: Tue Jan 12 11:42:46 2010
New Revision: 898289
URL: http://svn.apache.org/viewvc?rev=898289&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48524
Remove unused keys. Fix case issue for jsp.error.usebean.noSession.
Modified:
tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/catalina/core/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/catalina/manager/host/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/realm/LocalStrings_es.properties
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties
Modified: tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties?rev=898289&r1=898288&r2=898289&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties Tue
Jan 12 11:42:46 2010
@@ -200,7 +200,6 @@
standardWrapper.notContext = El contenedor padre para un Arropador (Wrapper)
debe de ser un Contexto
standardWrapper.notFound = No est\u00E1 disponible el Servlet {0}
standardWrapper.notServlet = La Clase {0} no es un Servlet
-standardWrapper.privilegedServlet = El Servlet de clase {0} es privilegiado y
no puede ser cargado mediante esta aplicaci\u00F3n web
standardWrapper.releaseFilters = Excepci\u00F3n de Liberaci\u00F3n de filtros
para servlet {0}
standardWrapper.serviceException = Servlet.service() para servlet {0}
lanz\u00F3 excepci\u00F3n
standardWrapper.statusHeader = HTTP Estado {0} - {1}
@@ -209,6 +208,3 @@
standardWrapper.unloadException = El Servlet {0} lanz\u00F3 excepci\u00F3n
unload()
standardWrapper.unloading = No puedo reservar espacio para servlet {0} porque
est\u00E1 siendo descargado
standardWrapper.waiting = Esperando por {0} instancia(s) para recuperar su
espacio reservado
-standardWrapper.restrictedServletsResource = No hallado fichero de propiedad
de Servlets Restringidos
-applicationFilterConfig.restrictedFiltersResource = No hallado fichero de
filtros Restringidos
-applicationFilterConfig.privilegedFilter = El filtro de clase {0} es
privilegiado y no puede ser cargado por esta aplicaci\u00F3n web
Modified: tomcat/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties?rev=898289&r1=898288&r2=898289&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties Tue
Jan 12 11:42:46 2010
@@ -171,7 +171,6 @@
standardWrapper.notContext=Le conteneur parent d''un enrobeur (wrapper) doit
\u00eatre un contexte
standardWrapper.notFound=Servlet {0} n''est pas disponible.
standardWrapper.notServlet=La classe {0} n''est pas une servlet
-standardWrapper.privilegedServlet=La servlet de classe {0} est
privil\u00e9gi\u00e9e (privileged) et ne peut \u00eatre charg\u00e9e par cette
application web
standardWrapper.releaseFilters=Exception des filtres de sortie (release
filters) pour la servlet {0}
standardWrapper.serviceException="Servlet.service()" pour la servlet {0} a
g\u00e9n\u00e9r\u00e9 une exception
standardWrapper.statusHeader=Etat HTTP {0} - {1}
Modified: tomcat/trunk/java/org/apache/catalina/core/LocalStrings_ja.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/LocalStrings_ja.properties?rev=898289&r1=898288&r2=898289&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings_ja.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings_ja.properties Tue
Jan 12 11:42:46 2010
@@ -178,7 +178,6 @@
standardWrapper.notContext=\u30e9\u30c3\u30d1\u306e\u89aa\u306e\u30b3\u30f3\u30c6\u30ca\u306f\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u3067\u306a\u3051\u308c\u3070\u3044\u3051\u307e\u305b\u3093
standardWrapper.notFound=\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8 {0}
\u304c\u5229\u7528\u3067\u304d\u307e\u305b\u3093
standardWrapper.notServlet=\u30af\u30e9\u30b9 {0}
\u306f\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8\u3067\u306f\u3042\u308a\u307e\u305b\u3093
-standardWrapper.privilegedServlet=\u30af\u30e9\u30b9 {0}
\u306e\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8\u306f\u7279\u6a29\u3092\u4e0e\u3048\u3089\u308c\u3066\u3044\u308b\u306e\u3067\u3001\u3053\u306eWeb\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u306b\u3088\u3063\u3066\u30ed\u30fc\u30c9\u3067\u304d\
svn commit: r898297 - /tomcat/trunk/java/org/apache/tomcat/util/res/StringManager.java
Author: markt
Date: Tue Jan 12 12:03:07 2010
New Revision: 898297
URL: http://svn.apache.org/viewvc?rev=898297&view=rev
Log:
Avoid NPE if bundle is missing
Modified:
tomcat/trunk/java/org/apache/tomcat/util/res/StringManager.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/res/StringManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/res/StringManager.java?rev=898297&r1=898296&r2=898297&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/res/StringManager.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/res/StringManager.java Tue Jan 12
12:03:07 2010
@@ -109,7 +109,10 @@
String str = null;
try {
-str = bundle.getString(key);
+// Avoid NPE if bundle is null and treat it like an MRE
+if (bundle != null) {
+str = bundle.getString(key);
+}
} catch(MissingResourceException mre) {
//bad: shouldn't mask an exception the following way:
// str = "[cannot find message associated with key '" + key + "'
due to " + mre + "]";
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48525] StringManager potential NPE
https://issues.apache.org/bugzilla/show_bug.cgi?id=48525 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #1 from Mark Thomas 2010-01-12 04:03:12 GMT --- Fixed in trunk. Thanks for the report. -- 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: r898318 - /tomcat/trunk/java/org/apache/jasper/compiler/ELParser.java
Author: markt
Date: Tue Jan 12 13:33:58 2010
New Revision: 898318
URL: http://svn.apache.org/viewvc?rev=898318&view=rev
Log:
Update the comment. We don't want or need another full EL parser.
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/ELParser.java
Modified: tomcat/trunk/java/org/apache/jasper/compiler/ELParser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/ELParser.java?rev=898318&r1=898317&r2=898318&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/ELParser.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/ELParser.java Tue Jan 12
13:33:58 2010
@@ -78,11 +78,12 @@
}
/**
- * Parse an EL expression string '${...}'
+ * Parse an EL expression string '${...}'. Currently only separates the EL
+ * into functions and everything else.
*
- * @return An ELNode.Nodes representing the EL expression TODO: Currently
- * only parsed into functions and text strings. This should be
- * rewritten for a full parser.
+ * @return An ELNode.Nodes representing the EL expression
+ *
+ * TODO: Can this be refactored to use the standard EL implementation?
*/
private ELNode.Nodes parseEL() {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48530] New: Patch for the Tomcat documentation : Server status page
https://issues.apache.org/bugzilla/show_bug.cgi?id=48530 Summary: Patch for the Tomcat documentation : Server status page Product: Tomcat 5 Version: 5.5.28 Platform: PC OS/Version: Linux Status: NEW Severity: enhancement Priority: P2 Component: Webapps:Documentation AssignedTo: dev@tomcat.apache.org ReportedBy: arnaud.e...@atosorigin.com Created an attachment (id=24832) --> (https://issues.apache.org/bugzilla/attachment.cgi?id=24832) The patch for the file manager-hoxto.xml of the Tomcat documentation. Hello, I have searched some informations about the “Server status” page, in the Apache Tomcat Manager, especially about the different stages of the threads. But it was very difficult to find something. So I've done a patch for the documentation, which speak about this page and quickly explain the stages. It must be apply to the file : manager-howto.xml. I hope it will be useful for other people. -- 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: r898376 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: jim Date: Tue Jan 12 15:37:03 2010 New Revision: 898376 URL: http://svn.apache.org/viewvc?rev=898376&view=rev Log: Cast votes on some tested patches 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=898376&r1=898375&r2=898376&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Jan 12 15:37:03 2010 @@ -113,7 +113,7 @@ Sessions timed out too early when using PersistentManager Port of patch by Keiichi Fujino http://people.apache.org/~markt/patches/2009-12-30-bug48345.patch - +1: markt, rjung + +1: markt, rjung, jim -1: * Allow special characters recognized by the Windows command-line shell to @@ -142,7 +142,7 @@ Provide an option to specify the command window title Patch provided by LiuYan http://svn.apache.org/viewvc?rev=895600&view=rev - +1: markt, kkolinko + +1: markt, kkolinko, jim -1: * Update recommended tcnative version to the forthcoming 1.1.19. @@ -150,7 +150,7 @@ http://svn.apache.org/viewvc?rev=895703&view=rev Also use 1.1.19 when bundling the source in the Tomcat build: http://svn.apache.org/viewvc?rev=897776&view=rev - +1: rjung, kkolinko, jfclere + +1: rjung, kkolinko, jfclere, jim -1: * Remove hard coded version numbers and instead apply version filter @@ -188,7 +188,7 @@ * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48470 Ensure shutdown does not lock up when Tomcat is shut down under load https://issues.apache.org/bugzilla/attachment.cgi?id=24827 - +1: markt + +1: markt, jim -1: * Fix various EL issues (with test cases) including BZ47413#c8 & BZ48112 @@ -205,12 +205,12 @@ https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk/test/org/apache/el/TestELEvaluation.java svn copy https://svn.apache.org/repos/asf/tomcat/trunk/test/org/apache/el/TesterFunctions.java https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk/test/org/apache/el/TesterFunctions.java - +1: markt + +1: markt, jim -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47977 Using a body with a tag that has an empty body should cause an error http://svn.apache.org/viewvc?rev=898126&view=rev http://svn.apache.org/viewvc?rev=898256&view=rev (case insensitivity) - +1: markt + +1: markt, jim -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r898378 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: jim Date: Tue Jan 12 15:38:04 2010 New Revision: 898378 URL: http://svn.apache.org/viewvc?rev=898378&view=rev Log: promote 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=898378&r1=898377&r2=898378&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Jan 12 15:38:04 2010 @@ -28,6 +28,28 @@ PATCHES ACCEPTED TO BACKPORT: [ start all new proposals below, under PATCHES PROPOSED. ] +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48345 + Sessions timed out too early when using PersistentManager + Port of patch by Keiichi Fujino + http://people.apache.org/~markt/patches/2009-12-30-bug48345.patch + +1: markt, rjung, jim + -1: + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48464 + Provide an option to specify the command window title + Patch provided by LiuYan + http://svn.apache.org/viewvc?rev=895600&view=rev + +1: markt, kkolinko, jim + -1: + +* Update recommended tcnative version to the forthcoming 1.1.19. + No update on the required version (17) + http://svn.apache.org/viewvc?rev=895703&view=rev + Also use 1.1.19 when bundling the source in the Tomcat build: + http://svn.apache.org/viewvc?rev=897776&view=rev + +1: rjung, kkolinko, jfclere, jim + -1: + PATCHES PROPOSED TO BACKPORT: [ New proposals should be added at the end of the list ] @@ -109,13 +131,6 @@ also provides this feature, and better than this patch does. -* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48345 - Sessions timed out too early when using PersistentManager - Port of patch by Keiichi Fujino - http://people.apache.org/~markt/patches/2009-12-30-bug48345.patch - +1: markt, rjung, jim - -1: - * Allow special characters recognized by the Windows command-line shell to be present in the names of CATALINA_HOME/_BASE and the current directory used to call the Tomcat scripts. @@ -138,21 +153,6 @@ The 'set "a=%b%"' trick is nice, because if you only use the quotation marks around the rhs, Windows actually adds them to the value of 'a'. -* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48464 - Provide an option to specify the command window title - Patch provided by LiuYan - http://svn.apache.org/viewvc?rev=895600&view=rev - +1: markt, kkolinko, jim - -1: - -* Update recommended tcnative version to the forthcoming 1.1.19. - No update on the required version (17) - http://svn.apache.org/viewvc?rev=895703&view=rev - Also use 1.1.19 when bundling the source in the Tomcat build: - http://svn.apache.org/viewvc?rev=897776&view=rev - +1: rjung, kkolinko, jfclere, jim - -1: - * Remove hard coded version numbers and instead apply version filter already defined in ant scripts. Backport from trunk of - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r898379 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/session/StoreBase.java
Author: jim
Date: Tue Jan 12 15:39:19 2010
New Revision: 898379
URL: http://svn.apache.org/viewvc?rev=898379&view=rev
Log:
java/org/apache/catalina/session/StoreBase.java
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48345
Sessions timed out too early when using PersistentManager
Port of patch by Keiichi Fujino
http://people.apache.org/~markt/patches/2009-12-30-bug48345.patch
+1: markt, rjung, jim
-1:
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/StoreBase.java
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=898379&r1=898378&r2=898379&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Jan 12 15:39:19 2010
@@ -28,13 +28,6 @@
PATCHES ACCEPTED TO BACKPORT:
[ start all new proposals below, under PATCHES PROPOSED. ]
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48345
- Sessions timed out too early when using PersistentManager
- Port of patch by Keiichi Fujino
- http://people.apache.org/~markt/patches/2009-12-30-bug48345.patch
- +1: markt, rjung, jim
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48464
Provide an option to specify the command window title
Patch provided by LiuYan
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/StoreBase.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/StoreBase.java?rev=898379&r1=898378&r2=898379&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/StoreBase.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/StoreBase.java Tue
Jan 12 15:39:19 2010
@@ -189,14 +189,15 @@
if (manager.getContainer().getLogger().isDebugEnabled()) {
manager.getContainer().getLogger().debug(getStoreName()+ ":
processExpires check number of " + keys.length + " sessions" );
}
-
+
for (int i = 0; i < keys.length; i++) {
try {
StandardSession session = (StandardSession) load(keys[i]);
if (session == null) {
continue;
}
-if (session.isValid()) {
+int timeIdle = (int) ((timeNow - session.thisAccessedTime) /
1000L);
+if (timeIdle < session.getMaxInactiveInterval()) {
continue;
}
if (manager.getContainer().getLogger().isDebugEnabled()) {
@@ -209,7 +210,7 @@
// expire swapped out session
session.expire();
}
-remove(session.getIdInternal());
+remove(keys[i]);
} catch (Exception e) {
manager.getContainer().getLogger().error("Session:
"+keys[i]+"; ", e);
try {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r898383 - in /tomcat/tc6.0.x/trunk: STATUS.txt bin/catalina.bat
Author: jim Date: Tue Jan 12 15:42:11 2010 New Revision: 898383 URL: http://svn.apache.org/viewvc?rev=898383&view=rev Log: Merge r895600 from trunk: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48464 Provide an option to specify the command window title Patch provided by LiuYan Submitted by: markt Reviewed/backported by: jim Modified: tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/bin/catalina.bat Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=898383&r1=898382&r2=898383&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Jan 12 15:42:11 2010 @@ -28,13 +28,6 @@ PATCHES ACCEPTED TO BACKPORT: [ start all new proposals below, under PATCHES PROPOSED. ] -* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48464 - Provide an option to specify the command window title - Patch provided by LiuYan - http://svn.apache.org/viewvc?rev=895600&view=rev - +1: markt, kkolinko, jim - -1: - * Update recommended tcnative version to the forthcoming 1.1.19. No update on the required version (17) http://svn.apache.org/viewvc?rev=895703&view=rev Modified: tomcat/tc6.0.x/trunk/bin/catalina.bat URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/bin/catalina.bat?rev=898383&r1=898382&r2=898383&view=diff == --- tomcat/tc6.0.x/trunk/bin/catalina.bat (original) +++ tomcat/tc6.0.x/trunk/bin/catalina.bat Tue Jan 12 15:42:11 2010 @@ -222,7 +222,8 @@ :doStart shift if not "%OS%" == "Windows_NT" goto noTitle -set _EXECJAVA=start "Tomcat" %_RUNJAVA% +if "%TITLE%" == "" set TITLE=Tomcat +set _EXECJAVA=start "%TITLE%" %_RUNJAVA% goto gotTitle :noTitle set _EXECJAVA=start %_RUNJAVA% - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r898409 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt build.properties.default java/org/apache/catalina/core/AprLifecycleListener.java webapps/docs/changelog.xml
Author: markt Date: Tue Jan 12 16:39:17 2010 New Revision: 898409 URL: http://svn.apache.org/viewvc?rev=898409&view=rev Log: Update recommended native to 1.1.19 and use for windows installer. Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/build.properties.default tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc6.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jan 12 16:39:17 2010 @@ -1,2 +1,2 @@ /tomcat:883362 -/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,77 0876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,890139,8902 65,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,896370,896384 +/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,77 0876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,890139,8902 65,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,89
[Tomcat Wiki] Update of "SupportAndTraining" by BoYoung Ahn
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change
notification.
The "SupportAndTraining" page has been changed by BoYoungAhn.
http://wiki.apache.org/tomcat/SupportAndTraining?action=diff&rev1=10&rev2=11
--
!MuleSoft provides comprehensive
[[http://www.mulesoft.com/mule-training|Tomcat Traininig]] for users of Apache
Tomcat. !MuleSoft offers a FREE prerecorded training course to help users to
get started with Apache Tomcat and also intensive instructor led training
courses on advanced topics such as
[[http://www.mulesoft.com/tomcat-performance-tuning|Tomcat performance
tuning]], [[http://www.mulesoft.com/tomcat-configuration-training|configuration
management]]. The training is designed by Tomcat experts and delivered by
experienced instructors.
+
[[http://www.nobleprog.com|{{http://www.nobleprog.com/system/files/u4/nobleproglogo.gif}}]]
+
+ !NobleProg provides comprehensive
[[http://http://www.nobleprog.com/tomcat-training/training-course|Online
Instructor-led Tomcat Traininig]] all around the world. !NobleProg also
provides intensive[[http://www.nobleprog.co.uk/apache/training|Tomcat Classroom
Courses in the UK]]. The training can be bespoken as users want with hands-on
exercises. The course can be conducted even if there is only one person by
experienced Tomcat instructors.
+
=== Example company name ===
Use this example as a basis for your entry. New entries should be added just
above this example.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
With a view to 6.0.23
Just doing some testing. Generally looking good. The log buffering does seem to be causing issues with lost messages on windows service shutdown. I'm looking at Kostantin's patch to disable buffering now. That should fix the symptom (good enough for 6.0.23). If it does, I'll try and figure out the root cause. More eyes appreciated. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Update of "SupportAndTraining" by BoYoung Ahn
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change
notification.
The "SupportAndTraining" page has been changed by BoYoungAhn.
http://wiki.apache.org/tomcat/SupportAndTraining?action=diff&rev1=11&rev2=12
--
If you would like to add your company to this page, feel free to do so. You
will need to create a wiki account to do so. There aren't any hard and fast
rules about what is acceptable but please keep your entry to a few lines, a
link and a small logo. Excessive entries will be edited. Remember to add you
company to both sections if you provide support and training.
= Support =
+
[[http://www.kippdata.de|{{http://www.kippdata.de/site/themes/kippdata/img/elements/kippdata_logo.gif|http://www.kippdata.de}}]]
-
[[http://www.kippdata.de|{{http://www.kippdata.de/site/themes/kippdata/img/elements/kippdata_logo.gif}}]]
-
- Kippdata's [[https://www.kippdata.de/tomcat/|eSupport for Apache Tomcat]]
features several eSupport packages starting from basic support levels up to
mission critical enterprise support. We actively contribute to the Apache
Tomcat project, so that our bug fixes and other code enhancements become part
of the standard Apache Tomcat code. Kippdata is located in Bonn, Germany.
+ Kippdata's [[https://www.kippdata.de/tomcat/|eSupport for Apache Tomcat]]
features several eSupport packages starting from basic support levels up to
mission critical enterprise support. We actively contribute to the Apache
Tomcat project, so that our bug fixes and other code enhancements become part
of the standard Apache Tomcat code. Kippdata is located in Bonn, Germany.
Kippdatas [[https://www.kippdata.de/tomcat/|eSupport für Apache Tomcat]]
bietet von Basis Level Support bis hin zu Support für unternehmenskritische
Anwendungen verschiedene eSupport-Pakete. Wir beteiligen uns aktiv am Apache
Tomcat Projekt, so dass unsere Fehlerbeseitigungen und andere Erweiterungen des
Codes in den Standard Apache Tomcat Code einfliessen. Kippdata ist in Bonn,
Deutschland, ansässig.
-
[[http://www.springsource.com|{{http://www.springframework.org/sites/all/themes/zen/framework/logo.png}}]]
+
[[http://www.springsource.com|{{http://www.springframework.org/sites/all/themes/zen/framework/logo.png|http://www.springsource.com}}]]
- !SpringSource provides global, 24x7,
[[http://www.covalent.net/supportservices/tomcat/index.html?aw|enterprise
support]] for production users of Apache Tomcat. !SpringSource employs the
leading experts on Apache Tomcat to ensure that support customers can get their
questions answered quickly and accurately and that bug fixes are incorporated
into the open source code base.
+ !SpringSource provides global, 24x7,
[[http://www.covalent.net/supportservices/tomcat/index.html?aw|enterprise
support]] for production users of Apache Tomcat. !SpringSource employs the
leading experts on Apache Tomcat to ensure that support customers can get their
questions answered quickly and accurately and that bug fixes are incorporated
into the open source code base.
- [[http://www.opengate.biz/|{{http://office.opengate.biz/images/og.png}}]]
+
[[http://www.opengate.biz/|{{http://office.opengate.biz/images/og.png|http://www.opengate.biz/}}]]
+ !OpenGate provides support for Apache Tomcat enterprise users located in
Italy. !OpenGate has 8 years experience in helping customers adopting Apache
Tomcat and hundreds of success stories.<> !OpenGate fornisce supporto in
Italia per gli utenti di Apache Tomcat. !OpenGate ha 8 anni di esperienza
nell'aiutare i clienti nell'adozione di Apache Tomcat e centinaia di storie di
successo.
- !OpenGate provides support for Apache Tomcat enterprise users located in
Italy. !OpenGate has 8 years experience in helping customers adopting Apache
Tomcat and hundreds of success stories.<>
- !OpenGate fornisce supporto in Italia per gli utenti di Apache Tomcat.
!OpenGate ha 8 anni di esperienza nell'aiutare i clienti nell'adozione di
Apache Tomcat e centinaia di storie di successo.
-
[[http://www.mulesoft.com|{{http://www.mulesoft.com/sites/default/files/mulesoft-logo-final.gif}}]]
+
[[http://www.mulesoft.com|{{http://www.mulesoft.com/sites/default/files/mulesoft-logo-final.gif|http://www.mulesoft.com}}]]
!MuleSoft provides global [[http://www.mulesoft.com/tomcat-support|enterprise
support]] for users of Apache Tomcat. !MuleSoft employs leading experts and
authors on Apache Tomcat to ensure that customers can get their questions
answered quickly and accurately. !MuleSoft also provides
[[http://www.mulesoft.com/free-tomcat-assistance|Free Tomcat Assistance]].
@@ -32, +30 @@
Use this example as a basis for your entry. New entries should be added just
above this example.
= Training =
+
[[http://www.kippdata.de|{{http://www.kippdata.de/site/themes/kippdata/img/elements/kippdata_logo.gif|http://www.kippdata.de}}]]
-
[[ht
[Tomcat Wiki] Update of "SupportAndTraining" by BoYoung Ahn
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change
notification.
The "SupportAndTraining" page has been changed by BoYoungAhn.
http://wiki.apache.org/tomcat/SupportAndTraining?action=diff&rev1=12&rev2=13
--
[[http://www.nobleprog.com|{{http://www.nobleprog.com/system/files/u4/nobleproglogo.gif|http://www.nobleprog.com}}]]
- !NobleProg provides comprehensive
[[http://http://www.nobleprog.com/tomcat-training/training-course|Online
Instructor-led Tomcat Traininig]] all around the world. !NobleProg also
provides intensive[[http://www.nobleprog.co.uk/apache/training|Tomcat Classroom
Courses in the UK]]. The training can be bespoken as users want with hands-on
exercises. The course can be conducted even if there is only one person by
experienced Tomcat instructors.
+ !NobleProg provides comprehensive
[[http://www.nobleprog.com/tomcat-training/training-course|Online
Instructor-led Tomcat Traininig]] all around the world. !NobleProg also
provides intensive[[http://www.nobleprog.co.uk/apache/training|Tomcat Classroom
Courses in the UK]]. The training can be bespoken as users want with hands-on
exercises. The course can be conducted even if there is only one person by
experienced Tomcat instructors.
=== Example company name ===
Use this example as a basis for your entry. New entries should be added just
above this example.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r898426 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Tue Jan 12 17:21:22 2010 New Revision: 898426 URL: http://svn.apache.org/viewvc?rev=898426&view=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=898426&r1=898425&r2=898426&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Jan 12 17:21:22 2010 @@ -160,7 +160,7 @@ which failed to implement this fix properly. http://svn.apache.org/viewvc?rev=897380&view=rev (fix) http://svn.apache.org/viewvc?rev=897381&view=rev (Documentation) - +1: kkolinko + +1: kkolinko, markt -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48470 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r898383 - in /tomcat/tc6.0.x/trunk: STATUS.txt bin/catalina.bat
Thank you, but - this missed the documentation part of the patch - we try to provide an entry in webapps/docs/changelog.xml for each committed patch. Especially for the ones provided by third parties, to give them proper credit. I will fix those issues in a few minutes. Best regards, Konstantin Kolinko 2010/1/12 : > Author: jim > Date: Tue Jan 12 15:42:11 2010 > New Revision: 898383 > > URL: http://svn.apache.org/viewvc?rev=898383&view=rev > Log: > Merge r895600 from trunk: > > Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48464 > Provide an option to specify the command window title > Patch provided by LiuYan > Submitted by: markt > Reviewed/backported by: jim > > Modified: > tomcat/tc6.0.x/trunk/STATUS.txt > tomcat/tc6.0.x/trunk/bin/catalina.bat > > Modified: tomcat/tc6.0.x/trunk/STATUS.txt > URL: > http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=898383&r1=898382&r2=898383&view=diff > == > --- tomcat/tc6.0.x/trunk/STATUS.txt (original) > +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Jan 12 15:42:11 2010 > @@ -28,13 +28,6 @@ > PATCHES ACCEPTED TO BACKPORT: > [ start all new proposals below, under PATCHES PROPOSED. ] > > -* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48464 > - Provide an option to specify the command window title > - Patch provided by LiuYan > - http://svn.apache.org/viewvc?rev=895600&view=rev > - +1: markt, kkolinko, jim > - -1: > - > * Update recommended tcnative version to the forthcoming 1.1.19. > No update on the required version (17) > http://svn.apache.org/viewvc?rev=895703&view=rev > > Modified: tomcat/tc6.0.x/trunk/bin/catalina.bat > URL: > http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/bin/catalina.bat?rev=898383&r1=898382&r2=898383&view=diff > == > --- tomcat/tc6.0.x/trunk/bin/catalina.bat (original) > +++ tomcat/tc6.0.x/trunk/bin/catalina.bat Tue Jan 12 15:42:11 2010 > @@ -222,7 +222,8 @@ > :doStart > shift > if not "%OS%" == "Windows_NT" goto noTitle > -set _EXECJAVA=start "Tomcat" %_RUNJAVA% > +if "%TITLE%" == "" set TITLE=Tomcat > +set _EXECJAVA=start "%TITLE%" %_RUNJAVA% > goto gotTitle > :noTitle > set _EXECJAVA=start %_RUNJAVA% > > > > - > 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: r898443 - in /tomcat/trunk/java/org/apache/catalina/manager/host: HTMLHostManagerServlet.java HostManagerServlet.java
Author: markt
Date: Tue Jan 12 17:57:55 2010
New Revision: 898443
URL: http://svn.apache.org/viewvc?rev=898443&view=rev
Log:
Fix the Eclipse warnings for the host-manager
Modified:
tomcat/trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java
tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java
Modified:
tomcat/trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java?rev=898443&r1=898442&r2=898443&view=diff
==
---
tomcat/trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java
Tue Jan 12 17:57:55 2010
@@ -396,7 +396,7 @@
URLEncoder.encode(hostName, "UTF-8"));
args[5] = hostsRemove;
args[6] = newNonce;
-if (host == this.host) {
+if (host == this.installedHost) {
writer.print(MessageFormat.format(
MANAGER_HOST_ROW_BUTTON_SECTION, args));
} else {
Modified:
tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java?rev=898443&r1=898442&r2=898443&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java
Tue Jan 12 17:57:55 2010
@@ -100,12 +100,6 @@
/**
- * Path where context descriptors should be deployed.
- */
-protected File configBase = null;
-
-
-/**
* The Context container associated with our web application.
*/
protected Context context = null;
@@ -120,7 +114,7 @@
/**
* The associated host.
*/
-protected Host host = null;
+protected Host installedHost = null;
/**
@@ -171,12 +165,12 @@
this.wrapper = wrapper;
if (wrapper == null) {
context = null;
-host = null;
+installedHost = null;
engine = null;
} else {
context = (Context) wrapper.getParent();
-host = (Host) context.getParent();
-engine = (Engine) host.getParent();
+installedHost = (Host) context.getParent();
+engine = (Engine) installedHost.getParent();
}
// Retrieve the MBean server
@@ -493,7 +487,7 @@
}
// Prevent removing our own host
-if (engine.findChild(name) == host) {
+if (engine.findChild(name) == installedHost) {
writer.println
(sm.getString("hostManagerServlet.cannotRemoveOwnHost", name));
return;
@@ -578,7 +572,7 @@
}
// Prevent starting our own host
-if (engine.findChild(name) == host) {
+if (engine.findChild(name) == installedHost) {
writer.println
(sm.getString("hostManagerServlet.cannotStartOwnHost", name));
return;
@@ -627,7 +621,7 @@
}
// Prevent starting our own host
-if (engine.findChild(name) == host) {
+if (engine.findChild(name) == installedHost) {
writer.println
(sm.getString("hostManagerServlet.cannotStopOwnHost", name));
return;
@@ -666,7 +660,7 @@
if (engine != null) {
configBase = new File(configBase, engine.getName());
}
-if (host != null) {
+if (installedHost != null) {
configBase = new File(configBase, hostName);
}
configBase.mkdirs();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r898456 - in /tomcat/trunk/java/org/apache/catalina/manager/host: HostManagerServlet.java LocalStrings.properties
Author: markt
Date: Tue Jan 12 18:23:27 2010
New Revision: 898456
URL: http://svn.apache.org/viewvc?rev=898456&view=rev
Log:
Use string manager for log messages
Modified:
tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java
tomcat/trunk/java/org/apache/catalina/manager/host/LocalStrings.properties
Modified:
tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java?rev=898456&r1=898455&r2=898456&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java
Tue Jan 12 18:23:27 2010
@@ -346,7 +346,7 @@
boolean xmlNamespaceAware,
boolean xmlValidation) {
if (debug >= 1) {
-log("add: Adding host '" + name + "'");
+log(sm.getString("hostManagerServlet.add", name));
}
// Validate the requested host name
@@ -470,7 +470,7 @@
protected synchronized void remove(PrintWriter writer, String name) {
if (debug >= 1) {
-log("remove: Removing host '" + name + "'");
+log(sm.getString("hostManagerServlet.remove", name));
}
// Validate the requested host name
@@ -523,9 +523,9 @@
*/
protected void list(PrintWriter writer) {
-if (debug >= 1)
-log("list: Listing hosts for engine '"
-+ engine.getName() + "'");
+if (debug >= 1) {
+log(sm.getString("hostManagerServlet.list", engine.getName()));
+}
writer.println(sm.getString("hostManagerServlet.listed",
engine.getName()));
@@ -555,8 +555,9 @@
*/
protected void start(PrintWriter writer, String name) {
-if (debug >= 1)
-log("start: Starting host with name '" + name + "'");
+if (debug >= 1) {
+log(sm.getString("hostManagerServlet.start", name));
+}
// Validate the requested host name
if ((name == null) || name.length() == 0) {
@@ -604,8 +605,9 @@
*/
protected void stop(PrintWriter writer, String name) {
-if (debug >= 1)
-log("stop: Stopping host with name '" + name + "'");
+if (debug >= 1) {
+log(sm.getString("hostManagerServlet.stop", name));
+}
// Validate the requested host name
if ((name == null) || name.length() == 0) {
Modified:
tomcat/trunk/java/org/apache/catalina/manager/host/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/host/LocalStrings.properties?rev=898456&r1=898455&r2=898456&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/manager/host/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/manager/host/LocalStrings.properties
Tue Jan 12 18:23:27 2010
@@ -35,6 +35,11 @@
hostManagerServlet.cannotStopOwnHost=FAIL - Cannot stop own host {0}
hostManagerServlet.stopped=OK - Host {0} stopped
hostManagerServlet.stopFailed=FAIL - Failed to stop host {0}
+hostManagerServlet.add=add: Adding host [{0}]
+hostManagerServlet.remove=remove: Removing host [{0}]
+hostManagerServlet.list=list: Listing hosts for engine [{0}]
+hostManagerServlet.start=start: Starting host with name [{0}]
+hostManagerServlet.stop=stop: Stopping host with name [{0}]
htmlHostManagerServlet.title=Tomcat Virtual Host Manager
htmlHostManagerServlet.messageLabel=Message:
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: With a view to 6.0.23
2010/1/12 Mark Thomas : > Just doing some testing. Generally looking good. The log buffering does > seem to be causing issues with lost messages on windows service > shutdown. I'm looking at Kostantin's patch to disable buffering now. > That should fix the symptom (good enough for 6.0.23). If it does, I'll > try and figure out the root cause. > > More eyes appreciated. > > Mark > Thank you for vote. I would very like to see the JULI FileHandler buffering patch in 6.0.23. A third vote is required. Mark, do you have an alternate patch for BZ 47774 (about session.isValid() and listeners executed with a wrong class loader)? You once mentioned that you tested it, but none was proposed. Thus far my testing of 6.0.21/22 resulted in that JULI patch and in the following bug reports: https://issues.apache.org/bugzilla/show_bug.cgi?id=48438 https://issues.apache.org/bugzilla/show_bug.cgi?id=48498 The first one (48438) is one more AccessControlException when running with security. It is not serious by its impact, and some fix should be easy to find. I think it is not a show-stopper. The second one (48498) is Jasper crashing when trying to report a compilation error. I've provided reproducers there. I am not so familiar with Jasper code to find a fix quickly, but I would like this to be fixed. It is hard to develop when Jasper fails to report where (even in what file) your error is. I have not tested whether it worked in 6.0.20. Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r898457 - /tomcat/trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java
Author: markt
Date: Tue Jan 12 18:27:33 2010
New Revision: 898457
URL: http://svn.apache.org/viewvc?rev=898457&view=rev
Log:
Make logging consistent for HTML and text interfaces
Modified:
tomcat/trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java
Modified:
tomcat/trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java?rev=898457&r1=898456&r2=898457&view=diff
==
---
tomcat/trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java
Tue Jan 12 18:27:33 2010
@@ -282,6 +282,10 @@
HttpServletResponse response,
String message) throws IOException {
+if (debug >= 1) {
+log(sm.getString("hostManagerServlet.list", engine.getName()));
+}
+
String newNonce = generateNonce();
request.getSession().setAttribute(NONCE_SESSION, newNonce);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: With a view to 6.0.23
On 12/01/2010 18:24, Konstantin Kolinko wrote: > 2010/1/12 Mark Thomas : >> Just doing some testing. Generally looking good. The log buffering does >> seem to be causing issues with lost messages on windows service >> shutdown. I'm looking at Kostantin's patch to disable buffering now. >> That should fix the symptom (good enough for 6.0.23). If it does, I'll >> try and figure out the root cause. >> >> More eyes appreciated. >> >> Mark >> > > Thank you for vote. I would very like to see the JULI FileHandler > buffering patch in 6.0.23. > A third vote is required. > > Mark, do you have an alternate patch for BZ 47774 (about > session.isValid() and listeners executed with a wrong class loader)? > You once mentioned that you tested it, but none was proposed. I looked back at the archives. When I said "works for me", I meant "I am happy with that idea" not "I have tested it and it works". Sorry for my poor choice of words. I will revisit that patch but I'm happy if it doesn't make it into 6.0.23. > Thus far my testing of 6.0.21/22 resulted in that JULI patch and in > the following bug reports: > https://issues.apache.org/bugzilla/show_bug.cgi?id=48438 > https://issues.apache.org/bugzilla/show_bug.cgi?id=48498 > > The first one (48438) is one more AccessControlException when running > with security. It is not serious by its impact, and some fix should be > easy to find. I think it is not a show-stopper. +1. > The second one (48498) is Jasper crashing when trying to report a > compilation error. > I've provided reproducers there. I am not so familiar with Jasper code > to find a fix quickly, but I would like this to be fixed. It is hard > to develop when Jasper fails to report where (even in what file) your > error is. I have not tested whether it worked in 6.0.20. I suspect it didn't. I'm happy with this not making it into 6.0.23 as well. I think we need to get 6.0.23 out asap. It has been too long since the last 6.0.x release and there are many, many bug fixes. Once 6.0.23 is out, there is nothing stopping us doing 6.0.24 a few weeks later if we think it is justified. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r898468 - in /tomcat/trunk/java/org/apache/juli: ClassLoaderLogManager.java logging/LogFactory.java
Author: markt
Date: Tue Jan 12 19:06:48 2010
New Revision: 898468
URL: http://svn.apache.org/viewvc?rev=898468&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48421
Clean up a web application's logs and handlers when it stops. This involved
modifying the fix that prevented log messages being lost in shutdown.
Modified:
tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java
tomcat/trunk/java/org/apache/juli/logging/LogFactory.java
Modified: tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java?rev=898468&r1=898467&r2=898468&view=diff
==
--- tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java (original)
+++ tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java Tue Jan 12
19:06:48 2010
@@ -46,6 +46,46 @@
*/
public class ClassLoaderLogManager extends LogManager {
+private final class Cleaner extends Thread {
+
+@Override
+public void run() {
+// The JVM us being shutdown. Make sure all loggers for all class
+// loaders are shutdown
+for (ClassLoaderLogInfo clLogInfo : classLoaderLoggers.values()) {
+for (Logger logger : clLogInfo.loggers.values()) {
+resetLogger(logger);
+}
+}
+}
+
+private void resetLogger(Logger logger) {
+
+Handler[] handlers = logger.getHandlers();
+for (Handler handler : handlers) {
+logger.removeHandler(handler);
+try {
+handler.close();
+} catch (Exception e) {
+// Ignore
+}
+}
+}
+
+}
+
+
+// Constructors
+
+public ClassLoaderLogManager() {
+super();
+try {
+Runtime.getRuntime().addShutdownHook(new Cleaner());
+} catch (IllegalStateException ise) {
+// We are probably already being shutdown. Ignore this error.
+}
+}
+
// -- Variables
@@ -485,33 +525,6 @@
}
-/**
- * Need to override reset so the loggers loaded by the web applications can
- * be shutdown.
- */
-@Override
-public void reset() {
-super.reset();
-for (ClassLoaderLogInfo classLoaderLogInfo :
classLoaderLoggers.values()) {
-for (Logger logger : classLoaderLogInfo.loggers.values()) {
-resetLogger(logger);
-}
-}
-}
-
-private void resetLogger(Logger logger) {
-
-Handler[] handlers = logger.getHandlers();
-for (Handler handler : handlers) {
-logger.removeHandler(handler);
-try {
-handler.close();
-} catch (Exception e) {
-// Ignore
-}
-}
-}
-
// LogNode Inner Class
Modified: tomcat/trunk/java/org/apache/juli/logging/LogFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/juli/logging/LogFactory.java?rev=898468&r1=898467&r2=898468&view=diff
==
--- tomcat/trunk/java/org/apache/juli/logging/LogFactory.java (original)
+++ tomcat/trunk/java/org/apache/juli/logging/LogFactory.java Tue Jan 12
19:06:48 2010
@@ -19,6 +19,7 @@
import java.util.Properties;
+import java.util.logging.LogManager;
@@ -325,8 +326,10 @@
*
* @param classLoader ClassLoader for which to release the LogFactory
*/
-public static void release(ClassLoader classLoader) {
-// nothing - we don't use any class loaders
+public static void release(
+@SuppressWarnings("unused") ClassLoader classLoader) {
+// JULI's log manager looks at the current classLoader
+LogManager.getLogManager().reset();
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48421] JULI webapp logging files will not closed when webapp is stopped,reloaded or undeployed
https://issues.apache.org/bugzilla/show_bug.cgi?id=48421 --- Comment #1 from Mark Thomas 2010-01-12 11:08:39 GMT --- This has been fixed in trunk and proposed for 6.0.x -- 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: r898471 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Tue Jan 12 19:14:25 2010 New Revision: 898471 URL: http://svn.apache.org/viewvc?rev=898471&view=rev Log: Proposal 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=898471&r1=898470&r2=898471&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Jan 12 19:14:25 2010 @@ -192,3 +192,11 @@ http://svn.apache.org/viewvc?rev=898256&view=rev (case insensitivity) +1: markt, jim -1: + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48421 + Prevent file descriptor leak. Allow a web application's logs to be deleted + once the application has been stopped. + http://svn.apache.org/viewvc?rev=898468&view=rev + +1: markt + -1: + \ 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: r898474 - in /tomcat/tc6.0.x/trunk: bin/catalina.bat webapps/docs/changelog.xml
Author: kkolinko Date: Tue Jan 12 19:20:59 2010 New Revision: 898474 URL: http://svn.apache.org/viewvc?rev=898474&view=rev Log: Followup to r898379, r898383. Add changelog entries. Add documentation to catalina.bat that was omitted in r898383. Modified: tomcat/tc6.0.x/trunk/bin/catalina.bat tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc6.0.x/trunk/bin/catalina.bat URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/bin/catalina.bat?rev=898474&r1=898473&r2=898474&view=diff == --- tomcat/tc6.0.x/trunk/bin/catalina.bat (original) +++ tomcat/tc6.0.x/trunk/bin/catalina.bat Tue Jan 12 19:20:59 2010 @@ -68,6 +68,11 @@ rem Example (all one line) rem set LOGGING_CONFIG="-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager" rem +rem TITLE (Optional) Specify the title of Tomcat window. The default +rem TITLE is Tomcat if it's not specified. +rem Example (all one line) +rem set TITLE=Tomcat.Cluster#1.Server#1 [%DATE% %TIME%] +rem rem rem rem $Id$ 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=898474&r1=898473&r2=898474&view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue Jan 12 19:20:59 2010 @@ -42,6 +42,10 @@ specification. (markt) +48345: Sessions timed out too early when using PersistentManager. +Patch provided by Keiichi Fujino. (markt) + + 48398: Make objects used as locks final to ensure correct operation. Patch provided by sebb. (markt) @@ -70,6 +74,10 @@ 47609: Correct regression in previous fix. (markt) + +48464: Provide an option to specify the command window title +in catalina.bat on Windows. Patch provided by LiuYan. (markt) + Add some missing deprecation markers for javax.servlet.jsp.JspContext. (markt/kkolinko) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r898475 - /tomcat/trunk/res/tomcat.nsi
Author: markt Date: Tue Jan 12 19:25:40 2010 New Revision: 898475 URL: http://svn.apache.org/viewvc?rev=898475&view=rev Log: JULI needs to be on class path Modified: tomcat/trunk/res/tomcat.nsi Modified: tomcat/trunk/res/tomcat.nsi URL: http://svn.apache.org/viewvc/tomcat/trunk/res/tomcat.nsi?rev=898475&r1=898474&r2=898475&view=diff == --- tomcat/trunk/res/tomcat.nsi (original) +++ tomcat/trunk/res/tomcat.nsi Tue Jan 12 19:25:40 2010 @@ -321,7 +321,7 @@ SectionEnd Section -post - nsExec::ExecToLog '"$instdir\bin\tom...@version_major@.exe" //US//tom...@version_major@ --Classpath "$INSTDIR\bin\bootstrap.jar" --StartClass org.apache.catalina.startup.Bootstrap --StopClass org.apache.catalina.startup.Bootstrap --StartParams start --StopParams stop --StartMode jvm --StopMode jvm' + nsExec::ExecToLog '"$instdir\bin\tom...@version_major@.exe" //US//tom...@version_major@ --Classpath "$INSTDIR\bin\bootstrap.jar;$INSTDIR\bin\tomcat-juli.jar" --StartClass org.apache.catalina.startup.Bootstrap --StopClass org.apache.catalina.startup.Bootstrap --StartParams start --StopParams stop --StartMode jvm --StopMode jvm' nsExec::ExecToLog '"$instdir\bin\tom...@version_major@.exe" //US//tom...@version_major@ --JvmOptions "-Dcatalina.home=$INSTDIR#-Dcatalina.base=$INSTDIR#-Djava.endorsed.dirs=$INSTDIR\endorsed#-Djava.io.tmpdir=$INSTDIR\temp#-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager#-Djava.util.logging.config.file=$INSTDIR\conf\logging.properties" --StdOutput auto --StdError auto' WriteUninstaller "$INSTDIR\Uninstall.exe" - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r898496 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Tue Jan 12 20:30:46 2010 New Revision: 898496 URL: http://svn.apache.org/viewvc?rev=898496&view=rev Log: Add note 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=898496&r1=898495&r2=898496&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Jan 12 20:30:46 2010 @@ -196,6 +196,8 @@ * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48421 Prevent file descriptor leak. Allow a web application's logs to be deleted once the application has been stopped. + I haven't figured out why, but this also prevents buffered log messages being + lost on stop when running as a service. http://svn.apache.org/viewvc?rev=898468&view=rev +1: markt -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48510] Memory leak after undeploying web application using custom log formatter
https://issues.apache.org/bugzilla/show_bug.cgi?id=48510 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||DUPLICATE --- Comment #1 from Mark Thomas 2010-01-12 13:06:04 GMT --- Thanks for the test case. This bug has the same root cause as bug 48421 so I am marking it as a duplicate. *** This bug has been marked as a duplicate of bug 48421 *** -- 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 48421] JULI webapp logging files will not closed when webapp is stopped,reloaded or undeployed
https://issues.apache.org/bugzilla/show_bug.cgi?id=48421 Mark Thomas changed: What|Removed |Added CC||dsavic...@gmail.com --- Comment #2 from Mark Thomas 2010-01-12 13:06:05 GMT --- *** Bug 48510 has been marked as a duplicate of this bug. *** -- 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: r898527 - in /tomcat/trunk: java/org/apache/coyote/http11/Http11AprProcessor.java java/org/apache/coyote/http11/Http11NioProcessor.java java/org/apache/coyote/http11/Http11Processor.java w
Author: markt
Date: Tue Jan 12 21:36:49 2010
New Revision: 898527
URL: http://svn.apache.org/viewvc?rev=898527&view=rev
Log:
Fix bug 48004. Allow applications to set the server header.
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
tomcat/trunk/webapps/docs/config/http.xml
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java?rev=898527&r1=898526&r2=898527&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java Tue Jan
12 21:36:49 2010
@@ -1688,8 +1688,10 @@
// Add server header
if (server != null) {
+// Always overrides anything the app might set
headers.setValue("Server").setString(server);
-} else {
+} else if (headers.getValue("Server") == null) {
+// If app didn't set the header, use the default
outputBuffer.write(Constants.SERVER_BYTES);
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java?rev=898527&r1=898526&r2=898527&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java Tue Jan
12 21:36:49 2010
@@ -1187,8 +1187,10 @@
// Add server header
if (server != null) {
+// Always overrides anything the app might set
headers.setValue("Server").setString(server);
-} else {
+} else if (headers.getValue("Server") == null) {
+// If app didn't set the header, use the default
outputBuffer.write(Constants.SERVER_BYTES);
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=898527&r1=898526&r2=898527&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Tue Jan 12
21:36:49 2010
@@ -855,8 +855,10 @@
// Add server header
if (server != null) {
+// Always overrides anything the app might set
headers.setValue("Server").setString(server);
-} else {
+} else if (headers.getValue("Server") == null) {
+// If app didn't set the header, use the default
outputBuffer.write(Constants.SERVER_BYTES);
}
Modified: tomcat/trunk/webapps/docs/config/http.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/http.xml?rev=898527&r1=898526&r2=898527&view=diff
==
--- tomcat/trunk/webapps/docs/config/http.xml (original)
+++ tomcat/trunk/webapps/docs/config/http.xml Tue Jan 12 21:36:49 2010
@@ -364,8 +364,12 @@
- The Server header for the http response.
- Unless you are paranoid, you won't need this feature.
+ Overrides the Server header for the http response. If set, the value
+ for this attribute overrides the Tomcat default and any Server header set
+ by a web application. If not set, any value specified by the application
+ is used. If the application does not specify a value then
+ Apache-Coyote/1.1 is used. Unless you are paranoid, you
won't
+ need this feature.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r898531 - /tomcat/tc5.5.x/trunk/STATUS.txt
Author: markt Date: Tue Jan 12 21:38:40 2010 New Revision: 898531 URL: http://svn.apache.org/viewvc?rev=898531&view=rev Log: Proposal 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=898531&r1=898530&r2=898531&view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Tue Jan 12 21:38:40 2010 @@ -263,3 +263,9 @@ We should not vote before 1.1.19 is officially released. +1: -1: + + Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48004 + Allow applications to set the Server header + http://svn.apache.org/viewvc?rev=898527&view=rev + +1: markt + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r898533 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Tue Jan 12 21:39:00 2010 New Revision: 898533 URL: http://svn.apache.org/viewvc?rev=898533&view=rev Log: Proposal 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=898533&r1=898532&r2=898533&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Jan 12 21:39:00 2010 @@ -201,4 +201,9 @@ http://svn.apache.org/viewvc?rev=898468&view=rev +1: markt -1: - \ No newline at end of file + + Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48004 + Allow applications to set the Server header + http://svn.apache.org/viewvc?rev=898527&view=rev + +1: markt + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48004] setHeader() does not replace the previous value for a "Server"
https://issues.apache.org/bugzilla/show_bug.cgi?id=48004 --- Comment #2 from Mark Thomas 2010-01-12 13:39:06 GMT --- This has been fixed in trunk and proposed for 6.0.x and 5.5.x. Note that you can set the server attribute on the connector to override the default server name. I updated the HTTP connector docs to clarify how this works. -- 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: r898543 - /tomcat/trunk/webapps/docs/manager-howto.xml
Author: markt Date: Tue Jan 12 22:03:32 2010 New Revision: 898543 URL: http://svn.apache.org/viewvc?rev=898543&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48530 Add info on the Server Status page to the Manager How-To Based on a patch by Arnaud Espy Modified: tomcat/trunk/webapps/docs/manager-howto.xml Modified: tomcat/trunk/webapps/docs/manager-howto.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/manager-howto.xml?rev=898543&r1=898542&r2=898543&view=diff == --- tomcat/trunk/webapps/docs/manager-howto.xml (original) +++ tomcat/trunk/webapps/docs/manager-howto.xml Tue Jan 12 22:03:32 2010 @@ -891,6 +891,52 @@ + + +From this link , you can view information about the server. + +First, you have the server and JVM version number, JVM provider, OS name +and number followed by the architecture type. + +Second, there is several information about the memory usage of the JVM +(available, total and max memory). + +Then, there is information about the Tomcat AJP and HTTP connectors. +The same information is available for both of them : + + +Threads information : Max threads, min and max spare threads, +current thread count and current thread busy. +Request information : Max processing time and processing time, +request and error count, bytes received and sent. +A table showing Stage, Time, Bytes Sent, Bytes Receive, Client, +VHost and Request. All existing threads are listed in the table. +Here is the list of the possible thread stages : + +"Parse and Prepare Request" : The request headers are +being parsed or the necessary preparation to read the request body (if +a transfer encoding has been specified) is taking place. +"Service" : The thread is processing a request and +generating the response. This stage follows the "Parse and Prepare +Request" stage and precedes the "Finishing" stage. There is always at +least one thread in this stage (the server-status page). +"Finishing" : The end of the request processing. Any +remainder of the response still in the output buffers is sent to the +client. This stage is followed by "Keep-Alive" if it is appropriate to +keep the connection alive or "Ready" if "Keep-Alive" is not +appropriate. +"Keep-Alive" : The thread keeps the connection open to +the client in case the client sends another request. If another request +is recieved, the next stage will br "Parse and Prepare Requst". If no +request is received before the keep alive times out, the connection will +be closed and the next stage will be "Ready". +"Ready" : The thread is at rest and ready to be +used. + + + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r898545 - in /tomcat/tc6.0.x/trunk/webapps/docs: changelog.xml manager-howto.xml
Author: markt Date: Tue Jan 12 22:06:38 2010 New Revision: 898545 URL: http://svn.apache.org/viewvc?rev=898545&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48530 Add info on the Server Status page to the Manager How-To Based on a patch by Arnaud Espy Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml tomcat/tc6.0.x/trunk/webapps/docs/manager-howto.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?rev=898545&r1=898544&r2=898545&view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue Jan 12 22:06:38 2010 @@ -69,6 +69,15 @@ + + + +48530: Add information on the Manager Server Status page to +the Manager How-To in the documentation webapp. Based on a patch by +Arnaud Espy. (markt) + + + Modified: tomcat/tc6.0.x/trunk/webapps/docs/manager-howto.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/manager-howto.xml?rev=898545&r1=898544&r2=898545&view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/manager-howto.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/manager-howto.xml Tue Jan 12 22:06:38 2010 @@ -897,6 +897,52 @@ + + +From this link , you can view information about the server. + +First, you have the server and JVM version number, JVM provider, OS name +and number followed by the architecture type. + +Second, there is several information about the memory usage of the JVM +(available, total and max memory). + +Then, there is information about the Tomcat AJP and HTTP connectors. +The same information is available for both of them : + + +Threads information : Max threads, min and max spare threads, +current thread count and current thread busy. +Request information : Max processing time and processing time, +request and error count, bytes received and sent. +A table showing Stage, Time, Bytes Sent, Bytes Receive, Client, +VHost and Request. All existing threads are listed in the table. +Here is the list of the possible thread stages : + +"Parse and Prepare Request" : The request headers are +being parsed or the necessary preparation to read the request body (if +a transfer encoding has been specified) is taking place. +"Service" : The thread is processing a request and +generating the response. This stage follows the "Parse and Prepare +Request" stage and precedes the "Finishing" stage. There is always at +least one thread in this stage (the server-status page). +"Finishing" : The end of the request processing. Any +remainder of the response still in the output buffers is sent to the +client. This stage is followed by "Keep-Alive" if it is appropriate to +keep the connection alive or "Ready" if "Keep-Alive" is not +appropriate. +"Keep-Alive" : The thread keeps the connection open to +the client in case the client sends another request. If another request +is recieved, the next stage will br "Parse and Prepare Requst". If no +request is received before the keep alive times out, the connection will +be closed and the next stage will be "Ready". +"Ready" : The thread is at rest and ready to be +used. + + + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r898550 - in /tomcat/tc5.5.x/trunk/container/webapps/docs: changelog.xml manager-howto.xml
Author: markt Date: Tue Jan 12 22:07:31 2010 New Revision: 898550 URL: http://svn.apache.org/viewvc?rev=898550&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48530 Add info on the Server Status page to the Manager How-To Based on a patch by Arnaud Espy Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml tomcat/tc5.5.x/trunk/container/webapps/docs/manager-howto.xml Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml?rev=898550&r1=898549&r2=898550&view=diff == --- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original) +++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Tue Jan 12 22:07:31 2010 @@ -172,6 +172,11 @@ 48381: Add information on how Tomcat treats host names to the host configuration documentation. (markt) + +48530: Add information on the Manager Server Status page to +the Manager How-To in the documentation webapp. Based on a patch by +Arnaud Espy. (markt) + Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/manager-howto.xml URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/manager-howto.xml?rev=898550&r1=898549&r2=898550&view=diff == --- tomcat/tc5.5.x/trunk/container/webapps/docs/manager-howto.xml (original) +++ tomcat/tc5.5.x/trunk/container/webapps/docs/manager-howto.xml Tue Jan 12 22:07:31 2010 @@ -900,6 +900,52 @@ + + +From this link , you can view information about the server. + +First, you have the server and JVM version number, JVM provider, OS name +and number followed by the architecture type. + +Second, there is several information about the memory usage of the JVM +(available, total and max memory). + +Then, there is information about the Tomcat AJP and HTTP connectors. +The same information is available for both of them : + + +Threads information : Max threads, min and max spare threads, +current thread count and current thread busy. +Request information : Max processing time and processing time, +request and error count, bytes received and sent. +A table showing Stage, Time, Bytes Sent, Bytes Receive, Client, +VHost and Request. All existing threads are listed in the table. +Here is the list of the possible thread stages : + +"Parse and Prepare Request" : The request headers are +being parsed or the necessary preparation to read the request body (if +a transfer encoding has been specified) is taking place. +"Service" : The thread is processing a request and +generating the response. This stage follows the "Parse and Prepare +Request" stage and precedes the "Finishing" stage. There is always at +least one thread in this stage (the server-status page). +"Finishing" : The end of the request processing. Any +remainder of the response still in the output buffers is sent to the +client. This stage is followed by "Keep-Alive" if it is appropriate to +keep the connection alive or "Ready" if "Keep-Alive" is not +appropriate. +"Keep-Alive" : The thread keeps the connection open to +the client in case the client sends another request. If another request +is recieved, the next stage will br "Parse and Prepare Requst". If no +request is received before the keep alive times out, the connection will +be closed and the next stage will be "Ready". +"Ready" : The thread is at rest and ready to be +used. + + + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48530] Patch for the Tomcat documentation : Server status page
https://issues.apache.org/bugzilla/show_bug.cgi?id=48530 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #1 from Mark Thomas 2010-01-12 14:08:17 GMT --- Thanks for the patch. I corrected a few details and applied to it trunk, 6.0.x and 5.5.x. It will be included in 6.0.23 and 5.5.29 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: r898551 - /tomcat/trunk/java/org/apache/catalina/connector/Request.java
Author: markt
Date: Tue Jan 12 22:15:31 2010
New Revision: 898551
URL: http://svn.apache.org/viewvc?rev=898551&view=rev
Log:
Revert fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=47774
Better fix to follow
Modified:
tomcat/trunk/java/org/apache/catalina/connector/Request.java
Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?rev=898551&r1=898550&r2=898551&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Tue Jan 12
22:15:31 2010
@@ -2181,31 +2181,11 @@
} catch (IOException e) {
// Can't find the session
}
+if ((session != null) && session.isValid())
+return (true);
+else
+return (false);
-if (session == null) return false;
-
-// The call to session.isValid() can trigger session listeners so make
-// sure we are using the webapp's class loader in case the listeners
are
-// triggered
-ClassLoader oldTccl = null;
-if (context.getLoader() != null &&
-context.getLoader().getClassLoader() != null) {
-oldTccl = Thread.currentThread().getContextClassLoader();
-Thread.currentThread().setContextClassLoader(
-context.getLoader().getClassLoader());
-}
-
-boolean result = false;
-try {
-if (session.isValid()) {
-result = true;
-}
-} finally {
-if (oldTccl != null) {
-Thread.currentThread().setContextClassLoader(oldTccl);
-}
-}
-return result;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r898555 - /tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
Author: markt
Date: Tue Jan 12 22:36:15 2010
New Revision: 898555
URL: http://svn.apache.org/viewvc?rev=898555&view=rev
Log:
Improved fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=47774
Modified:
tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
Modified: tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/StandardSession.java?rev=898555&r1=898554&r2=898555&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/session/StandardSession.java Tue Jan
12 22:36:15 2010
@@ -702,37 +702,55 @@
// Notify interested application event listeners
// FIXME - Assumes we call listeners in reverse order
Context context = (Context) manager.getContainer();
-Object listeners[] = context.getApplicationLifecycleListeners();
-if (notify && (listeners != null)) {
-HttpSessionEvent event =
-new HttpSessionEvent(getSession());
-for (int i = 0; i < listeners.length; i++) {
-int j = (listeners.length - 1) - i;
-if (!(listeners[j] instanceof HttpSessionListener))
-continue;
-HttpSessionListener listener =
-(HttpSessionListener) listeners[j];
-try {
-fireContainerEvent(context,
- "beforeSessionDestroyed",
- listener);
-listener.sessionDestroyed(event);
-fireContainerEvent(context,
- "afterSessionDestroyed",
- listener);
-} catch (Throwable t) {
+
+// The call to expire() may not have been triggered by the webapp.
+// Make sure the webapp's class loader is set when calling the
+// listeners
+ClassLoader oldTccl = null;
+if (context.getLoader() != null &&
+context.getLoader().getClassLoader() != null) {
+oldTccl = Thread.currentThread().getContextClassLoader();
+Thread.currentThread().setContextClassLoader(
+context.getLoader().getClassLoader());
+}
+try {
+Object listeners[] =
context.getApplicationLifecycleListeners();
+if (notify && (listeners != null)) {
+HttpSessionEvent event =
+new HttpSessionEvent(getSession());
+for (int i = 0; i < listeners.length; i++) {
+int j = (listeners.length - 1) - i;
+if (!(listeners[j] instanceof HttpSessionListener))
+continue;
+HttpSessionListener listener =
+(HttpSessionListener) listeners[j];
try {
fireContainerEvent(context,
+ "beforeSessionDestroyed",
+ listener);
+listener.sessionDestroyed(event);
+fireContainerEvent(context,
"afterSessionDestroyed",
listener);
-} catch (Exception e) {
-// Ignore
+} catch (Throwable t) {
+try {
+fireContainerEvent(context,
+ "afterSessionDestroyed",
+ listener);
+} catch (Exception e) {
+// Ignore
+}
+manager.getContainer().getLogger().error
+(sm.getString("standardSession.sessionEvent"),
t);
}
-manager.getContainer().getLogger().error
-(sm.getString("standardSession.sessionEvent"), t);
}
}
+} finally {
+if (oldTccl != null) {
+Thread.currentThread().setContextClassLoader(oldTccl);
+}
}
+
if (ACTIVITY_CHECK) {
accessCount.set(0);
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail:
svn commit: r898557 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt
Date: Tue Jan 12 22:39:15 2010
New Revision: 898557
URL: http://svn.apache.org/viewvc?rev=898557&view=rev
Log:
Propose improved fix for
https://issues.apache.org/bugzilla/show_bug.cgi?id=47774 based on dev list
discussion
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=898557&r1=898556&r2=898557&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Jan 12 22:39:15 2010
@@ -70,21 +70,9 @@
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47774
Ensure web application class loader is used when calling session listeners
- http://svn.apache.org/viewvc?rev=890530&view=rev
- http://svn.apache.org/viewvc?rev=892193&view=rev
+ http://svn.apache.org/viewvc?rev=898555&view=rev
+1: markt
-1:
- 0: kkolinko:
- Re approach:
- Request.isRequestedSessionIdValid() serves as implementation for
- HttpServletRequest.isRequestedSessionIdValid().
- I think that ClassLoader should already be set when calling this
- method.
-
- I mean, the problem is elsewhere. Supposedly in CoyoteAdapter.
- parseSessionCookiesId(), but may be earlier in the call chain.
-
- I won't oppose the patch. I have to think a bit more about it.
* Fix second part of
https://issues.apache.org/bugzilla/show_bug.cgi?id=47413#c8
Coerce result of composite EL expression (${a}${b}) from String to the
expected type.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r898558 - /tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java
Author: markt
Date: Tue Jan 12 22:43:23 2010
New Revision: 898558
URL: http://svn.apache.org/viewvc?rev=898558&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48516
Fix possible NPE when user does not exist in directory
Patch provided by Kevin Conaway
Modified:
tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java
Modified: tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java?rev=898558&r1=898557&r2=898558&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java Tue Jan 12
22:43:23 2010
@@ -1929,8 +1929,12 @@
User user = getUser(context, username);
-return new GenericPrincipal(user.username, user.password ,
-getRoles(context, user));
+if (user != null) {
+return new GenericPrincipal(user.username, user.password,
+getRoles(context, user));
+}
+
+return null;
}
/**
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r898559 - /tomcat/tc5.5.x/trunk/STATUS.txt
Author: markt Date: Tue Jan 12 22:45:30 2010 New Revision: 898559 URL: http://svn.apache.org/viewvc?rev=898559&view=rev Log: Proposal 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=898559&r1=898558&r2=898559&view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Tue Jan 12 22:45:30 2010 @@ -269,3 +269,10 @@ http://svn.apache.org/viewvc?rev=898527&view=rev +1: markt -1: + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48516 + Prevent possible NPE in JNDIRealm when user does not exist + Patch provided by Kevin Conaway + http://svn.apache.org/viewvc?rev=898558&view=rev + +1: markt + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r898561 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Tue Jan 12 22:45:48 2010 New Revision: 898561 URL: http://svn.apache.org/viewvc?rev=898561&view=rev Log: Proposal 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=898561&r1=898560&r2=898561&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Jan 12 22:45:48 2010 @@ -190,8 +190,15 @@ +1: markt -1: - Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48004 +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48004 Allow applications to set the Server header http://svn.apache.org/viewvc?rev=898527&view=rev +1: markt -1: + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48516 + Prevent possible NPE in JNDIRealm when user does not exist + Patch provided by Kevin Conaway + http://svn.apache.org/viewvc?rev=898558&view=rev + +1: markt + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48516] NullPointerException in JNDIRealm
https://issues.apache.org/bugzilla/show_bug.cgi?id=48516 --- Comment #2 from Mark Thomas 2010-01-12 14:46:02 GMT --- Many thanks for the patch. It has been applied to trunk and proposed for 6.0.x and 5.5.x. -- 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 48007] ClassNotFoundException when deserializing custom object with FileStore
https://issues.apache.org/bugzilla/show_bug.cgi?id=48007 Mark Thomas changed: What|Removed |Added Component|Catalina|Catalina Version|6.0.20 |5.5.27 Product|Tomcat 6|Tomcat 5 Target Milestone|default |--- --- Comment #3 from Mark Thomas 2010-01-12 14:51:52 GMT --- Correcting version as per issue description -- 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 48532] New: try to read truststore even when clientauth is false
https://issues.apache.org/bugzilla/show_bug.cgi?id=48532 Summary: try to read truststore even when clientauth is false Product: Tomcat 6 Version: unspecified Platform: PC OS/Version: All Status: NEW Severity: normal Priority: P2 Component: Connectors AssignedTo: dev@tomcat.apache.org ReportedBy: k...@cpttm.org.mo When people try to set up SSL with Tomcat, most of them don't need client authentication and thus won't set the truststoreFile, truststorePass and etc. However, Tomcat (or rather, JSSESocketFactory) will always try to load the trust store. Somehow it got a valid path but the password (by default set to that for the keystore) is incorrect and will throw an exception like below. This is very confusing as people will keep checking the password of their keystore (and don't know anything about trust store). I'd recommend the following solutions (most preferred listed first): 1) don't load the trust store if client authentication is false. 2) if a trust store is not specified, use the keystore. 3) the SSL howto should emphasize that a trust store must be set up. sample stack trace: java.io.IOException: Keystore was tampered with, or password was incorrect at sun.security.provider.JavaKeyStore.engineLoad(JavaKeyStore.java:771) at sun.security.provider.JavaKeyStore$JKS.engineLoad(JavaKeyStore.java:3 8) at java.security.KeyStore.load(KeyStore.java:1185) at org.apache.tomcat.util.net.jsse.JSSESocketFactory.getStore(JSSESocket Factory.java:287) at org.apache.tomcat.util.net.jsse.JSSESocketFactory.getTrustStore(JSSES ocketFactory.java:261) at org.apache.tomcat.util.net.jsse.JSSE14SocketFactory.getTrustManagers( JSSE14SocketFactory.java:175) at org.apache.tomcat.util.net.jsse.JSSE15SocketFactory.getTrustManagers( JSSE15SocketFactory.java:69) -- 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
modify the source code to measure the time of processing a request
Hi, Our company is using the apache tomcat 6.0.20 as our server. And now I plan to measure the time of every requet processed in the server without the help of any benchmark tool. I plan to modify the code to add a time stamp in a request when it comes into the server and add another time stamp when it go out of server. So with a simple subtraction I can get the time I need. However,I am not familiar with the archive of the source code.So anyone could give me some suggestion of doing this?Like where should I modify in the source code. Thanks! ___ 好玩贺卡等你发，邮箱贺卡全新上线！ http://card.mail.cn.yahoo.com/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: modify the source code to measure the time of processing a request
This type of request belongs on the user mailing list, so please direct any follow up there. What you want can be done with a simple ServletRequestListener. There is no need to hack the Tomcat code. "Bao" wrote in message news:930702.47873...@web92411.mail.cnh.yahoo.com... Hi, Our company is using the apache tomcat 6.0.20 as our server. And now I plan to measure the time of every requet processed in the server without the help of any benchmark tool. I plan to modify the code to add a time stamp in a request when it comes into the server and add another time stamp when it go out of server. So with a simple subtraction I can get the time I need. However,I am not familiar with the archive of the source code.So anyone could give me some suggestion of doing this?Like where should I modify in the source code. Thanks! ___ ºÃÍæºØ¿¨µÈÄã·¢£¬ÓÊÏäºØ¿¨È«ÐÂÉÏÏߣ¡ http://card.mail.cn.yahoo.com/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
