DO NOT REPLY [Bug 48105] Transfering PNG using getResponse().getOutputStream()
https://issues.apache.org/bugzilla/show_bug.cgi?id=48105
--- Comment #6 from Stefan Schumacher
2009-11-04 00:26:51 UTC ---
Enclosed a call stack using mod_jk...additional stacktrace using Tomcat 6.*
will be delivered today.
T_1223033e029_SEVERE 2009-06-30T11:07:01,929 java.lang.System.arraycopy
Version 7.1.0.${p4.changelist}
Additional information:
ServletOutputStream.write
Exception class: class java.lang.ArrayIndexOutOfBoundsException
HttpServletResponse getBufferSize: 8184
HttpServletResponse getCharacterEncoding: UTF-8
HttpServletResponse getContentType: image/png;charset=UTF-8
HttpServletResponse getLocale: en_US
FileInputStream class: class java.io.FileInputStream
FileInputStream toString: java.io.fileinputstr...@1bf446e
FileInputStream available: 21302
ServletOutputStream class: class
org.apache.catalina.connector.CoyoteOutputStream
ServletOutputStream toString:
org.apache.catalina.connector.coyoteoutputstr...@25a311
len: 4096
Query:
/businesspublisher/modelgraphic.do?IDSConversationID=ID_1&img=NSN%20approvede82360d3409/dd0cecf1-2fed-11de-27ff-001e0b6f107a_100.png
java.lang.ArrayIndexOutOfBoundsException
at java.lang.System.arraycopy(Native Method)
at org.apache.jk.common.MsgAjp.cpBytes(MsgAjp.java:199)
at org.apache.jk.common.MsgAjp.appendBytes(MsgAjp.java:187)
at org.apache.jk.common.JkInputStream.doWrite(JkInputStream.java:154)
at org.apache.coyote.Response.doWrite(Response.java:560)
at
org.apache.catalina.connector.OutputBuffer.realWriteBytes(OutputBuffer.java:353)
at org.apache.tomcat.util.buf.ByteChunk.flushBuffer(ByteChunk.java:434)
at org.apache.tomcat.util.buf.ByteChunk.append(ByteChunk.java:349)
at
org.apache.catalina.connector.OutputBuffer.writeBytes(OutputBuffer.java:381)
at org.apache.catalina.connector.OutputBuffer.write(OutputBuffer.java:370)
at
org.apache.catalina.connector.CoyoteOutputStream.write(CoyoteOutputStream.java:89)
at
com.idsscheer.aris.businesspublisher.actions.AClusterModelGraphicAction.executeInternal(AClusterModelGraphicAction.java:44)
at
com.idsscheer.aris.businesspublisher.actions.ABPLayoutBaseAction.executeImpl(ABPLayoutBaseAction.java:36)
at
com.idsscheer.aris.businesspublisher.actions.BaseAction.execute(BaseAction.java:273)
at
org.apache.struts.action.RequestProcessor.processActionPerform(RequestProcessor.java:431)
at
org.apache.struts.action.RequestProcessor.process(RequestProcessor.java:236)
at org.apache.struts.action.ActionServlet.process(ActionServlet.java:1196)
at org.apache.struts.action.ActionServlet.doGet(ActionServlet.java:414)
at javax.servlet.http.HttpServlet.service(HttpServlet.java:617)
thanks
Stefan
--
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 47330] proposal : port of mod_remoteip in Tomcat as RemoteIpValve
https://issues.apache.org/bugzilla/show_bug.cgi?id=47330 Cyrille Le Clerc changed: What|Removed |Added Attachment #24465|0 |1 is obsolete|| --- Comment #7 from Cyrille Le Clerc 2009-11-04 01:04:03 UTC --- Created an attachment (id=24471) --> (https://issues.apache.org/bugzilla/attachment.cgi?id=24471) Fixed Tomcat 7 patch with successful test case Sorry for the time you lost. Here is the patch that includes the following modified/added files : - valve.xml - RemoteIpValveTest.java - RemoteIpValve.java - LocalStrings.properties - mbeans-descriptors.xml -- 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 48117] New: two misspellings in the javadoc of class "org.apache.catalina.startup.ContextConfig"
https://issues.apache.org/bugzilla/show_bug.cgi?id=48117 Summary: two misspellings in the javadoc of class "org.apache.catalina.startup.ContextConfig" Product: Tomcat 7 Version: trunk Platform: PC OS/Version: Linux Status: NEW Severity: trivial Priority: P2 Component: Catalina AssignedTo: dev@tomcat.apache.org ReportedBy: qingyang...@qunar.com in protected synchronized void stop(): (Line: 1059) // Removing sercurity role 'security' is misspelled to 'sercurity' in protected InputSource getWebXmlSource(String filename, String path): (Line: 1354) /** * * @param filename Name of the file (possibly with one or more leading path * segemnts) to read * @param path Location that filename is relative to * @return */ 'segments' is misspelled to 'segemnts'. -- 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 48118] New: two misspellings in the javadoc of class "org.apache.catalina.startup.Embeded"
https://issues.apache.org/bugzilla/show_bug.cgi?id=48118
Summary: two misspellings in the javadoc of class
"org.apache.catalina.startup.Embeded"
Product: Tomcat 7
Version: trunk
Platform: PC
OS/Version: Linux
Status: NEW
Severity: trivial
Priority: P2
Component: Catalina
AssignedTo: dev@tomcat.apache.org
ReportedBy: qingyang...@qunar.com
Line: 230
/**
* Return true if redirction of standard streams is enabled.
*/
public boolean isRedirectStreams() {
return (this.redirectStreams);
}
'redirection' was misspelled to 'redirction'
Line: 875
/** Initialize naming - this should only enable java:env and root naming.
* If tomcat is embeded in an application that already defines those -
* it shouldn't do it.
*
* XXX The 2 should be separated, you may want to enable java: but not
* the initial context and the reverse
* XXX Can we "guess" - i.e. lookup java: and if something is returned
assume
* false ?
* XXX We have a major problem with the current setting for java: url
*/
protected void initNaming() {
'embedded' was mispelled to 'embeded'
--
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 48119] New: 5 misspellings in the javadoc of class "org.apache.catalina.startup.HostConfig'
https://issues.apache.org/bugzilla/show_bug.cgi?id=48119 Summary: 5 misspellings in the javadoc of class "org.apache.catalina.startup.HostConfig' Product: Tomcat 7 Version: trunk Platform: PC OS/Version: Linux Status: NEW Severity: trivial Priority: P2 Component: Catalina AssignedTo: dev@tomcat.apache.org ReportedBy: qingyang...@qunar.com No.1 Line 146: /** * Attribute value used to turn on/off XML namespace awarenes. */ protected boolean xmlNamespaceAware = false; 'awareness' was misspelled as 'awarenes' No.2 Line 268: /** * Get the server.xmlattribute's xmlNamespaceAware. * @return true if namespace awarenes is enabled. * */ public boolean getXmlNamespaceAware(){ return xmlNamespaceAware; } 'awareness' was misspelled as 'awarenes' No.3 Line 366: /** * Has the specified application been deployed? Note applications defined * in server.xml will not have been deployed. * @return true if the application has been deployed and * false if the applciation has not been deployed or does not * exist */ public boolean isDeployed(String name) { 'application' was misspelled as 'applciation' No.4 Line 1328: /** * Add a new Context to be managed by us. * Entry point for the admin webapp, and other JMX Context controlers. */ public void manageApp(Context context) { 'controllers' was misspelled as 'controlers' Line 1382: /** * Remove a webapp from our control. * Entry point for the admin webapp, and other JMX Context controlers. */ public void unmanageApp(String contextPath) { 'controllers' was misspelled as 'controlers' -- 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 48120] New: one misspelling in the javadoc of class "org.apache.catalina.startup.SetNextNamingRule"
https://issues.apache.org/bugzilla/show_bug.cgi?id=48120
Summary: one misspelling in the javadoc of class
"org.apache.catalina.startup.SetNextNamingRule"
Product: Tomcat 7
Version: trunk
Platform: PC
OS/Version: Linux
Status: NEW
Severity: trivial
Priority: P2
Component: Catalina
AssignedTo: dev@tomcat.apache.org
ReportedBy: qingyang...@qunar.com
Line 50:
/**
* Construct a "set next" rule with the specified method name.
*
* @param methodName Method name of the parent method to call
* @param paramType Java class of the parent method's argument
* (if you wish to use a primitive type, specify the corresonding
* Java wrapper class instead, such as java.lang.Boolean
* for a boolean parameter)
*/
public SetNextNamingRule(String methodName,
String paramType) {
'corresponding' was misspelled as 'corresonding'
--
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 48121] New: 2 misspellings in the javadoc of class "org.apache.catalina.startup.TldConfig"
https://issues.apache.org/bugzilla/show_bug.cgi?id=48121 Summary: 2 misspellings in the javadoc of class "org.apache.catalina.startup.TldConfig" Product: Tomcat 7 Version: trunk Platform: PC OS/Version: Linux Status: NEW Severity: trivial Priority: P2 Component: Catalina AssignedTo: dev@tomcat.apache.org ReportedBy: qingyang...@qunar.com No.1 Line 194: /** * Attribute value used to turn on/off TLD namespace awarenes. */ private boolean tldNamespaceAware = false; 'awareness' was misspelled as 'awarenes' No.2 Line 261 /** * Get the server.xmlattribute's xmlNamespaceAware. * @return true if namespace awarenes is enabled. * */ public boolean getTldNamespaceAware(){ return this.tldNamespaceAware; } 'awareness' was misspelled as 'awarenes' -- 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 47512] Binding java.lang.reflect.Proxy to JNDI directory raises java.lang.ClassCastException
https://issues.apache.org/bugzilla/show_bug.cgi?id=47512 --- Comment #4 from Konstantin Kolinko 2009-11-04 01:50:51 UTC --- So, Martin wants to have a global JNDI entry, that behaves differently depending on the caller. I think that relying on ObjectFactory to do the trick is wrong. Factories, as the name implies, are supposed to be called to create an object. Creation is something that is done once. It would be wrong to do it on every access. The Javadoc for NamingManager#getObjectInstance() clearly states that it "Creates an instance of an object". Thus caching the result, as NamingContext#lookup(Name,boolean) does, is valid. I think that implementing a custom javax.naming.Context would be one of possible proper ways to implement what you do want. Though I have not tried so myself, so I do not really know. -- 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 48122] New: a misspelling in the javadoc of class "org.apache.catalina.startup.Tomcat"
https://issues.apache.org/bugzilla/show_bug.cgi?id=48122
Summary: a misspelling in the javadoc of class
"org.apache.catalina.startup.Tomcat"
Product: Tomcat 7
Version: trunk
Platform: PC
OS/Version: Linux
Status: NEW
Severity: trivial
Priority: P2
Component: Catalina
AssignedTo: dev@tomcat.apache.org
ReportedBy: qingyang...@qunar.com
Line 245
/**
* Add an existing Servlet to the context with no class.forName or
* initialisation.
* @param contextPath Context to add Servlet to
* @param servletName Servlet name (used in mappings)
* @param servlet The Servlet to add
* @return The wrapper for the servlet
*/
public StandardWrapper addServlet(String contextPath,
String servletName,
Servlet servlet) {
'initialization' was misspelled as 'initialisation'
No.2
--
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: r832691 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Wed Nov 4 09:53:47 2009 New Revision: 832691 URL: http://svn.apache.org/viewvc?rev=832691&view=rev Log: veto 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=832691&r1=832690&r2=832691&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Nov 4 09:53:47 2009 @@ -389,5 +389,6 @@ https://issues.apache.org/bugzilla/show_bug.cgi?id=47512 http://svn.apache.org/viewvc?rev=832638&view=rev +1: funkman - -1: + -1: kkolinko: +https://issues.apache.org/bugzilla/show_bug.cgi?id=47512#c4 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48122] a misspelling in the javadoc of class "org.apache.catalina.startup.Tomcat"
https://issues.apache.org/bugzilla/show_bug.cgi?id=48122 Konstantin Kolinko changed: What|Removed |Added Status|NEW |RESOLVED Resolution||INVALID --- Comment #1 from Konstantin Kolinko 2009-11-04 01:59:53 UTC --- Please learn the difference between English and US English. As long as it is either of them, no correction is needed. Also, if you could provide a Subversion patch file against Tomcat trunk, that would be a lot better. -- 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 48123] New: 4 misspellings in the javadoc of class "org.apache.catalina.startup.WebRuleSet"
https://issues.apache.org/bugzilla/show_bug.cgi?id=48123
Summary: 4 misspellings in the javadoc of class
"org.apache.catalina.startup.WebRuleSet"
Product: Tomcat 7
Version: trunk
Platform: PC
OS/Version: Linux
Status: NEW
Severity: trivial
Priority: P2
Component: Catalina
AssignedTo: dev@tomcat.apache.org
ReportedBy: qingyang...@qunar.com
No.1
Line: 99
/**
* Construct an instance of this RuleSet with the default
* matching pattern prefix and default fargment setting.
*/
public WebRuleSet() {
'fragment' was misspelled as 'fargment'
No.2
Line: 614
/**
* Rule to check that the login-config is occuring
* only 1 time within the web.xml
*/
final class SetLoginConfig extends Rule {
'occurring' was misspelled as 'occuring'
No.3
Line 635
/**
* Rule to check that the jsp-config is occuring
* only 1 time within the web.xml
*/
final class SetJspConfig extends Rule {
'occurring' was misspelled as 'occuring'
No.4
Line 656
/**
* Rule to check that the session-config is occuring
* only 1 time within the web.xml
*/
final class SetSessionConfig extends Rule {
'occurring' was misspelled as 'occuring'
--
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: r832697 - /tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
Author: kkolinko
Date: Wed Nov 4 10:16:36 2009
New Revision: 832697
URL: http://svn.apache.org/viewvc?rev=832697&view=rev
Log:
Add a comment
Modified:
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
Modified: tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java?rev=832697&r1=832696&r2=832697&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java Wed Nov
4 10:16:36 2009
@@ -2182,6 +2182,10 @@
} catch (IOException e) {}
}
if (fileNeedConvert) {
+// Workaround for certain files on platforms that use
+// EBCDIC encoding, when they are read through
FileInputStream.
+// See commit message of rev.303915 for details
+//
http://svn.apache.org/viewvc?view=revision&revision=303915
String str = new String(binaryContent,0,pos);
try {
binaryContent = str.getBytes("UTF-8");
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r832039 - in /tomcat/trunk/java/org/apache/naming: HandlerRef.java ResourceRef.java ServiceRef.java StringManager.java resources/DirContextURLStreamHandler.java
2009/11/3 Mark Thomas : > Filip Hanik - Dev Lists wrote: >> On 11/02/2009 02:30 PM, Remy Maucherat wrote: >>> On Mon, 2009-11-02 at 18:46 +, ma...@apache.org wrote: >>> Author: markt Date: Mon Nov 2 18:46:21 2009 New Revision: 832039 URL: http://svn.apache.org/viewvc?rev=832039&view=rev Log: StringBuffer -> StringBuilder for o.a.naming >>> So I did not test or anything, but is SBuilder faster than SBuffer ? Or >>> it uses less resources ? >>> >> >> in most uses cases you'd barely see a difference. As speed locking has >> gotten much better. (my unqualified guess is that locking is optimistic) >> The only time you'd see a difference is if there was an actual >> contention on the resource, which with StringBuffers is rare too. > > I'm leaning towards not porting this to 6.0.x since there is no clear > performance issue caused by StringBuffer in 6.0.x. That said, the Javadoc for > StringBuilder is enough to convince me that we should make the change in trunk > as part of the general clean-up/improvement of the code for Tomcat 7. > > Mark > In my opinion, this change in no way different from any other. Though it is not urgent, as nobody depends on it. If anyone can find some time to review and vote for any subset of those 50+ patches, and there will be enough votes, I will be happy to commit it. One benefit would be better alignment of TC 7 and TC 6 code and thus easier backport of patches. The 6.0 -> 5.5 backports will need the StringBuilder -> StringBuffer conversion anyway, so those are unaffected. Regarding the StringBuilder: They have a common base class, AbstractStringBuilder, that provides the implementation for them. What they add on top of it are classcasts, and synchronization. Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r832733 - /tomcat/trunk/java/org/apache/catalina/startup/Embedded.java
Author: idarwin
Date: Wed Nov 4 13:13:41 2009
New Revision: 832733
URL: http://svn.apache.org/viewvc?rev=832733&view=rev
Log:
Bugfix typos from 48118
Modified:
tomcat/trunk/java/org/apache/catalina/startup/Embedded.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/Embedded.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Embedded.java?rev=832733&r1=832732&r2=832733&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/Embedded.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Embedded.java Wed Nov 4
13:13:41 2009
@@ -227,7 +227,7 @@
/**
- * Return true if redirction of standard streams is enabled.
+ * Return true if redirection of standard streams is enabled.
*/
public boolean isRedirectStreams() {
@@ -872,7 +872,7 @@
/** Initialize naming - this should only enable java:env and root naming.
- * If tomcat is embeded in an application that already defines those -
+ * If tomcat is embedded in an application that already defines those -
* it shouldn't do it.
*
* XXX The 2 should be separated, you may want to enable java: but not
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48118] two misspellings in the javadoc of class "org.apache.catalina.startup.Embeded"
https://issues.apache.org/bugzilla/show_bug.cgi?id=48118 Ian Darwin changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #1 from Ian Darwin 2009-11-04 05:17:48 UTC --- Applied, thanks. As mentioned, diff-based patches are easier to apply than verbal descriptions. -- 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: r832734 - /tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
Author: idarwin Date: Wed Nov 4 13:26:33 2009 New Revision: 832734 URL: http://svn.apache.org/viewvc?rev=832734&view=rev Log: Bugfix typos from 48119 Modified: tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java Modified: tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java?rev=832734&r1=832733&r2=832734&view=diff == --- tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java (original) +++ tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java Wed Nov 4 13:26:33 2009 @@ -143,7 +143,7 @@ /** - * Attribute value used to turn on/off XML namespace awarenes. + * Attribute value used to turn on/off XML namespace awareness. */ protected boolean xmlNamespaceAware = false; @@ -265,7 +265,7 @@ /** * Get the server.xmlattribute's xmlNamespaceAware. - * @return true if namespace awarenes is enabled. + * @return true if namespace awareness is enabled. * */ public boolean getXmlNamespaceAware(){ @@ -274,7 +274,7 @@ /** - * Set the namespace aware feature of the XML parser used when + * Set the namespace-aware feature of the XML parser used when * parsing xml instances. * @param xmlNamespaceAware true to enable namespace awareness */ @@ -363,7 +363,7 @@ * Has the specified application been deployed? Note applications defined * in server.xml will not have been deployed. * @return true if the application has been deployed and - * false if the applciation has not been deployed or does not + * false if the application has not been deployed or does not * exist */ public boolean isDeployed(String name) { @@ -1325,7 +1325,7 @@ /** * Add a new Context to be managed by us. - * Entry point for the admin webapp, and other JMX Context controlers. + * Entry point for the admin webapp, and other JMX Context controllers. */ public void manageApp(Context context) { @@ -1379,7 +1379,7 @@ /** * Remove a webapp from our control. - * Entry point for the admin webapp, and other JMX Context controlers. + * Entry point for the admin webapp, and other JMX Context controllers. */ public void unmanageApp(String contextPath) { if(isServiced(contextPath)) { - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48119] 5 misspellings in the javadoc of class "org.apache.catalina.startup.HostConfig'
https://issues.apache.org/bugzilla/show_bug.cgi?id=48119 Ian Darwin changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #1 from Ian Darwin 2009-11-04 05:27:36 UTC --- Applied to trunk, 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
Re: UserConfig: alternative implementation
On Tue, 3 Nov 2009 16:34:57 -0800 Costin Manolache wrote: > Curious: how does it scale for large number of users, in particular if you > have NFS homes ? I use it at a university server with 780 user accounts with home directories mounted via NFS from distinct file server, user database is LDAP. Reading the remote user database and checking all home directories for webapps takes about 100 ms of real time. Performance for the large number of deployed webapps would likely be the same as with the original tomcat UserConfig or Host having all the apps in a single appbase. > It would be interesting to change this to not init the contexts when tomcat > starts - just register a handler that would start the context on first > request. > Or as a Valve that looks for ~foo and then lookups and start the context for > that user on demand. Most contexts will probably start soon anyway since every user would want to check his/her webapp after it is installed. Then to make this approach useful some checking for long-ununsed contexts would be required or periodic tomcat restarts to clean-up. Anyway it would be interesting thing to implement. > IMHO this could be a nice feature - but it's a perfect example of thing that > shouldn't be bundled in tomcat, but > available as a separate download. And if it used a scheme like /user/foo - > it may even be possible to implement it as a app+standard filter, with just > one 'internal API' call to load the context. For me it's not a problem to support this as a separate package, but tomcat already have such a thing bundled which is not currently very useful. -- Mikhail - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r832792 - /tomcat/trunk/java/org/apache/naming/NamingContext.java
Author: funkman
Date: Wed Nov 4 16:40:16 2009
New Revision: 832792
URL: http://svn.apache.org/viewvc?rev=832792&view=rev
Log:
revert based on https://issues.apache.org/bugzilla/show_bug.cgi?id=47512#c4
Modified:
tomcat/trunk/java/org/apache/naming/NamingContext.java
Modified: tomcat/trunk/java/org/apache/naming/NamingContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/NamingContext.java?rev=832792&r1=832791&r2=832792&view=diff
==
--- tomcat/trunk/java/org/apache/naming/NamingContext.java (original)
+++ tomcat/trunk/java/org/apache/naming/NamingContext.java Wed Nov 4 16:40:16
2009
@@ -794,8 +794,13 @@
}
} else if (entry.type == NamingEntry.REFERENCE) {
try {
-return NamingManager.getObjectInstance
+Object obj = NamingManager.getObjectInstance
(entry.value, name, this, env);
+if (obj != null) {
+entry.value = obj;
+entry.type = NamingEntry.ENTRY;
+}
+return obj;
} catch (NamingException e) {
throw e;
} catch (Exception e) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r832793 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: funkman Date: Wed Nov 4 16:41:09 2009 New Revision: 832793 URL: http://svn.apache.org/viewvc?rev=832793&view=rev Log: withdrawl proposal based on feedback Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=832793&r1=832792&r2=832793&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Nov 4 16:41:09 2009 @@ -385,10 +385,4 @@ -1: -* Binding java.lang.reflect.Proxy to JNDI directory raises java.lang.ClassCastException - https://issues.apache.org/bugzilla/show_bug.cgi?id=47512 - http://svn.apache.org/viewvc?rev=832638&view=rev - +1: funkman - -1: kkolinko: -https://issues.apache.org/bugzilla/show_bug.cgi?id=47512#c4 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 47512] Binding java.lang.reflect.Proxy to JNDI directory raises java.lang.ClassCastException
https://issues.apache.org/bugzilla/show_bug.cgi?id=47512 --- Comment #5 from Tim Funk 2009-11-04 08:42:38 UTC --- patch withdrawn based on feedback -- 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 47512] Binding java.lang.reflect.Proxy to JNDI directory raises java.lang.ClassCastException
https://issues.apache.org/bugzilla/show_bug.cgi?id=47512 --- Comment #6 from Tim Funk 2009-11-04 09:53:09 UTC --- Would this do what you need? (This might be worth moving the the tomcat user list if you need ideas/help) http://tomcat.apache.org/tomcat-6.0-doc/jndi-resources-howto.html#Adding%20Custom%20Resource%20Factories -- 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 48129] New: [PATCH] Fix build with OpenSSL 1.0.0-beta3
https://issues.apache.org/bugzilla/show_bug.cgi?id=48129 Summary: [PATCH] Fix build with OpenSSL 1.0.0-beta3 Product: Tomcat Native Version: unspecified Platform: PC OS/Version: Linux Status: NEW Severity: normal Priority: P2 Component: Library AssignedTo: dev@tomcat.apache.org ReportedBy: ville.sky...@iki.fi Created an attachment (id=24472) --> (https://issues.apache.org/bugzilla/attachment.cgi?id=24472) Fix build with OpenSSL 1.0.0-beta3 The attached patch is needed to build tomcat-native with OpenSSL 1.0.0-beta3. In addition to 1.0.0-beta3, I have successfully build-tested it with OpenSSL 0.9.8k (Fedora 11) and 0.9.8e (CentOS 5.4). Kudos for the patch belong to Tomas Mraz (tmraz at redhat.com) who applied it in the Fedora tomcat-native packages, I'm just forwarding it here after noticing that it is still needed with tomcat-native 1.1.17. The build error with OpenSSL 1.0.0-beta3 without this patch is: src/sslutils.c: In function 'SSL_CTX_use_certificate_chain': src/sslutils.c:427: error: 'STACK' undeclared (first use in this function) src/sslutils.c:427: error: (Each undeclared identifier is reported only once src/sslutils.c:427: error: for each function it appears in.) src/sslutils.c:427: error: 'extra_certs' undeclared (first use in this function) -- 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 48129] [PATCH] Fix build with OpenSSL 1.0.0-beta3
https://issues.apache.org/bugzilla/show_bug.cgi?id=48129 Ville Skytt changed: What|Removed |Added Attachment #24472|application/octet-stream|text/plain mime type|| Attachment #24472|0 |1 is patch|| -- 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: UserConfig: alternative implementation
On Wed, Nov 4, 2009 at 6:47 AM, Mikhail Kryshen wrote: > On Tue, 3 Nov 2009 16:34:57 -0800 > Costin Manolache wrote: > > > Curious: how does it scale for large number of users, in particular if > you > > have NFS homes ? > > I use it at a university server with 780 user accounts with home > directories mounted via NFS from distinct file server, user database is > LDAP. Reading the remote user database and checking all home directories > for webapps takes about 100 ms of real time. > > I was asking about tomcat startup time - loading all the 780 contexts, versus a normal startup with 2-3 contexts. BTW - it would be nice to include this kind of info in the docs. > Performance for the large number of deployed webapps would likely be the > same as with the original tomcat UserConfig or Host having all the apps > in a single appbase. > > > It would be interesting to change this to not init the contexts when > tomcat > > starts - just register a handler that would start the context on first > > request. > > Or as a Valve that looks for ~foo and then lookups and start the context > for > > that user on demand. > > Most contexts will probably start soon anyway since every user would want > to check his/her webapp after it is installed. Then to make this approach > useful some checking for long-ununsed contexts would be required or > periodic tomcat restarts to clean-up. Anyway it would be interesting > thing to implement. > 780 users each accessing his app every time tomcat starts ? I doubt it. You're right, stopping long-unused contexts would be another nice thing. > > > IMHO this could be a nice feature - but it's a perfect example of thing > that > > shouldn't be bundled in tomcat, but > > available as a separate download. And if it used a scheme like /user/foo > - > > it may even be possible to implement it as a app+standard filter, with > just > > one 'internal API' call to load the context. > > For me it's not a problem to support this as a separate package, but > tomcat already have such a thing bundled which is not currently very > useful. Well, since we'll have a major release - it is possible to move what used to be bundled ( and not currently very useful or used by lots of people ) to separate packages that can be better supported. Costin
svn commit: r832858 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Wed Nov 4 19:44:29 2009 New Revision: 832858 URL: http://svn.apache.org/viewvc?rev=832858&view=rev Log: Vote Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=832858&r1=832857&r2=832858&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Nov 4 19:44:29 2009 @@ -226,6 +226,8 @@ * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47893 Use StringBuilder instead of StringBuffer + -0: markt for all SBuilder->SBuffer patches. Code cleanup is fine in trunk but +no need to backport it The patches, as well as patches for individual files inside them, are independent of each other. Vote for as many as you want. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: UserConfig: alternative implementation
On Wed, 4 Nov 2009 10:46:07 -0800 Costin Manolache wrote: > I was asking about tomcat startup time - loading all the 780 contexts, > versus a normal > startup with 2-3 contexts. BTW - it would be nice to include this kind of > info in the docs. Tried the following test setup: 1000 users, 1 application per user (copies of the same application with several servlets and jsp's), homes on NFS, HomesUserConfig listener. Deployment at startup: 2 min 15 s. Periodic checks for new/deleted/updated apps: 500-1000 ms. Java process memory (no sessions opened): 463 M. Software and hardware details: Xen virtual machine on Intel Xeon 2.5 GHz, Linux 2.6.27.37 OpenJDK 64-Bit Server VM (build 14.0-b16, mixed mode) Apache Tomcat 6.0.18 -- Mikhail - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 47451] NPE if response contains null content-encoding header
https://issues.apache.org/bugzilla/show_bug.cgi?id=47451 Stefan Gloy changed: What|Removed |Added CC||ste...@poh.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 48131] New: Add @deprecated annotations to deprecated elements
https://issues.apache.org/bugzilla/show_bug.cgi?id=48131 Summary: Add @deprecated annotations to deprecated elements Product: Tomcat 7 Version: trunk Platform: PC OS/Version: Windows XP Status: NEW Severity: normal Priority: P2 Component: Catalina AssignedTo: dev@tomcat.apache.org ReportedBy: s...@apache.org Created an attachment (id=24475) --> (https://issues.apache.org/bugzilla/attachment.cgi?id=24475) Patch to add @deprecated annotations to deprecated elements Patch to add @deprecated annotations to deprecated elements -- 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 48132] New: Patch to add @Override annotations
https://issues.apache.org/bugzilla/show_bug.cgi?id=48132 Summary: Patch to add @Override annotations Product: Tomcat 7 Version: trunk Platform: PC OS/Version: Windows XP Status: NEW Severity: normal Priority: P2 Component: Catalina AssignedTo: dev@tomcat.apache.org ReportedBy: s...@apache.org Created an attachment (id=24476) --> (https://issues.apache.org/bugzilla/attachment.cgi?id=24476) Patch to add @Override annotations Patch to add @Override annotations -- 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 48132] Patch to add @Override annotations
https://issues.apache.org/bugzilla/show_bug.cgi?id=48132 --- Comment #1 from Sebb 2009-11-04 15:32:47 UTC --- Created an attachment (id=24477) --> (https://issues.apache.org/bugzilla/attachment.cgi?id=24477) Patch for a.o.el -- 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 48132] Patch to add @Override annotations
https://issues.apache.org/bugzilla/show_bug.cgi?id=48132 --- Comment #2 from Sebb 2009-11-04 15:33:35 UTC --- Created an attachment (id=24478) --> (https://issues.apache.org/bugzilla/attachment.cgi?id=24478) Patch for coyote -- 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 48132] Patch to add @Override annotations
https://issues.apache.org/bugzilla/show_bug.cgi?id=48132 Sebb changed: What|Removed |Added Attachment #24478|application/octet-stream|text/plain mime type|| Attachment #24478|0 |1 is patch|| -- 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 48132] Patch to add @Override annotations
https://issues.apache.org/bugzilla/show_bug.cgi?id=48132 --- Comment #3 from Sebb 2009-11-04 15:38:29 UTC --- Created an attachment (id=24479) --> (https://issues.apache.org/bugzilla/attachment.cgi?id=24479) Jasper -- 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 48132] Patch to add @Override annotations
https://issues.apache.org/bugzilla/show_bug.cgi?id=48132 --- Comment #4 from Sebb 2009-11-04 15:38:55 UTC --- Created an attachment (id=24480) --> (https://issues.apache.org/bugzilla/attachment.cgi?id=24480) Juli & naming -- 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 48132] Patch to add @Override annotations
https://issues.apache.org/bugzilla/show_bug.cgi?id=48132 --- Comment #5 from Sebb 2009-11-04 15:39:15 UTC --- Created an attachment (id=24481) --> (https://issues.apache.org/bugzilla/attachment.cgi?id=24481) Servlet -- 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 48132] Patch to add @Override annotations
https://issues.apache.org/bugzilla/show_bug.cgi?id=48132 --- Comment #6 from Sebb 2009-11-04 15:39:38 UTC --- Created an attachment (id=24482) --> (https://issues.apache.org/bugzilla/attachment.cgi?id=24482) Test classes -- 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 48132] Patch to add @Override annotations
https://issues.apache.org/bugzilla/show_bug.cgi?id=48132 --- Comment #7 from Sebb 2009-11-04 15:40:01 UTC --- Created an attachment (id=24483) --> (https://issues.apache.org/bugzilla/attachment.cgi?id=24483) tomcat classes -- 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 48132] Patch to add @Override annotations
https://issues.apache.org/bugzilla/show_bug.cgi?id=48132 Sebb changed: What|Removed |Added Attachment #24476|application/octet-stream|text/plain mime type|| Attachment #24476|0 |1 is patch|| -- 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 48132] Patch to add @Override annotations
https://issues.apache.org/bugzilla/show_bug.cgi?id=48132 Sebb changed: What|Removed |Added Attachment #24482|application/octet-stream|text/plain mime type|| Attachment #24482|0 |1 is patch|| -- 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: r832926 - /tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
Author: markt
Date: Thu Nov 5 00:26:28 2009
New Revision: 832926
URL: http://svn.apache.org/viewvc?rev=832926&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48117
Spelling errors
Modified:
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=832926&r1=832925&r2=832926&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Thu Nov 5
00:26:28 2009
@@ -1056,7 +1056,7 @@
}
*/
-// Removing sercurity role
+// Removing security role
String[] securityRoles = context.findSecurityRoles();
for (i = 0; i < securityRoles.length; i++) {
context.removeSecurityRole(securityRoles[i]);
@@ -1354,7 +1354,7 @@
/**
*
* @param filename Name of the file (possibly with one or more leading
path
- * segemnts) to read
+ * segments) to read
* @param path Location that filename is relative to
* @return
*/
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48117] two misspellings in the javadoc of class "org.apache.catalina.startup.ContextConfig"
https://issues.apache.org/bugzilla/show_bug.cgi?id=48117 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED -- 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: r832927 - /tomcat/trunk/java/org/apache/catalina/startup/SetNextNamingRule.java
Author: markt Date: Thu Nov 5 00:28:09 2009 New Revision: 832927 URL: http://svn.apache.org/viewvc?rev=832927&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48120 Spelling errors Modified: tomcat/trunk/java/org/apache/catalina/startup/SetNextNamingRule.java Modified: tomcat/trunk/java/org/apache/catalina/startup/SetNextNamingRule.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/SetNextNamingRule.java?rev=832927&r1=832926&r2=832927&view=diff == --- tomcat/trunk/java/org/apache/catalina/startup/SetNextNamingRule.java (original) +++ tomcat/trunk/java/org/apache/catalina/startup/SetNextNamingRule.java Thu Nov 5 00:28:09 2009 @@ -47,7 +47,7 @@ * * @param methodName Method name of the parent method to call * @param paramType Java class of the parent method's argument - * (if you wish to use a primitive type, specify the corresonding + * (if you wish to use a primitive type, specify the corresponding * Java wrapper class instead, such as java.lang.Boolean * for a boolean parameter) */ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48120] one misspelling in the javadoc of class "org.apache.catalina.startup.SetNextNamingRule"
https://issues.apache.org/bugzilla/show_bug.cgi?id=48120 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED -- 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: r832928 - /tomcat/trunk/java/org/apache/catalina/startup/TldConfig.java
Author: markt Date: Thu Nov 5 00:30:25 2009 New Revision: 832928 URL: http://svn.apache.org/viewvc?rev=832928&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48121 Spelling errors Modified: tomcat/trunk/java/org/apache/catalina/startup/TldConfig.java Modified: tomcat/trunk/java/org/apache/catalina/startup/TldConfig.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/TldConfig.java?rev=832928&r1=832927&r2=832928&view=diff == --- tomcat/trunk/java/org/apache/catalina/startup/TldConfig.java (original) +++ tomcat/trunk/java/org/apache/catalina/startup/TldConfig.java Thu Nov 5 00:30:25 2009 @@ -191,7 +191,7 @@ /** - * Attribute value used to turn on/off TLD namespace awarenes. + * Attribute value used to turn on/off TLD namespace awareness. */ private boolean tldNamespaceAware = false; @@ -258,7 +258,7 @@ /** * Get the server.xmlattribute's xmlNamespaceAware. - * @return true if namespace awarenes is enabled. + * @return true if namespace awareness is enabled. * */ public boolean getTldNamespaceAware(){ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48121] 2 misspellings in the javadoc of class "org.apache.catalina.startup.TldConfig"
https://issues.apache.org/bugzilla/show_bug.cgi?id=48121 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED -- 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: r832931 - /tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java
Author: markt
Date: Thu Nov 5 00:34:33 2009
New Revision: 832931
URL: http://svn.apache.org/viewvc?rev=832931&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48123
Spelling errors
Modified:
tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java?rev=832931&r1=832930&r2=832931&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java Thu Nov 5
00:34:33 2009
@@ -96,7 +96,7 @@
/**
* Construct an instance of this RuleSet with the default
- * matching pattern prefix and default fargment setting.
+ * matching pattern prefix and default fragment setting.
*/
public WebRuleSet() {
@@ -611,7 +611,7 @@
/**
- * Rule to check that the login-config is occuring
+ * Rule to check that the login-config is occurring
* only 1 time within the web.xml
*/
final class SetLoginConfig extends Rule {
@@ -632,7 +632,7 @@
/**
- * Rule to check that the jsp-config is occuring
+ * Rule to check that the jsp-config is occurring
* only 1 time within the web.xml
*/
final class SetJspConfig extends Rule {
@@ -653,7 +653,7 @@
/**
- * Rule to check that the session-config is occuring
+ * Rule to check that the session-config is occurring
* only 1 time within the web.xml
*/
final class SetSessionConfig extends Rule {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 48123] 4 misspellings in the javadoc of class "org.apache.catalina.startup.WebRuleSet"
https://issues.apache.org/bugzilla/show_bug.cgi?id=48123 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED -- 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: r832938 - in /tomcat/trunk/java: javax/servlet/ javax/servlet/http/ javax/servlet/jsp/ javax/servlet/jsp/el/ javax/servlet/jsp/tagext/ org/apache/catalina/ org/apache/catalina/connector/ o
Author: markt Date: Thu Nov 5 00:46:07 2009 New Revision: 832938 URL: http://svn.apache.org/viewvc?rev=832938&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48131 Patch provided by sebb Modified: tomcat/trunk/java/javax/servlet/ServletContext.java tomcat/trunk/java/javax/servlet/ServletRequest.java tomcat/trunk/java/javax/servlet/ServletRequestWrapper.java tomcat/trunk/java/javax/servlet/SingleThreadModel.java tomcat/trunk/java/javax/servlet/UnavailableException.java tomcat/trunk/java/javax/servlet/http/HttpServletRequest.java tomcat/trunk/java/javax/servlet/http/HttpServletRequestWrapper.java tomcat/trunk/java/javax/servlet/http/HttpServletResponse.java tomcat/trunk/java/javax/servlet/http/HttpServletResponseWrapper.java tomcat/trunk/java/javax/servlet/http/HttpSession.java tomcat/trunk/java/javax/servlet/http/HttpSessionContext.java tomcat/trunk/java/javax/servlet/http/HttpUtils.java tomcat/trunk/java/javax/servlet/jsp/JspException.java tomcat/trunk/java/javax/servlet/jsp/el/ELException.java tomcat/trunk/java/javax/servlet/jsp/el/ELParseException.java tomcat/trunk/java/javax/servlet/jsp/el/Expression.java tomcat/trunk/java/javax/servlet/jsp/el/ExpressionEvaluator.java tomcat/trunk/java/javax/servlet/jsp/el/FunctionMapper.java tomcat/trunk/java/javax/servlet/jsp/el/VariableResolver.java tomcat/trunk/java/javax/servlet/jsp/tagext/BodyTag.java tomcat/trunk/java/org/apache/catalina/Cluster.java tomcat/trunk/java/org/apache/catalina/Manager.java tomcat/trunk/java/org/apache/catalina/connector/Request.java tomcat/trunk/java/org/apache/catalina/connector/Response.java tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java tomcat/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpResponse.java tomcat/trunk/java/org/apache/catalina/core/DummyRequest.java tomcat/trunk/java/org/apache/catalina/core/DummyResponse.java tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java tomcat/trunk/java/org/apache/catalina/session/StandardSession.java tomcat/trunk/java/org/apache/catalina/session/StandardSessionFacade.java tomcat/trunk/java/org/apache/catalina/startup/Catalina.java tomcat/trunk/java/org/apache/catalina/tribes/io/XByteBuffer.java tomcat/trunk/java/org/apache/catalina/tribes/membership/McastService.java tomcat/trunk/java/org/apache/catalina/tribes/transport/ReceiverBase.java tomcat/trunk/java/org/apache/el/parser/SimpleCharStream.java tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java tomcat/trunk/java/org/apache/naming/resources/ResourceAttributes.java tomcat/trunk/java/org/apache/tomcat/util/digester/Rule.java tomcat/trunk/java/org/apache/tomcat/util/digester/SetNextRule.java tomcat/trunk/java/org/apache/tomcat/util/digester/SetPropertiesRule.java tomcat/trunk/java/org/apache/tomcat/util/digester/SetPropertyRule.java tomcat/trunk/java/org/apache/tomcat/util/digester/SetRootRule.java tomcat/trunk/java/org/apache/tomcat/util/digester/SetTopRule.java Modified: tomcat/trunk/java/javax/servlet/ServletContext.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/ServletContext.java?rev=832938&r1=832937&r2=832938&view=diff == --- tomcat/trunk/java/javax/servlet/ServletContext.java (original) +++ tomcat/trunk/java/javax/servlet/ServletContext.java Thu Nov 5 00:46:07 2009 @@ -357,6 +357,7 @@ * */ +@Deprecated public Servlet getServlet(String name) throws ServletException; @@ -377,6 +378,7 @@ * */ +@Deprecated public Enumeration getServlets(); @@ -396,6 +398,7 @@ * */ +@Deprecated public Enumeration getServletNames(); @@ -431,6 +434,7 @@ * */ +@Deprecated public void log(Exception exception, String msg); Modified: tomcat/trunk/java/javax/servlet/ServletRequest.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/ServletRequest.java?rev=832938&r1=832937&r2=832938&view=diff == --- tomcat/trunk/java/javax/servlet/ServletRequest.java (original) +++ tomcat/trunk/java/javax/servlet/ServletRequest.java Thu Nov 5 00:46:07 2009 @@ -546,6 +546,7 @@ * */ +@Deprecated public String getRealPath(String path); Modified: tomcat/trunk/java/javax/servlet/ServletRequestWrapper.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/ServletRequestWrapper
DO NOT REPLY [Bug 48131] Add @deprecated annotations to deprecated elements
https://issues.apache.org/bugzilla/show_bug.cgi?id=48131 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #1 from Mark Thomas 2009-11-04 16:46:53 GMT --- Patch 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: r832945 [4/4] - in /tomcat/trunk/java/org/apache/catalina: ./ ant/ ant/jmx/ authenticator/ connector/ core/ deploy/ filters/ ha/ ha/authenticator/ ha/context/ ha/deploy/ ha/session/ ha/tcp
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioSender.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioSender.java?rev=832945&r1=832944&r2=832945&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioSender.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioSender.java
Thu Nov 5 00:58:58 2009
@@ -211,6 +211,7 @@
* @throws IOException
* @todo Implement this org.apache.catalina.tribes.transport.IDataSender
method
*/
+@Override
public synchronized void connect() throws IOException {
if ( connecting || isConnected()) return;
connecting = true;
@@ -255,6 +256,7 @@
*
* @todo Implement this org.apache.catalina.tribes.transport.IDataSender
method
*/
+@Override
public void disconnect() {
try {
connecting = false;
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java?rev=832945&r1=832944&r2=832945&view=diff
==
---
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java
Thu Nov 5 00:58:58 2009
@@ -235,6 +235,7 @@
else return result;
}
+@Override
public void connect() {
//do nothing, we connect on demand
setConnected(true);
@@ -269,17 +270,20 @@
}
+@Override
public synchronized void disconnect() {
setConnected(false);
try {close(); }catch (Exception x){}
}
+@Override
public void finalize() {
try {disconnect(); }catch ( Exception ignore){}
try {selector.close();} catch (Exception ignore) {}
}
+@Override
public boolean keepalive() {
boolean result = false;
for ( Iterator> i =
nioSenders.entrySet().iterator(); i.hasNext(); ) {
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/PooledParallelSender.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/PooledParallelSender.java?rev=832945&r1=832944&r2=832945&view=diff
==
---
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/PooledParallelSender.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/PooledParallelSender.java
Thu Nov 5 00:58:58 2009
@@ -60,6 +60,7 @@
}
}
+@Override
public DataSender getNewDataSender() {
try {
ParallelNioSender sender = new ParallelNioSender();
@@ -70,11 +71,13 @@
}
}
+@Override
public synchronized void disconnect() {
this.connected = false;
super.disconnect();
}
+@Override
public synchronized void connect() throws IOException {
this.connected = true;
super.connect();
Modified: tomcat/trunk/java/org/apache/catalina/tribes/util/ExecutorFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/util/ExecutorFactory.java?rev=832945&r1=832944&r2=832945&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/tribes/util/ExecutorFactory.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/util/ExecutorFactory.java Thu
Nov 5 00:58:58 2009
@@ -66,6 +66,7 @@
return super.offer(o); //forces the item onto the queue, to be
used if the task is rejected
}
+@Override
public boolean offer(Runnable o) {
//we can't do any checks
if (parent==null) return super.offer(o);
Modified: tomcat/trunk/java/org/apache/catalina/users/MemoryGroup.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/users/MemoryGroup.java?rev=832945&r1=832944&r2=832945&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/users/MemoryGroup.java (original)
+++ tomcat/trunk/java/org/apache/catalina/users/MemoryGroup.java Thu Nov 5
00:58:58 2009
@@ -82,6 +82,7 @@
/**
* Return the set of {...@link Role}s assigned specifically to this group.
*/
+@Override
public Iterator getRoles() {
synchronized (roles) {
@@ -94,6 +95,7 @@
/**
* Return the {...@link UserDatabase} within which this Group is defined.
*/
+@Override
public UserDatabase getUserDatabase() {
return (this.database);
@@ -104,6 +106,7 @@
/**
* Return the
svn commit: r832946 - in /tomcat/sandbox/tomcat-lite: ./ coyote-extensions/org/apache/coyote/adapters/ coyote-extensions/org/apache/coyote/adapters/dav/ coyote-extensions/org/apache/coyote/client/ coy
Author: costin Date: Thu Nov 5 01:00:48 2009 New Revision: 832946 URL: http://svn.apache.org/viewvc?rev=832946&view=rev Log: Delete very old files. Added: tomcat/sandbox/tomcat-lite/test/org/apache/tomcat/async/ Removed: tomcat/sandbox/tomcat-lite/.project tomcat/sandbox/tomcat-lite/build.xml tomcat/sandbox/tomcat-lite/coyote-extensions/org/apache/coyote/adapters/ClientAbortException.java tomcat/sandbox/tomcat-lite/coyote-extensions/org/apache/coyote/adapters/CoyoteMain.java tomcat/sandbox/tomcat-lite/coyote-extensions/org/apache/coyote/adapters/CoyoteServer.java tomcat/sandbox/tomcat-lite/coyote-extensions/org/apache/coyote/adapters/CoyoteUtils.java tomcat/sandbox/tomcat-lite/coyote-extensions/org/apache/coyote/adapters/EchoAdapter.java tomcat/sandbox/tomcat-lite/coyote-extensions/org/apache/coyote/adapters/MapperAdapter.java tomcat/sandbox/tomcat-lite/coyote-extensions/org/apache/coyote/adapters/MessageReader.java tomcat/sandbox/tomcat-lite/coyote-extensions/org/apache/coyote/adapters/MessageWriter.java tomcat/sandbox/tomcat-lite/coyote-extensions/org/apache/coyote/adapters/ProxyAdapter.java tomcat/sandbox/tomcat-lite/coyote-extensions/org/apache/coyote/adapters/SimpleFileAdapter.java tomcat/sandbox/tomcat-lite/coyote-extensions/org/apache/coyote/adapters/SleepAdapter.java tomcat/sandbox/tomcat-lite/coyote-extensions/org/apache/coyote/adapters/StaticAdapter.java tomcat/sandbox/tomcat-lite/coyote-extensions/org/apache/coyote/adapters/StaticMain.java tomcat/sandbox/tomcat-lite/coyote-extensions/org/apache/coyote/adapters/dav/ tomcat/sandbox/tomcat-lite/coyote-extensions/org/apache/coyote/client/AsyncHttp.java tomcat/sandbox/tomcat-lite/coyote-extensions/org/apache/coyote/client/AsyncHttpCallback.java tomcat/sandbox/tomcat-lite/coyote-extensions/org/apache/coyote/client/AsyncHttpPool.java tomcat/sandbox/tomcat-lite/coyote-extensions/org/apache/coyote/client/BlockingHttp.java tomcat/sandbox/tomcat-lite/coyote-extensions/org/apache/coyote/client/SocketPool.java tomcat/sandbox/tomcat-lite/coyote-extensions/org/apache/coyote/http11/async/ tomcat/sandbox/tomcat-lite/coyote-extensions/org/apache/tomcat/async/JsseSslSupport.java tomcat/sandbox/tomcat-lite/coyote-extensions/org/apache/tomcat/async/SelectorCallback.java tomcat/sandbox/tomcat-lite/coyote-extensions/org/apache/tomcat/async/SelectorChannel.java tomcat/sandbox/tomcat-lite/coyote-extensions/org/apache/tomcat/async/SelectorPool.java tomcat/sandbox/tomcat-lite/coyote-extensions/org/apache/tomcat/async/SelectorThread.java tomcat/sandbox/tomcat-lite/coyote-extensions/org/apache/tomcat/async/SelectorThreadNio.java tomcat/sandbox/tomcat-lite/coyote-extensions/org/apache/tomcat/async/SocketPool.java tomcat/sandbox/tomcat-lite/coyote-extensions/org/apache/tomcat/async/http/ tomcat/sandbox/tomcat-lite/coyote-extensions/org/apache/tomcat/async/socks/ tomcat/sandbox/tomcat-lite/coyote-extensions/org/apache/tomcat/util/http/Http11Parser.java tomcat/sandbox/tomcat-lite/coyote-extensions/org/apache/tomcat/util/http/HttpStatus.java tomcat/sandbox/tomcat-lite/coyote-extensions/org/apache/tomcat/util/net/SelectorCallback.java tomcat/sandbox/tomcat-lite/coyote-extensions/org/apache/tomcat/util/net/SelectorPool.java tomcat/sandbox/tomcat-lite/coyote-extensions/org/apache/tomcat/util/net/SelectorThread.java tomcat/sandbox/tomcat-lite/coyote-extensions/org/apache/tomcat/util/net/SelectorThreadNio.java tomcat/sandbox/tomcat-lite/java/org/apache/tomcat/lite/CharsetMapperDefault.properties tomcat/sandbox/tomcat-lite/java/org/apache/tomcat/lite/FilterChainImpl.java tomcat/sandbox/tomcat-lite/java/org/apache/tomcat/lite/FilterConfigImpl.java tomcat/sandbox/tomcat-lite/java/org/apache/tomcat/lite/LocalStrings.properties tomcat/sandbox/tomcat-lite/java/org/apache/tomcat/lite/Locale2Charset.java tomcat/sandbox/tomcat-lite/java/org/apache/tomcat/lite/ParameterMap.java tomcat/sandbox/tomcat-lite/java/org/apache/tomcat/lite/RequestDispatcherImpl.java tomcat/sandbox/tomcat-lite/java/org/apache/tomcat/lite/ServletConfigImpl.java tomcat/sandbox/tomcat-lite/java/org/apache/tomcat/lite/ServletContextImpl.java tomcat/sandbox/tomcat-lite/java/org/apache/tomcat/lite/ServletInputStreamImpl.java tomcat/sandbox/tomcat-lite/java/org/apache/tomcat/lite/ServletOutputStreamImpl.java tomcat/sandbox/tomcat-lite/java/org/apache/tomcat/lite/ServletReaderImpl.java tomcat/sandbox/tomcat-lite/java/org/apache/tomcat/lite/ServletRequestImpl.java tomcat/sandbox/tomcat-lite/java/org/apache/tomcat/lite/ServletRequestWrapperImpl.java tomcat/sandbox/tomcat-lite/java/org/apache/tomcat/lite/ServletResponseImpl.java tomcat/sandbox/tomcat-lite/java/org/apache/tomcat/lite/ServletResponseIncludeWrapper.java tomcat/sandbox/tomcat-lite/java/org/apache/tomcat/l
svn commit: r832947 - in /tomcat/sandbox/tomcat-lite: .classpath bin/ build.properties.default coyote-apr.files coyote-extensions/ coyote-nio.files external/ java/ resources/ test/ tomcat-coyote/ weba
Author: costin Date: Thu Nov 5 01:03:05 2009 New Revision: 832947 URL: http://svn.apache.org/viewvc?rev=832947&view=rev Log: Removing old files Removed: tomcat/sandbox/tomcat-lite/.classpath tomcat/sandbox/tomcat-lite/bin/ tomcat/sandbox/tomcat-lite/build.properties.default tomcat/sandbox/tomcat-lite/coyote-apr.files tomcat/sandbox/tomcat-lite/coyote-extensions/ tomcat/sandbox/tomcat-lite/coyote-nio.files tomcat/sandbox/tomcat-lite/external/ tomcat/sandbox/tomcat-lite/java/ tomcat/sandbox/tomcat-lite/resources/ tomcat/sandbox/tomcat-lite/test/ tomcat/sandbox/tomcat-lite/tomcat-coyote/ tomcat/sandbox/tomcat-lite/webapps/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r832949 - in /tomcat/trunk/java/org/apache/catalina: ant/jmx/JMXAccessorTask.java core/ApplicationHttpResponse.java loader/WebappClassLoader.java tribes/transport/bio/BioReceiver.java valv
Author: markt
Date: Thu Nov 5 01:09:39 2009
New Revision: 832949
URL: http://svn.apache.org/viewvc?rev=832949&view=rev
Log:
Add a few annotations missed by recent patches
Modified:
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpResponse.java
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java
tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java
Modified: tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java?rev=832949&r1=832948&r2=832949&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java Thu Nov
5 01:09:39 2009
@@ -338,6 +338,7 @@
* @exception BuildException
*if a validation error occurs
*/
+@Override
public void execute() throws BuildException {
if (testIfCondition() && testUnlessCondition()) {
try {
Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpResponse.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpResponse.java?rev=832949&r1=832948&r2=832949&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpResponse.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpResponse.java Thu
Nov 5 01:09:39 2009
@@ -354,6 +354,7 @@
* @deprecated
*/
@Deprecated
+@Override
public void setStatus(int sc, String msg) {
if (!included)
Modified: tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java?rev=832949&r1=832948&r2=832949&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java Thu Nov
5 01:09:39 2009
@@ -249,6 +249,7 @@
protected HashMap notFoundResources =
new LinkedHashMap() {
private static final long serialVersionUID = 1L;
+@Override
protected boolean removeEldestEntry(
Map.Entry eldest) {
return size() > 1000;
@@ -817,6 +818,7 @@
/**
* Render a String representation of this object.
*/
+@Override
public String toString() {
StringBuilder sb = new StringBuilder("WebappClassLoader\r\n");
@@ -847,6 +849,7 @@
/**
* Add the specified URL to the classloader.
*/
+@Override
protected void addURL(URL url) {
super.addURL(url);
hasExternalRepositories = true;
@@ -862,6 +865,7 @@
*
* @exception ClassNotFoundException if the class was not found
*/
+@Override
public Class findClass(String name) throws ClassNotFoundException {
if (log.isDebugEnabled())
@@ -959,6 +963,7 @@
*
* @param name Name of the resource to be found
*/
+@Override
public URL findResource(final String name) {
if (log.isDebugEnabled())
@@ -997,6 +1002,7 @@
*
* @exception IOException if an input/output error occurs
*/
+@Override
public Enumeration findResources(String name) throws IOException {
if (log.isDebugEnabled())
@@ -1081,6 +1087,7 @@
*
* @param name Name of the resource to return a URL for
*/
+@Override
public URL getResource(String name) {
if (log.isDebugEnabled())
@@ -1156,6 +1163,7 @@
*
* @param name Name of the resource to return an input stream for
*/
+@Override
public InputStream getResourceAsStream(String name) {
if (log.isDebugEnabled())
@@ -1238,6 +1246,7 @@
*
* @exception ClassNotFoundException if the class was not found
*/
+@Override
public Class loadClass(String name) throws ClassNotFoundException {
return (loadClass(name, false));
@@ -1270,6 +1279,7 @@
*
* @exception ClassNotFoundException if the class was not found
*/
+@Override
public synchronized Class loadClass(String name, boolean resolve)
throws ClassNotFoundException {
@@ -1408,6 +1418,7 @@
* @param codeSource where the code was loaded from
* @return PermissionCollection for CodeSource
*/
+@Override
protected PermissionCollection getPermissions(CodeSource codeSource) {
String codeUrl = codeSource.getLocation().toString();
@@ -143
svn commit: r832950 - in /tomcat/trunk/java/org/apache/el: ./ lang/ parser/
Author: markt
Date: Thu Nov 5 01:13:12 2009
New Revision: 832950
URL: http://svn.apache.org/viewvc?rev=832950&view=rev
Log:
Partial fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=48132
Patch provided by sebb with some additional issues reported by Eclispe
Modified:
tomcat/trunk/java/org/apache/el/ExpressionFactoryImpl.java
tomcat/trunk/java/org/apache/el/MethodExpressionImpl.java
tomcat/trunk/java/org/apache/el/MethodExpressionLiteral.java
tomcat/trunk/java/org/apache/el/ValueExpressionImpl.java
tomcat/trunk/java/org/apache/el/ValueExpressionLiteral.java
tomcat/trunk/java/org/apache/el/lang/ELArithmetic.java
tomcat/trunk/java/org/apache/el/lang/EvaluationContext.java
tomcat/trunk/java/org/apache/el/lang/FunctionMapperFactory.java
tomcat/trunk/java/org/apache/el/lang/FunctionMapperImpl.java
tomcat/trunk/java/org/apache/el/lang/VariableMapperFactory.java
tomcat/trunk/java/org/apache/el/lang/VariableMapperImpl.java
tomcat/trunk/java/org/apache/el/parser/ArithmeticNode.java
tomcat/trunk/java/org/apache/el/parser/AstAnd.java
tomcat/trunk/java/org/apache/el/parser/AstBracketSuffix.java
tomcat/trunk/java/org/apache/el/parser/AstChoice.java
tomcat/trunk/java/org/apache/el/parser/AstCompositeExpression.java
tomcat/trunk/java/org/apache/el/parser/AstDeferredExpression.java
tomcat/trunk/java/org/apache/el/parser/AstDiv.java
tomcat/trunk/java/org/apache/el/parser/AstDotSuffix.java
tomcat/trunk/java/org/apache/el/parser/AstDynamicExpression.java
tomcat/trunk/java/org/apache/el/parser/AstEmpty.java
tomcat/trunk/java/org/apache/el/parser/AstEqual.java
tomcat/trunk/java/org/apache/el/parser/AstFalse.java
tomcat/trunk/java/org/apache/el/parser/AstFloatingPoint.java
tomcat/trunk/java/org/apache/el/parser/AstFunction.java
tomcat/trunk/java/org/apache/el/parser/AstGreaterThan.java
tomcat/trunk/java/org/apache/el/parser/AstGreaterThanEqual.java
tomcat/trunk/java/org/apache/el/parser/AstIdentifier.java
tomcat/trunk/java/org/apache/el/parser/AstInteger.java
tomcat/trunk/java/org/apache/el/parser/AstLessThan.java
tomcat/trunk/java/org/apache/el/parser/AstLessThanEqual.java
tomcat/trunk/java/org/apache/el/parser/AstLiteralExpression.java
tomcat/trunk/java/org/apache/el/parser/AstMinus.java
tomcat/trunk/java/org/apache/el/parser/AstMod.java
tomcat/trunk/java/org/apache/el/parser/AstMult.java
tomcat/trunk/java/org/apache/el/parser/AstNegative.java
tomcat/trunk/java/org/apache/el/parser/AstNot.java
tomcat/trunk/java/org/apache/el/parser/AstNotEqual.java
tomcat/trunk/java/org/apache/el/parser/AstNull.java
tomcat/trunk/java/org/apache/el/parser/AstOr.java
tomcat/trunk/java/org/apache/el/parser/AstPlus.java
tomcat/trunk/java/org/apache/el/parser/AstString.java
tomcat/trunk/java/org/apache/el/parser/AstTrue.java
tomcat/trunk/java/org/apache/el/parser/AstValue.java
tomcat/trunk/java/org/apache/el/parser/BooleanNode.java
tomcat/trunk/java/org/apache/el/parser/ParseException.java
tomcat/trunk/java/org/apache/el/parser/SimpleNode.java
tomcat/trunk/java/org/apache/el/parser/Token.java
tomcat/trunk/java/org/apache/el/parser/TokenMgrError.java
Modified: tomcat/trunk/java/org/apache/el/ExpressionFactoryImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/ExpressionFactoryImpl.java?rev=832950&r1=832949&r2=832950&view=diff
==
--- tomcat/trunk/java/org/apache/el/ExpressionFactoryImpl.java (original)
+++ tomcat/trunk/java/org/apache/el/ExpressionFactoryImpl.java Thu Nov 5
01:13:12 2009
@@ -42,10 +42,12 @@
super();
}
+@Override
public Object coerceToType(Object obj, Class type) {
return ELSupport.coerceToType(obj, type);
}
+@Override
public MethodExpression createMethodExpression(ELContext context,
String expression, Class expectedReturnType,
Class[] expectedParamTypes) {
@@ -58,6 +60,7 @@
expectedParamTypes);
}
+@Override
public ValueExpression createValueExpression(ELContext context,
String expression, Class expectedType) {
if (expectedType == null) {
@@ -68,6 +71,7 @@
return builder.createValueExpression(expectedType);
}
+@Override
public ValueExpression createValueExpression(Object instance,
Class expectedType) {
if (expectedType == null) {
Modified: tomcat/trunk/java/org/apache/el/MethodExpressionImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/MethodExpressionImpl.java?rev=832950&r1=832949&r2=832950&view=diff
==
--- tomcat/trunk/java/org/apache/el/MethodExpressionImpl.java (original)
+++ tomcat/trunk/java/org/apache/el/MethodExpressionImpl.java Thu Nov 5
01
svn commit: r832951 - in /tomcat/trunk/java/org/apache/coyote: ./ ajp/ http11/ http11/filters/
Author: markt
Date: Thu Nov 5 01:14:16 2009
New Revision: 832951
URL: http://svn.apache.org/viewvc?rev=832951&view=rev
Log:
Partial fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=48132
Patch provided by sebb
Modified:
tomcat/trunk/java/org/apache/coyote/Request.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java
tomcat/trunk/java/org/apache/coyote/http11/InternalInputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/InternalOutputBuffer.java
tomcat/trunk/java/org/apache/coyote/http11/filters/GzipOutputFilter.java
Modified: tomcat/trunk/java/org/apache/coyote/Request.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/Request.java?rev=832951&r1=832950&r2=832951&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/Request.java (original)
+++ tomcat/trunk/java/org/apache/coyote/Request.java Thu Nov 5 01:14:16 2009
@@ -434,6 +434,7 @@
// debug
+@Override
public String toString() {
return "R( " + requestURI().toString() + ")";
}
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java?rev=832951&r1=832950&r2=832951&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java Thu Nov 5
01:14:16 2009
@@ -327,6 +327,7 @@
protected ConcurrentLinkedQueue recycledProcessors =
new ConcurrentLinkedQueue() {
protected AtomicInteger size = new AtomicInteger(0);
+@Override
public boolean offer(AjpAprProcessor processor) {
boolean offer = (proto.processorCache == -1) ? true :
(size.get() < proto.processorCache);
//avoid over growing our cache or add after we have stopped
@@ -341,6 +342,7 @@
return result;
}
+@Override
public AjpAprProcessor poll() {
AjpAprProcessor result = super.poll();
if ( result != null ) {
@@ -349,6 +351,7 @@
return result;
}
+@Override
public void clear() {
AjpAprProcessor next = poll();
while ( next != null ) {
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpProtocol.java?rev=832951&r1=832950&r2=832951&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpProtocol.java Thu Nov 5
01:14:16 2009
@@ -321,6 +321,7 @@
protected ConcurrentLinkedQueue recycledProcessors =
new ConcurrentLinkedQueue() {
protected AtomicInteger size = new AtomicInteger(0);
+@Override
public boolean offer(AjpProcessor processor) {
boolean offer = (proto.processorCache == -1) ? true :
(size.get() < proto.processorCache);
//avoid over growing our cache or add after we have stopped
@@ -335,6 +336,7 @@
return result;
}
+@Override
public AjpProcessor poll() {
AjpProcessor result = super.poll();
if ( result != null ) {
@@ -343,6 +345,7 @@
return result;
}
+@Override
public void clear() {
AjpProcessor next = poll();
while ( next != null ) {
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java?rev=832951&r1=832950&r2=832951&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java Thu Nov
5 01:14:16 2009
@@ -478,6 +478,7 @@
protected Conc
svn commit: r832953 [2/2] - in /tomcat/trunk/java/org/apache/jasper: compiler/ el/ runtime/ servlet/ tagplugins/jstl/ xmlparser/
Modified: tomcat/trunk/java/org/apache/jasper/runtime/BodyContentImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/runtime/BodyContentImpl.java?rev=832953&r1=832952&r2=832953&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/runtime/BodyContentImpl.java (original)
+++ tomcat/trunk/java/org/apache/jasper/runtime/BodyContentImpl.java Thu Nov 5
01:16:53 2009
@@ -65,6 +65,7 @@
/**
* Write a single character.
*/
+@Override
public void write(int c) throws IOException {
if (writer != null) {
writer.write(c);
@@ -92,6 +93,7 @@
* @param off Offset from which to start reading characters
* @param len Number of characters to write
*/
+@Override
public void write(char[] cbuf, int off, int len) throws IOException {
if (writer != null) {
writer.write(cbuf, off, len);
@@ -117,6 +119,7 @@
* Write an array of characters. This method cannot be inherited from the
* Writer class because it must suppress I/O exceptions.
*/
+@Override
public void write(char[] buf) throws IOException {
if (writer != null) {
writer.write(buf);
@@ -132,6 +135,7 @@
* @param off Offset from which to start reading characters
* @param len Number of characters to be written
*/
+@Override
public void write(String s, int off, int len) throws IOException {
if (writer != null) {
writer.write(s, off, len);
@@ -149,6 +153,7 @@
* Write a string. This method cannot be inherited from the Writer class
* because it must suppress I/O exceptions.
*/
+@Override
public void write(String s) throws IOException {
if (writer != null) {
writer.write(s);
@@ -164,6 +169,7 @@
*
* @throws IOException If an I/O error occurs
*/
+@Override
public void newLine() throws IOException {
if (writer != null) {
writer.write(LINE_SEPARATOR);
@@ -182,6 +188,7 @@
* @param b The boolean to be printed
* @throws IOException
*/
+@Override
public void print(boolean b) throws IOException {
if (writer != null) {
writer.write(b ? "true" : "false");
@@ -199,6 +206,7 @@
* @param c The char to be printed
* @throws IOException
*/
+@Override
public void print(char c) throws IOException {
if (writer != null) {
writer.write(String.valueOf(c));
@@ -217,6 +225,7 @@
* @param i The int to be printed
* @throws IOException
*/
+@Override
public void print(int i) throws IOException {
if (writer != null) {
writer.write(String.valueOf(i));
@@ -235,6 +244,7 @@
* @param l The long to be printed
* @throws IOException
*/
+@Override
public void print(long l) throws IOException {
if (writer != null) {
writer.write(String.valueOf(l));
@@ -253,6 +263,7 @@
* @param f The float to be printed
* @throws IOException
*/
+@Override
public void print(float f) throws IOException {
if (writer != null) {
writer.write(String.valueOf(f));
@@ -271,6 +282,7 @@
* @param d The double to be printed
* @throws IOException
*/
+@Override
public void print(double d) throws IOException {
if (writer != null) {
writer.write(String.valueOf(d));
@@ -290,6 +302,7 @@
* @throws NullPointerException If s is null
* @throws IOException
*/
+@Override
public void print(char[] s) throws IOException {
if (writer != null) {
writer.write(s);
@@ -308,6 +321,7 @@
* @param s The String to be printed
* @throws IOException
*/
+@Override
public void print(String s) throws IOException {
if (s == null) s = "null";
if (writer != null) {
@@ -327,6 +341,7 @@
* @param obj The Object to be printed
* @throws IOException
*/
+@Override
public void print(Object obj) throws IOException {
if (writer != null) {
writer.write(String.valueOf(obj));
@@ -343,6 +358,7 @@
*
* @throws IOException
*/
+@Override
public void println() throws IOException {
newLine();
}
@@ -354,6 +370,7 @@
*
* @throws IOException
*/
+@Override
public void println(boolean x) throws IOException {
print(x);
println();
@@ -366,6 +383,7 @@
*
* @throws IOException
*/
+@Override
public void println(char x) throws IOException {
print(x);
println();
@@ -378,6 +396,7 @@
*
* @throws IOException
*/
+@Override
public void println(int x) throws IOException {
print(x);
println();
@@ -390,6 +409,7 @@
*
* @throws IO
svn commit: r832954 - in /tomcat/trunk/java/org/apache: juli/ juli/logging/ naming/ naming/resources/
Author: markt
Date: Thu Nov 5 01:18:05 2009
New Revision: 832954
URL: http://svn.apache.org/viewvc?rev=832954&view=rev
Log:
Partial fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=48132
Patch provided by sebb
Modified:
tomcat/trunk/java/org/apache/juli/AsyncFileHandler.java
tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java
tomcat/trunk/java/org/apache/juli/FileHandler.java
tomcat/trunk/java/org/apache/juli/JdkLoggerFormatter.java
tomcat/trunk/java/org/apache/juli/logging/LogConfigurationException.java
tomcat/trunk/java/org/apache/naming/EjbRef.java
tomcat/trunk/java/org/apache/naming/HandlerRef.java
tomcat/trunk/java/org/apache/naming/NamingEntry.java
tomcat/trunk/java/org/apache/naming/ResourceEnvRef.java
tomcat/trunk/java/org/apache/naming/ResourceLinkRef.java
tomcat/trunk/java/org/apache/naming/ResourceRef.java
tomcat/trunk/java/org/apache/naming/ServiceRef.java
tomcat/trunk/java/org/apache/naming/TransactionRef.java
tomcat/trunk/java/org/apache/naming/resources/CacheEntry.java
tomcat/trunk/java/org/apache/naming/resources/DirContextURLConnection.java
tomcat/trunk/java/org/apache/naming/resources/DirContextURLStreamHandler.java
tomcat/trunk/java/org/apache/naming/resources/FileDirContext.java
tomcat/trunk/java/org/apache/naming/resources/ImmutableNameNotFoundException.java
tomcat/trunk/java/org/apache/naming/resources/ResourceAttributes.java
tomcat/trunk/java/org/apache/naming/resources/WARDirContext.java
Modified: tomcat/trunk/java/org/apache/juli/AsyncFileHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/juli/AsyncFileHandler.java?rev=832954&r1=832953&r2=832954&view=diff
==
--- tomcat/trunk/java/org/apache/juli/AsyncFileHandler.java (original)
+++ tomcat/trunk/java/org/apache/juli/AsyncFileHandler.java Thu Nov 5 01:18:05
2009
@@ -120,6 +120,7 @@
this.setName("AsyncFileHandlerWriter-"+System.identityHashCode(this));
}
+@Override
public void run() {
while (run) {
try {
Modified: tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java?rev=832954&r1=832953&r2=832954&view=diff
==
--- tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java (original)
+++ tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java Thu Nov 5
01:18:05 2009
@@ -74,6 +74,7 @@
*
* @param logger The logger to be added
*/
+@Override
public synchronized boolean addLogger(final Logger logger) {
final String loggerName = logger.getName();
@@ -170,6 +171,7 @@
*
* @param name The name of the logger to retrieve
*/
+@Override
public synchronized Logger getLogger(final String name) {
ClassLoader classLoader = Thread.currentThread()
.getContextClassLoader();
@@ -181,6 +183,7 @@
* Get an enumeration of the logger names currently defined in the
* classloader local configuration.
*/
+@Override
public synchronized Enumeration getLoggerNames() {
ClassLoader classLoader = Thread.currentThread()
.getContextClassLoader();
@@ -194,6 +197,7 @@
*
* @param name The property name
*/
+@Override
public String getProperty(String name) {
ClassLoader classLoader = Thread.currentThread()
.getContextClassLoader();
@@ -230,6 +234,7 @@
}
+@Override
public void readConfiguration()
throws IOException, SecurityException {
@@ -239,6 +244,7 @@
}
+@Override
public void readConfiguration(InputStream is)
throws IOException, SecurityException {
Modified: tomcat/trunk/java/org/apache/juli/FileHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/juli/FileHandler.java?rev=832954&r1=832953&r2=832954&view=diff
==
--- tomcat/trunk/java/org/apache/juli/FileHandler.java (original)
+++ tomcat/trunk/java/org/apache/juli/FileHandler.java Thu Nov 5 01:18:05 2009
@@ -111,6 +111,7 @@
*
* @param record description of the log event
*/
+@Override
public void publish(LogRecord record) {
if (!isLoggable(record)) {
@@ -161,6 +162,7 @@
/**
* Close the currently open log file (if any).
*/
+@Override
public void close() {
closeWriter();
}
@@ -185,6 +187,7 @@
/**
* Flush the writer.
*/
+@Override
public void flush() {
try {
Modified: tomcat/trunk/java/org/apache/juli/JdkLoggerFormatter.java
URL:
http://svn.apache.o
svn commit: r832955 - in /tomcat/trunk/java/javax: el/ servlet/http/ servlet/jsp/ servlet/jsp/el/ servlet/jsp/tagext/
Author: markt
Date: Thu Nov 5 01:19:20 2009
New Revision: 832955
URL: http://svn.apache.org/viewvc?rev=832955&view=rev
Log:
Partial fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=48132
Patch provided by sebb
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/Expression.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/Cookie.java
tomcat/trunk/java/javax/servlet/http/HttpServlet.java
tomcat/trunk/java/javax/servlet/http/HttpSessionBindingEvent.java
tomcat/trunk/java/javax/servlet/jsp/JspWriter.java
tomcat/trunk/java/javax/servlet/jsp/el/ImplicitObjectELResolver.java
tomcat/trunk/java/javax/servlet/jsp/el/ScopedAttributeELResolver.java
tomcat/trunk/java/javax/servlet/jsp/tagext/BodyContent.java
tomcat/trunk/java/javax/servlet/jsp/tagext/BodyTagSupport.java
tomcat/trunk/java/javax/servlet/jsp/tagext/TagAttributeInfo.java
Modified: tomcat/trunk/java/javax/el/ArrayELResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/ArrayELResolver.java?rev=832955&r1=832954&r2=832955&view=diff
==
--- tomcat/trunk/java/javax/el/ArrayELResolver.java (original)
+++ tomcat/trunk/java/javax/el/ArrayELResolver.java Thu Nov 5 01:19:20 2009
@@ -34,7 +34,8 @@
this.readOnly = readOnly;
}
- public Object getValue(ELContext context, Object base, Object property)
+ @Override
+public Object getValue(ELContext context, Object base, Object property)
throws NullPointerException, PropertyNotFoundException,
ELException {
if (context == null) {
throw new NullPointerException();
@@ -52,7 +53,8 @@
return null;
}
- public Class getType(ELContext context, Object base, Object property)
+ @Override
+public Class getType(ELContext context, Object base, Object property)
throws NullPointerException, PropertyNotFoundException,
ELException {
if (context == null) {
throw new NullPointerException();
@@ -68,7 +70,8 @@
return null;
}
- public void setValue(ELContext context, Object base, Object property,
+ @Override
+public void setValue(ELContext context, Object base, Object property,
Object value) throws NullPointerException,
PropertyNotFoundException, PropertyNotWritableException,
ELException {
@@ -91,7 +94,8 @@
}
}
- public boolean isReadOnly(ELContext context, Object base, Object
property)
+ @Override
+public boolean isReadOnly(ELContext context, Object base, Object property)
throws NullPointerException, PropertyNotFoundException,
ELException {
if (context == null) {
throw new NullPointerException();
@@ -106,7 +110,8 @@
return this.readOnly;
}
- public Iterator getFeatureDescriptors(ELContext
context, Object base) {
+ @Override
+public Iterator getFeatureDescriptors(ELContext
context, Object base) {
if (base != null && base.getClass().isArray()) {
FeatureDescriptor[] descs = new
FeatureDescriptor[Array.getLength(base)];
for (int i = 0; i < descs.length; i++) {
@@ -124,7 +129,8 @@
return null;
}
- public Class getCommonPropertyType(ELContext context, Object base) {
+ @Override
+public Class getCommonPropertyType(ELContext context, Object base) {
if (base != null && base.getClass().isArray()) {
return Integer.class;
}
Modified: tomcat/trunk/java/javax/el/BeanELResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/BeanELResolver.java?rev=832955&r1=832954&r2=832955&view=diff
==
--- tomcat/trunk/java/javax/el/BeanELResolver.java (original)
+++ tomcat/trunk/java/javax/el/BeanELResolver.java Thu Nov 5 01:19:20 2009
@@ -47,7 +47,8 @@
this.readOnly = readOnly;
}
- public Object getValue(ELContext context, Object base, Object property)
+ @Override
+public Object getValue(ELContext context, Object base, Object property)
throws NullPointerException, PropertyNotFoundException,
ELException {
if (context == null) {
throw new NullPointerException();
@@ -71,7 +72,8 @@
}
svn commit: r832956 - in /tomcat/trunk: modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/ test/org/apache/catalina/connector/ test/org/apache/catalina/core/ test/org/apache/catalina/startup/ test/or
Author: markt
Date: Thu Nov 5 01:21:11 2009
New Revision: 832956
URL: http://svn.apache.org/viewvc?rev=832956&view=rev
Log:
Partial fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=48132
Patch provided by sebb
Modified:
tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/CheckOutThreadTest.java
tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/ConnectCountTest.java
tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/DefaultTestCase.java
tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/FairnessTest.java
tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TestAsyncQueue.java
tomcat/trunk/test/org/apache/catalina/connector/TestRequest.java
tomcat/trunk/test/org/apache/catalina/core/TestStandardContext.java
tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java
tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
tomcat/trunk/test/org/apache/catalina/tribes/demos/CoordinationDemo.java
tomcat/trunk/test/org/apache/catalina/tribes/demos/EchoRpcTest.java
tomcat/trunk/test/org/apache/catalina/tribes/demos/LoadTest.java
tomcat/trunk/test/org/apache/catalina/tribes/demos/MapDemo.java
tomcat/trunk/test/org/apache/catalina/tribes/demos/MembersWithProperties.java
tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestChannelOptionFlag.java
tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestChannelStartStop.java
tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestDataIntegrity.java
tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestMulticastPackages.java
tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestRemoteProcessException.java
tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestUdpPackages.java
tomcat/trunk/test/org/apache/catalina/tribes/test/interceptors/TestNonBlockingCoordinator.java
tomcat/trunk/test/org/apache/catalina/tribes/test/interceptors/TestOrderInterceptor.java
tomcat/trunk/test/org/apache/catalina/tribes/test/io/TestSenderConnections.java
tomcat/trunk/test/org/apache/catalina/tribes/test/io/TestSerialization.java
tomcat/trunk/test/org/apache/catalina/tribes/test/membership/TestDomainFilter.java
tomcat/trunk/test/org/apache/catalina/tribes/test/membership/TestMemberArrival.java
tomcat/trunk/test/org/apache/catalina/tribes/test/membership/TestMemberSerialization.java
tomcat/trunk/test/org/apache/catalina/tribes/test/membership/TestTcpFailureDetector.java
tomcat/trunk/test/org/apache/catalina/tribes/test/transport/SocketReceive.java
tomcat/trunk/test/org/apache/catalina/tribes/test/transport/SocketTribesReceive.java
tomcat/trunk/test/org/apache/catalina/tribes/test/transport/SocketValidateReceive.java
tomcat/trunk/test/org/apache/catalina/valves/Benchmarks.java
tomcat/trunk/test/org/apache/tomcat/util/http/CookiesBaseTest.java
tomcat/trunk/test/org/apache/tomcat/util/http/TestCookiesNoFwdStrictSysProps.java
Modified:
tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/CheckOutThreadTest.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/CheckOutThreadTest.java?rev=832956&r1=832955&r2=832956&view=diff
==
---
tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/CheckOutThreadTest.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/CheckOutThreadTest.java
Thu Nov 5 01:21:11 2009
@@ -374,6 +374,7 @@
public class TestThread extends Thread {
protected DataSource d;
protected String query = null;
+@Override
public void run() {
long max = -1, totalmax=0, totalcmax=0, cmax = -1, nroffetch = 0,
totalruntime = 0;
try {
Modified:
tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/ConnectCountTest.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/ConnectCountTest.java?rev=832956&r1=832955&r2=832956&view=diff
==
---
tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/ConnectCountTest.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/ConnectCountTest.java
Thu Nov 5 01:21:11 2009
@@ -239,6 +239,7 @@
protected long sleep = 10;
protected boolean async = false;
long minwait = Long.MAX_VALUE, maxwait = -1, totalwait=0, totalcmax=0,
cmax = -1, nroffetch = 0, totalruntime = 0;
+@Override
public void run() {
try {
long now = System.currentTimeMillis();
Modified:
tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/DefaultTestCase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/m
svn commit: r832961 - in /tomcat/trunk: java/org/apache/tomcat/util/net/ webapps/examples/WEB-INF/classes/ webapps/examples/WEB-INF/classes/async/ webapps/examples/WEB-INF/classes/chat/ webapps/exampl
Author: markt
Date: Thu Nov 5 01:28:51 2009
New Revision: 832961
URL: http://svn.apache.org/viewvc?rev=832961&view=rev
Log:
Add other @Override annotations identified by Eclipse
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java
tomcat/trunk/webapps/examples/WEB-INF/classes/CookieExample.java
tomcat/trunk/webapps/examples/WEB-INF/classes/HelloWorldExample.java
tomcat/trunk/webapps/examples/WEB-INF/classes/RequestHeaderExample.java
tomcat/trunk/webapps/examples/WEB-INF/classes/RequestInfoExample.java
tomcat/trunk/webapps/examples/WEB-INF/classes/RequestParamExample.java
tomcat/trunk/webapps/examples/WEB-INF/classes/SessionExample.java
tomcat/trunk/webapps/examples/WEB-INF/classes/async/Stockticker.java
tomcat/trunk/webapps/examples/WEB-INF/classes/chat/ChatServlet.java
tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilterTestServlet.java
tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.java
tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java
tomcat/trunk/webapps/examples/WEB-INF/classes/examples/ExampleTagBase.java
tomcat/trunk/webapps/examples/WEB-INF/classes/examples/FooTag.java
tomcat/trunk/webapps/examples/WEB-INF/classes/examples/FooTagExtraInfo.java
tomcat/trunk/webapps/examples/WEB-INF/classes/examples/LogTag.java
tomcat/trunk/webapps/examples/WEB-INF/classes/examples/ShowSource.java
tomcat/trunk/webapps/examples/WEB-INF/classes/filters/ExampleFilter.java
tomcat/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/EchoAttributesTag.java
tomcat/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/FindBookSimpleTag.java
tomcat/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/HelloWorldSimpleTag.java
tomcat/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/RepeatSimpleTag.java
tomcat/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/ShuffleSimpleTag.java
tomcat/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/TileSimpleTag.java
tomcat/trunk/webapps/examples/WEB-INF/classes/servletToJsp.java
tomcat/trunk/webapps/examples/WEB-INF/classes/validators/DebugValidator.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java?rev=832961&r1=832960&r2=832961&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java Thu
Nov 5 01:28:51 2009
@@ -303,6 +303,7 @@
return result;
}
+@Override
public void run() {
while (run) {
try {
Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/CookieExample.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/CookieExample.java?rev=832961&r1=832960&r2=832961&view=diff
==
--- tomcat/trunk/webapps/examples/WEB-INF/classes/CookieExample.java (original)
+++ tomcat/trunk/webapps/examples/WEB-INF/classes/CookieExample.java Thu Nov 5
01:28:51 2009
@@ -35,6 +35,7 @@
ResourceBundle rb = ResourceBundle.getBundle("LocalStrings");
+@Override
public void doGet(HttpServletRequest request,
HttpServletResponse response)
throws IOException, ServletException
@@ -109,6 +110,7 @@
out.println("");
}
+@Override
public void doPost(HttpServletRequest request,
HttpServletResponse response)
throws IOException, ServletException
Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/HelloWorldExample.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/HelloWorldExample.java?rev=832961&r1=832960&r2=832961&view=diff
==
--- tomcat/trunk/webapps/examples/WEB-INF/classes/HelloWorldExample.java
(original)
+++ tomcat/trunk/webapps/examples/WEB-INF/classes/HelloWorldExample.java Thu
Nov 5 01:28:51 2009
@@ -32,6 +32,7 @@
public class HelloWorldExample extends HttpServlet {
+@Override
public void doGet(HttpServletRequest request,
HttpServletResponse response)
throws IOException, ServletException
Modified:
tomcat/trunk/webapps/examples/WEB-INF/classes/RequestHeaderExample.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/RequestHeaderExample.java?rev=832961&r1=832960&r2=832961&view=diff
==
--- tomcat/t
svn commit: r832963 - in /tomcat/trunk: java/org/apache/el/parser/ modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/
Author: markt
Date: Thu Nov 5 01:30:02 2009
New Revision: 832963
URL: http://svn.apache.org/viewvc?rev=832963&view=rev
Log:
Use Eclipse quick fix to remove unused imports
Modified:
tomcat/trunk/java/org/apache/el/parser/ELParserTokenManager.java
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/AbandonPercentageTest.java
tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/StarvationTest.java
tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TestException.java
tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TwoDataSources.java
Modified: tomcat/trunk/java/org/apache/el/parser/ELParserTokenManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/ELParserTokenManager.java?rev=832963&r1=832962&r2=832963&view=diff
==
--- tomcat/trunk/java/org/apache/el/parser/ELParserTokenManager.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/ELParserTokenManager.java Thu Nov 5
01:30:02 2009
@@ -1,7 +1,5 @@
/* Generated By:JJTree&JavaCC: Do not edit this line.
ELParserTokenManager.java */
package org.apache.el.parser;
-import java.io.StringReader;
-import javax.el.ELException;
/** Token Manager. */
public class ELParserTokenManager implements ELParserConstants
Modified:
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java?rev=832963&r1=832962&r2=832963&view=diff
==
---
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
Thu Nov 5 01:30:02 2009
@@ -19,7 +19,6 @@
import java.io.PrintWriter;
import java.sql.Connection;
import java.sql.SQLException;
-import java.sql.SQLFeatureNotSupportedException;
import java.util.Iterator;
import java.util.Properties;
import java.util.concurrent.Future;
Modified:
tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/AbandonPercentageTest.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/AbandonPercentageTest.java?rev=832963&r1=832962&r2=832963&view=diff
==
---
tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/AbandonPercentageTest.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/AbandonPercentageTest.java
Thu Nov 5 01:30:02 2009
@@ -18,8 +18,6 @@
package org.apache.tomcat.jdbc.test;
import java.sql.Connection;
-import java.sql.SQLException;
-
import org.apache.tomcat.jdbc.pool.interceptor.ResetAbandonedTimer;
public class AbandonPercentageTest extends DefaultTestCase {
Modified:
tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/StarvationTest.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/StarvationTest.java?rev=832963&r1=832962&r2=832963&view=diff
==
---
tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/StarvationTest.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/StarvationTest.java
Thu Nov 5 01:30:02 2009
@@ -16,12 +16,9 @@
*/
package org.apache.tomcat.jdbc.test;
-import java.util.concurrent.CountDownLatch;
import java.sql.Connection;
import java.sql.SQLException;
-import org.apache.tomcat.jdbc.test.CheckOutThreadTest.TestThread;
-
/**
* If a connection is abandoned and closed,
* then that should free up a spot in the pool, and other threads
Modified:
tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TestException.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TestException.java?rev=832963&r1=832962&r2=832963&view=diff
==
---
tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TestException.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TestException.java
Thu Nov 5 01:30:02 2009
@@ -1,14 +1,9 @@
package org.apache.tomcat.jdbc.test;
-import java.lang.reflect.Method;
import java.sql.Connection;
-import java.sql.SQLException;
-
import org.apache.tomcat.jdbc.pool.ConnectionPool;
import org.apache.tomcat.jdbc.pool.JdbcInterceptor;
import org.apache.tomcat.jdbc.pool.PooledConnection;
-import
org.apache.tomcat.jdbc.pool.interceptor.AbstractCreateStatementInterceptor;
-import org.apache.tomcat.jdbc.pool.interceptor.A
DO NOT REPLY [Bug 48132] Patch to add @Override annotations
https://issues.apache.org/bugzilla/show_bug.cgi?id=48132 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #8 from Mark Thomas 2009-11-04 17:36:44 GMT --- 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: r832974 - in /tomcat/trunk: java/org/apache/catalina/valves/ test/org/apache/catalina/valves/ webapps/docs/config/
Author: markt
Date: Thu Nov 5 02:03:12 2009
New Revision: 832974
URL: http://svn.apache.org/viewvc?rev=832974&view=rev
Log:
https://issues.apache.org/bugzilla/show_bug.cgi?id=47330
Add RemoteIpValve
Patch provided by Cyrille Le Clerc
Added:
tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java
tomcat/trunk/test/org/apache/catalina/valves/RemoteIpValveTest.java
Modified:
tomcat/trunk/java/org/apache/catalina/valves/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/valves/mbeans-descriptors.xml
tomcat/trunk/webapps/docs/config/valve.xml
Modified: tomcat/trunk/java/org/apache/catalina/valves/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/LocalStrings.properties?rev=832974&r1=832973&r2=832974&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/valves/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/valves/LocalStrings.properties Thu
Nov 5 02:03:12 2009
@@ -41,6 +41,9 @@
errorReportValve.note=note
errorReportValve.rootCauseInLogs=The full stack trace of the root cause is
available in the {0} logs.
+# Remote IP valve
+remoteIpValve.syntax=Invalid regular expressions [{0}] provided.
+
# HTTP status reports
http.100=The client may continue ({0}).
http.101=The server is switching protocols according to the "Upgrade" header
({0}).
Added: tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java?rev=832974&view=auto
==
--- tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java (added)
+++ tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java Thu Nov 5
02:03:12 2009
@@ -0,0 +1,712 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.catalina.valves;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.regex.Pattern;
+import java.util.regex.PatternSyntaxException;
+
+import javax.servlet.ServletException;
+
+import org.apache.tomcat.util.res.StringManager;
+import org.apache.catalina.connector.Request;
+import org.apache.catalina.connector.Response;
+import org.apache.catalina.valves.Constants;
+import org.apache.catalina.valves.RequestFilterValve;
+import org.apache.catalina.valves.ValveBase;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
+
+/**
+ *
+ * Tomcat port of http://httpd.apache.org/docs/trunk/mod/mod_remoteip.html";>mod_remoteip,
this valve replaces the apparent
+ * client remote IP address and hostname for the request with the IP address
list presented by a proxy or a load balancer via a request
+ * headers (e.g. "X-Forwarded-For").
+ *
+ *
+ * Another feature of this valve is to replace the apparent scheme
(http/https) and server port with the scheme presented by a proxy or a
+ * load balancer via a request header (e.g. "X-Forwarded-Proto").
+ *
+ *
+ * This valve proceeds as follows:
+ *
+ *
+ * If the incoming request.getRemoteAddr() matches the valve's
list of internal proxies :
+ *
+ * Loop on the comma delimited list of IPs and hostnames passed by the
preceding load balancer or proxy in the given request's Http
+ * header named $remoteIPHeader (default value
x-forwarded-for). Values are processed in right-to-left order.
+ * For each ip/host of the list:
+ *
+ * if it matches the internal proxies list, the ip/host is swallowed
+ * if it matches the trusted proxies list, the ip/host is added to the
created proxies header
+ * otherwise, the ip/host is declared to be the remote ip and looping is
stopped.
+ *
+ *
+ * If the request http header named $protocolHeader (e.g.
x-forwarded-for) equals to the value of
+ * protocolHeaderHttpsValue configuration parameter (default
https) then request.isSecure = true,
+ * request.scheme = https and request.serverPort =
443. Note that 443 can be overwritten with the
+ * $httpsServerPort configuration parameter.
+
DO NOT REPLY [Bug 47330] proposal : port of mod_remoteip in Tomcat as RemoteIpValve
https://issues.apache.org/bugzilla/show_bug.cgi?id=47330 Mark Thomas changed: What|Removed |Added Status|NEEDINFO|NEW --- Comment #8 from Mark Thomas 2009-11-04 18:05:37 GMT --- Thanks for the updated patch. I have applied the valve patch to trunk. The filter patch will follow along with a backport proposal for the valve to 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 48133] New: misspellings in the javadoc and comment of the various classes in the package of "org.apache.core"
https://issues.apache.org/bugzilla/show_bug.cgi?id=48133 Summary: misspellings in the javadoc and comment of the various classes in the package of "org.apache.core" Product: Tomcat 7 Version: trunk Platform: PC OS/Version: Linux Status: NEW Severity: minor Priority: P2 Component: Catalina AssignedTo: dev@tomcat.apache.org ReportedBy: qingyang...@qunar.com Created an attachment (id=24486) --> (https://issues.apache.org/bugzilla/attachment.cgi?id=24486) the svn patch file Please see the attached file, which is a svn patch file of the he various classes in the package of "org.apache.core" -- 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
