Re: svn commit: r960104 - /tomcat/trunk/test/org/apache/catalina/mbeans/TestRegistration.java
On 08/07/2010 06:37, Marc Guillemot wrote: > Hi Mark, > > Mark Thomas wrote: >> ... >> There is nothing stopping you running FindBugs, Checkstyle or any other >> tool locally. I use FindBugs on the Tomact 7 code-base all the time. > > what about sharing the config and including it into the build? It is just the default configuration for the Eclipse plug-in, not part of the build script or anything. > According to the negative comments on commits, everybody should agree on > following checks > FileTabCharacter -> currently 146 failures +1 > JavadocType (versionFormat) -> currently 539 failures Not sure what exactly you are proposing here. Could you clarify? > Following simple steps could be: Seems reasonable, providing there is agreement amongst the committers for each additional check that is added. > Additionally it seems that you pay attention at some warnings emitted by > your IDE. It would be interesting to express these rules as checkstyle > (or whatever) rule that can be checked automatically. Can you list the > Eclipse style warnings you try to fix? Just the standard Java compiler warnings. > I agree that coherent code style is only cosmetic in a first time as it > doesn't change the resulting byte code. Nevertheless it makes easier to > concentrate on the important things: the code content, without being > distracted by the form. Therefore it helps to find real problems and > make easier to compare files, apply patches, ... But it makes it harder to back-port changes. I'm not against cleaning up the code, we just need to be aware of the consequences of doing so. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r960104 - /tomcat/trunk/test/org/apache/catalina/mbeans/TestRegistration.java
Mark Thomas wrote: ... JavadocType (versionFormat) -> currently 539 failures Not sure what exactly you are proposing here. Could you clarify? I mean the format of the @Version JavaDoc tag what Konstantin Kolinko has started to fix: http://tomcat.markmail.org/thread/bfry4x5gwbhezo6x ... Additionally it seems that you pay attention at some warnings emitted by your IDE. It would be interesting to express these rules as checkstyle (or whatever) rule that can be checked automatically. Can you list the Eclipse style warnings you try to fix? Just the standard Java compiler warnings. is there an agreement among the committers for that? ;-) I would be cautious with Eclipse warnings. Some of them don't make sense (or at least not alone like "Serializable class without serialVersionUID") and others have pros and cons (like removing the "else" when the "if" ends with a return) I agree that coherent code style is only cosmetic in a first time as it doesn't change the resulting byte code. Nevertheless it makes easier to concentrate on the important things: the code content, without being distracted by the form. Therefore it helps to find real problems and make easier to compare files, apply patches, ... But it makes it harder to back-port changes. I'm not against cleaning up the code, we just need to be aware of the consequences of doing so. Two solutions for easy back ports 1) never make change, neither yet, nor in the future and keep everything, even if dirty 2) apply clean style rules on all maintained code versions Of course I prefer (2) ;-) Cheers, Marc. -- Blog: http://mguillem.wordpress.com - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Update of "TomcatVersions" by markt
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change notification. The "TomcatVersions" page has been changed by markt. The comment on this change is: Re-order to list latest first. Update 7.0.x info. Update list of unsupported versions.. http://wiki.apache.org/tomcat/TomcatVersions?action=diff&rev1=13&rev2=14 -- It is anticipated that releases will be provided for a maximum of 3 major versions at any one time. - = Tomcat 3.3.x = + = Tomcat 7.0.x = - ||Spec versions: ||Servlet 2.2, JSP 1.1 || + ||Spec versions: ||Servlet 3.0, JSP 2.2, EL 2.2 || - ||Stable: ||Yes || + ||Stable: ||No || - ||Enhancements: ||Highly unlikely || - ||Bug Fixes: ||Highly unlikely || + ||Enhancements: ||Yes || + ||Bug Fixes: ||Yes || - ||Security Fixes: ||Highly unlikely || + ||Security Fixes: ||Yes || - ||Releases: ||Highly unlikely || - ||Release Manager: ||Bill Barker (billbarker) || + ||Releases: ||Yes || + ||Release Manager: ||Mark Thomas (markt) || ||Process: ||CTR || - ||Listed on download pages: ||No || + ||Listed on download pages: ||Yes || - = Tomcat 4.1.x = + = Tomcat 6.0.x = - ||Spec versions: ||Servlet 2.3, JSP 1.2 || + ||Spec versions: ||Servlet 2.5, JSP 2.1 || ||Stable: ||Yes || - ||Enhancements: ||Highly unlikely || - ||Bug Fixes: ||Highly unlikely || + ||Enhancements: ||Yes || + ||Bug Fixes: ||Yes || - ||Security Fixes: ||Highly unlikely || + ||Security Fixes: ||Yes || - ||Releases: ||Highly unlikely || - ||Release Manager: ||Mark Thomas (markt) || + ||Releases: ||Yes || + ||Release Manager: ||Jean-Frederic Clere (jfclere) || - ||Process: ||CTR || + ||Process: ||RTC || ||Listed on download pages: ||Yes || @@ -43, +43 @@ ||Listed on download pages: ||Yes || - = Tomcat 6.0.x = + = Tomcat 4.1.x = - ||Spec versions: ||Servlet 2.5, JSP 2.1 || + ||Spec versions: ||Servlet 2.3, JSP 1.2 || ||Stable: ||Yes || - ||Enhancements: ||Yes || - ||Bug Fixes: ||Yes || + ||Enhancements: ||Highly unlikely || + ||Bug Fixes: ||Highly unlikely || - ||Security Fixes: ||Yes || + ||Security Fixes: ||Highly unlikely || - ||Releases: ||Yes || - ||Release Manager: ||Jean-Frederic Clere (jfclere) || + ||Releases: ||Highly unlikely || + ||Release Manager: ||Mark Thomas (markt) || - ||Process: ||RTC || + ||Process: ||CTR || - ||Listed on download pages: ||Yes || - - - = Tomcat 7.0.x = - ||Spec versions: ||Servlet 3.0, JSP 2.2 || - ||Stable: ||No || - ||Enhancements: ||Yes || - ||Bug Fixes: ||Yes || - ||Security Fixes: ||Yes || - ||Releases: ||No || - ||Release Manager: ||TBD || - ||Process: ||RTC || ||Listed on download pages: ||No || - Features + = Tomcat 3.3.x = + ||Spec versions: ||Servlet 2.2, JSP 1.1 || + ||Stable: ||Yes || + ||Enhancements: ||Highly unlikely || + ||Bug Fixes: ||Highly unlikely || + ||Security Fixes: ||Highly unlikely || + ||Releases: ||Highly unlikely || + ||Release Manager: ||Bill Barker (billbarker) || + ||Process: ||CTR || + ||Listed on download pages: ||No || - * 6.x plus - * Servlet 3.0 - * JSP 2.2 - * http://svn.eu.apache.org/repos/asf/tomcat/trunk/webapps/docs/changelog.xml - - See http://svn.apache.org/repos/asf/tomcat/trunk/TOMCAT-7-RELEASE-PLAN.txt = Unsupported versions = The following versions are no longer supported. The source is still available from SVN and both source and binary downloads are available from the archives. @@ -82, +73 @@ * Tomcat 3.0.x * Tomcat 3.1.x * Tomcat 3.2.x + * Tomcat 3.3.x * Tomcat 4.0.x + * Tomcat 4.1.x * Tomcat 5.0.x - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r961647 - /tomcat/trunk/TOMCAT-7-RELEASE-PLAN.txt
Author: markt Date: Thu Jul 8 09:00:47 2010 New Revision: 961647 URL: http://svn.apache.org/viewvc?rev=961647&view=rev Log: Update post release of 7.0.0 beta Modified: tomcat/trunk/TOMCAT-7-RELEASE-PLAN.txt Modified: tomcat/trunk/TOMCAT-7-RELEASE-PLAN.txt URL: http://svn.apache.org/viewvc/tomcat/trunk/TOMCAT-7-RELEASE-PLAN.txt?rev=961647&r1=961646&r2=961647&view=diff == --- tomcat/trunk/TOMCAT-7-RELEASE-PLAN.txt (original) +++ tomcat/trunk/TOMCAT-7-RELEASE-PLAN.txt Thu Jul 8 09:00:47 2010 @@ -31,8 +31,8 @@ 4. Do an initial release (from trunk) - Create tc7.0.x\tags to hold release tags - Done - - Add to web site - - Update Wiki version status page + - Add to web site - Done + - Update Wiki version status page - Done 5. Fix issues as they get reported - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release build 6.0.28
On 08.07.2010 01:14, sebb wrote: On 7 July 2010 21:19, Rainer Jung wrote: On 07.07.2010 21:00, sebb wrote: On 7 July 2010 10:47, Rainer Jungwrote: On 29.06.2010 17:17, jean-frederic clere wrote: - build.properties: it would be nice, if you did the release changes to the file before tagging (and undo after) like Mark does for TC 7 (properties version and version.build). That way checking the identity between the tag and the release source would be easier (less deltas to ignore). Or: Create clean workspace from SVN. Make any necessary updates that apply to the tag only. Create the tag from the workspace using svn copy dir https://.../ Trunk is then untainted by unnecessary changes, and the tag commit e-mail shows the changes made. History is also preseved. I personally do not like edits of tags. I think tags should be used as a single cross cut through the code (like in CVS) and uniquely identify one revision, so not be edited. Personal preference though. My preference too. Tags should be immutable. I see now that my phrase "the tag commit e-mail shows the changes made." could be taken to mean that the tag is editted. However that is not the case. The tag is created from the workspace + changes; the e-mail shows the changes from the initial workspace checkout. So instead of seeing the changes as commits to trunk, followed by a simple SVN copy which creates the tag, the copy and changes appear in the tag creation e-mail itself. OK? Interesting, never tried that, sounds good, especially since the email you describe would contain the info you'd like to see (the changes relative to trunk). Good idea. Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r960104 - /tomcat/trunk/test/org/apache/catalina/mbeans/TestRegistration.java
On 08.07.2010 10:30, Marc Guillemot wrote: Mark Thomas wrote: ... JavadocType (versionFormat) -> currently 539 failures Not sure what exactly you are proposing here. Could you clarify? I mean the format of the @Version JavaDoc tag what Konstantin Kolinko has started to fix: http://tomcat.markmail.org/thread/bfry4x5gwbhezo6x ... Additionally it seems that you pay attention at some warnings emitted by your IDE. It would be interesting to express these rules as checkstyle (or whatever) rule that can be checked automatically. Can you list the Eclipse style warnings you try to fix? Just the standard Java compiler warnings. is there an agreement among the committers for that? ;-) I would be cautious with Eclipse warnings. Some of them don't make sense (or at least not alone like "Serializable class without serialVersionUID") and others have pros and cons (like removing the "else" when the "if" ends with a return) I agree that coherent code style is only cosmetic in a first time as it doesn't change the resulting byte code. Nevertheless it makes easier to concentrate on the important things: the code content, without being distracted by the form. Therefore it helps to find real problems and make easier to compare files, apply patches, ... But it makes it harder to back-port changes. I'm not against cleaning up the code, we just need to be aware of the consequences of doing so. Two solutions for easy back ports 1) never make change, neither yet, nor in the future and keep everything, even if dirty 2) apply clean style rules on all maintained code versions Of course I prefer (2) ;-) Not so sure. Often code history is important and you compare older code revisions to new ones. Big style changes or cleanup makes this hard. I'm +1 to style cleanup in general, because there are quite some old files that are ugly and hard to read. But I wonder whether we are maybe now coming closer to the point, where we will only backport bug fixes from TC 7 to 6 and 5.5. My impression is, that we did quite some feature backporting the last months and 6 should really reach feature maturity now at patch level 28. If so, it could make sense to only clean up the TC 7 code base. Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49234] JMX Descriptor Modifications
https://issues.apache.org/bugzilla/show_bug.cgi?id=49234 --- Comment #58 from chamith buddhika 2010-07-08 07:05:50 EDT --- Created an attachment (id=25733) --> (https://issues.apache.org/bugzilla/attachment.cgi?id=25733) o.a.Catalina.users Patch Removes non existent class descriptors. -- 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 49234] JMX Descriptor Modifications
https://issues.apache.org/bugzilla/show_bug.cgi?id=49234 --- Comment #59 from chamith buddhika 2010-07-08 07:09:03 EDT --- Created an attachment (id=25734) --> (https://issues.apache.org/bugzilla/attachment.cgi?id=25734) o.a.Catalina.valves Patch Removes non existent class descriptors and adds missing attributes. -- 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: r961720 - /tomcat/tc6.0.x/trunk/KEYS
Author: jfclere Date: Thu Jul 8 11:37:08 2010 New Revision: 961720 URL: http://svn.apache.org/viewvc?rev=961720&view=rev Log: Add my long key. Modified: tomcat/tc6.0.x/trunk/KEYS Modified: tomcat/tc6.0.x/trunk/KEYS URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/KEYS?rev=961720&r1=961719&r2=961720&view=diff == --- tomcat/tc6.0.x/trunk/KEYS (original) +++ tomcat/tc6.0.x/trunk/KEYS Thu Jul 8 11:37:08 2010 @@ -385,3 +385,61 @@ e7sQDYEbvppSAJ9+i7TzCNvZ4PK/odiIWeZ61+KK Io8ZP0E= =xT1M -END PGP PUBLIC KEY BLOCK- + +Type Bits/KeyID Date User ID +pub 4096R/D3262722 2009-11-05 Jean-Frederic Clere (Apache signing key) + +-BEGIN PGP PUBLIC KEY BLOCK- +Version: GnuPG v1.4.9 (GNU/Linux) + +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 +uqXsrZkxnIfKHT2LqDQ= +=Panx +-END PGP PUBLIC KEY BLOCK- - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r961726 - /tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Author: jfclere Date: Thu Jul 8 12:11:29 2010 New Revision: 961726 URL: http://svn.apache.org/viewvc?rev=961726&view=rev Log: 6.0.27 wasn't released. Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=961726&r1=961725&r2=961726&view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Jul 8 12:11:29 2010 @@ -96,7 +96,7 @@ - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[RESULT] [VOTE] Release Tomcat 5.5.30 Build
On Jul 1, 2010, at 12:11 PM, Jim Jagielski wrote: > The builds for Tomcat 5.5.30 are ready for testing and approval. > The candidates binaries are available here: > > http://people.apache.org/~jim/tomcat-5.5/ > > According to the release process, the 5.5.30 build corresponding to the > tag TOMCAT_5_5_30 [1] is: > > [ ] Broken > [ ] Alpha > [ ] Beta > [ ] Stable > +++ > > 1. http://svn.apache.org/viewvc/tomcat/tc5.5.x/tags/TOMCAT_5_5_30/ > We have >=3 +1 Binding Votes, so I will go ahead with the release process... Thx to all! - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release build 6.0.28
On Thu, Jul 8, 2010 at 3:59 AM, Rainer Jung wrote: > On 08.07.2010 01:14, sebb wrote: >> >> On 7 July 2010 21:19, Rainer Jung wrote: >>> >>> On 07.07.2010 21:00, sebb wrote: On 7 July 2010 10:47, Rainer Jung wrote: > > On 29.06.2010 17:17, jean-frederic clere wrote: >>> > - build.properties: it would be nice, if you did the release changes > to > the > file before tagging (and undo after) like Mark does for TC 7 > (properties > version and version.build). That way checking the identity between the > tag > and the release source would be easier (less deltas to ignore). Or: Create clean workspace from SVN. Make any necessary updates that apply to the tag only. Create the tag from the workspace using svn copy dir https://.../ Trunk is then untainted by unnecessary changes, and the tag commit e-mail shows the changes made. History is also preseved. >>> >>> I personally do not like edits of tags. I think tags should be used as a >>> single cross cut through the code (like in CVS) and uniquely identify one >>> revision, so not be edited. Personal preference though. >> >> My preference too. Tags should be immutable. >> >> I see now that my phrase "the tag commit e-mail shows the changes >> made." could be taken to mean that the tag is editted. >> >> However that is not the case. >> >> The tag is created from the workspace + changes; the e-mail shows the >> changes from the initial workspace checkout. >> >> So instead of seeing the changes as commits to trunk, followed by a >> simple SVN copy which creates the tag, the copy and changes appear in >> the tag creation e-mail itself. >> >> OK? > > Interesting, never tried that, sounds good, especially since the email you > describe would contain the info you'd like to see (the changes relative to > trunk). Good idea. IIUC, it means the tag would not refer to any trunk revision. It gets around having a commit to a tag by hiding the change in the copy. I'd rather get over the notion that tags can't be modified than be tagging uncommitted code. Hen - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r961819 - in /tomcat/trunk: java/org/apache/catalina/connector/Connector.java webapps/docs/changelog.xml
Author: markt
Date: Thu Jul 8 15:48:48 2010
New Revision: 961819
URL: http://svn.apache.org/viewvc?rev=961819&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49503
Revert the protocol handler component of r940656. Subsequent lifecycle fixes
have resolved the issues that required this change
Modified:
tomcat/trunk/java/org/apache/catalina/connector/Connector.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/connector/Connector.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Connector.java?rev=961819&r1=961818&r2=961819&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Connector.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Connector.java Thu Jul 8
15:48:48 2010
@@ -840,6 +840,14 @@ public class Connector extends Lifecycle
IntrospectionUtils.setProperty(protocolHandler, "jkHome",
System.getProperty("catalina.base"));
+try {
+protocolHandler.init();
+} catch (Exception e) {
+throw new LifecycleException
+(sm.getString
+ ("coyoteConnector.protocolHandlerInitializationFailed", e));
+}
+
onameProtocolHandler = register(protocolHandler,
createObjectNameKeyProperties("ProtocolHandler"));
@@ -860,16 +868,6 @@ public class Connector extends Lifecycle
setState(LifecycleState.STARTING);
-// Protocol handlers do not follow Lifecycle conventions.
-// protocolHandler.init() needs to wait until the connector.start()
-try {
-protocolHandler.init();
-} catch (Exception e) {
-throw new LifecycleException
-(sm.getString
- ("coyoteConnector.protocolHandlerInitializationFailed", e));
-}
-
try {
protocolHandler.start();
} catch (Exception e) {
@@ -883,7 +881,7 @@ public class Connector extends Lifecycle
("coyoteConnector.protocolHandlerStartFailed", e));
}
-// MapperListener doesn't follow Lifecycle conventions either
+// MapperListener doesn't follow Lifecycle conventions
mapperListener.init();
}
@@ -898,17 +896,7 @@ public class Connector extends Lifecycle
setState(LifecycleState.STOPPING);
-// Protocol handlers do not follow Lifecycle conventions.
-// protocolHandler.destroy() needs to be called in connector.stop()
-try {
-protocolHandler.destroy();
-} catch (Exception e) {
-throw new LifecycleException
-(sm.getString
- ("coyoteConnector.protocolHandlerDestroyFailed", e));
-}
-
-// MapperListener doesn't follow Lifecycle conventions either
+// MapperListener doesn't follow Lifecycle conventions
mapperListener.destroy();
}
@@ -918,6 +906,14 @@ public class Connector extends Lifecycle
unregister(onameMapper);
unregister(onameProtocolHandler);
+try {
+protocolHandler.destroy();
+} catch (Exception e) {
+throw new LifecycleException
+(sm.getString
+ ("coyoteConnector.protocolHandlerDestroyFailed", e));
+}
+
if (getService() != null) {
getService().removeConnector(this);
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=961819&r1=961818&r2=961819&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Jul 8 15:48:48 2010
@@ -80,6 +80,12 @@
guess user passwords by brute-force. (markt)
+49503: Make sure connectors bind to their associated ports
+sufficiently early to allow jsvc and the
+org.apache.catalina.startup.EXIT_ON_INIT_FAILURE system property to
+operate correctly. (markt)
+
+
49525: Ensure cookies for the ROOT context have a path of /
rather than an empty string. (markt)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49503] Connectors do not bind to their ports in Catalina.load(), but only later in start()
https://issues.apache.org/bugzilla/show_bug.cgi?id=49503 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #2 from Mark Thomas 2010-07-08 11:49:33 EDT --- Fix as suggested. Will be in 7.0.1 onwards. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49555] Custom Taglibs should support all parameters
https://issues.apache.org/bugzilla/show_bug.cgi?id=49555 Mark Thomas changed: What|Removed |Added Severity|blocker |normal --- Comment #3 from Mark Thomas 2010-07-08 11:52:09 EDT --- No response in 2 days. Can't be that critical. Reduce severity to normal. Since the OP hasn't provided a test case, I'll see about creating one based on what I think the issue is. -- 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
Vote: Add Checkstyle roleset and make code cleanups!
Hi, after the discussion about code style (http://tomcat.markmail.org/thread/2c7lkzmpcuxqpgjj ), I think that we must vote for this fix: https://issues.apache.org/bugzilla/show_bug.cgi?id=49268 It includes a starting point for a very limited checkstyle ruleset. +1: progressively introduce checkstyle with checks for which a consensus exists (first TabSpacePolicy, @Version format) 0 : More discussion needed -1: no checkstyle integration. Tomcat shoudn't have code style rules Regards Peter
svn commit: r961827 - in /tomcat/site/trunk/xdocs: download-60.xml index.xml oldnews.xml security-6.xml stylesheets/tomcat-site.xsl
Author: jfclere Date: Thu Jul 8 16:09:11 2010 New Revision: 961827 URL: http://svn.apache.org/viewvc?rev=961827&view=rev Log: change for the 6.0.28 release and put back the standard logo. Modified: tomcat/site/trunk/xdocs/download-60.xml tomcat/site/trunk/xdocs/index.xml tomcat/site/trunk/xdocs/oldnews.xml tomcat/site/trunk/xdocs/security-6.xml tomcat/site/trunk/xdocs/stylesheets/tomcat-site.xsl Modified: tomcat/site/trunk/xdocs/download-60.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/download-60.xml?rev=961827&r1=961826&r2=961827&view=diff == --- tomcat/site/trunk/xdocs/download-60.xml (original) +++ tomcat/site/trunk/xdocs/download-60.xml Thu Jul 8 16:09:11 2010 @@ -15,8 +15,8 @@ http://www.apache.org/dist/tomcat/tomcat-6/KEYS";>KEYS | -6.0.26 | -Browse | +6.0.28 | +Browse | http://archive.apache.org/dist/tomcat/tomcat-6";>Archives @@ -56,11 +56,11 @@ - - + + - Please see the - README + Please see the + README file for packaging information. It explains what every distribution contains. @@ -69,74 +69,74 @@ Core: -zip -(http://www.apache.org/dist/tomcat/tomcat-6/v6.0.26/bin/apache-tomcat-6.0.26.zip.asc";>pgp, -http://www.apache.org/dist/tomcat/tomcat-6/v6.0.26/bin/apache-tomcat-6.0.26.zip.md5";>md5) +zip +(http://www.apache.org/dist/tomcat/tomcat-6/v6.0.28/bin/apache-tomcat-6.0.28.zip.asc";>pgp, +http://www.apache.org/dist/tomcat/tomcat-6/v6.0.28/bin/apache-tomcat-6.0.28.zip.md5";>md5) -tar.gz -(http://www.apache.org/dist/tomcat/tomcat-6/v6.0.26/bin/apache-tomcat-6.0.26.tar.gz.asc";>pgp, -http://www.apache.org/dist/tomcat/tomcat-6/v6.0.26/bin/apache-tomcat-6.0.26.tar.gz.md5";>md5) +tar.gz +(http://www.apache.org/dist/tomcat/tomcat-6/v6.0.28/bin/apache-tomcat-6.0.28.tar.gz.asc";>pgp, +http://www.apache.org/dist/tomcat/tomcat-6/v6.0.28/bin/apache-tomcat-6.0.28.tar.gz.md5";>md5) -32-bit Windows zip -(http://www.apache.org/dist/tomcat/tomcat-6/v6.0.26/bin/apache-tomcat-6.0.26-windows-x86.zip.asc";>pgp, -http://www.apache.org/dist/tomcat/tomcat-6/v6.0.26/bin/apache-tomcat-6.0.26-windows-x86.zip.md5";>md5) +32-bit Windows zip +(http://www.apache.org/dist/tomcat/tomcat-6/v6.0.28/bin/apache-tomcat-6.0.28-windows-x86.zip.asc";>pgp, +http://www.apache.org/dist/tomcat/tomcat-6/v6.0.28/bin/apache-tomcat-6.0.28-windows-x86.zip.md5";>md5) -64-bit Windows zip -(http://www.apache.org/dist/tomcat/tomcat-6/v6.0.26/bin/apache-tomcat-6.0.26-windows-x64.zip.asc";>pgp, -http://www.apache.org/dist/tomcat/tomcat-6/v6.0.26/bin/apache-tomcat-6.0.26-windows-x64.zip.md5";>md5) +64-bit Windows zip +(http://www.apache.org/dist/tomcat/tomcat-6/v6.0.28/bin/apache-tomcat-6.0.28-windows-x64.zip.asc";>pgp, +http://www.apache.org/dist/tomcat/tomcat-6/v6.0.28/bin/apache-tomcat-6.0.28-windows-x64.zip.md5";>md5) -64-bit Itanium Windows zip -(http://www.apache.org/dist/tomcat/tomcat-6/v6.0.26/bin/apache-tomcat-6.0.26-windows-i64.zip.asc";>pgp, -http://www.apache.org/dist/tomcat/tomcat-6/v6.0.26/bin/apache-tomcat-6.0.26-windows-i64.zip.md5";>md5) +64-bit Itanium Windows zip +(http://www.apache.org/dist/tomcat/tomcat-6/v6.0.28/bin/apache-tomcat-6.0.28-windows-i64.zip.asc";>pgp, +http://www.apache.org/dist/tomcat/tomcat-6/v6.0.28/bin/apache-tomcat-6.0.28-windows-i64.zip.md5";>md5) -32-bit/64-bit Windows Service Installer -(http://www.apache.org/dist/tomcat/tomcat-6/v6.0.26/bin/apache-tomcat-6.0.26.exe.asc";>pgp, -http://www.apache.org/dist/tomcat/tomcat-6/v6.0.26/bin/apache-tomcat-6.0.26.exe.md5";>md5) +32-bit/64-bit Windows Service Installer +(http://www.apache.org/dist/tomcat/tomcat-6/v6.0.28/bin/apache-tomcat-6.0.28.exe.asc";>pgp, +http://www.apache.org/dist/tomcat/tomcat-6/v6.0.28/bin/apache-tomcat-6.0.28.exe.md5";>md5) Deployer: -zip -(http://www.apache.org/dist/tomcat/tomcat-6/v6.0.26/bin/apache-tomcat-6.0.26-deployer.zip.asc";>pgp, -http://www.apache.org/dist/tomcat/tomcat-6/v6.0.26/bin/apache-tomcat-6.0.26-deployer.zip.md5";>md5) +zip +(http://www.apache.org/dist/tomcat/tomcat-6/v6.0.28/bin/apache-tomcat-6.0.28
svn commit: r961828 [3/3] - /tomcat/site/trunk/docs/
Modified: tomcat/site/trunk/docs/security-impact.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-impact.html?rev=961828&r1=961827&r2=961828&view=diff == --- tomcat/site/trunk/docs/security-impact.html (original) +++ tomcat/site/trunk/docs/security-impact.html Thu Jul 8 16:10:01 2010 @@ -3,18 +3,18 @@ Apache Tomcat - Security Impact Levels - - - + + + - - + + http://tomcat.apache.org/";> - + @@ -25,28 +25,28 @@ http://www.apache.org/";> -http://www.apache.org/images/asf-logo.gif"; align="right" alt="Apache Logo" border="0"/> +http://www.apache.org/images/asf-logo.gif"; /> -http://www.google.com/search"; method="get"> - - - +http://www.google.com/search";> + + + - + - + - + Apache Tomcat @@ -178,11 +178,11 @@ - - + + - + @@ -216,14 +216,14 @@ - + - + - + Critical @@ -245,14 +245,14 @@ - + - + - + Important @@ -275,14 +275,14 @@ - + - + - + Moderate @@ -306,14 +306,14 @@ - + - + - + Low @@ -333,7 +333,7 @@ - + @@ -342,17 +342,17 @@ - + - + Copyright © 1999-2010, The Apache Software Foundation - + "Apache", the Apache feather, and the Apache Tomcat logo are trademarks of the Apache Software Foundation for our open source software. Modified: tomcat/site/trunk/docs/security-jk.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-jk.html?rev=961828&r1=961827&r2=961828&view=diff == --- tomcat/site/trunk/docs/security-jk.html (original) +++ tomcat/site/trunk/docs/security-jk.html Thu Jul 8 16:10:01 2010 @@ -3,18 +3,18 @@ Apache Tomcat - Apache Tomcat JK Connectors vulnerabilities - - - + + + - - + + http://tomcat.apache.org/";> - + @@ -25,28 +25,28 @@ http://www.apache.org/";> -http://www.apache.org/images/asf-logo.gif"; align="right" alt="Apache Logo" border="0"/> +http://www.apache.org/images/asf-logo.gif"; /> -http://www.google.com/search"; method="get"> - - - +http://www.google.com/search";> + + + - + - + - + Apache Tomcat @@ -178,11 +178,11 @@ - - + + - + @@ -219,14 +219,14 @@ - + - + - + @@ -259,14 +259,14 @@ - + - + - + @@ -295,7 +295,7 @@ http://svn.apache.org/viewvc?rev=702540&view=rev";> revision 702540. -Affects: JK 1.2.0-1.2.26 +Affects: JK 1.2.0-1.2.26 Source shipped with Tomcat 4.0.0-4.0.6, 4.1.0-4.1.36, 5.0.0-5.0.30, 5.5.0-5.5.27 @@ -305,14 +305,14 @@ - + - + - + @@ -360,7 +360,7 @@ interoperability with mod_rewrite. -Affects: JK 1.2.0-1.2.22 (httpd mod_jk module only) +Affects: JK 1.2.0-1.2.22 (httpd mod_jk module only) Source shipped with Tomcat 4.0.0-4.0.6, 4.1.0-4.1.36, 5.0.0-5.0.30, 5.5.0-5.5.23 @@ -370,14 +370,14 @@ - + - + - + @@ -401,7 +401,7 @@ could result in a stack overflow condition which could be leveraged to execute arbitrary code or crash the web server. -Affects: JK 1.2.19-1.2.20 +Affects: JK 1.2.19-1.2.20 Source shipped with: Tomcat 4.1.34, 5.5.20 @@ -410,14 +410,14 @@ - + - + - + @@ -442,7 +442,7 @@ this type can cause mod_jk to read beyond buffer boundaries and thus reveal sensitive memory information to a client. -Affects: JK 1.2.0-1.2.15 +Affects: JK 1.2.0-1.2.15 Source shipped with: Tomcat 4.0.0-4.0.6, 4.1.0-4.1.32, 5.0.0-5.0.30, 5.5.0-5.5.16 @@ -452,7 +452,7 @@ - + @@ -461,17 +461,17 @@ - + - + Copyright © 1999-2010, The Apache Software Foundation - + "Apache", the Apache feather, and the Apache Tomcat logo are trademarks of the Apache Software Foundation for our open source software. Modified: tomcat/site/trunk/docs/security-native.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-native.html?rev=961828&r1=961827&r2=961828&view=diff == --- tomcat/site/trunk/docs/security-native.html (original) +++ tomcat/site/trunk/docs/security-native.html Thu Jul 8 16:10:01 2010 @@ -3,18 +3,18 @@ Apache Tomcat - Apache Tomcat APR/native Connector vulnerabilities - - - + + + - - + + http://tomcat.apache.org/";> - + @@ -25,28 +25,28 @@ http://www.apache.org/";> -http://www.apache.org/images/asf-logo.gif"; align="right" alt="Apache Logo" border="0"/> +http://www.apache.org/images/asf-logo.gif"; /> -http://www.google.com/search"; method="get"> - - - +http://www.google.com/search";> + + +
Re: Vote: Add Checkstyle roleset and make code cleanups!
On Thu, 2010-07-08 at 18:02 +0200, Peter Roßbach wrote: > Hi, > > after the discussion about code style > (http://tomcat.markmail.org/thread/2c7lkzmpcuxqpgjj > ), I think that we must vote for this fix: > > https://issues.apache.org/bugzilla/show_bug.cgi?id=49268 > It includes a starting point for a very limited checkstyle ruleset. > > +1: progressively introduce checkstyle with checks for which a > consensus exists (first TabSpacePolicy, @Version format) > 0 : More discussion needed > -1: no checkstyle integration. Tomcat shoudn't have code style rules -1, but I'm not actually contributing to trunk, so I guess it's only an opinion. Rémy - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release build 6.0.28
On 8 July 2010 16:22, Henri Yandell wrote: > On Thu, Jul 8, 2010 at 3:59 AM, Rainer Jung wrote: >> On 08.07.2010 01:14, sebb wrote: >>> >>> On 7 July 2010 21:19, Rainer Jung wrote: On 07.07.2010 21:00, sebb wrote: > > On 7 July 2010 10:47, Rainer Jung wrote: >> >> On 29.06.2010 17:17, jean-frederic clere wrote: >> - build.properties: it would be nice, if you did the release changes >> to >> the >> file before tagging (and undo after) like Mark does for TC 7 >> (properties >> version and version.build). That way checking the identity between the >> tag >> and the release source would be easier (less deltas to ignore). > > Or: > > Create clean workspace from SVN. > > Make any necessary updates that apply to the tag only. > > Create the tag from the workspace using svn copy dir https://.../ > > Trunk is then untainted by unnecessary changes, and the tag commit > e-mail shows the changes made. > History is also preseved. I personally do not like edits of tags. I think tags should be used as a single cross cut through the code (like in CVS) and uniquely identify one revision, so not be edited. Personal preference though. >>> >>> My preference too. Tags should be immutable. >>> >>> I see now that my phrase "the tag commit e-mail shows the changes >>> made." could be taken to mean that the tag is editted. >>> >>> However that is not the case. >>> >>> The tag is created from the workspace + changes; the e-mail shows the >>> changes from the initial workspace checkout. >>> >>> So instead of seeing the changes as commits to trunk, followed by a >>> simple SVN copy which creates the tag, the copy and changes appear in >>> the tag creation e-mail itself. >>> >>> OK? >> >> Interesting, never tried that, sounds good, especially since the email you >> describe would contain the info you'd like to see (the changes relative to >> trunk). Good idea. > > IIUC, it means the tag would not refer to any trunk revision. Strictly speaking, yes, there is no exact match in trunk, because the version fixes are deliberately not applied to trunk. > It gets around having a commit to a tag by hiding the change in the copy. Sort of. The changes are not hidden, they are shown in the commit e-mail. > I'd rather get over the notion that tags can't be modified than be tagging > uncommitted code. All the code is committed; it's just not all in trunk. However, if you modify the tag after creation as you suggest, again the revisions to the tag won't appear in trunk. AFAICT, the only way to ensure that a tag corresponds to a trunk revision is to tag from trunk and then never change the tag => immutable tag. The end result of the method I propose is similar to creating the tag and then updating it, but it's easier to spot violations, because a tag should only appear the once, and never in an update commit. > Hen > > - > 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
[g...@vmgump]: Project tomcat-taglibs-standard (in module tomcat-taglibs) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-taglibs-standard has an issue affecting its community integration. This issue affects 45 projects, and has been outstanding for 5 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - commons-jelly : Commons Jelly - commons-jelly-tags-ant : Commons Jelly - commons-jelly-tags-ant-test : Commons Jelly - commons-jelly-tags-antlr : Commons Jelly - commons-jelly-tags-avalon : Commons Jelly - commons-jelly-tags-bean : Commons Jelly - commons-jelly-tags-beanshell : Commons Jelly - commons-jelly-tags-betwixt : Commons Jelly - commons-jelly-tags-bsf : Commons Jelly - commons-jelly-tags-define : Commons Jelly - commons-jelly-tags-define-test : Commons Jelly - commons-jelly-tags-dynabean : Commons Jelly - commons-jelly-tags-email : Commons Jelly - commons-jelly-tags-fmt : Commons Jelly - commons-jelly-tags-fmt-test : Commons Jelly - commons-jelly-tags-html : Commons Jelly - commons-jelly-tags-http : Commons Jelly - commons-jelly-tags-interaction : Commons Jelly - commons-jelly-tags-jaxme : Commons Jelly - commons-jelly-tags-jface : Commons Jelly - commons-jelly-tags-jms : Commons Jelly - commons-jelly-tags-jmx : Commons Jelly - commons-jelly-tags-jsl : Commons Jelly - commons-jelly-tags-jsl-test : Commons Jelly - commons-jelly-tags-junit : Commons Jelly - commons-jelly-tags-log : Commons Jelly - commons-jelly-tags-memory : Commons Jelly - commons-jelly-tags-quartz : Commons Jelly - commons-jelly-tags-regexp : Commons Jelly - commons-jelly-tags-soap : Commons Jelly - commons-jelly-tags-sql : Commons Jelly - commons-jelly-tags-swing : Commons Jelly - commons-jelly-tags-swt : Commons Jelly - commons-jelly-tags-threads : Commons Jelly - commons-jelly-tags-util : Commons Jelly - commons-jelly-tags-validate : Commons Jelly - commons-jelly-tags-velocity : Commons Jelly - commons-jelly-tags-xml : Commons Jelly - commons-jelly-tags-xml-test : Commons Jelly - commons-jelly-tags-xmlunit : Commons Jelly - commons-jelly-test : Commons Jelly - maven : Project Management Tools - maven-bootstrap : Project Management Tools - tomcat-taglibs-standard : Standard Taglib - tomcat-taglibs-standard-test : JSP Taglibs Full details are available at: http://vmgump.apache.org/gump/public/tomcat-taglibs/tomcat-taglibs-standard/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -INFO- Optional dependency httpunit failed with reason build failed -INFO- Optional dependency cactus failed with reason build failed -DEBUG- (Gump generated) Maven2 Settings in: /srv/gump/public/workspace/tomcat-taglibs/standard/gump_mvn_settings.xml -INFO- Failed with reason build failed -DEBUG- Maven POM in: /srv/gump/public/workspace/tomcat-taglibs/standard/pom.xml -INFO- Failed to extract fallback artifacts from Gump Repository The following work was performed: http://vmgump.apache.org/gump/public/tomcat-taglibs/tomcat-taglibs-standard/gump_work/build_tomcat-taglibs_tomcat-taglibs-standard.html Work Name: build_tomcat-taglibs_tomcat-taglibs-standard (Type: Build) Work ended in a state of : Failed Elapsed: 4 mins 20 secs Command Line: mvn --batch-mode -DskipTests=true --settings /srv/gump/public/workspace/tomcat-taglibs/standard/gump_mvn_settings.xml install [Working Directory: /srv/gump/public/workspace/tomcat-taglibs/standard] CLASSPATH: /usr/lib/jvm/java-6-sun/lib/tools.jar:/srv/gump/public/workspace/tomcat-taglibs/taglibs-parent/pom.xml:/srv/gump/public/workspace/xml-commons/java/external/build/xml-apis-ext.jar:/srv/gump/public/workspace/jakarta-cactus/framework/framework-uberjars/javaEE-14-uberjar/target/cactus.core.framework.uberjar.javaEE.14-1.8.1-SNAPSHOT.jar:/srv/gump/public/workspace/httpunit/lib/httpunit.jar:/srv/gump/public/workspace/xstream/xstream/target/xstream-1.4-SNAPSHOT.jar - at org.apache.cactus.maven2.mojos.CactifyWarMojo.getOriginalWebXml(CactifyWarMojo.java:648) at org.apache.cactus.maven2.mojos.CactifyWarMojo.execute(CactifyWarMojo.java:277) at org.apache.maven.plugin.DefaultPluginManager.executeMojo(DefaultPluginManager.java:490) at org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoals(DefaultLifecycleExecutor.java:694) at org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoalWithLifecycle(DefaultLifecycleExecutor.java:556) at org.apache.maven.lifecycle.DefaultL
Re: [VOTE] Release build 6.0.28
On Thu, Jul 8, 2010 at 9:36 AM, sebb wrote: > On 8 July 2010 16:22, Henri Yandell wrote: >> >> IIUC, it means the tag would not refer to any trunk revision. > > Strictly speaking, yes, there is no exact match in trunk, because the > version fixes are deliberately not applied to trunk. > >> It gets around having a commit to a tag by hiding the change in the copy. > > Sort of. The changes are not hidden, they are shown in the commit e-mail. e-mails are fairly worthless though. The issue for me is that while it is in the svn log history, it's in a trunk->tag copy that many will assume is an atomic step. Immutability of tags vs atomic commits. >> I'd rather get over the notion that tags can't be modified than be tagging >> uncommitted code. > > All the code is committed; it's just not all in trunk. > > However, if you modify the tag after creation as you suggest, again > the revisions to the tag won't appear in trunk. > > AFAICT, the only way to ensure that a tag corresponds to a trunk > revision is to tag from trunk and then never change the tag => > immutable tag. Agreed; but not agreed on it being important. The need for a tag to point to a trunk revision is an arbitrary invention of our development process; instead: * Create release branch. * Develop on release branch. * Declare release branch releaseable [vote]. * 'Tag' by making release branch read-only. In SVN terms, mv the release branch from 7.0.0-release to 7.0.0. Not saying that's great, just that issue may be in how we're defining the problem. > The end result of the method I propose is similar to creating the tag > and then updating it, but it's easier to spot violations, because a > tag should only appear the once, and never in an update commit. But obscures history. I may be weird - I seem to spend a lot of my time in source control history so care a lot about keeping it simple. Also I'm bikeshedding - I've not been a Tomcat release manager, so there may be details that differ from my experience elsewhere. Hen - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r961868 - in /tomcat/site/trunk: docs/download-55.html xdocs/download-55.xml
Author: jim Date: Thu Jul 8 18:28:01 2010 New Revision: 961868 URL: http://svn.apache.org/viewvc?rev=961868&view=rev Log: 5.5.30 Modified: tomcat/site/trunk/docs/download-55.html tomcat/site/trunk/xdocs/download-55.xml Modified: tomcat/site/trunk/docs/download-55.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-55.html?rev=961868&r1=961867&r2=961868&view=diff == --- tomcat/site/trunk/docs/download-55.html (original) +++ tomcat/site/trunk/docs/download-55.html Thu Jul 8 18:28:01 2010 @@ -227,8 +227,8 @@ http://www.apache.org/dist/tomcat/tomcat-5/KEYS";>KEYS | -5.5.29 | -Browse | +5.5.30 | +Browse | http://archive.apache.org/dist/tomcat/tomcat-5";>Archives @@ -328,8 +328,8 @@ - -5.5.29 + +5.5.30 @@ -339,8 +339,8 @@ - Please see the - README + Please see the + README file for packaging information. It explains what every distribution contains. @@ -364,19 +364,19 @@ Core: - zip - (http://www.apache.org/dist/tomcat/tomcat-5/v5.5.29/bin/apache-tomcat-5.5.29.zip.asc";>pgp, - http://www.apache.org/dist/tomcat/tomcat-5/v5.5.29/bin/apache-tomcat-5.5.29.zip.md5";>md5) + zip + (http://www.apache.org/dist/tomcat/tomcat-5/v5.5.30/bin/apache-tomcat-5.5.30.zip.asc";>pgp, + http://www.apache.org/dist/tomcat/tomcat-5/v5.5.30/bin/apache-tomcat-5.5.30.zip.md5";>md5) - tar.gz - (http://www.apache.org/dist/tomcat/tomcat-5/v5.5.29/bin/apache-tomcat-5.5.29.tar.gz.asc";>pgp, - http://www.apache.org/dist/tomcat/tomcat-5/v5.5.29/bin/apache-tomcat-5.5.29.tar.gz.md5";>md5) + tar.gz + (http://www.apache.org/dist/tomcat/tomcat-5/v5.5.30/bin/apache-tomcat-5.5.30.tar.gz.asc";>pgp, + http://www.apache.org/dist/tomcat/tomcat-5/v5.5.30/bin/apache-tomcat-5.5.30.tar.gz.md5";>md5) - Windows Service Installer - (http://www.apache.org/dist/tomcat/tomcat-5/v5.5.29/bin/apache-tomcat-5.5.29.exe.asc";>pgp, - http://www.apache.org/dist/tomcat/tomcat-5/v5.5.29/bin/apache-tomcat-5.5.29.exe.md5";>md5) + Windows Service Installer + (http://www.apache.org/dist/tomcat/tomcat-5/v5.5.30/bin/apache-tomcat-5.5.30.exe.asc";>pgp, + http://www.apache.org/dist/tomcat/tomcat-5/v5.5.30/bin/apache-tomcat-5.5.30.exe.md5";>md5) @@ -384,28 +384,28 @@ Deployer: - zip - (http://www.apache.org/dist/tomcat/tomcat-5/v5.5.29/bin/apache-tomcat-5.5.29-deployer.zip.asc";>pgp, - http://www.apache.org/dist/tomcat/tomcat-5/v5.5.29/bin/apache-tomcat-5.5.29-deployer.zip.md5";>md5) + zip + (http://www.apache.org/dist/tomcat/tomcat-5/v5.5.30/bin/apache-tomcat-5.5.30-deployer.zip.asc";>pgp, + http://www.apache.org/dist/tomcat/tomcat-5/v5.5.30/bin/apache-tomcat-5.5.30-deployer.zip.md5";>md5) - tar.gz - (http://www.apache.org/dist/tomcat/tomcat-5/v5.5.29/bin/apache-tomcat-5.5.29-deployer.tar.gz.asc";>pgp, - http://www.apache.org/dist/tomcat/tomcat-5/v5.5.29/bin/apache-tomcat-5.5.29-deployer.tar.gz.md5";>md5) + tar.gz + (http://www.apache.org/dist/tomcat/tomcat-5/v5.5.30/bin/apache-tomcat-5.5.30-deployer.tar.gz.asc";>pgp, + http://www.apache.org/dist/tomcat/tomcat-5/v5.5.30/bin/apache-tomcat-5.5.30-deployer.tar.gz.md5";>md5) Embedded: - zip - (http://www.apache.org/dist/tomcat/tomcat-5/v5.5.29/bin/apache-tomcat-5.5.29-embed.zip.asc";>pgp, - http://www.apache.org/dist/tomcat/tomcat-5/v5.5.29/bin/apache-tomcat-5.5.29-embed.zip.md5";>md5) + zip + (http://www.apache.org/dist/tomcat/tomcat-5/v5.5.30/bin/apache-tomcat-5.5.30-embed.zip.asc";>pgp, + http://www.apache.org/dist/tomcat/tomcat-5/v5.5.30/bin/apache-tomcat-5.5.30-embed.zip.md5";>md5) - tar.gz - (http://www.apache.org/dist/tomcat/tomcat-5/v5.5.29/bin/apache-tomcat-5.5.29-embed.tar.gz.asc";>pgp, - http://www.apache.org/dist/tomcat/tomcat-5/v5.5.29/bin/apache-tomcat-5.5.29-embed.tar.gz.md5";>md5) + tar.gz + (http://www.apache.org/dist/tomcat/tomcat-5/v5.5.30/bin/apache-tomcat-5.5.30-embed.tar.gz.asc";>pgp, + http://www.apache.org/dist/tomcat/tomcat-5/v5.5.30/bin/apache-tomcat-5.5.30-embed.tar.gz.md5";>md5) @@ -413,37 +413,37 @@ Administration Web Application: -zip -(http://www.apache.org/dist/tomcat/tomcat-5/v5.5.29/bin/apache-t
Re: [VOTE] Release build 6.0.28
2010/7/7 sebb : > > Or: > > Create clean workspace from SVN. > > Make any necessary updates that apply to the tag only. > > Create the tag from the workspace using svn copy dir https://.../ > > Trunk is then untainted by unnecessary changes, and the tag commit > e-mail shows the changes made. > History is also preseved. > Good advice, though 1. I would leave the decision to the release manager. Whatever steps are easier. It is the result (release) that matters. Whether or not several e-mails are wasted, I do not really care. 2. URL -> URL copy in subversion is easy. WC -> URL copy in subversion is a bit more risky operation. If you perform checkout or update before applying your changes, you are safe. But if your WC has mixed revisions, certain trouble happens. (Summarizing, in this particular case it is likely to succeed, but in general sense it has caveats). 3. There already are "tag.bat"/"tag.sh" scripts that perform URL -> URL copy. Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release build 6.0.28
On 8 July 2010 17:57, Henri Yandell wrote: > On Thu, Jul 8, 2010 at 9:36 AM, sebb wrote: >> On 8 July 2010 16:22, Henri Yandell wrote: >>> >>> IIUC, it means the tag would not refer to any trunk revision. >> >> Strictly speaking, yes, there is no exact match in trunk, because the >> version fixes are deliberately not applied to trunk. >> >>> It gets around having a commit to a tag by hiding the change in the copy. >> >> Sort of. The changes are not hidden, they are shown in the commit e-mail. > > e-mails are fairly worthless though. The issue for me is that while it > is in the svn log history, it's in a trunk->tag copy that many will > assume is an atomic step. AFAIK, it is. > Immutability of tags vs atomic commits. > >>> I'd rather get over the notion that tags can't be modified than be tagging >>> uncommitted code. >> >> All the code is committed; it's just not all in trunk. >> >> However, if you modify the tag after creation as you suggest, again >> the revisions to the tag won't appear in trunk. >> >> AFAICT, the only way to ensure that a tag corresponds to a trunk >> revision is to tag from trunk and then never change the tag => >> immutable tag. > > Agreed; but not agreed on it being important. The need for a tag to > point to a trunk revision is an arbitrary invention of our development > process; instead: > > * Create release branch. > * Develop on release branch. > * Declare release branch releaseable [vote]. > * 'Tag' by making release branch read-only. In SVN terms, mv the > release branch from 7.0.0-release to 7.0.0. Which I think complicates the history even more. > Not saying that's great, just that issue may be in how we're defining > the problem. > >> The end result of the method I propose is similar to creating the tag >> and then updating it, but it's easier to spot violations, because a >> tag should only appear the once, and never in an update commit. > > But obscures history. I may be weird - I seem to spend a lot of my > time in source control history so care a lot about keeping it simple. Huh? I don't see how updating a tag (potentially multiple times) is more clear than creating the tag once. Also, creating a branch for the tagging adds even more places to search for history. > Also I'm bikeshedding - I've not been a Tomcat release manager, so > there may be details that differ from my experience elsewhere. One important item I forgot to mention: if you update trunk, and then create the tag from that, there is a window when trunk will contain incorrect information about versions. I'm not sure how you can prevent accidental use of trunk when in that state - e.g. it might be used in CI systems. The method I describe completely avoids that. But if you have a better method, or want to use something else - that's fine by me. I just wanted to point out what I think is a simple and effective method for creating immutable tags. > Hen > > - > 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: r961942 - /tomcat/trunk/java/javax/servlet/jsp/tagext/FunctionInfo.java
Author: markt
Date: Thu Jul 8 21:19:39 2010
New Revision: 961942
URL: http://svn.apache.org/viewvc?rev=961942&view=rev
Log:
Tab police
Modified:
tomcat/trunk/java/javax/servlet/jsp/tagext/FunctionInfo.java
Modified: tomcat/trunk/java/javax/servlet/jsp/tagext/FunctionInfo.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/tagext/FunctionInfo.java?rev=961942&r1=961941&r2=961942&view=diff
==
--- tomcat/trunk/java/javax/servlet/jsp/tagext/FunctionInfo.java (original)
+++ tomcat/trunk/java/javax/servlet/jsp/tagext/FunctionInfo.java Thu Jul 8
21:19:39 2010
@@ -35,8 +35,7 @@ public class FunctionInfo {
*/
public FunctionInfo(String name, String klass, String signature) {
-
- this.name = name;
+this.name = name;
this.functionClass = klass;
this.functionSignature = signature;
}
@@ -48,7 +47,7 @@ public class FunctionInfo {
*/
public String getName() {
- return name;
+return name;
}
/**
@@ -74,7 +73,6 @@ public class FunctionInfo {
/*
* fields
*/
-
private String name;
private String functionClass;
private String functionSignature;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r961947 - in /tomcat/trunk/test: org/apache/el/TestELInJsp.java org/apache/el/TesterFunctions.java webapp-3.0/WEB-INF/bugs.tld webapp-3.0/bug49555.jsp
Author: markt
Date: Thu Jul 8 21:28:21 2010
New Revision: 961947
URL: http://svn.apache.org/viewvc?rev=961947&view=rev
Log:
Test case for https://issues.apache.org/bugzilla/show_bug.cgi?id=49555
Fix to follow shortly
Added:
tomcat/trunk/test/webapp-3.0/bug49555.jsp (with props)
Modified:
tomcat/trunk/test/org/apache/el/TestELInJsp.java
tomcat/trunk/test/org/apache/el/TesterFunctions.java
tomcat/trunk/test/webapp-3.0/WEB-INF/bugs.tld
Modified: tomcat/trunk/test/org/apache/el/TestELInJsp.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/el/TestELInJsp.java?rev=961947&r1=961946&r2=961947&view=diff
==
--- tomcat/trunk/test/org/apache/el/TestELInJsp.java (original)
+++ tomcat/trunk/test/org/apache/el/TestELInJsp.java Thu Jul 8 21:28:21 2010
@@ -309,6 +309,22 @@ public class TestELInJsp extends TomcatB
assertEcho(result, "{OK}");
}
+public void testBug49555() throws Exception {
+Tomcat tomcat = getTomcatInstance();
+
+File appDir = new File("test/webapp-3.0");
+// app dir is relative to server home
+tomcat.addWebapp(null, "/test", appDir.getAbsolutePath());
+
+tomcat.start();
+
+ByteChunk res = getUrl("http://localhost:"; + getPort() +
+"/test/bug49555.jsp");
+
+String result = res.toString();
+assertEcho(result, "00-" + TesterFunctions.Inner.RETVAL);
+}
+
public void testELMisc() throws Exception {
Tomcat tomcat = getTomcatInstance();
Modified: tomcat/trunk/test/org/apache/el/TesterFunctions.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/el/TesterFunctions.java?rev=961947&r1=961946&r2=961947&view=diff
==
--- tomcat/trunk/test/org/apache/el/TesterFunctions.java (original)
+++ tomcat/trunk/test/org/apache/el/TesterFunctions.java Thu Jul 8 21:28:21
2010
@@ -21,4 +21,12 @@ public class TesterFunctions {
public static String trim(String input) {
return input.trim();
}
+
+public static class Inner {
+
+public static final String RETVAL = "Return from bug49555";
+public static String bug49555() {
+return RETVAL;
+}
+}
}
Modified: tomcat/trunk/test/webapp-3.0/WEB-INF/bugs.tld
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/webapp-3.0/WEB-INF/bugs.tld?rev=961947&r1=961946&r2=961947&view=diff
==
--- tomcat/trunk/test/webapp-3.0/WEB-INF/bugs.tld (original)
+++ tomcat/trunk/test/webapp-3.0/WEB-INF/bugs.tld Thu Jul 8 21:28:21 2010
@@ -67,5 +67,9 @@
AT_END
-
+
+bug49555
+org.apache.el.TesterFunctions$Inner
+java.lang.String bug49555()
+
\ No newline at end of file
Added: tomcat/trunk/test/webapp-3.0/bug49555.jsp
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/webapp-3.0/bug49555.jsp?rev=961947&view=auto
==
--- tomcat/trunk/test/webapp-3.0/bug49555.jsp (added)
+++ tomcat/trunk/test/webapp-3.0/bug49555.jsp Thu Jul 8 21:28:21 2010
@@ -0,0 +1,18 @@
+<%--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+--%>
+<%@ taglib uri="http://tomcat.apache.org/bugs"; prefix="bugs" %>
+00-${bugs:bug49555()}
Propchange: tomcat/trunk/test/webapp-3.0/bug49555.jsp
--
svn:eol-style = native
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r961948 - in /tomcat/trunk: java/org/apache/jasper/compiler/ELFunctionMapper.java webapps/docs/changelog.xml
Author: markt
Date: Thu Jul 8 21:29:12 2010
New Revision: 961948
URL: http://svn.apache.org/viewvc?rev=961948&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49555
Correctly handle tag libraries that use functions defined in static inner
classes
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/ELFunctionMapper.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/jasper/compiler/ELFunctionMapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/ELFunctionMapper.java?rev=961948&r1=961947&r2=961948&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/ELFunctionMapper.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/ELFunctionMapper.java Thu Jul
8 21:29:12 2010
@@ -212,8 +212,8 @@ public class ELFunctionMapper {
FunctionInfo funcInfo = f.getFunctionInfo();
String key = f.getPrefix()+ ":" + f.getName();
ds.append(funcMethod + "(\"" + key + "\", " +
-funcInfo.getFunctionClass() + ".class, " +
-'\"' + f.getMethodName() + "\", " +
+getCanonicalName(funcInfo.getFunctionClass()) +
+".class, " + '\"' + f.getMethodName() + "\", " +
"new Class[] {");
String params[] = f.getParameters();
for (int k = 0; k < params.length; k++) {
@@ -286,6 +286,17 @@ public class ELFunctionMapper {
private String getMapName() {
return "_jspx_fnmap_" + currFunc++;
}
+
+/**
+ * Convert a binary class name into a canonical one that can be used
+ * when generating Java source code.
+ *
+ * @param className Binary class name
+ * @return Canonical equivalent
+ */
+private String getCanonicalName(String className) {
+return className.replace('$', '.');
+}
}
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=961948&r1=961947&r2=961948&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Jul 8 21:29:12 2010
@@ -149,6 +149,10 @@
Improve logging of JSP exceptions by including JSP snippet (if enabled)
rather than just the root cause in the host log. (markt)
+
+49555: Correctly handled Tag Libraries where functions are
+defined in static inner classes. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r961949 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Thu Jul 8 21:30:16 2010 New Revision: 961949 URL: http://svn.apache.org/viewvc?rev=961949&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=961949&r1=961948&r2=961949&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jul 8 21:30:16 2010 @@ -163,3 +163,10 @@ PATCHES PROPOSED TO BACKPORT: https://issues.apache.org/bugzilla/attachment.cgi?id=25727 +1: markt -1: + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49555 + Correctly handle tag libraries that use functions defined in static inner + classes + http://svn.apache.org/viewvc?rev=961948&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 49555] Custom Taglibs should support all parameters
https://issues.apache.org/bugzilla/show_bug.cgi?id=49555 Mark Thomas changed: What|Removed |Added Component|Jasper |Jasper Product|Tomcat 7|Tomcat 6 Target Milestone|--- |default --- Comment #4 from Mark Thomas 2010-07-08 17:31:41 EDT --- Confirmed. Fixed in 7.0.x and will be in 7.0.1 onwards. 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
DO NOT REPLY [Bug 49574] New: ConcurrentModificationException when updating a WAR file
https://issues.apache.org/bugzilla/show_bug.cgi?id=49574 Summary: ConcurrentModificationException when updating a WAR file Product: Tomcat 6 Version: 6.0.20 Platform: PC OS/Version: Linux Status: NEW Severity: normal Priority: P2 Component: Catalina AssignedTo: dev@tomcat.apache.org ReportedBy: arc...@dellroad.org This is on openSuSE Linux 11.2 with using the tomcat6-6.0.20-24.6.2 RPM. I updated a WAR file and while tomcat was shutting down the app this exception appeared in the logs: Jul 8, 2010 4:28:24 PM org.apache.catalina.startup.HostConfig checkResources WARNING: Error while removing context [/decider] java.util.ConcurrentModificationException at java.util.HashMap$HashIterator.nextEntry(HashMap.java:810) at java.util.HashMap$EntryIterator.next(HashMap.java:851) at java.util.HashMap$EntryIterator.next(HashMap.java:849) at java.util.HashMap.putAllForCreate(HashMap.java:452) at java.util.HashMap.clone(HashMap.java:686) at org.apache.catalina.loader.WebappClassLoader.clearReferences(WebappClassLoader.java:1633) at org.apache.catalina.loader.WebappClassLoader.stop(WebappClassLoader.java:1536) at org.apache.catalina.loader.WebappLoader.stop(WebappLoader.java:707) at org.apache.catalina.core.StandardContext.stop(StandardContext.java:4611) at org.apache.catalina.core.ContainerBase.removeChild(ContainerBase.java:924) at org.apache.catalina.startup.HostConfig.checkResources(HostConfig.java:1115) at org.apache.catalina.startup.HostConfig.check(HostConfig.java:1323) at org.apache.catalina.startup.HostConfig.lifecycleEvent(HostConfig.java:303) at org.apache.catalina.util.LifecycleSupport.fireLifecycleEvent(LifecycleSupport.java:119) at org.apache.catalina.core.ContainerBase.backgroundProcess(ContainerBase.java:1337) at org.apache.catalina.core.ContainerBase$ContainerBackgroundProcessor.processChildren(ContainerBase.java:1601) at org.apache.catalina.core.ContainerBase$ContainerBackgroundProcessor.processChildren(ContainerBase.java:1610) at org.apache.catalina.core.ContainerBase$ContainerBackgroundProcessor.run(ContainerBase.java:1590) at java.lang.Thread.run(Thread.java:636) Looks like there is some kind of race condition in tomcat. -- 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: r961955 - /tomcat/tc5.5.x/trunk/STATUS.txt
Author: kkolinko Date: Thu Jul 8 21:41:08 2010 New Revision: 961955 URL: http://svn.apache.org/viewvc?rev=961955&view=rev Log: vote Modified: tomcat/tc5.5.x/trunk/STATUS.txt Modified: tomcat/tc5.5.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=961955&r1=961954&r2=961955&view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Thu Jul 8 21:41:08 2010 @@ -56,7 +56,7 @@ PATCHES PROPOSED TO BACKPORT: svn propdel svn:executable container/webapps/docs/default-servlet.xml svn propdel svn:executable container/webapps/docs/balancer-howto.xml svn propdel svn:executable container/webapps/jmxremote/WEB-INF/web.xml - +1: rjung + +1: rjung, kkolinko -1: b) Add to .bat and .sh files where missing (most already have the property set) @@ -68,5 +68,5 @@ PATCHES PROPOSED TO BACKPORT: svn propset svn:executable '*' jasper/src/bin/jspc-using-launcher.sh svn propset svn:executable '*' jasper/src/bin/jasper.sh svn propset svn:executable '*' connectors/http11/src/test/test.bat - +1: rjung + +1: rjung, kkolinko -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 49574] ConcurrentModificationException when updating a WAR file
https://issues.apache.org/bugzilla/show_bug.cgi?id=49574 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||WONTFIX --- Comment #1 from Mark Thomas 2010-07-08 17:44:40 EDT --- It is an expected side-effect of having the clear references code enabled by default. If your web application is well-behaved then you can safely disable it. See http://tomcat.apache.org/tomcat-6.0-doc/config/systemprops.html and look for org.apache.catalina.loader.WebappClassLoader.ENABLE_CLEAR_REFERENCES -- 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 49234] JMX Descriptor Modifications
https://issues.apache.org/bugzilla/show_bug.cgi?id=49234 --- Comment #60 from Mark Thomas 2010-07-08 17:56:28 EDT --- All patches applied. Many thanks. -- 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: r961963 - in /tomcat/trunk: java/org/apache/naming/factory/webservices/ServiceRefFactory.java webapps/docs/changelog.xml
Author: markt
Date: Thu Jul 8 22:22:34 2010
New Revision: 961963
URL: http://svn.apache.org/viewvc?rev=961963&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48297
Use the HandlerInfo to initialise the HandlerChain, rather than adding to it
which clearly isn't correct.
>From looking at the javadoc, I believe this is the fix required but I don't
>have a test case.
Modified:
tomcat/trunk/java/org/apache/naming/factory/webservices/ServiceRefFactory.java
tomcat/trunk/webapps/docs/changelog.xml
Modified:
tomcat/trunk/java/org/apache/naming/factory/webservices/ServiceRefFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/factory/webservices/ServiceRefFactory.java?rev=961963&r1=961962&r2=961963&view=diff
==
---
tomcat/trunk/java/org/apache/naming/factory/webservices/ServiceRefFactory.java
(original)
+++
tomcat/trunk/java/org/apache/naming/factory/webservices/ServiceRefFactory.java
Thu Jul 8 22:22:34 2010
@@ -45,6 +45,7 @@ import javax.wsdl.factory.WSDLFactory;
import javax.wsdl.xml.WSDLReader;
import javax.xml.namespace.QName;
+import javax.xml.rpc.handler.Handler;
import javax.xml.rpc.handler.HandlerChain;
import javax.xml.rpc.handler.HandlerInfo;
import javax.xml.rpc.handler.HandlerRegistry;
@@ -355,7 +356,11 @@ public class ServiceRefFactory
private void initHandlerChain(QName portName, HandlerRegistry
handlerRegistry,
HandlerInfo handlerInfo, ArrayList soaprolesToAdd) {
HandlerChain handlerChain = (HandlerChain)
handlerRegistry.getHandlerChain(portName);
-handlerChain.add(handlerInfo);
+Iterator iter = handlerChain.iterator();
+while (iter.hasNext()) {
+Handler handler = iter.next();
+handler.init(handlerInfo);
+}
String[] soaprolesRegistered = handlerChain.getRoles();
String [] soaproles = new String[soaprolesRegistered.length +
soaprolesToAdd.size()];
int i;
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=961963&r1=961962&r2=961963&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Jul 8 22:22:34 2010
@@ -56,6 +56,10 @@
Add entryPoint support to the CSRF prevention filter. (markt)
+48297: Correctly initialise handler chain for web services
+resources. (markt)
+
+
49030: When initializing/starting/stopping connectors and
one of them fails, do not ignore the others. (markt/kkolinko)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48297] webservices.ServiceRefFactory.initHandlerChain adds wrong items to list?
https://issues.apache.org/bugzilla/show_bug.cgi?id=48297 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #2 from Mark Thomas 2010-07-08 18:23:45 EDT --- Fixed in 7.0.x and will be included in 7.0.1 onwards. I don;t have a test case so the fix is based on a review of the JavaDoc and a review of the code. -- 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 49576] New: 飞过海
https://issues.apache.org/bugzilla/show_bug.cgi?id=49576 Summary: 飞过海 Product: Tomcat 3 Version: Unknown Platform: PC OS/Version: Windows XP Status: NEW Severity: minor Priority: P2 Component: Servlet AssignedTo: dev@tomcat.apache.org ReportedBy: minmin02102...@126.com -- 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 49576] 飞过海
https://issues.apache.org/bugzilla/show_bug.cgi?id=49576 Bill Barker changed: What|Removed |Added Status|NEW |RESOLVED Resolution||INVALID -- 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
