Author: markt
Date: Sun Feb 7 21:02:03 2010
New Revision: 907490
URL: http://svn.apache.org/viewvc?rev=907490&view=rev
Log:
Get javax.servlet passing TCK API check
Mainly removing generics and @Deprecated
Modified:
tomcat/trunk/java/javax/servlet/HttpConstraintElement.java
tomcat/trunk/java/javax/servlet/HttpMethodConstraintElement.java
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/ServletResponseWrapper.java
tomcat/trunk/java/javax/servlet/SingleThreadModel.java
tomcat/trunk/java/javax/servlet/UnavailableException.java
tomcat/trunk/java/javax/servlet/annotation/HandlesTypes.java
tomcat/trunk/java/javax/servlet/annotation/MultipartConfig.java
Modified: tomcat/trunk/java/javax/servlet/HttpConstraintElement.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/HttpConstraintElement.java?rev=907490&r1=907489&r2=907490&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/HttpConstraintElement.java (original)
+++ tomcat/trunk/java/javax/servlet/HttpConstraintElement.java Sun Feb 7
21:02:03 2010
@@ -28,7 +28,7 @@
public class HttpConstraintElement {
private static final String LSTRING_FILE = "javax.servlet.LocalStrings";
- protected static final ResourceBundle lStrings =
+ private static final ResourceBundle lStrings =
ResourceBundle.getBundle(LSTRING_FILE);
private EmptyRoleSemantic emptyRoleSemantic = EmptyRoleSemantic.PERMIT;
Modified: tomcat/trunk/java/javax/servlet/HttpMethodConstraintElement.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/HttpMethodConstraintElement.java?rev=907490&r1=907489&r2=907490&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/HttpMethodConstraintElement.java (original)
+++ tomcat/trunk/java/javax/servlet/HttpMethodConstraintElement.java Sun Feb 7
21:02:03 2010
@@ -16,12 +16,19 @@
*/
package javax.servlet;
+import java.util.ResourceBundle;
+
/**
* @since Servlet 3.0
* TODO SERVLET3 - Add comments
*/
public class HttpMethodConstraintElement extends HttpConstraintElement {
-
+
+ // Can't inherit from HttpConstraintElement as API does not allow it
+ private static final String LSTRING_FILE = "javax.servlet.LocalStrings";
+ private static final ResourceBundle lStrings =
+ ResourceBundle.getBundle(LSTRING_FILE);
+
private String methodName;
public HttpMethodConstraintElement(String methodName) {
Modified: tomcat/trunk/java/javax/servlet/ServletContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/ServletContext.java?rev=907490&r1=907489&r2=907490&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/ServletContext.java (original)
+++ tomcat/trunk/java/javax/servlet/ServletContext.java Sun Feb 7 21:02:03 2010
@@ -353,10 +353,10 @@
* <p>In lieu of this method, servlets can share information using the
* <code>ServletContext</code> class and can perform shared business logic
* by invoking methods on common non-servlet classes.
- *
+ *
+ * @deprecated
*/
-
- @Deprecated
+ @SuppressWarnings("dep-ann") // Spec API does not use dep-ann
public Servlet getServlet(String name) throws ServletException;
@@ -374,10 +374,10 @@
* remains only to preserve binary compatibility. This method
* will be permanently removed in a future version of the Java
* Servlet API.
- *
+ *
+ * @deprecated
*/
-
- @Deprecated
+ @SuppressWarnings("dep-ann") // Spec API does not use dep-ann
public Enumeration<Servlet> getServlets();
@@ -394,10 +394,10 @@
* this method always returns an empty <code>Enumeration</code> and
* remains only to preserve binary compatibility. This method will
* be permanently removed in a future version of the Java Servlet API.
- *
+ *
+ * @deprecated
*/
-
- @Deprecated
+ @SuppressWarnings("dep-ann") // Spec API does not use dep-ann
public Enumeration<String> getServletNames();
@@ -430,10 +430,10 @@
* <p>This method was originally defined to write an
* exception's stack trace and an explanatory error message
* to the servlet log file.
- *
+ *
+ * @deprecated
*/
-
- @Deprecated
+ @SuppressWarnings("dep-ann") // Spec API does not use dep-ann
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=907490&r1=907489&r2=907490&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/ServletRequest.java (original)
+++ tomcat/trunk/java/javax/servlet/ServletRequest.java Sun Feb 7 21:02:03 2010
@@ -540,13 +540,10 @@
/**
- *
* @deprecated As of Version 2.1 of the Java Servlet API,
* use {...@link ServletContext#getRealPath}
instead.
- *
*/
-
- @Deprecated
+ @SuppressWarnings("dep-ann") // Spec API does not use dep-ann
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.java?rev=907490&r1=907489&r2=907490&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/ServletRequestWrapper.java (original)
+++ tomcat/trunk/java/javax/servlet/ServletRequestWrapper.java Sun Feb 7
21:02:03 2010
@@ -351,8 +351,7 @@
* on the wrapped request object.
* @deprecated As of Version 3.0 of the Java Servlet API
*/
-
- @Deprecated
+ @SuppressWarnings("dep-ann") // Spec API does not use dep-ann
public String getRealPath(String path) {
return this.request.getRealPath(path);
}
@@ -493,7 +492,8 @@
* @since Servlet 3.0
* TODO SERVLET3 - Add comments
*/
- public boolean isWrapperFor(Class<? extends ServletRequest> wrappedType) {
+ @SuppressWarnings("unchecked") // Spec API does not use generics
+ public boolean isWrapperFor(Class wrappedType) {
if (wrappedType.isAssignableFrom(request.getClass())) {
return true;
}
Modified: tomcat/trunk/java/javax/servlet/ServletResponseWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/ServletResponseWrapper.java?rev=907490&r1=907489&r2=907490&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/ServletResponseWrapper.java (original)
+++ tomcat/trunk/java/javax/servlet/ServletResponseWrapper.java Sun Feb 7
21:02:03 2010
@@ -231,7 +231,8 @@
* @since Servlet 3.0
* TODO SERVLET3 - Add comments
*/
- public boolean isWrapperFor(Class<? extends ServletResponse> wrappedType) {
+ @SuppressWarnings("unchecked") // Spec API does not use generics
+ public boolean isWrapperFor(Class wrappedType) {
if (wrappedType.isAssignableFrom(response.getClass())) {
return true;
}
Modified: tomcat/trunk/java/javax/servlet/SingleThreadModel.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/SingleThreadModel.java?rev=907490&r1=907489&r2=907490&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/SingleThreadModel.java (original)
+++ tomcat/trunk/java/javax/servlet/SingleThreadModel.java Sun Feb 7 21:02:03
2010
@@ -44,8 +44,7 @@
* @deprecated As of Java Servlet API 2.4, with no direct
* replacement.
*/
-
-...@deprecated
+...@suppresswarnings("dep-ann") // Spec API does not use dep-ann
public interface SingleThreadModel {
// No methods
}
Modified: tomcat/trunk/java/javax/servlet/UnavailableException.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/UnavailableException.java?rev=907490&r1=907489&r2=907490&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/UnavailableException.java (original)
+++ tomcat/trunk/java/javax/servlet/UnavailableException.java Sun Feb 7
21:02:03 2010
@@ -56,19 +56,16 @@
private int seconds; // unavailability estimate
/**
- *
- * @deprecated As of Java Servlet API 2.2, use {...@link
- * #UnavailableException(String)} instead.
- *
* @param servlet the <code>Servlet</code> instance that is
* unavailable
*
* @param msg a <code>String</code> specifying the
* descriptive message
- *
+ *
+ * @deprecated As of Java Servlet API 2.2, use {...@link
+ * #UnavailableException(String)} instead.
*/
-
- @Deprecated
+ @SuppressWarnings("dep-ann") // Spec API does not use dep-ann
public UnavailableException(Servlet servlet, String msg) {
super(msg);
this.servlet = servlet;
@@ -76,8 +73,6 @@
}
/**
- * @deprecated As of Java Servlet API 2.2, use {...@link
- * #UnavailableException(String, int)} instead.
*
* @param seconds an integer specifying the number of seconds
* the servlet expects to be unavailable; if
@@ -89,10 +84,11 @@
* @param msg a <code>String</code> specifying the descriptive
* message, which can be written to a log file or
* displayed for the user.
- *
+ *
+ * @deprecated As of Java Servlet API 2.2, use {...@link
+ * #UnavailableException(String, int)} instead.
*/
-
- @Deprecated
+ @SuppressWarnings("dep-ann") // Spec API does not use dep-ann
public UnavailableException(int seconds, Servlet servlet, String msg) {
super(msg);
this.servlet = servlet;
@@ -172,16 +168,14 @@
}
/**
- * @deprecated As of Java Servlet API 2.2, with no replacement.
- *
* Returns the servlet that is reporting its unavailability.
*
* @return the <code>Servlet</code> object that is
* throwing the <code>UnavailableException</code>
*
+ * @deprecated As of Java Servlet API 2.2, with no replacement.
*/
-
- @Deprecated
+ @SuppressWarnings("dep-ann") // Spec API does not use dep-ann
public Servlet getServlet() {
return servlet;
}
Modified: tomcat/trunk/java/javax/servlet/annotation/HandlesTypes.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/annotation/HandlesTypes.java?rev=907490&r1=907489&r2=907490&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/annotation/HandlesTypes.java (original)
+++ tomcat/trunk/java/javax/servlet/annotation/HandlesTypes.java Sun Feb 7
21:02:03 2010
@@ -16,7 +16,6 @@
*/
package javax.servlet.annotation;
-import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
@@ -28,7 +27,7 @@
*/
@Target({ElementType.TYPE})
@Retention(RetentionPolicy.RUNTIME)
-...@documented
+...@suppresswarnings("unchecked") // Spec API does not use generics
public @interface HandlesTypes {
- Class<?>[] value();
+ Class[] value();
}
Modified: tomcat/trunk/java/javax/servlet/annotation/MultipartConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/annotation/MultipartConfig.java?rev=907490&r1=907489&r2=907490&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/annotation/MultipartConfig.java (original)
+++ tomcat/trunk/java/javax/servlet/annotation/MultipartConfig.java Sun Feb 7
21:02:03 2010
@@ -16,7 +16,6 @@
*/
package javax.servlet.annotation;
-import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
@@ -28,7 +27,6 @@
*/
@Target({ElementType.TYPE})
@Retention(RetentionPolicy.RUNTIME)
-...@documented
public @interface MultipartConfig {
String location() default "";
long maxFileSize() default -1L;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
