Re: svn commit: r1042482 - in /tomcat/trunk: ./ conf/ java/org/apache/catalina/core/ java/org/apache/catalina/loader/ java/org/apache/tomcat/util/threads/ res/confinstall/ webapps/ webapps/docs/ weba
On 06.12.2010 22:01, Sylvain Laurent wrote: On 6 déc. 2010, at 01:09, Mark Thomas wrote: On 05/12/2010 22:54, slaur...@apache.org wrote: Modified: tomcat/trunk/ (props changed) tomcat/trunk/conf/ (props changed) tomcat/trunk/webapps/(props changed) -1 to all these changes. a) This is not a Tomcat instance for running. That is created in output. b) It reverts a useful change I made earlier today Sorry, I did not realize there could be changes on directories with SVN. For debugging I launch tomcat from the base directory and this creates directories likes log, work, etc... I believe you fixed this. Just in case Mark's remark a) wasn't clear: after building Tomcat you can debug inside the sub directory output/build which contains a full installation. Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
configure the web.xml file to display the index.jsp page of a web application
Hi all, I'm working on Ubuntu 9.10 where I have installed Tomcat 7. I have a problem with following web.xml file: the program work fine but when I try to connect to localhost:8080/OverEncrypt I can not show any page even if I set index.jsp. The folder configuration is the following: $CATALINA_HOME/webapps/OverEncrypt/WEB-INF with classes and lib folder; $CATALINA_HOME/webapps/OverEncrypt/WEB-INF/web.xml; $CATALINA_HOME/webapps/OverEncrypt/index.jsp the page that I want show on the browser; What should I change to display the page index.jsp? http://java.sun.com/xml/ns/javaee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"; version="3.0" metadata-complete="true"> OverEncrypt milton com.bradmcevoy.http.MiltonServlet resource.factory.factory.class unibg.overencrypt.Initializer authentication.handler.classes com.bradmcevoy.http.http11.auth.BasicAuthHandler not.found.url /404.jsp filter_0 com.bradmcevoy.http.DebugFilter 0 milton /* 30 index.jsp -- View this message in context: http://old.nabble.com/configure-the-web.xml-file-to-display-the-index.jsp-page-of-a-web-application-tp30394975p30394975.html Sent from the Tomcat - Dev mailing list archive at Nabble.com. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: configure the web.xml file to display the index.jsp page of a web application
On 07/12/2010 10:28, pix_siro wrote: Hi all, I'm working on Ubuntu 9.10 where I have installed Tomcat 7. I have a problem with following web.xml file: the program work fine but when I try to connect to localhost:8080/OverEncrypt I can not show any page even if I set index.jsp. This question belongs on the users mailing list, not the developers mailing list. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: configure the web.xml file to display the index.jsp page of a web application
Sorry i've try to delete it and post on users mailing list but maybe something gone wrong. markt-2 wrote: > > On 07/12/2010 10:28, pix_siro wrote: >> >> Hi all, >> I'm working on Ubuntu 9.10 where I have installed Tomcat 7. I have a >> problem >> with following web.xml file: the program work fine but when I try to >> connect >> to localhost:8080/OverEncrypt I can not show any page even if I set >> index.jsp. > > This question belongs on the users mailing list, not the developers > mailing list. > > Mark > > > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > > > -- View this message in context: http://old.nabble.com/Re%3A-configure-the-web.xml-file-to-display-the-index.jsp-page-of-a-web-application-tp30395079p30395102.html Sent from the Tomcat - Dev mailing list archive at Nabble.com. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1042786 - in /tomcat/trunk/java/org/apache: catalina/core/ catalina/loader/ tomcat/util/threads/
Am Montag, den 06.12.2010, 21:22 + schrieb Mark Thomas:
> On 06/12/2010 20:49, slaur...@apache.org wrote:
> > Author: slaurent
> > Date: Mon Dec 6 20:49:14 2010
> > New Revision: 1042786
> >
> > URL: http://svn.apache.org/viewvc?rev=1042786&view=rev
>
>
> > @@ -63,7 +72,7 @@ public class ThreadLocalLeakPreventionLi
> > try {
> > Lifecycle lifecycle = event.getLifecycle();
> > if (Lifecycle.AFTER_START_EVENT.equals(event.getType())
> > -&& lifecycle instanceof Server) {
> > +&& lifecycle instanceof Server) {
> > // when the server starts, we register ourself as listener
> > for
> > // all context
> > // as well as container event listener so that we know
> > when new
>
> That indenting is now misleading (it was fine before) and the operator
> is still at the beginning of the line.
I just made a quick lookup for usage of (&&) operator at the end of line
versus (&&) operator at the beginning of the next line. It seems that
usage has changed between tomcat 6 and trunk.
In tomcat6.x it is
> egrep -r "&&\s*$" * | wc -l # && at the end of line
217
> egrep -r "^\s*&&" * | wc -l # && at front of line
228
that is slightly in favor of operator after line wrapping.
In tomcat.trunk it is now
> egrep -r "&&\s*$" * | wc -l # && at the end of line
279
> egrep -r "^\s*&&" * | wc -l # && at front of line
264
Which is favors operator before line wrapping.
Java coding conventions and eclipse coding conventions both prefer
operator after line wrapping.
So is operator after line wrapping really a tomcat standard?
>
>
> > -log.error("Exception processing event " + event, e);
> > +String msg =
> > +sm.getString(
> > +
> > "threadLocalLeakPreventionListener.lifecycleEvent.error",
> > +event);
> > +log.error(msg, e);
>
> More auto formatting "helpfulness" by the look of it. No reason for
> String msg = sm.getString(
> not to be on one line.
It would probably break the 80 character limits :)
>
> If we can pull some Eclipse settings together to help folks with this
> that would be great.
That would be great, if we knew what the conventions were.
http://tomcat.apache.org/getinvolved.html only mentions four
conventions.
>
> Mark
Bye
Felix
>
> -
> 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
DO NOT REPLY [Bug 50339] mod_jk parsing error if workers.properties contains whitespaces
https://issues.apache.org/bugzilla/show_bug.cgi?id=50339 --- Comment #5 from Frank 2010-12-07 07:40:27 EST --- Yes, that seems to work. Thanks a lot, guys! Cheers, Frank -- 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
Re: svn commit: r1042786 - in /tomcat/trunk/java/org/apache: catalina/core/ catalina/loader/ tomcat/util/threads/
On 07/12/2010 12:29, Felix Schumacher wrote:
Am Montag, den 06.12.2010, 21:22 + schrieb Mark Thomas:
That indenting is now misleading (it was fine before) and the operator
is still at the beginning of the line.
I just made a quick lookup for usage of (&&) operator at the end of line
versus (&&) operator at the beginning of the next line. It seems that
usage has changed between tomcat 6 and trunk.
For the stats to be meaningful you'd need to look at all the possible
operators, not just &&. That said, I suspect you'll see a similar thing,
a gradual shift towards operator before line wrapping
Java coding conventions and eclipse coding conventions both prefer
operator after line wrapping.
My preference is for operator before since I believe it aids
readability. YMMV.
So is operator after line wrapping really a tomcat standard?
operator before line wrapping is the direction the code is heading in
and the direction I think it should continue to head.
-log.error("Exception processing event " + event, e);
+String msg =
+sm.getString(
+"threadLocalLeakPreventionListener.lifecycleEvent.error",
+event);
+log.error(msg, e);
More auto formatting "helpfulness" by the look of it. No reason for
String msg = sm.getString(
not to be on one line.
It would probably break the 80 character limits :)
I don't get this. I was suggesting the following:
String msg = sm.getString(
"threadLocalLeakPreventionListener.lifecycleEvent.error",
event);
i.e. get rid of the unnecessary line break.
If we can pull some Eclipse settings together to help folks with this
that would be great.
That would be great, if we knew what the conventions were.
http://tomcat.apache.org/getinvolved.html only mentions four
conventions.
I'm not sure on the best way to approach this. The code is not
consistent. The committers don't have a consistent style for new stuff.
I'm not sure how much we can agree on.
What I have been doing is slowly adding rules to Checkstyle. So far
there hasn't been any push back but I'm sure there will be some at some
point. My idea was to add the rules the community was happy with and
where we disagree leave things as they are. Modifier order and redundant
modifiers are the next ones on the list. I'll see if there is an
operator placement one ... there is so I'll add that as well (commented
out until the issues are fixed).
Mark
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1042786 - in /tomcat/trunk/java/org/apache: catalina/core/ catalina/loader/ tomcat/util/threads/
On 07/12/2010 13:28, Mark Thomas wrote: On 07/12/2010 12:29, Felix Schumacher wrote: Am Montag, den 06.12.2010, 21:22 + schrieb Mark Thomas: That indenting is now misleading (it was fine before) and the operator is still at the beginning of the line. I just made a quick lookup for usage of (&&) operator at the end of line versus (&&) operator at the beginning of the next line. It seems that usage has changed between tomcat 6 and trunk. For the stats to be meaningful you'd need to look at all the possible operators, not just &&. That said, I suspect you'll see a similar thing, a gradual shift towards operator before line wrapping Based on the Checkstyle error count for Tomcat 7: operator before new line 2022 operator after new line 1077 So there is a preference for operator before but there are plenty of counter examples. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
RE: svn commit: r1042786 - in /tomcat/trunk/java/org/apache: catalina/core/ catalina/loader/ tomcat/util/threads/
> From: Mark Thomas [mailto:ma...@apache.org] > Subject: Re: svn commit: r1042786 - in /tomcat/trunk/java/org/apache: > catalina/core/ catalina/loader/ tomcat/util/threads/ > My preference is for operator before since I believe it aids > readability. YMMV. Strongly agree. I've been programming in a multitude of languages for over forty years, and I find operator before line break to be a much more readable (and aesthetically pleasing) arrangement. Sun's Java programming conventions haven't been updated in over a decade, and were written before many people had much experience with the language. It's unfortunate they haven't been kept up to date with newer productivity findings. (I also find it quite curious that they specify break after comma, but before other operators - we don't need no stinkin' consistency.) - Chuck THIS COMMUNICATION MAY CONTAIN CONFIDENTIAL AND/OR OTHERWISE PROPRIETARY MATERIAL and is thus for use only by the intended recipient. If you received this in error, please contact the sender and delete the e-mail and its attachments from all computers. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1042786 - in /tomcat/trunk/java/org/apache: catalina/core/ catalina/loader/ tomcat/util/threads/
Am Dienstag, den 07.12.2010, 13:28 + schrieb Mark Thomas:
> On 07/12/2010 12:29, Felix Schumacher wrote:
> > Am Montag, den 06.12.2010, 21:22 + schrieb Mark Thomas:
> >>> -log.error("Exception processing event " + event, e);
> >>> +String msg =
> >>> +sm.getString(
> >>> +
> >>> "threadLocalLeakPreventionListener.lifecycleEvent.error",
> >>> +event);
> >>> +log.error(msg, e);
> >>
> >> More auto formatting "helpfulness" by the look of it. No reason for
> >> String msg = sm.getString(
> >> not to be on one line.
> > It would probably break the 80 character limits :)
>
> I don't get this. I was suggesting the following:
> String msg = sm.getString(
> "threadLocalLeakPreventionListener.lifecycleEvent.error",
> event);
> i.e. get rid of the unnecessary line break.
Oh, didn't think of that one, you are right :)
>
> >> If we can pull some Eclipse settings together to help folks with this
> >> that would be great.
> > That would be great, if we knew what the conventions were.
> > http://tomcat.apache.org/getinvolved.html only mentions four
> > conventions.
>
> I'm not sure on the best way to approach this. The code is not
> consistent. The committers don't have a consistent style for new stuff.
> I'm not sure how much we can agree on.
>
> What I have been doing is slowly adding rules to Checkstyle. So far
> there hasn't been any push back but I'm sure there will be some at some
> point. My idea was to add the rules the community was happy with and
> where we disagree leave things as they are. Modifier order and redundant
> modifiers are the next ones on the list. I'll see if there is an
> operator placement one ... there is so I'll add that as well (commented
> out until the issues are fixed).
Great, I really love to use eclipse auto formatting, but that can only
be used, if we commit ourselves onto one style.
If we have already commited the style by checkstyle rules, we should
prepare an eclipse formatting rule that matches those.
Regards
Felix
>
> Mark
>
>
>
> -
> 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: r1043049 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Tue Dec 7 13:59:47 2010 New Revision: 1043049 URL: http://svn.apache.org/viewvc?rev=1043049&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=1043049&r1=1043048&r2=1043049&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Dec 7 13:59:47 2010 @@ -274,4 +274,9 @@ PATCHES PROPOSED TO BACKPORT: +1: slaurent, kkolinko -0: markt - See http://markmail.org/message/mnowpijhnxg554t5 -1: - \ No newline at end of file + +* Make SSL protocol selection consistent between BIO and NIO and update docs + to reflect current BIO and post-patch NIO. + http://people.apache.org/~markt/patches/2010-12-07-ssl-algorithm-tc6.patch + +1: markt + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1043050 - /tomcat/trunk/webapps/docs/changelog.xml
Author: markt Date: Tue Dec 7 14:00:42 2010 New Revision: 1043050 URL: http://svn.apache.org/viewvc?rev=1043050&view=rev Log: Typo Modified: tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1043050&r1=1043049&r2=1043050&view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Tue Dec 7 14:00:42 2010 @@ -160,7 +160,7 @@ of configuration files. Patch provided by Luke Meyer. (markt) -Correct validate provided context path so sessions for the ROOT web +Correctly validate provided context path so sessions for the ROOT web application can be viewed through the HTML Manager. (markt) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1043051 - /tomcat/trunk/checkstyle.xml
Author: markt Date: Tue Dec 7 14:01:21 2010 New Revision: 1043051 URL: http://svn.apache.org/viewvc?rev=1043051&view=rev Log: Another day, another check Modified: tomcat/trunk/checkstyle.xml Modified: tomcat/trunk/checkstyle.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/checkstyle.xml?rev=1043051&r1=1043050&r2=1043051&view=diff == --- tomcat/trunk/checkstyle.xml (original) +++ tomcat/trunk/checkstyle.xml Tue Dec 7 14:01:21 2010 @@ -56,6 +56,11 @@ https://sourceforge.net/tracker/?func=detail&aid=3039718&group_id=29721&atid=397078 --> + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1042786 - in /tomcat/trunk/java/org/apache: catalina/core/ catalina/loader/ tomcat/util/threads/
2010/12/7 Mark Thomas : > > My preference is for operator before since I believe it aids readability. > YMMV. > >> So is operator after line wrapping really a tomcat standard? > > operator before line wrapping is the direction the code is heading in and > the direction I think it should continue to head. > My personal preference is that the new code formatting were more or less consistent with the rest of the file. I *do not* care where operator is on that line. If it is readable, it is fine with me. I see no value in bothering about it besides some aesthetics. (It makes no difference in Java. Though in Javascript placing operator at the end of the line is preferred, because of implicit ';' that can otherwise split the line in two). Trying to enforce a style here goes nowhere: such changes cannot be backported to TC6, and you cannot limit checkstyle to check only files created after certain date. 2010/12/7 Caldarale, Charles R : > Strongly agree. I've been programming in a multitude of languages for over > forty years, and I find operator before line break to be a much more readable > (and aesthetically pleasing) arrangement. > If you have some "long string" that occupies all space up to position 79, forcing some operator after it to stay on the same line effectively increases its length by several chars and will cause the whole string to be placed on the new line. It just wastes space and becomes ugly. Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
RE: svn commit: r1042786 - in /tomcat/trunk/java/org/apache: catalina/core/ catalina/loader/ tomcat/util/threads/
> From: Konstantin Kolinko [mailto:knst.koli...@gmail.com] > Subject: Re: svn commit: r1042786 - in /tomcat/trunk/java/org/apache: > catalina/core/ catalina/loader/ tomcat/util/threads/ > If you have some "long string" that occupies all space up to position > 79, forcing some operator after it to stay on the same line > effectively increases its length by several chars and will cause the > whole string to be placed on the new line. It just wastes space and > becomes ugly. Agreed, which is why Mark's suggestion of making those static final String fields is even more compelling. - Chuck THIS COMMUNICATION MAY CONTAIN CONFIDENTIAL AND/OR OTHERWISE PROPRIETARY MATERIAL and is thus for use only by the intended recipient. If you received this in error, please contact the sender and delete the e-mail and its attachments from all computers. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1042482 - in /tomcat/trunk: ./ conf/ java/org/apache/catalina/core/ java/org/apache/catalina/loader/ java/org/apache/tomcat/util/threads/ res/confinstall/ webapps/ webapps/docs/ webap
Am Montag, den 06.12.2010, 22:01 +0100 schrieb Sylvain Laurent:
> >
> >> +public void lifecycleEvent(LifecycleEvent event) {
> >> +try {
> >> +Lifecycle lifecycle = event.getLifecycle();
> >> +if (Lifecycle.AFTER_START_EVENT.equals(event.getType())
> >> +&& lifecycle instanceof Server) {
> > With the operator on the new line it is easy to miss what is going on.
> > Generally, Tomcat style is to put the operator on the first line. e.g.
> > if (Lifecycle.AFTER_START_EVENT.equals(event.getType()) &&
> >lifecycle instanceof Server) {
> >
> > There are multiple instances of this throughout the commit.
>
> Still eclipse. But I did not manage to find a setting to change this behavior
> :-(
It is "Line Wrapping->Expressions->Binary expressions" [x] Wrap before
operator.
hth
Felix
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1043098 - in /tomcat/trunk/java/javax: el/ servlet/http/ servlet/jsp/ servlet/jsp/el/ servlet/jsp/tagext/
Author: markt
Date: Tue Dec 7 15:36:36 2010
New Revision: 1043098
URL: http://svn.apache.org/viewvc?rev=1043098&view=rev
Log:
Fix modifier order in javax.*
Modified:
tomcat/trunk/java/javax/el/ArrayELResolver.java
tomcat/trunk/java/javax/el/BeanELResolver.java
tomcat/trunk/java/javax/el/CompositeELResolver.java
tomcat/trunk/java/javax/el/ELResolver.java
tomcat/trunk/java/javax/el/ListELResolver.java
tomcat/trunk/java/javax/el/MapELResolver.java
tomcat/trunk/java/javax/el/ResourceBundleELResolver.java
tomcat/trunk/java/javax/servlet/http/HttpUtils.java
tomcat/trunk/java/javax/servlet/jsp/JspContext.java
tomcat/trunk/java/javax/servlet/jsp/JspWriter.java
tomcat/trunk/java/javax/servlet/jsp/PageContext.java
tomcat/trunk/java/javax/servlet/jsp/el/ImplicitObjectELResolver.java
tomcat/trunk/java/javax/servlet/jsp/tagext/BodyTag.java
tomcat/trunk/java/javax/servlet/jsp/tagext/IterationTag.java
tomcat/trunk/java/javax/servlet/jsp/tagext/PageData.java
tomcat/trunk/java/javax/servlet/jsp/tagext/Tag.java
tomcat/trunk/java/javax/servlet/jsp/tagext/TagLibraryInfo.java
tomcat/trunk/java/javax/servlet/jsp/tagext/TagLibraryValidator.java
Modified: tomcat/trunk/java/javax/el/ArrayELResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/ArrayELResolver.java?rev=1043098&r1=1043097&r2=1043098&view=diff
==
--- tomcat/trunk/java/javax/el/ArrayELResolver.java (original)
+++ tomcat/trunk/java/javax/el/ArrayELResolver.java Tue Dec 7 15:36:36 2010
@@ -145,14 +145,14 @@ public class ArrayELResolver extends ELR
return null;
}
-private final static void checkBounds(Object base, int idx) {
+private static final void checkBounds(Object base, int idx) {
if (idx < 0 || idx >= Array.getLength(base)) {
throw new PropertyNotFoundException(
new ArrayIndexOutOfBoundsException(idx).getMessage());
}
}
-private final static int coerce(Object property) {
+private static final int coerce(Object property) {
if (property instanceof Number) {
return ((Number) property).intValue();
}
Modified: tomcat/trunk/java/javax/el/BeanELResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/BeanELResolver.java?rev=1043098&r1=1043097&r2=1043098&view=diff
==
--- tomcat/trunk/java/javax/el/BeanELResolver.java (original)
+++ tomcat/trunk/java/javax/el/BeanELResolver.java Tue Dec 7 15:36:36 2010
@@ -197,7 +197,7 @@ public class BeanELResolver extends ELRe
return null;
}
-protected final static class BeanProperties {
+protected static final class BeanProperties {
private final Map properties;
private final Class type;
@@ -236,7 +236,7 @@ public class BeanELResolver extends ELRe
}
}
-protected final static class BeanProperty {
+protected static final class BeanProperty {
private final Class type;
private final Class owner;
@@ -254,7 +254,8 @@ public class BeanELResolver extends ELRe
}
// Can't use Class because API needs to match specification
-public @SuppressWarnings("rawtypes") Class getPropertyType() {
+@SuppressWarnings("rawtypes")
+public Class getPropertyType() {
return this.type;
}
@@ -310,7 +311,7 @@ public class BeanELResolver extends ELRe
return props.get(ctx, prop);
}
-private final static Method getMethod(Class type, Method m) {
+private static final Method getMethod(Class type, Method m) {
if (m == null || Modifier.isPublic(type.getModifiers())) {
return m;
}
@@ -342,7 +343,7 @@ public class BeanELResolver extends ELRe
return null;
}
-private final static class ConcurrentCache {
+private static final class ConcurrentCache {
private final int size;
private final Map eden;
Modified: tomcat/trunk/java/javax/el/CompositeELResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/CompositeELResolver.java?rev=1043098&r1=1043097&r2=1043098&view=diff
==
--- tomcat/trunk/java/javax/el/CompositeELResolver.java (original)
+++ tomcat/trunk/java/javax/el/CompositeELResolver.java Tue Dec 7 15:36:36 2010
@@ -153,7 +153,7 @@ public class CompositeELResolver extends
return null;
}
-private final static class FeatureIterator implements
Iterator {
+private static final class FeatureIterator implements
Iterator {
private final ELContext context;
Modified: tomcat/trunk/java/javax/el/ELResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/ELResolver.java?rev=1043098&r1=1043097&r2=1
svn commit: r1043099 - in /tomcat/trunk/java/org/apache/el: lang/ELArithmetic.java lang/ELSupport.java lang/ExpressionBuilder.java util/MessageFactory.java
Author: markt
Date: Tue Dec 7 15:38:06 2010
New Revision: 1043099
URL: http://svn.apache.org/viewvc?rev=1043099&view=rev
Log:
Fix modifier order in org.apache.el.*
Modified:
tomcat/trunk/java/org/apache/el/lang/ELArithmetic.java
tomcat/trunk/java/org/apache/el/lang/ELSupport.java
tomcat/trunk/java/org/apache/el/lang/ExpressionBuilder.java
tomcat/trunk/java/org/apache/el/util/MessageFactory.java
Modified: tomcat/trunk/java/org/apache/el/lang/ELArithmetic.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/lang/ELArithmetic.java?rev=1043099&r1=1043098&r2=1043099&view=diff
==
--- tomcat/trunk/java/org/apache/el/lang/ELArithmetic.java (original)
+++ tomcat/trunk/java/org/apache/el/lang/ELArithmetic.java Tue Dec 7 15:38:06
2010
@@ -30,7 +30,7 @@ import org.apache.el.util.MessageFactory
*/
public abstract class ELArithmetic {
-public final static class BigDecimalDelegate extends ELArithmetic {
+public static final class BigDecimalDelegate extends ELArithmetic {
@Override
protected Number add(Number num0, Number num1) {
@@ -78,7 +78,7 @@ public abstract class ELArithmetic {
}
}
-public final static class BigIntegerDelegate extends ELArithmetic {
+public static final class BigIntegerDelegate extends ELArithmetic {
@Override
protected Number add(Number num0, Number num1) {
@@ -123,7 +123,7 @@ public abstract class ELArithmetic {
}
}
-public final static class DoubleDelegate extends ELArithmetic {
+public static final class DoubleDelegate extends ELArithmetic {
@Override
protected Number add(Number num0, Number num1) {
@@ -194,7 +194,7 @@ public abstract class ELArithmetic {
}
}
-public final static class LongDelegate extends ELArithmetic {
+public static final class LongDelegate extends ELArithmetic {
@Override
protected Number add(Number num0, Number num1) {
@@ -239,17 +239,17 @@ public abstract class ELArithmetic {
}
}
-public final static BigDecimalDelegate BIGDECIMAL = new
BigDecimalDelegate();
+public static final BigDecimalDelegate BIGDECIMAL = new
BigDecimalDelegate();
-public final static BigIntegerDelegate BIGINTEGER = new
BigIntegerDelegate();
+public static final BigIntegerDelegate BIGINTEGER = new
BigIntegerDelegate();
-public final static DoubleDelegate DOUBLE = new DoubleDelegate();
+public static final DoubleDelegate DOUBLE = new DoubleDelegate();
-public final static LongDelegate LONG = new LongDelegate();
+public static final LongDelegate LONG = new LongDelegate();
-private final static Long ZERO = new Long(0);
+private static final Long ZERO = new Long(0);
-public final static Number add(final Object obj0, final Object obj1) {
+public static final Number add(final Object obj0, final Object obj1) {
if (obj0 == null && obj1 == null) {
return new Long(0);
}
@@ -270,7 +270,7 @@ public abstract class ELArithmetic {
return delegate.add(num0, num1);
}
-public final static Number mod(final Object obj0, final Object obj1) {
+public static final Number mod(final Object obj0, final Object obj1) {
if (obj0 == null && obj1 == null) {
return new Long(0);
}
@@ -291,7 +291,7 @@ public abstract class ELArithmetic {
return delegate.mod(num0, num1);
}
-public final static Number subtract(final Object obj0, final Object obj1) {
+public static final Number subtract(final Object obj0, final Object obj1) {
if (obj0 == null && obj1 == null) {
return new Long(0);
}
@@ -312,7 +312,7 @@ public abstract class ELArithmetic {
return delegate.subtract(num0, num1);
}
-public final static Number divide(final Object obj0, final Object obj1) {
+public static final Number divide(final Object obj0, final Object obj1) {
if (obj0 == null && obj1 == null) {
return ZERO;
}
@@ -331,7 +331,7 @@ public abstract class ELArithmetic {
return delegate.divide(num0, num1);
}
-public final static Number multiply(final Object obj0, final Object obj1) {
+public static final Number multiply(final Object obj0, final Object obj1) {
if (obj0 == null && obj1 == null) {
return new Long(0);
}
@@ -352,11 +352,11 @@ public abstract class ELArithmetic {
return delegate.multiply(num0, num1);
}
-public final static boolean isNumber(final Object obj) {
+public static final boolean isNumber(final Object obj) {
return (obj != null && isNumberType(obj.getClass()));
}
-public final static boolean isNumberType(final Class type) {
+public static final boolean isNumberType(final Class type) {
return type == Long.
svn commit: r1043101 - in /tomcat/trunk/java/org/apache/jasper: compiler/ el/ runtime/ xmlparser/
Author: markt
Date: Tue Dec 7 15:39:09 2010
New Revision: 1043101
URL: http://svn.apache.org/viewvc?rev=1043101&view=rev
Log:
Fix modifier order in org.apache.jasper.*
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/ELFunctionMapper.java
tomcat/trunk/java/org/apache/jasper/compiler/ELNode.java
tomcat/trunk/java/org/apache/jasper/compiler/JspConfig.java
tomcat/trunk/java/org/apache/jasper/compiler/Node.java
tomcat/trunk/java/org/apache/jasper/el/ELContextImpl.java
tomcat/trunk/java/org/apache/jasper/el/ELResolverImpl.java
tomcat/trunk/java/org/apache/jasper/runtime/JspApplicationContextImpl.java
tomcat/trunk/java/org/apache/jasper/xmlparser/EncodingMap.java
tomcat/trunk/java/org/apache/jasper/xmlparser/XMLEncodingDetector.java
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=1043101&r1=1043100&r2=1043101&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/ELFunctionMapper.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/ELFunctionMapper.java Tue Dec
7 15:39:09 2010
@@ -198,7 +198,7 @@ public class ELFunctionMapper {
// Generate declaration for the map statically
decName = getMapName();
-ss.append("static private
org.apache.jasper.runtime.ProtectedFunctionMapper " + decName + ";\n");
+ss.append("private static
org.apache.jasper.runtime.ProtectedFunctionMapper " + decName + ";\n");
ds.append(" " + decName + "= ");
ds.append("org.apache.jasper.runtime.ProtectedFunctionMapper");
Modified: tomcat/trunk/java/org/apache/jasper/compiler/ELNode.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/ELNode.java?rev=1043101&r1=1043100&r2=1043101&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/ELNode.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/ELNode.java Tue Dec 7
15:39:09 2010
@@ -36,7 +36,7 @@ import org.apache.jasper.JasperException
abstract class ELNode {
-abstract public void accept(Visitor v) throws JasperException;
+public abstract void accept(Visitor v) throws JasperException;
/**
* Child classes
Modified: tomcat/trunk/java/org/apache/jasper/compiler/JspConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/JspConfig.java?rev=1043101&r1=1043100&r2=1043101&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/JspConfig.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/JspConfig.java Tue Dec 7
15:39:09 2010
@@ -45,14 +45,14 @@ public class JspConfig {
private ServletContext ctxt;
private volatile boolean initialized = false;
-private final static String defaultIsXml = null;// unspecified
+private static final String defaultIsXml = null;// unspecified
private String defaultIsELIgnored = null; // unspecified
-private final static String defaultIsScriptingInvalid = null;
+private static final String defaultIsScriptingInvalid = null;
private String defaultDeferedSyntaxAllowedAsLiteral = null;
-private final static String defaultTrimDirectiveWhitespaces = null;
-private final static String defaultDefaultContentType = null;
-private final static String defaultBuffer = null;
-private final static String defaultErrorOnUndeclaredNamespace = "false";
+private static final String defaultTrimDirectiveWhitespaces = null;
+private static final String defaultDefaultContentType = null;
+private static final String defaultBuffer = null;
+private static final String defaultErrorOnUndeclaredNamespace = "false";
private JspProperty defaultJspProperty;
public JspConfig(ServletContext ctxt) {
@@ -515,7 +515,7 @@ public class JspConfig {
}
}
-static public class JspProperty {
+public static class JspProperty {
private String isXml;
private String elIgnored;
Modified: tomcat/trunk/java/org/apache/jasper/compiler/Node.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Node.java?rev=1043101&r1=1043100&r2=1043101&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/Node.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Node.java Tue Dec 7 15:39:09
2010
@@ -815,7 +815,7 @@ abstract class Node implements TagConsta
/**
* Represents an expression, declaration, or scriptlet
*/
-public static abstract class ScriptingElement extends Node {
+public abstract static class Scr
svn commit: r1043103 - in /tomcat/trunk/java/org/apache/tomcat: jni/ util/ util/bcel/ util/digester/ util/http/mapper/ util/modeler/ util/net/ util/res/
Author: markt
Date: Tue Dec 7 15:40:06 2010
New Revision: 1043103
URL: http://svn.apache.org/viewvc?rev=1043103&view=rev
Log:
Fix modifier order in org.apache.tomcat.*
Modified:
tomcat/trunk/java/org/apache/tomcat/jni/Library.java
tomcat/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/Constants.java
tomcat/trunk/java/org/apache/tomcat/util/digester/AbstractObjectCreationFactory.java
tomcat/trunk/java/org/apache/tomcat/util/digester/AbstractRulesImpl.java
tomcat/trunk/java/org/apache/tomcat/util/http/mapper/Mapper.java
tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java
tomcat/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java
tomcat/trunk/java/org/apache/tomcat/util/net/SSLImplementation.java
tomcat/trunk/java/org/apache/tomcat/util/res/StringManager.java
Modified: tomcat/trunk/java/org/apache/tomcat/jni/Library.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/Library.java?rev=1043103&r1=1043102&r2=1043103&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/jni/Library.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/jni/Library.java Tue Dec 7 15:40:06
2010
@@ -32,7 +32,7 @@ public final class Library {
/*
* A handle to the unique Library singleton instance.
*/
-static private Library _instance = null;
+private static Library _instance = null;
private Library()
throws Exception
@@ -163,7 +163,7 @@ public final class Library {
* called for any APR library.
* @param libraryName the name of the library to load
*/
-static public boolean initialize(String libraryName)
+public static boolean initialize(String libraryName)
throws Exception
{
if (_instance == null) {
Modified: tomcat/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java?rev=1043103&r1=1043102&r2=1043103&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java Tue Dec 7
15:40:06 2010
@@ -231,7 +231,7 @@ public final class IntrospectionUtils {
}
}
-public final static String PATH_SEPARATOR =
System.getProperty("path.separator");
+public static final String PATH_SEPARATOR =
System.getProperty("path.separator");
/**
* Adds classpath entries from a vector of URL's to the "tc_path_add"
System
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/Constants.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/Constants.java?rev=1043103&r1=1043102&r2=1043103&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/Constants.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/Constants.java Tue Dec 7
15:40:06 2010
@@ -27,71 +27,71 @@ public interface Constants {
/** One of the access flags for fields, methods, or classes.
*/
- public final static short ACC_FINAL= 0x0010;
+ public static final short ACC_FINAL= 0x0010;
/** One of the access flags for fields, methods, or classes.
*/
- public final static short ACC_INTERFACE= 0x0200;
+ public static final short ACC_INTERFACE= 0x0200;
/** One of the access flags for fields, methods, or classes.
*/
- public final static short ACC_ABSTRACT = 0x0400;
+ public static final short ACC_ABSTRACT = 0x0400;
/** One of the access flags for fields, methods, or classes.
*/
- public final static short ACC_ENUM = 0x4000;
+ public static final short ACC_ENUM = 0x4000;
// Applies to classes compiled by new compilers only
/** One of the access flags for fields, methods, or classes.
*/
- public final static short ACC_SUPER= 0x0020;
+ public static final short ACC_SUPER= 0x0020;
/** One of the access flags for fields, methods, or classes.
*/
- public final static short MAX_ACC_FLAG = ACC_ENUM;
+ public static final short MAX_ACC_FLAG = ACC_ENUM;
/** The names of the access flags. */
- public final static String[] ACCESS_NAMES = {
+ public static final String[] ACCESS_NAMES = {
"public", "private", "protected", "static", "final", "synchronized",
"volatile", "transient", "native", "interface", "abstract", "strictfp",
"synthetic", "annotation", "enum"
};
/** Marks a constant pool entry as type UTF-8. */
- public final static byte CONSTANT_Utf8 = 1;
+ public static final byte CONSTANT_Utf8 = 1;
/** Marks a constant pool entry as type Integer. */
- public fi
svn commit: r1043104 - in /tomcat/trunk/java/org/apache/naming: StringManager.java resources/ResourceAttributes.java
Author: markt
Date: Tue Dec 7 15:40:49 2010
New Revision: 1043104
URL: http://svn.apache.org/viewvc?rev=1043104&view=rev
Log:
Fix modifier order in org.apache.naming.*
Modified:
tomcat/trunk/java/org/apache/naming/StringManager.java
tomcat/trunk/java/org/apache/naming/resources/ResourceAttributes.java
Modified: tomcat/trunk/java/org/apache/naming/StringManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/StringManager.java?rev=1043104&r1=1043103&r2=1043104&view=diff
==
--- tomcat/trunk/java/org/apache/naming/StringManager.java (original)
+++ tomcat/trunk/java/org/apache/naming/StringManager.java Tue Dec 7 15:40:49
2010
@@ -159,7 +159,7 @@ public class StringManager {
*
* @param packageName The package name
*/
-public synchronized static final StringManager getManager(String
packageName) {
+public static final synchronized StringManager getManager(String
packageName) {
StringManager mgr = managers.get(packageName);
if (mgr == null) {
mgr = new StringManager(packageName);
Modified: tomcat/trunk/java/org/apache/naming/resources/ResourceAttributes.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/resources/ResourceAttributes.java?rev=1043104&r1=1043103&r2=1043104&view=diff
==
--- tomcat/trunk/java/org/apache/naming/resources/ResourceAttributes.java
(original)
+++ tomcat/trunk/java/org/apache/naming/resources/ResourceAttributes.java Tue
Dec 7 15:40:49 2010
@@ -152,7 +152,7 @@ public class ResourceAttributes implemen
};
-protected final static TimeZone gmtZone = TimeZone.getTimeZone("GMT");
+protected static final TimeZone gmtZone = TimeZone.getTimeZone("GMT");
/**
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1043105 - in /tomcat/trunk/java/org/apache/catalina: authenticator/ core/ filters/ mbeans/ realm/ security/ ssi/ tribes/util/ util/
Author: markt
Date: Tue Dec 7 15:42:32 2010
New Revision: 1043105
URL: http://svn.apache.org/viewvc?rev=1043105&view=rev
Log:
Fix modifier order in org.apache.catalina.*
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterChain.java
tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java
tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java
tomcat/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java
tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java
tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java
tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
tomcat/trunk/java/org/apache/catalina/security/SecurityConfig.java
tomcat/trunk/java/org/apache/catalina/security/SecurityUtil.java
tomcat/trunk/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIEcho.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIExec.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIFsize.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIMediator.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIProcessor.java
tomcat/trunk/java/org/apache/catalina/tribes/util/StringManager.java
tomcat/trunk/java/org/apache/catalina/util/Base64.java
tomcat/trunk/java/org/apache/catalina/util/DateTool.java
tomcat/trunk/java/org/apache/catalina/util/IOTools.java
tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java
tomcat/trunk/java/org/apache/catalina/util/MIME2Java.java
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java?rev=1043105&r1=1043104&r2=1043105&view=diff
==
---
tomcat/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/authenticator/DigestAuthenticator.java
Tue Dec 7 15:42:32 2010
@@ -87,7 +87,7 @@ public class DigestAuthenticator
/**
* MD5 message digest provider.
*/
-protected volatile static MessageDigest md5Helper;
+protected static volatile MessageDigest md5Helper;
/**
Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterChain.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterChain.java?rev=1043105&r1=1043104&r2=1043105&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterChain.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterChain.java Tue
Dec 7 15:42:32 2010
@@ -57,8 +57,8 @@ import org.apache.tomcat.util.res.String
final class ApplicationFilterChain implements FilterChain, CometFilterChain {
// Used to enforce requirements of SRV.8.2 / SRV.14.2.5.1
-private final static ThreadLocal lastServicedRequest;
-private final static ThreadLocal lastServicedResponse;
+private static final ThreadLocal lastServicedRequest;
+private static final ThreadLocal lastServicedResponse;
static {
if (ApplicationDispatcher.WRAP_SAME_OBJECT) {
Modified: tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java?rev=1043105&r1=1043104&r2=1043105&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java Tue Dec 7
15:42:32 2010
@@ -418,9 +418,9 @@ public class ExpiresFilter extends Filte
return new Duration(amount, DurationUnit.SECOND);
}
-final protected int amount;
+protected final int amount;
-final protected DurationUnit unit;
+protected final DurationUnit unit;
public Duration(int amount, DurationUnit unit) {
super();
Modified: tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java?rev=1043105&r1=1043104&r2=1043105&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java Tue Dec
7 15:42:32 2010
@@ -417,7 +417,7 @@ import org.apache.juli.logging.LogFactor
public class RemoteIpFilter implements Filter {
public static class XForwardedRequest extends HttpServletRequestWrapper {
-final static ThreadLocal threadLocalDateForma
svn commit: r1043106 - in /tomcat/trunk: build.xml checkstyle.xml test/org/apache/catalina/valves/Benchmarks.java test/org/apache/tomcat/util/http/CookiesBaseTest.java
Author: markt
Date: Tue Dec 7 15:43:37 2010
New Revision: 1043106
URL: http://svn.apache.org/viewvc?rev=1043106&view=rev
Log:
Add checkstyle rule for modifier order and fix remaining issues in current code
base
Modified:
tomcat/trunk/build.xml
tomcat/trunk/checkstyle.xml
tomcat/trunk/test/org/apache/catalina/valves/Benchmarks.java
tomcat/trunk/test/org/apache/tomcat/util/http/CookiesBaseTest.java
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1043106&r1=1043105&r2=1043106&view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Tue Dec 7 15:43:37 2010
@@ -431,6 +431,8 @@
+
+
Modified: tomcat/trunk/checkstyle.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/checkstyle.xml?rev=1043106&r1=1043105&r2=1043106&view=diff
==
--- tomcat/trunk/checkstyle.xml (original)
+++ tomcat/trunk/checkstyle.xml Tue Dec 7 15:43:37 2010
@@ -44,9 +44,7 @@
-
Modified: tomcat/trunk/test/org/apache/catalina/valves/Benchmarks.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/valves/Benchmarks.java?rev=1043106&r1=1043105&r2=1043106&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/valves/Benchmarks.java (original)
+++ tomcat/trunk/test/org/apache/catalina/valves/Benchmarks.java Tue Dec 7
15:43:37 2010
@@ -182,7 +182,7 @@ public class Benchmarks extends TestCase
benchmark.doTest(5, tests);
}
-private static abstract class TimeDateElementBenchmarkTestBase {
+private abstract static class TimeDateElementBenchmarkTestBase {
protected static final String months[] = { "Jan", "Feb", "Mar", "Apr",
"May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" };
Modified: tomcat/trunk/test/org/apache/tomcat/util/http/CookiesBaseTest.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/http/CookiesBaseTest.java?rev=1043106&r1=1043105&r2=1043106&view=diff
==
--- tomcat/trunk/test/org/apache/tomcat/util/http/CookiesBaseTest.java
(original)
+++ tomcat/trunk/test/org/apache/tomcat/util/http/CookiesBaseTest.java Tue Dec
7 15:43:37 2010
@@ -30,7 +30,7 @@ import org.apache.catalina.startup.Tomca
/**
* Base Test case for {...@link Cookies}. Note because of the use of
- * final static constants in {...@link Cookies}, each of these
tests
+ * static final constants in {...@link Cookies}, each of these
tests
* must be executed in a new JVM instance. The tests have been place in
separate
* classes to facilitate this when running the unit tests via Ant.
*/
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1042786 - in /tomcat/trunk/java/org/apache: catalina/core/ catalina/loader/ tomcat/util/threads/
On 07/12/2010 14:48, Konstantin Kolinko wrote: > 2010/12/7 Mark Thomas : >> >> My preference is for operator before since I believe it aids readability. >> YMMV. >> >>> So is operator after line wrapping really a tomcat standard? >> >> operator before line wrapping is the direction the code is heading in and >> the direction I think it should continue to head. >> > > My personal preference is that the new code formatting were more or > less consistent with the rest of the file. +1 > Trying to enforce a style here goes nowhere: such changes cannot be > backported to TC6, and you cannot limit checkstyle to check only files > created after certain date. Before any checkstyle check can be enabled, the whole code-base has to be changed to conform to the check. This tends to be something I do when I have spare 30 mins I can't do anything else in, I'm stuck somewhere without internet connectivity or I just feel the need to do something fairly mindless for a while. I usually add the checks I am thinking of working on to the checksyle file in advance of doing the work - commented out with an indication of the current number of failures - to give folks a chance to comment. > If you have some "long string" that occupies all space up to position > 79, forcing some operator after it to stay on the same line > effectively increases its length by several chars and will cause the > whole string to be placed on the new line. It just wastes space and > becomes ugly. +1. Line length is an area I am becoming increasingly happy to be flexible. Aim for 80 but if 81 or 82 (or anything < ~90) makes the code more readable then I'd be fine with it. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1042482 - in /tomcat/trunk: ./ conf/ java/org/apache/catalina/core/ java/org/apache/catalina/loader/ java/org/apache/tomcat/util/threads/ res/confinstall/ webapps/ webapps/docs/ weba
On 7 déc. 2010, at 09:41, Rainer Jung wrote: >> > > Just in case Mark's remark a) wasn't clear: after building Tomcat you can > debug inside the sub directory output/build which contains a full > installation. I had understood Mark, but it's not practical for debugging... I prefer to debug tomcat within eclipse and use the classes compiled by eclipse. I'll just ignore the work and log directories when committing changes. Though if we could ignore them that would be nice... - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1043153 - in /tomcat/trunk/java/org/apache: catalina/tribes/membership/Membership.java tomcat/util/net/URL.java
Author: markt
Date: Tue Dec 7 18:05:31 2010
New Revision: 1043153
URL: http://svn.apache.org/viewvc?rev=1043153&view=rev
Log:
Fix a couple of 'high priority' FindBugs warnings
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/membership/Membership.java
tomcat/trunk/java/org/apache/tomcat/util/net/URL.java
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/membership/Membership.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/Membership.java?rev=1043153&r1=1043152&r2=1043153&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/tribes/membership/Membership.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/membership/Membership.java Tue
Dec 7 18:05:31 2010
@@ -18,6 +18,7 @@
package org.apache.catalina.tribes.membership;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Comparator;
@@ -37,8 +38,8 @@ import org.apache.catalina.tribes.Member
* @author Peter Rossbach
* @version $Id$
*/
-public class Membership
-{
+public class Membership implements Cloneable {
+
protected static final MemberImpl[] EMPTY_MEMBERS = new MemberImpl[0];
private final Object membersLock = new Object();
@@ -270,8 +271,12 @@ public class Membership
// - Inner Class
-private class MemberComparator implements Comparator {
+private static class MemberComparator implements Comparator,
+Serializable {
+
+private static final long serialVersionUID = 1L;
+@Override
public int compare(Member m1, Member m2) {
//longer alive time, means sort first
long result = m2.getMemberAliveTime() - m1.getMemberAliveTime();
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/URL.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/URL.java?rev=1043153&r1=1043152&r2=1043153&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/URL.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/URL.java Tue Dec 7 18:05:31
2010
@@ -316,6 +316,20 @@ public final class URL implements Serial
}
+@Override
+public int hashCode() {
+final int prime = 31;
+int result = 1;
+result = prime * result + ((file == null) ? 0 : file.hashCode());
+result = prime * result + ((host == null) ? 0 : host.hashCode());
+result = prime * result + port;
+result = prime * result +
+((protocol == null) ? 0 : protocol.hashCode());
+result = prime * result + ((ref == null) ? 0 : ref.hashCode());
+return result;
+}
+
+
/**
* Return the authority part of the URL.
*/
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1043157 - in /tomcat/trunk/java: javax/el/ExpressionFactory.java org/apache/catalina/core/StandardContext.java org/apache/jasper/compiler/JDTCompiler.java org/apache/tomcat/util/net/NioEn
Author: markt
Date: Tue Dec 7 18:36:39 2010
New Revision: 1043157
URL: http://svn.apache.org/viewvc?rev=1043157&view=rev
Log:
Fix some FindBugs warnings - all unclosed streams. These could potentially lead
to locked files and maybe memory leaks.
Fix some other simple FindBugs/Eclipse warnings in affected files.
Modified:
tomcat/trunk/java/javax/el/ExpressionFactory.java
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/trunk/java/org/apache/jasper/compiler/JDTCompiler.java
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
Modified: tomcat/trunk/java/javax/el/ExpressionFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/ExpressionFactory.java?rev=1043157&r1=1043156&r2=1043157&view=diff
==
--- tomcat/trunk/java/javax/el/ExpressionFactory.java (original)
+++ tomcat/trunk/java/javax/el/ExpressionFactory.java Tue Dec 7 18:36:39 2010
@@ -219,9 +219,9 @@ public abstract class ExpressionFactory
if (is != null) {
String line = null;
+BufferedReader br = null;
try {
-BufferedReader br =
-new BufferedReader(new InputStreamReader(is, "UTF-8"));
+br = new BufferedReader(new InputStreamReader(is, "UTF-8"));
line = br.readLine();
if (line != null && line.trim().length() > 0) {
return line.trim();
@@ -234,10 +234,13 @@ public abstract class ExpressionFactory
e);
} finally {
try {
+if (br != null) {
+br.close();
+}
+} catch (IOException ioe) {/*Ignore*/}
+try {
is.close();
-} catch (IOException ioe) {
-// Ignore
-}
+} catch (IOException ioe) {/*Ignore*/}
}
}
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1043157&r1=1043156&r2=1043157&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Tue Dec 7
18:36:39 2010
@@ -5897,21 +5897,26 @@ public class StandardContext extends Con
if (stream == null) {
return "";
}
-BufferedReader br = new BufferedReader(
-new InputStreamReader(stream));
StringBuilder sb = new StringBuilder();
-String strRead = "";
+BufferedReader br = null;
try {
+br = new BufferedReader(new InputStreamReader(stream));
+String strRead = "";
while (strRead != null) {
sb.append(strRead);
strRead = br.readLine();
}
} catch (IOException e) {
return "";
+} finally {
+if (br != null) {
+try {
+br.close();
+} catch (IOException ioe) {/*Ignore*/}
+}
}
return sb.toString();
-
}
Modified: tomcat/trunk/java/org/apache/jasper/compiler/JDTCompiler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/JDTCompiler.java?rev=1043157&r1=1043156&r2=1043157&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/JDTCompiler.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/JDTCompiler.java Tue Dec 7
18:36:39 2010
@@ -98,17 +98,21 @@ public class JDTCompiler extends org.apa
this.sourceFile = sourceFile;
}
+@Override
public char[] getFileName() {
return sourceFile.toCharArray();
}
+@Override
public char[] getContents() {
char[] result = null;
FileInputStream is = null;
+Reader reader = null;
try {
is = new FileInputStream(sourceFile);
-Reader reader =
-new BufferedReader(new InputStreamReader(is,
ctxt.getOptions().getJavaEncoding()));
+
+reader = new BufferedReader(new InputStreamReader(is,
+ctxt.getOptions().getJavaEncoding()));
char[] chars = new char[8192];
StringBuilder buf = new StringBuilder();
int count;
@@ -121,17 +125,21 @@ public class JDTCompiler extends org.apa
} catch (IOExceptio
Re: svn commit: r1042482 - in /tomcat/trunk: ./ conf/ java/org/apache/catalina/core/ java/org/apache/catalina/loader/ java/org/apache/tomcat/util/threads/ res/confinstall/ webapps/ webapps/docs/ weba
On 07/12/2010 17:49, Sylvain Laurent wrote: > > On 7 déc. 2010, at 09:41, Rainer Jung wrote: >>> >> >> Just in case Mark's remark a) wasn't clear: after building Tomcat >> you can debug inside the sub directory output/build which contains >> a full installation. > > I had understood Mark, but it's not practical for debugging... I > prefer to debug tomcat within eclipse and use the classes compiled by > eclipse. I'll just ignore the work and log directories when > committing changes. Though if we could ignore them that would be > nice... Debugging that way isn't something I would want to do or recommend that others do but if it works for you, lets not make your life difficult. My previous veto was due to: a) I thought it was bad practice (too easy to commit local changes to config files, too easy to include local changes in a release build) and b) because it reverted a change I needed. I won't object to adding the ignores you need providing that build.xml is updated to ensure that they are also ignored as part of any build. A quick glance shows temp, work and logs should be OK but conf/ will need a change or two to ensure it is ignored. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1042786 - in /tomcat/trunk/java/org/apache: catalina/core/ catalina/loader/ tomcat/util/threads/
On 7 déc. 2010, at 17:35, Mark Thomas wrote: > +1. Line length is an area I am becoming increasingly happy to be > flexible. Aim for 80 but if 81 or 82 (or anything < ~90) makes the code > more readable then I'd be fine with it. As a rookie, I did not want to start bothering you with this, but since you bring the topic... I think 80 is somewhat outdated: screens are now bigger, and especially wider (16:9 vs 4:3). I think we should allow a greater line length to reduce the code height (the number of lines). My preference is 100 characters per line. Sylvain - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1042786 - in /tomcat/trunk/java/org/apache: catalina/core/ catalina/loader/ tomcat/util/threads/
On 07/12/2010 22:22, Sylvain Laurent wrote: > > On 7 déc. 2010, at 17:35, Mark Thomas wrote: >> +1. Line length is an area I am becoming increasingly happy to be >> flexible. Aim for 80 but if 81 or 82 (or anything < ~90) makes the code >> more readable then I'd be fine with it. > > As a rookie, I did not want to start bothering you with this, but since you > bring the topic... We are both committers and so your opinion holds as much weight as mine or any other committer. > I think 80 is somewhat outdated: screens are now bigger, and especially wider > (16:9 vs 4:3). > I think we should allow a greater line length to reduce the code height (the > number of lines). > My preference is 100 characters per line. That is a fair point. The times I work on a screen where >80 is an issue are far, far fewer than the times when a longer line length would make the code more readable. The way I like to have my IDE set up, 100 is a little too wide. 90 is manageable which is why I said usually 80 with the flexibility to go to 90 if it makes the code more readable. Of course, I have been looking for an excuse to buy myself a nice new wide-screen monitor ;) Based on a couple of classes I have been working on recently, a longer line length doesn't seem to offer too much in the way of fewer lines. My guess is 80->90 reduces line count by ~3% and 90->100 by a similar amount. I am sure it will vary by class. My own view is that we should generally stick to 80 but treat it as a guideline and use longer lines where it improves readability but lines longer than 90 really should be the exception when there is no place available to break the line. As I said, all this is just my opinion. There is no formal limit but the current code generally sticks to 80. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1043260 - /tomcat/trunk/java/org/apache/catalina/tribes/group/AbsoluteOrder.java
Author: markt
Date: Wed Dec 8 01:01:56 2010
New Revision: 1043260
URL: http://svn.apache.org/viewvc?rev=1043260&view=rev
Log:
Another Findbugs niggle
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/AbsoluteOrder.java
Modified: tomcat/trunk/java/org/apache/catalina/tribes/group/AbsoluteOrder.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/AbsoluteOrder.java?rev=1043260&r1=1043259&r2=1043260&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/tribes/group/AbsoluteOrder.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/group/AbsoluteOrder.java Wed
Dec 8 01:01:56 2010
@@ -16,6 +16,7 @@
*/
package org.apache.catalina.tribes.group;
+import java.io.Serializable;
import java.util.Arrays;
import java.util.Comparator;
@@ -57,7 +58,12 @@ public class AbsoluteOrder {
}
-public static class AbsoluteComparator implements Comparator {
+public static class AbsoluteComparator implements Comparator,
+Serializable {
+
+private static final long serialVersionUID = 1L;
+
+@Override
public int compare(Member m1, Member m2) {
int result = compareIps(m1,m2);
if ( result == 0 ) result = comparePorts(m1,m2);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1043263 - in /tomcat/trunk/java/org/apache/jasper: Constants.java compiler/AntCompiler.java
Author: markt
Date: Wed Dec 8 01:12:03 2010
New Revision: 1043263
URL: http://svn.apache.org/viewvc?rev=1043263&view=rev
Log:
Jasper should not depend on Catalina
Re-use constants where possible
Fix a FindBugs niggle
Modified:
tomcat/trunk/java/org/apache/jasper/Constants.java
tomcat/trunk/java/org/apache/jasper/compiler/AntCompiler.java
Modified: tomcat/trunk/java/org/apache/jasper/Constants.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/Constants.java?rev=1043263&r1=1043262&r2=1043263&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/Constants.java (original)
+++ tomcat/trunk/java/org/apache/jasper/Constants.java Wed Dec 8 01:12:03 2010
@@ -214,4 +214,15 @@ public class Constants {
System.getProperty("org.apache.catalina.SESSION_PARAMETER_NAME",
"jsessionid");
+/**
+ * Name of the system property containing
+ * the tomcat product installation path
+ */
+public static final String CATALINA_HOME_PROP = "catalina.home";
+
+/**
+ * Name of the system property containing
+ * the tomcat instance installation path
+ */
+public static final String CATALINA_BASE_PROP = "catalina.base";
}
Modified: tomcat/trunk/java/org/apache/jasper/compiler/AntCompiler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/AntCompiler.java?rev=1043263&r1=1043262&r2=1043263&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/AntCompiler.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/AntCompiler.java Wed Dec 8
01:12:03 2010
@@ -24,7 +24,7 @@ import java.io.IOException;
import java.io.PrintStream;
import java.util.StringTokenizer;
-import org.apache.catalina.Globals;
+import org.apache.jasper.Constants;
import org.apache.jasper.JasperException;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
@@ -75,8 +75,8 @@ public class AntCompiler extends Compile
logger.setErrorPrintStream(System.err);
logger.setMessageOutputLevel(Project.MSG_INFO);
project.addBuildListener( logger);
-if (System.getProperty(Globals.CATALINA_HOME_PROP) != null) {
-project.setBasedir(System.getProperty(Globals.CATALINA_HOME_PROP));
+if (System.getProperty(Constants.CATALINA_HOME_PROP) != null) {
+
project.setBasedir(System.getProperty(Constants.CATALINA_HOME_PROP));
}
if( options.getCompiler() != null ) {
@@ -88,7 +88,7 @@ public class AntCompiler extends Compile
return project;
}
-public class JasperAntLogger extends DefaultLogger {
+public static class JasperAntLogger extends DefaultLogger {
protected StringBuilder reportBuf = new StringBuilder();
@@ -101,7 +101,7 @@ public class AntCompiler extends Compile
@Override
protected void log(String message) {
reportBuf.append(message);
-reportBuf.append(System.getProperty("line.separator"));
+reportBuf.append(Constants.NEWLINE);
}
protected String getReport() {
@@ -245,7 +245,7 @@ public class AntCompiler extends Compile
// Stop capturing the System.err output for this thread
String errorCapture = SystemLogHandler.unsetThread();
if (errorCapture != null) {
-errorReport.append(System.getProperty("line.separator"));
+errorReport.append(Constants.NEWLINE);
errorReport.append(errorCapture);
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1043265 - /tomcat/trunk/java/org/apache/catalina/Globals.java
Author: markt
Date: Wed Dec 8 01:14:43 2010
New Revision: 1043265
URL: http://svn.apache.org/viewvc?rev=1043265&view=rev
Log:
Remove unused code.
Make spacing consistent.
Modified:
tomcat/trunk/java/org/apache/catalina/Globals.java
Modified: tomcat/trunk/java/org/apache/catalina/Globals.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Globals.java?rev=1043265&r1=1043264&r2=1043265&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/Globals.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Globals.java Wed Dec 8 01:14:43 2010
@@ -35,6 +35,7 @@ public final class Globals {
public static final String ALT_DD_ATTR =
"org.apache.catalina.deploy.alt_dd";
+
/**
* The request attribute under which we store the array of X509Certificate
* objects representing the certificate chain presented by our client,
@@ -43,6 +44,7 @@ public final class Globals {
public static final String CERTIFICATES_ATTR =
"javax.servlet.request.X509Certificate";
+
/**
* The request attribute under which we store the name of the cipher suite
* being used on an SSL connection (as an object of type
@@ -53,24 +55,19 @@ public final class Globals {
/**
- * The servlet context attribute under which we store the class loader
- * used for loading servlets (as an object of type java.lang.ClassLoader).
- */
-public static final String CLASS_LOADER_ATTR =
-"org.apache.catalina.classloader";
-
-/**
* Request dispatcher state.
*/
public static final String DISPATCHER_TYPE_ATTR =
"org.apache.catalina.core.DISPATCHER_TYPE";
+
/**
* Request dispatcher path.
*/
public static final String DISPATCHER_REQUEST_PATH_ATTR =
"org.apache.catalina.core.DISPATCHER_REQUEST_PATH";
+
/**
* The JNDI directory context which is associated with the context. This
* context can be used to manipulate static files.
@@ -119,6 +116,7 @@ public final class Globals {
public static final String ERROR_MESSAGE_ATTR =
"javax.servlet.error.message";
+
/**
* The request attribute under which we store the key size being used for
* this SSL connection (as an object of type java.lang.Integer).
@@ -126,6 +124,7 @@ public final class Globals {
public static final String KEY_SIZE_ATTR =
"javax.servlet.request.key_size";
+
/**
* The request attribute under which we store the session id being used
* for this SSL connection (as an object of type java.lang.String).
@@ -167,12 +166,6 @@ public final class Globals {
/**
- * Platform specific new line sequence.
- */
-public static final String NEWLINE = System.getProperty("line.separator");
-
-
-/**
* The request attribute under which the request URI of the included
* servlet is stored on an included dispatcher request.
*/
@@ -287,14 +280,6 @@ public final class Globals {
/**
- * The servlet context attribute under which we record the set of
- * welcome files (as an object of type String[]) for this application.
- */
-public static final String WELCOME_FILES_ATTR =
-"org.apache.catalina.WELCOME_FILES";
-
-
-/**
* The master flag which controls strict servlet specification
* compliance.
*/
@@ -320,12 +305,14 @@ public final class Globals {
*/
public static final String DEFAULT_MBEAN_DOMAIN = "Catalina";
+
/**
* Name of the system property containing
* the tomcat product installation path
*/
public static final String CATALINA_HOME_PROP = "catalina.home";
+
/**
* Name of the system property containing
* the tomcat instance installation path
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1043269 - /tomcat/trunk/java/org/apache/catalina/ant/BaseRedirectorHelperTask.java
Author: markt
Date: Wed Dec 8 01:21:12 2010
New Revision: 1043269
URL: http://svn.apache.org/viewvc?rev=1043269&view=rev
Log:
Remove unused code
Modified:
tomcat/trunk/java/org/apache/catalina/ant/BaseRedirectorHelperTask.java
Modified:
tomcat/trunk/java/org/apache/catalina/ant/BaseRedirectorHelperTask.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/BaseRedirectorHelperTask.java?rev=1043269&r1=1043268&r2=1043269&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ant/BaseRedirectorHelperTask.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ant/BaseRedirectorHelperTask.java Wed
Dec 8 01:21:12 2010
@@ -358,19 +358,4 @@ public abstract class BaseRedirectorHelp
handleOutput(output);
}
}
-
-/**
- * Handles output with ERR priority to error stream and all other
- * priorities to output stream, then flushes the stream.
- *
- * @param output The output to log. Should not be null.
- */
-protected void handleFlush(String output, int priority) {
-if (priority == Project.MSG_ERR) {
-handleErrorFlush(output);
-} else {
-handleFlush(output);
-}
-}
-
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1043272 - in /tomcat/trunk/java/org/apache/catalina: LifecycleEvent.java authenticator/Constants.java authenticator/SavedRequest.java
Author: markt
Date: Wed Dec 8 01:31:51 2010
New Revision: 1043272
URL: http://svn.apache.org/viewvc?rev=1043272&view=rev
Log:
Remove unused code
Modified:
tomcat/trunk/java/org/apache/catalina/LifecycleEvent.java
tomcat/trunk/java/org/apache/catalina/authenticator/Constants.java
tomcat/trunk/java/org/apache/catalina/authenticator/SavedRequest.java
Modified: tomcat/trunk/java/org/apache/catalina/LifecycleEvent.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/LifecycleEvent.java?rev=1043272&r1=1043271&r2=1043272&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/LifecycleEvent.java (original)
+++ tomcat/trunk/java/org/apache/catalina/LifecycleEvent.java Wed Dec 8
01:31:51 2010
@@ -39,20 +39,6 @@ public final class LifecycleEvent extend
// --- Constructors
-
-/**
- * Construct a new LifecycleEvent with the specified parameters.
- *
- * @param lifecycle Component on which this event occurred
- * @param type Event type (required)
- */
-public LifecycleEvent(Lifecycle lifecycle, String type) {
-
-this(lifecycle, type, null);
-
-}
-
-
/**
* Construct a new LifecycleEvent with the specified parameters.
*
Modified: tomcat/trunk/java/org/apache/catalina/authenticator/Constants.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/Constants.java?rev=1043272&r1=1043271&r2=1043272&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/authenticator/Constants.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/Constants.java Wed Dec
8 01:31:51 2010
@@ -29,11 +29,6 @@ public class Constants {
public static final String DIGEST_METHOD = "DIGEST";
public static final String FORM_METHOD = "FORM";
-// User data constraints for transport guarantee
-public static final String NONE_TRANSPORT = "NONE";
-public static final String INTEGRAL_TRANSPORT = "INTEGRAL";
-public static final String CONFIDENTIAL_TRANSPORT = "CONFIDENTIAL";
-
// Form based authentication constants
public static final String FORM_ACTION = "/j_security_check";
public static final String FORM_PASSWORD = "j_password";
@@ -48,42 +43,6 @@ public class Constants {
// - Request Notes
-
-/**
- * If a user has been authenticated by the web layer, by means of a
- * login method other than CLIENT_CERT, the username and password
- * used to authenticate the user will be attached to the request as
- * Notes for use by other server components. A server component can
- * also call several existing methods on Request to determine whether
- * or not any user has been authenticated:
- *
- * request.getAuthType()
- * will return BASIC, CLIENT_CERT, DIGEST, FORM, or null
- * if there is no authenticated user.
- * request.getUserPrincipal()
- * will return the authenticated Principal returned by the
- * Realm that authenticated this user.
- *
- * If CLIENT_CERT authentication was performed, the certificate chain
- * will be available as a request attribute, as defined in the
- * servlet specification.
- */
-
-
-/**
- * The notes key for the password used to authenticate this user.
- */
-public static final String REQ_PASSWORD_NOTE =
- "org.apache.catalina.request.PASSWORD";
-
-
-/**
- * The notes key for the username used to authenticate this user.
- */
-public static final String REQ_USERNAME_NOTE =
- "org.apache.catalina.request.USERNAME";
-
-
/**
* The notes key to track the single-sign-on identity with which this
* request is associated.
Modified: tomcat/trunk/java/org/apache/catalina/authenticator/SavedRequest.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/SavedRequest.java?rev=1043272&r1=1043271&r2=1043272&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/authenticator/SavedRequest.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/SavedRequest.java Wed
Dec 8 01:31:51 2010
@@ -118,28 +118,6 @@ public final class SavedRequest {
}
-
-/**
- * The set of request parameters associated with this Request. Each
- * entry is keyed by the parameter name, pointing at a String array of
- * the corresponding values.
- */
-private HashMap parameters =
-new HashMap();
-
-public void addParameter(String name, String values[]) {
-parameters.put(name, values);
-}
-
-public Iterator getParameterNames() {
-return (parameters.keySet().itera
Re: svn commit: r1042786 - in /tomcat/trunk/java/org/apache: catalina/core/ catalina/loader/ tomcat/util/threads/
2010/12/8 Sylvain Laurent : > > On 7 déc. 2010, at 17:35, Mark Thomas wrote: >> +1. Line length is an area I am becoming increasingly happy to be >> flexible. Aim for 80 but if 81 or 82 (or anything < ~90) makes the code >> more readable then I'd be fine with it. > > As a rookie, I did not want to start bothering you with this, but since you > bring the topic... > I think 80 is somewhat outdated: screens are now bigger, and especially wider > (16:9 vs 4:3). > I think we should allow a greater line length to reduce the code height (the > number of lines). > My preference is 100 characters per line. IDEs are fine, but long lines are hard to deal with 1) in commit e-mails - they become wrapped 2) in side-by-side diffs Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
