svn commit: r782320 - /tomcat/current/tc5.5.x/STATUS.txt
Author: kkolinko Date: Sat Jun 6 23:26:49 2009 New Revision: 782320 URL: http://svn.apache.org/viewvc?rev=782320&view=rev Log: propose updated patch Modified: tomcat/current/tc5.5.x/STATUS.txt Modified: tomcat/current/tc5.5.x/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=782320&r1=782319&r2=782320&view=diff == --- tomcat/current/tc5.5.x/STATUS.txt (original) +++ tomcat/current/tc5.5.x/STATUS.txt Sat Jun 6 23:26:49 2009 @@ -49,12 +49,11 @@ * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=38483 Make access log valves thread safe (part 2) - (It is an addition to markts' 2009-02-04-bug38483.patch that is proposed above) + (It is an addition to markt's 2009-02-04-bug38483.patch that is proposed above) The dateFormatter that is used for log file rotation also needs its syncs. - The sync block scope is wide, because rotationLastChecked assignment is also - not safe: long and pointer assignments are not atomic. - It also allows us to get rid of double checks for tsDate. - http://people.apache.org/~kkolinko/patches/2009-05-29_bug38483_2.patch + Also added volatile modifier to rotationLastChecked, because + long assignments are not atomic. (see Java Language Specification 3rd ed, ch. 17.7) + http://people.apache.org/~kkolinko/patches/2009-06-07_bug38483_2.patch +1: kkolinko -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r782317 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Sat Jun 6 22:52:19 2009 New Revision: 782317 URL: http://svn.apache.org/viewvc?rev=782317&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=782317&r1=782316&r2=782317&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Jun 6 22:52:19 2009 @@ -145,7 +145,7 @@ Remove use of ServerFactory to enable MapperListener to start when service name != engine name https://issues.apache.org/bugzilla/attachment.cgi?id=23764 - +1: markt + +1: markt, kkolinko -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47299 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r782316 - /tomcat/current/tc5.5.x/STATUS.txt
Author: kkolinko Date: Sat Jun 6 22:44:54 2009 New Revision: 782316 URL: http://svn.apache.org/viewvc?rev=782316&view=rev Log: votes Modified: tomcat/current/tc5.5.x/STATUS.txt Modified: tomcat/current/tc5.5.x/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=782316&r1=782315&r2=782316&view=diff == --- tomcat/current/tc5.5.x/STATUS.txt (original) +++ tomcat/current/tc5.5.x/STATUS.txt Sat Jun 6 22:44:54 2009 @@ -36,7 +36,7 @@ * Patch to prevent regression with above fix for 36923 (ie bug 47318) http://svn.apache.org/viewvc?rev=782168&view=rev - +1: markt + +1: markt, kkolinko -1: @@ -82,6 +82,7 @@ from OACC to tc5.5.x. +1: rjung, pero, kkolinko -1: + * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46552 Return a 400 rather than a 200 if headers are too large http://people.apache.org/~markt/patches/2009-04-09-bug46552.patch @@ -122,6 +123,8 @@ http://svn.apache.org/viewvc?rev=777624&view=rev +1: markt -1: + kkolinko: good, but needs an amendment, because some files were deleted in +http://svn.apache.org/viewvc?view=rev&revision=779927 * Fix download task for NSIS so that it installs what it downloads, instead of just downloading an exe installer. @@ -136,5 +139,5 @@ name != engine name This is a regression caused by the fix for bug 42707 https://issues.apache.org/bugzilla/attachment.cgi?id=23764 - +1: markt - -1: \ No newline at end of file + +1: markt, kkolinko + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 47324] New: sessionsList.jsp uses absolute urls which doesn't work for Tomcat behind a reverse proxy
https://issues.apache.org/bugzilla/show_bug.cgi?id=47324 Summary: sessionsList.jsp uses absolute urls which doesn't work for Tomcat behind a reverse proxy Product: Tomcat 6 Version: unspecified Platform: All OS/Version: All Status: NEW Severity: normal Priority: P2 Component: Manager application AssignedTo: dev@tomcat.apache.org ReportedBy: maik.jablon...@gmail.com sessionsList.jsp uses getRequestURL() which creates absolute links (with server:port included) like: http://localhost:8080/manager/html/sessions?path=/ This is a problem when running Tomcat-Manager-Application behind a reverse proxy (e.g. apache http server), because outgoing links doesn't work anymore. Proposed fix is to use getRequestURI instead. 29c29String submitUrl = > ((HttpServletRequest)pageContext.getRequest()).getRequestURI() + "?path=" + > path; -- 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 47323] Name clash: o.a.c.Manager class vs. o.a.c.manager package when compiling JSP
https://issues.apache.org/bugzilla/show_bug.cgi?id=47323 Konstantin Kolinko changed: What|Removed |Added CC||p...@mediamens.nl --- Comment #1 from Konstantin Kolinko 2009-06-06 10:08:37 PST --- *** Bug 39093 has been marked as a duplicate of this bug. *** -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 39093] Tomcat messes up when a class has the same name as a package
https://issues.apache.org/bugzilla/show_bug.cgi?id=39093
Konstantin Kolinko changed:
What|Removed |Added
Resolution|INVALID |DUPLICATE
--- Comment #7 from Konstantin Kolinko 2009-06-06
10:08:37 PST ---
In Tomcat 6.0.20, I cannot reproduce this issue as is (by deploying the web
application from attachment 18379), but I can if I move the class files from
WEB-INF/classes into ${catalina.home}/lib
Thus, the issue does exist, but is not observed with web applications, because
different class loaders behave differently.
My environment:
- Windows XP Prof. SP3
- JRE 1.6.0_13-b03
- Tomcat 6.0.20
A workaround is to pack the classes into a jar file.
*** This bug has been marked as a duplicate of bug 47323 ***
--
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 47323] New: Name clash: o.a.c.Manager class vs. o.a.c.manager package when compiling JSP
https://issues.apache.org/bugzilla/show_bug.cgi?id=47323
Summary: Name clash: o.a.c.Manager class vs. o.a.c.manager
package when compiling JSP
Product: Tomcat 6
Version: 6.0.20
Platform: PC
OS/Version: Windows XP
Status: NEW
Severity: minor
Priority: P2
Component: Jasper
AssignedTo: dev@tomcat.apache.org
ReportedBy: knst.koli...@gmail.com
The following issue is specific to MS Windows, where file system is
case-insensitive, and it does not occur when the classes are inside a jar file
(catalina.jar).
I observed it in development environment, when trying to run Tomcat from its
compiled sources without building a distributive.
Steps to reproduce this issue with TC 6.0.20:
--
1. Get and unpack apache-tomcat-6.0.20.zip
2. In ${catalina.home}/lib folder unpack all classes from catalina.jar.
Remove catalina.jar or rename it e.g. to catalina.ja_.
3. In ${catalina.home}/conf/tomcat-users.xml add a user with role "manager"
4. Launch Tomcat and login to the Manager application
5. On the page that lists the web applications, click on the count of sessions
for the manager webapp, i.e. access the following URL:
http://localhost:8080/manager/html/sessions?path=/manager
6. Expected result: Showing a list of sessions for the web app.
Actual result:
-
FAIL - Encountered exception org.apache.jasper.JasperException: Unable to
compile class for JSP:
An error occurred at line: 8 in the generated java file
The import org.apache.catalina.manager cannot be resolved
-
The issue is reproducible if the compiler is replaced with the latest one from
eclipse-JDT-SDK-3.5RC3.zip of 200905282000.
I cannot reproduce the issue independently when editing files in Eclipse IDE,
so it is like it does not affect Eclipse users.
I was looking in the code where Jasper calls the JDT compiler, and found the
following, in method generateClass(String[]) of o.a.j.compiler.JDTCompiler:
final INameEnvironment env = new INameEnvironment() {
(..)
private boolean isPackage(String result) {
if (result.equals(targetClassName)) {
return false;
}
String resourceName = result.replace('.', '/') + ".class";
InputStream is =
classLoader.getResourceAsStream(resourceName);
return is == null;
}
}
The isPackage() method will provide false negative for "o.a.c.manager" package,
because an attempt to read "o.a.c.manager.class" file will result in reading
the "Manager.class" file and will be successful.
I thought of proposing to rename either the class or the package, but it is not
feasible, as there are a lot of other subpackages with similar name clashes in
o.a.catalina: authenticator, realm, loader, session. :/
The workaround for this issue is to pack clashing classes into a jar file, or
to use a different OS.
--
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: r782254 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Sat Jun 6 13:07:13 2009 New Revision: 782254 URL: http://svn.apache.org/viewvc?rev=782254&view=rev Log: votes 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=782254&r1=782253&r2=782254&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Jun 6 13:07:13 2009 @@ -130,6 +130,8 @@ mime-type for .doc is application/msword See mime.types file of Apache, e.g. here: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/conf/ +or IANA +http://www.iana.org/assignments/media-types/index.html The rest of the change is OK. ) @@ -150,10 +152,16 @@ Simply code. Make it work with classes that extend StandardContext http://svn.apache.org/viewvc?rev=782145&view=rev +1: markt + +1: kkolinko ( + good. + I see no need to carry on the "Race condition is harmless" comment, + because IMO it applies to containerEventMethod field lazy initialization code, + that is removed from the source. + ) -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47318 Process include preludes and codas for directivesOnly as well as full pages http://svn.apache.org/viewvc?rev=782166&view=rev - +1: markt + +1: markt, kkolinko -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r782249 - in /tomcat/trunk/java: javax/servlet/http/ org/apache/catalina/connector/ org/apache/catalina/core/
ma...@apache.org wrote: > Author: markt > Date: Sat Jun 6 12:54:28 2009 > New Revision: 782249 > > URL: http://svn.apache.org/viewvc?rev=782249&view=rev Add with this, we should be up to date with the latest draft of the Servlet 3.0 spec. Just some implementation to do ... Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r782249 - in /tomcat/trunk/java: javax/servlet/http/ org/apache/catalina/connector/ org/apache/catalina/core/
Author: markt
Date: Sat Jun 6 12:54:28 2009
New Revision: 782249
URL: http://svn.apache.org/viewvc?rev=782249&view=rev
Log:
login -> authenticate
Modified:
tomcat/trunk/java/javax/servlet/http/HttpServletRequest.java
tomcat/trunk/java/javax/servlet/http/HttpServletRequestWrapper.java
tomcat/trunk/java/org/apache/catalina/connector/Request.java
tomcat/trunk/java/org/apache/catalina/connector/RequestFacade.java
tomcat/trunk/java/org/apache/catalina/core/DummyRequest.java
Modified: tomcat/trunk/java/javax/servlet/http/HttpServletRequest.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/HttpServletRequest.java?rev=782249&r1=782248&r2=782249&view=diff
==
--- tomcat/trunk/java/javax/servlet/http/HttpServletRequest.java (original)
+++ tomcat/trunk/java/javax/servlet/http/HttpServletRequest.java Sat Jun 6
12:54:28 2009
@@ -667,8 +667,9 @@
* @throws IOException
* @throws ServletException
* @since Servlet 3.0
+ * TODO SERVLET3 - Add comments
*/
-public boolean login(HttpServletResponse response)
+public boolean authenticate(HttpServletResponse response)
throws IOException, ServletException;
@@ -678,6 +679,7 @@
* @param password
* @throws ServletException
* @since Servlet 3.0
+ * TODO SERVLET3 - Add comments
*/
public void login(java.lang.String username, String password)
throws ServletException;
@@ -687,6 +689,7 @@
*
* @throws ServletException
* @since Servlet 3.0
+ * TODO SERVLET3 - Add comments
*/
public void logout() throws ServletException;
@@ -695,6 +698,7 @@
*
* @return
* @since Servlet 3.0
+ * TODO SERVLET3 - Add comments
*/
public Iterable getParts();
@@ -705,6 +709,7 @@
* @return
* @throws IllegalArgumentException
* @since Servlet 3.0
+ * TODO SERVLET3 - Add comments
*/
public Part getPart(java.lang.String name);
}
Modified: tomcat/trunk/java/javax/servlet/http/HttpServletRequestWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/HttpServletRequestWrapper.java?rev=782249&r1=782248&r2=782249&view=diff
==
--- tomcat/trunk/java/javax/servlet/http/HttpServletRequestWrapper.java
(original)
+++ tomcat/trunk/java/javax/servlet/http/HttpServletRequestWrapper.java Sat Jun
6 12:54:28 2009
@@ -264,14 +264,16 @@
/**
* @since Servlet 3.0
+ * TODO SERVLET3 - Add comments
*/
-public boolean login(HttpServletResponse response)
+public boolean authenticate(HttpServletResponse response)
throws IOException, ServletException {
-return this._getHttpServletRequest().login(response);
+return this._getHttpServletRequest().authenticate(response);
}
/**
* @since Servlet 3.0
+ * TODO SERVLET3 - Add comments
*/
public void login(String username, String password) throws
ServletException {
this._getHttpServletRequest().login(username, password);
@@ -279,6 +281,7 @@
/**
* @since Servlet 3.0
+ * TODO SERVLET3 - Add comments
*/
public void logout() throws ServletException {
this._getHttpServletRequest().logout();
@@ -287,6 +290,7 @@
/**
* @since Servlet 3.0
+ * TODO SERVLET3 - Add comments
*/
public Iterable getParts() {
return this._getHttpServletRequest().getParts();
@@ -294,6 +298,7 @@
/**
* @since Servlet 3.0
+ * TODO SERVLET3 - Add comments
*/
public Part getPart(String name) {
return this._getHttpServletRequest().getPart(name);
Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?rev=782249&r1=782248&r2=782249&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Sat Jun 6
12:54:28 2009
@@ -2239,7 +2239,7 @@
return requestedSessionSSL;
}
-public boolean login(HttpServletResponse response) throws IOException {
+public boolean authenticate(HttpServletResponse response) throws
IOException {
// TODO Servlet 3
return false;
}
Modified: tomcat/trunk/java/org/apache/catalina/connector/RequestFacade.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/RequestFacade.java?rev=782249&r1=782248&r2=782249&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/RequestFacade.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Request
svn commit: r782248 - /tomcat/trunk/java/javax/servlet/annotation/WebListener.java
Author: markt
Date: Sat Jun 6 12:50:53 2009
New Revision: 782248
URL: http://svn.apache.org/viewvc?rev=782248&view=rev
Log:
Add default
Modified:
tomcat/trunk/java/javax/servlet/annotation/WebListener.java
Modified: tomcat/trunk/java/javax/servlet/annotation/WebListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/annotation/WebListener.java?rev=782248&r1=782247&r2=782248&view=diff
==
--- tomcat/trunk/java/javax/servlet/annotation/WebListener.java (original)
+++ tomcat/trunk/java/javax/servlet/annotation/WebListener.java Sat Jun 6
12:50:53 2009
@@ -23,13 +23,13 @@
import java.lang.annotation.Documented;
/**
- * @since 3.0
+ * @since Servlet 3.0
* $Id$
- * TODO SERVLET3
+ * TODO SERVLET3 - Add comments
*/
@Target({ElementType.TYPE})
@Retention(RetentionPolicy.RUNTIME)
@Documented
public @interface WebListener {
-String description();
+String description() default "";
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r782247 - /tomcat/trunk/java/javax/servlet/annotation/MultipartConfig.java
Author: markt
Date: Sat Jun 6 12:50:28 2009
New Revision: 782247
URL: http://svn.apache.org/viewvc?rev=782247&view=rev
Log:
Update types
Modified:
tomcat/trunk/java/javax/servlet/annotation/MultipartConfig.java
Modified: tomcat/trunk/java/javax/servlet/annotation/MultipartConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/annotation/MultipartConfig.java?rev=782247&r1=782246&r2=782247&view=diff
==
--- tomcat/trunk/java/javax/servlet/annotation/MultipartConfig.java (original)
+++ tomcat/trunk/java/javax/servlet/annotation/MultipartConfig.java Sat Jun 6
12:50:28 2009
@@ -23,16 +23,16 @@
import java.lang.annotation.Target;
/**
- * @since 3.0
+ * @since Servlet 3.0
* $Id$
- * TODO SERVLET3
+ * TODO SERVLET3 - Add comments
*/
@Target({ElementType.TYPE})
@Retention(RetentionPolicy.RUNTIME)
@Documented
public @interface MultipartConfig {
String location() default "";
-int maxFileSize() default 0;
-int maxRequestSize() default 0;
+long maxFileSize() default 0L;
+long maxRequestSize() default 0L;
int fileSizeThreshold() default 0;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r782245 - /tomcat/trunk/java/javax/servlet/SessionCookieConfig.java
Author: markt
Date: Sat Jun 6 12:49:52 2009
New Revision: 782245
URL: http://svn.apache.org/viewvc?rev=782245&view=rev
Log:
Fix copy and paste error
Modified:
tomcat/trunk/java/javax/servlet/SessionCookieConfig.java
Modified: tomcat/trunk/java/javax/servlet/SessionCookieConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/SessionCookieConfig.java?rev=782245&r1=782244&r2=782245&view=diff
==
--- tomcat/trunk/java/javax/servlet/SessionCookieConfig.java (original)
+++ tomcat/trunk/java/javax/servlet/SessionCookieConfig.java Sat Jun 6
12:49:52 2009
@@ -18,8 +18,9 @@
/**
*
- * @since 3.0
+ * @since Servlet 3.0
* $Id$
+ * TODO SERVLET3 - Add comments
*/
public interface SessionCookieConfig {
@@ -84,6 +85,6 @@
*/
public void setMaxAge(int MaxAge);
-public int getHttpOnly();
+public int getMaxAge();
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r782244 - in /tomcat/trunk/java/javax/servlet: ./ annotation/ http/
Author: markt
Date: Sat Jun 6 12:49:12 2009
New Revision: 782244
URL: http://svn.apache.org/viewvc?rev=782244&view=rev
Log:
Cosmetic changes
- make since tags consistent
- Add TODOs were required
- Fix copy and paste errors in javadoc
Modified:
tomcat/trunk/java/javax/servlet/AsyncContext.java
tomcat/trunk/java/javax/servlet/AsyncEvent.java
tomcat/trunk/java/javax/servlet/AsyncListener.java
tomcat/trunk/java/javax/servlet/DispatcherType.java
tomcat/trunk/java/javax/servlet/FilterRegistration.java
tomcat/trunk/java/javax/servlet/Registration.java
tomcat/trunk/java/javax/servlet/ServletContainerInitializer.java
tomcat/trunk/java/javax/servlet/ServletContext.java
tomcat/trunk/java/javax/servlet/ServletRegistration.java
tomcat/trunk/java/javax/servlet/ServletRequest.java
tomcat/trunk/java/javax/servlet/ServletRequestWrapper.java
tomcat/trunk/java/javax/servlet/ServletResponseWrapper.java
tomcat/trunk/java/javax/servlet/SessionTrackingMode.java
tomcat/trunk/java/javax/servlet/annotation/HandlesTypes.java
tomcat/trunk/java/javax/servlet/annotation/WebFilter.java
tomcat/trunk/java/javax/servlet/annotation/WebInitParam.java
tomcat/trunk/java/javax/servlet/annotation/WebServlet.java
tomcat/trunk/java/javax/servlet/http/Cookie.java
tomcat/trunk/java/javax/servlet/http/HttpServletResponse.java
tomcat/trunk/java/javax/servlet/http/HttpServletResponseWrapper.java
tomcat/trunk/java/javax/servlet/http/Part.java
Modified: tomcat/trunk/java/javax/servlet/AsyncContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/AsyncContext.java?rev=782244&r1=782243&r2=782244&view=diff
==
--- tomcat/trunk/java/javax/servlet/AsyncContext.java (original)
+++ tomcat/trunk/java/javax/servlet/AsyncContext.java Sat Jun 6 12:49:12 2009
@@ -17,9 +17,9 @@
package javax.servlet;
/**
- * @since 3.0
+ * @since Servlet 3.0
* $Id$
- * TODO SERVLET3
+ * TODO SERVLET3 - Add comments
*/
public interface AsyncContext {
public static final String ASYNC_REQUEST_URI =
Modified: tomcat/trunk/java/javax/servlet/AsyncEvent.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/AsyncEvent.java?rev=782244&r1=782243&r2=782244&view=diff
==
--- tomcat/trunk/java/javax/servlet/AsyncEvent.java (original)
+++ tomcat/trunk/java/javax/servlet/AsyncEvent.java Sat Jun 6 12:49:12 2009
@@ -17,7 +17,7 @@
package javax.servlet;
/**
- * @since 3.0
+ * @since Servlet 3.0
* $Id$
* TODO SERVLET3 - Add comments
*/
Modified: tomcat/trunk/java/javax/servlet/AsyncListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/AsyncListener.java?rev=782244&r1=782243&r2=782244&view=diff
==
--- tomcat/trunk/java/javax/servlet/AsyncListener.java (original)
+++ tomcat/trunk/java/javax/servlet/AsyncListener.java Sat Jun 6 12:49:12 2009
@@ -20,7 +20,7 @@
import java.util.EventListener;
/**
- * @since 3.0
+ * @since Servlet 3.0
* $Id$
* TODO SERVLET3 - Add comments
*/
Modified: tomcat/trunk/java/javax/servlet/DispatcherType.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/DispatcherType.java?rev=782244&r1=782243&r2=782244&view=diff
==
--- tomcat/trunk/java/javax/servlet/DispatcherType.java (original)
+++ tomcat/trunk/java/javax/servlet/DispatcherType.java Sat Jun 6 12:49:12 2009
@@ -17,7 +17,7 @@
package javax.servlet;
/**
- * @since 3.0
+ * @since Servlet 3.0
* $Id$
*/
public enum DispatcherType {
Modified: tomcat/trunk/java/javax/servlet/FilterRegistration.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/FilterRegistration.java?rev=782244&r1=782243&r2=782244&view=diff
==
--- tomcat/trunk/java/javax/servlet/FilterRegistration.java (original)
+++ tomcat/trunk/java/javax/servlet/FilterRegistration.java Sat Jun 6 12:49:12
2009
@@ -19,7 +19,7 @@
import java.util.EnumSet;
/**
- * @since 3.0
+ * @since Servlet 3.0
* $Id$
* TODO SERVLET3 - Add comments
*/
@@ -33,7 +33,8 @@
* @throws IllegalArgumentException
* @throws IllegalStateException
*/
-public void addMappingForServletNames(EnumSet
dispatcherTypes,
+public void addMappingForServletNames(
+EnumSet dispatcherTypes,
boolean isMatchAfter, String... servletNames);
/**
@@ -44,7 +45,8 @@
* @throws IllegalArgumentException
* @throws IllegalStateException
*/
-public void addMappingForUrlPatterns(EnumSet
dispatcherTypes,
+public void addMappingForUrlPatterns(
+EnumSet dispatcherTypes,
boolean isMatchAfter, String
