This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 4ed2dc843a59ef204f93082d610f8d6f547051ab
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Nov 27 23:25:20 2019 +0000
Rename "javax.annotation.*" to "jakarta.annotation.*"
---
build.xml | 10 ++++--
java/{javax => jakarta}/annotation/Generated.java | 2 +-
.../{javax => jakarta}/annotation/ManagedBean.java | 2 +-
.../annotation/PostConstruct.java | 2 +-
java/{javax => jakarta}/annotation/PreDestroy.java | 2 +-
java/{javax => jakarta}/annotation/Priority.java | 2 +-
java/{javax => jakarta}/annotation/Resource.java | 2 +-
java/{javax => jakarta}/annotation/Resources.java | 2 +-
.../annotation/security/DeclareRoles.java | 2 +-
.../annotation/security/DenyAll.java | 2 +-
.../annotation/security/PermitAll.java | 2 +-
.../annotation/security/RolesAllowed.java | 2 +-
.../annotation/security/RunAs.java | 2 +-
.../annotation/sql/DataSourceDefinition.java | 2 +-
.../annotation/sql/DataSourceDefinitions.java | 2 +-
.../catalina/core/DefaultInstanceManager.java | 7 ++--
.../apache/catalina/startup/WebAnnotationSet.java | 9 +++---
modules/cxf/pom.xml | 2 +-
res/META-INF/annotations-api.jar.manifest | 4 +--
res/bnd/annotations-api.jar.tmp.bnd | 6 ++--
res/checkstyle/checkstyle.xml | 2 +-
res/checkstyle/jakarta-checkstyle.xml | 37 ++++++++++++++++++++++
...port-control.xml => jakarta-import-control.xml} | 4 +--
res/checkstyle/javax-import-control.xml | 2 +-
res/checkstyle/org-import-control.xml | 8 ++---
.../startup/TesterServletWithAnnotations.java | 3 +-
.../startup/TesterServletWithLifeCycleMethods.java | 5 +--
test/webapp/annotations.jsp | 2 +-
28 files changed, 88 insertions(+), 41 deletions(-)
diff --git a/build.xml b/build.xml
index 4141d0a..133fb74 100644
--- a/build.xml
+++ b/build.xml
@@ -327,7 +327,7 @@
<!-- ========= Pattern sets used to control content of JAR files =========
-->
<!-- Pattern sets for jar files in standard distributions -->
<patternset id="files.annotations-api">
- <include name="javax/annotation/**" />
+ <include name="jakarta/annotation/**" />
</patternset>
<patternset id="files.servlet-api">
@@ -627,6 +627,12 @@
<exclude name="build.properties" />
</fileset>
</checkstyle>
+ <!-- jakarta package checks -->
+ <checkstyle config="res/checkstyle/jakarta-checkstyle.xml">
+ <fileset dir="java/jakarta" >
+ <include name="**/*.java"/>
+ </fileset>
+ </checkstyle>
<!-- javax package checks -->
<checkstyle config="res/checkstyle/javax-checkstyle.xml">
<fileset dir="java/javax" >
@@ -1879,7 +1885,7 @@ Apache Tomcat ${version} native binaries for Win64
AMD64/EMT64 platform.
<target name="javadoc" depends="dist-source"
description="Create the Tomcat javadoc" >
- <javadoc packagenames="javax.annotation.*"
+ <javadoc packagenames="jakarta.annotation.*"
sourcepath="${tomcat.dist}/src/java"
destdir="${tomcat.dist}/webapps/docs/annotationapi"
version="true"
diff --git a/java/javax/annotation/Generated.java
b/java/jakarta/annotation/Generated.java
similarity index 98%
rename from java/javax/annotation/Generated.java
rename to java/jakarta/annotation/Generated.java
index 06d99bd..a2f6913 100644
--- a/java/javax/annotation/Generated.java
+++ b/java/jakarta/annotation/Generated.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package javax.annotation;
+package jakarta.annotation;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
diff --git a/java/javax/annotation/ManagedBean.java
b/java/jakarta/annotation/ManagedBean.java
similarity index 97%
rename from java/javax/annotation/ManagedBean.java
rename to java/jakarta/annotation/ManagedBean.java
index f2739a4..a602b04 100644
--- a/java/javax/annotation/ManagedBean.java
+++ b/java/jakarta/annotation/ManagedBean.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package javax.annotation;
+package jakarta.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/java/javax/annotation/PostConstruct.java
b/java/jakarta/annotation/PostConstruct.java
similarity index 97%
rename from java/javax/annotation/PostConstruct.java
rename to java/jakarta/annotation/PostConstruct.java
index 3ecb25b..62e6096 100644
--- a/java/javax/annotation/PostConstruct.java
+++ b/java/jakarta/annotation/PostConstruct.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package javax.annotation;
+package jakarta.annotation;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
diff --git a/java/javax/annotation/PreDestroy.java
b/java/jakarta/annotation/PreDestroy.java
similarity index 97%
rename from java/javax/annotation/PreDestroy.java
rename to java/jakarta/annotation/PreDestroy.java
index eb1d578..6a07a95 100644
--- a/java/javax/annotation/PreDestroy.java
+++ b/java/jakarta/annotation/PreDestroy.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package javax.annotation;
+package jakarta.annotation;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
diff --git a/java/javax/annotation/Priority.java
b/java/jakarta/annotation/Priority.java
similarity index 97%
rename from java/javax/annotation/Priority.java
rename to java/jakarta/annotation/Priority.java
index a4980da..f5b59c1 100644
--- a/java/javax/annotation/Priority.java
+++ b/java/jakarta/annotation/Priority.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package javax.annotation;
+package jakarta.annotation;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
diff --git a/java/javax/annotation/Resource.java
b/java/jakarta/annotation/Resource.java
similarity index 98%
rename from java/javax/annotation/Resource.java
rename to java/jakarta/annotation/Resource.java
index 498ca22..70b4d76 100644
--- a/java/javax/annotation/Resource.java
+++ b/java/jakarta/annotation/Resource.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package javax.annotation;
+package jakarta.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/java/javax/annotation/Resources.java
b/java/jakarta/annotation/Resources.java
similarity index 97%
rename from java/javax/annotation/Resources.java
rename to java/jakarta/annotation/Resources.java
index 7b79dda..12317ed 100644
--- a/java/javax/annotation/Resources.java
+++ b/java/jakarta/annotation/Resources.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package javax.annotation;
+package jakarta.annotation;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
diff --git a/java/javax/annotation/security/DeclareRoles.java
b/java/jakarta/annotation/security/DeclareRoles.java
similarity index 96%
rename from java/javax/annotation/security/DeclareRoles.java
rename to java/jakarta/annotation/security/DeclareRoles.java
index d50e30d..e0f93df 100644
--- a/java/javax/annotation/security/DeclareRoles.java
+++ b/java/jakarta/annotation/security/DeclareRoles.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package javax.annotation.security;
+package jakarta.annotation.security;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
diff --git a/java/javax/annotation/security/DenyAll.java
b/java/jakarta/annotation/security/DenyAll.java
similarity index 96%
rename from java/javax/annotation/security/DenyAll.java
rename to java/jakarta/annotation/security/DenyAll.java
index 069aca2..f722de3 100644
--- a/java/javax/annotation/security/DenyAll.java
+++ b/java/jakarta/annotation/security/DenyAll.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package javax.annotation.security;
+package jakarta.annotation.security;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
diff --git a/java/javax/annotation/security/PermitAll.java
b/java/jakarta/annotation/security/PermitAll.java
similarity index 96%
rename from java/javax/annotation/security/PermitAll.java
rename to java/jakarta/annotation/security/PermitAll.java
index db1d7b6..5ceaa32 100644
--- a/java/javax/annotation/security/PermitAll.java
+++ b/java/jakarta/annotation/security/PermitAll.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package javax.annotation.security;
+package jakarta.annotation.security;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
diff --git a/java/javax/annotation/security/RolesAllowed.java
b/java/jakarta/annotation/security/RolesAllowed.java
similarity index 97%
rename from java/javax/annotation/security/RolesAllowed.java
rename to java/jakarta/annotation/security/RolesAllowed.java
index f916b6d..5c4d14f 100644
--- a/java/javax/annotation/security/RolesAllowed.java
+++ b/java/jakarta/annotation/security/RolesAllowed.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package javax.annotation.security;
+package jakarta.annotation.security;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
diff --git a/java/javax/annotation/security/RunAs.java
b/java/jakarta/annotation/security/RunAs.java
similarity index 96%
rename from java/javax/annotation/security/RunAs.java
rename to java/jakarta/annotation/security/RunAs.java
index 8a366e2..f980219 100644
--- a/java/javax/annotation/security/RunAs.java
+++ b/java/jakarta/annotation/security/RunAs.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package javax.annotation.security;
+package jakarta.annotation.security;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
diff --git a/java/javax/annotation/sql/DataSourceDefinition.java
b/java/jakarta/annotation/sql/DataSourceDefinition.java
similarity index 98%
rename from java/javax/annotation/sql/DataSourceDefinition.java
rename to java/jakarta/annotation/sql/DataSourceDefinition.java
index feb0758..dd003a7 100644
--- a/java/javax/annotation/sql/DataSourceDefinition.java
+++ b/java/jakarta/annotation/sql/DataSourceDefinition.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package javax.annotation.sql;
+package jakarta.annotation.sql;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/java/javax/annotation/sql/DataSourceDefinitions.java
b/java/jakarta/annotation/sql/DataSourceDefinitions.java
similarity index 97%
rename from java/javax/annotation/sql/DataSourceDefinitions.java
rename to java/jakarta/annotation/sql/DataSourceDefinitions.java
index 7fcbc050..23f5a65 100644
--- a/java/javax/annotation/sql/DataSourceDefinitions.java
+++ b/java/jakarta/annotation/sql/DataSourceDefinitions.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package javax.annotation.sql;
+package jakarta.annotation.sql;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/java/org/apache/catalina/core/DefaultInstanceManager.java
b/java/org/apache/catalina/core/DefaultInstanceManager.java
index cd47c02..18c98d4 100644
--- a/java/org/apache/catalina/core/DefaultInstanceManager.java
+++ b/java/org/apache/catalina/core/DefaultInstanceManager.java
@@ -35,9 +35,6 @@ import java.util.Map;
import java.util.Properties;
import java.util.Set;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.annotation.Resource;
import javax.ejb.EJB;
import javax.naming.Context;
import javax.naming.NamingException;
@@ -45,6 +42,10 @@ import javax.persistence.PersistenceContext;
import javax.persistence.PersistenceUnit;
import javax.xml.ws.WebServiceRef;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
+import jakarta.annotation.Resource;
+
import org.apache.catalina.ContainerServlet;
import org.apache.catalina.Globals;
import org.apache.catalina.security.SecurityUtil;
diff --git a/java/org/apache/catalina/startup/WebAnnotationSet.java
b/java/org/apache/catalina/startup/WebAnnotationSet.java
index f1636af..6921023 100644
--- a/java/org/apache/catalina/startup/WebAnnotationSet.java
+++ b/java/org/apache/catalina/startup/WebAnnotationSet.java
@@ -19,13 +19,14 @@ package org.apache.catalina.startup;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
-import javax.annotation.Resource;
-import javax.annotation.Resources;
-import javax.annotation.security.DeclareRoles;
-import javax.annotation.security.RunAs;
import javax.servlet.ServletSecurityElement;
import javax.servlet.annotation.ServletSecurity;
+import jakarta.annotation.Resource;
+import jakarta.annotation.Resources;
+import jakarta.annotation.security.DeclareRoles;
+import jakarta.annotation.security.RunAs;
+
import org.apache.catalina.Container;
import org.apache.catalina.Context;
import org.apache.catalina.Wrapper;
diff --git a/modules/cxf/pom.xml b/modules/cxf/pom.xml
index 23eb7e9..7bfff9a 100644
--- a/modules/cxf/pom.xml
+++ b/modules/cxf/pom.xml
@@ -125,7 +125,7 @@
<artifactSet>
<excludes>
<!-- Already present in Tomcat or in the
CDI bundle -->
-
<exclude>javax.annotation:javax.annotation-api</exclude>
+
<exclude>jakarta.annotation:jakarta.annotation-api</exclude>
<exclude>javax.el:*</exclude>
<exclude>javax.enterprise:cdi-api</exclude>
<exclude>javax.inject:*</exclude>
diff --git a/res/META-INF/annotations-api.jar.manifest
b/res/META-INF/annotations-api.jar.manifest
index d813b80..4b43993 100644
--- a/res/META-INF/annotations-api.jar.manifest
+++ b/res/META-INF/annotations-api.jar.manifest
@@ -2,8 +2,8 @@ Manifest-version: 1.0
X-Compile-Source-JDK: @source.jdk@
X-Compile-Target-JDK: @target.jdk@
-Name: javax/annotation/
-Implementation-Title: javax.annotation
+Name: jakarta/annotation/
+Implementation-Title: jakarta.annotation
Implementation-Vendor: Apache Software Foundation
Implementation-Version: 1.3.@annotation.revision@
Specification-Title: Common Annotations
diff --git a/res/bnd/annotations-api.jar.tmp.bnd
b/res/bnd/annotations-api.jar.tmp.bnd
index 0a53313..032eb3f 100644
--- a/res/bnd/annotations-api.jar.tmp.bnd
+++ b/res/bnd/annotations-api.jar.tmp.bnd
@@ -16,6 +16,6 @@ Bundle-Name: tomcat-annotations-api
Bundle-SymbolicName: org.apache.tomcat-annotations-api
Bundle-Version: @VERSION@
Export-Package: \
- javax.annotation,\
- javax.annotation.security,\
- javax.annotation.sql
+ jakarta.annotation,\
+ jakarta.annotation.security,\
+ jakarta.annotation.sql
diff --git a/res/checkstyle/checkstyle.xml b/res/checkstyle/checkstyle.xml
index 711212e..c0d687c 100644
--- a/res/checkstyle/checkstyle.xml
+++ b/res/checkstyle/checkstyle.xml
@@ -70,7 +70,7 @@
<property name="illegalPkgs" value="sun,junit.framework"/>
</module>
<module name="ImportOrder">
- <property name="groups"
value="java,javax,org.hamcrest,org.junit,org,async,jsp2,util"/>
+ <property name="groups"
value="java,javax,jakarta,org.hamcrest,org.junit,org,async,jsp2,util"/>
<property name="ordered" value="true"/>
<property name="separated" value="true"/>
<property name="option" value="above"/>
diff --git a/res/checkstyle/jakarta-checkstyle.xml
b/res/checkstyle/jakarta-checkstyle.xml
new file mode 100644
index 0000000..e9115ad
--- /dev/null
+++ b/res/checkstyle/jakarta-checkstyle.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<!DOCTYPE module PUBLIC
+ "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
+ "http://www.puppycrawl.com/dtds/configuration_1_2.dtd";>
+<module name="Checker">
+ <!-- When adding checks, keep to the order checks are listed under
-->
+ <!-- 'Standard Checks' in the Checkstyle documentation:
-->
+ <!-- http://checkstyle.sourceforge.net/config_coding.html
-->
+
+ <!-- Cache what has passed checkstyle -->
+ <property name="cacheFile"
+
value="${tomcat.output}/res/checkstyle/cachefile-jakarta-checkstyle.xml"/>
+
+ <!-- Specific checks for javax.* packages -->
+
+ <module name="TreeWalker">
+ <module name="ImportControl">
+ <property name="file"
value="${basedir}/res/checkstyle/jakarta-import-control.xml"/>
+ </module>
+ </module>
+</module>
diff --git a/res/checkstyle/javax-import-control.xml
b/res/checkstyle/jakarta-import-control.xml
similarity index 96%
copy from res/checkstyle/javax-import-control.xml
copy to res/checkstyle/jakarta-import-control.xml
index 010f511..26ec8b0 100644
--- a/res/checkstyle/javax-import-control.xml
+++ b/res/checkstyle/jakarta-import-control.xml
@@ -19,10 +19,10 @@
"-//Puppy Crawl//DTD Import Control 1.1//EN"
"http://www.puppycrawl.com/dtds/import_control_1_1.dtd";>
-<import-control pkg="javax">
+<import-control pkg="jakarta">
<allow pkg="java"/>
<subpackage name="annotation">
- <allow pkg="javax.annotation"/>
+ <allow pkg="jakarta.annotation"/>
</subpackage>
<subpackage name="ejb">
<allow pkg="javax.ejb"/>
diff --git a/res/checkstyle/javax-import-control.xml
b/res/checkstyle/javax-import-control.xml
index 010f511..3ba050d 100644
--- a/res/checkstyle/javax-import-control.xml
+++ b/res/checkstyle/javax-import-control.xml
@@ -22,7 +22,7 @@
<import-control pkg="javax">
<allow pkg="java"/>
<subpackage name="annotation">
- <allow pkg="javax.annotation"/>
+ <allow pkg="jakarta.annotation"/>
</subpackage>
<subpackage name="ejb">
<allow pkg="javax.ejb"/>
diff --git a/res/checkstyle/org-import-control.xml
b/res/checkstyle/org-import-control.xml
index afa3e61..269e160 100644
--- a/res/checkstyle/org-import-control.xml
+++ b/res/checkstyle/org-import-control.xml
@@ -36,7 +36,7 @@
<allow pkg="org.xml.sax"/>
<allow pkg="org.ietf.jgss"/>
<subpackage name="catalina">
- <allow pkg="javax.annotation"/>
+ <allow pkg="jakarta.annotation"/>
<allow pkg="javax.ejb"/>
<allow pkg="javax.persistence"/>
<allow pkg="javax.servlet"/>
@@ -50,7 +50,7 @@
<subpackage name="ant">
<allow pkg="org.apache.tools.ant"/>
<allow class="org.apache.tomcat.util.Base64"/>
- <disallow pkg="javax.annotation"/>
+ <disallow pkg="jakarta.annotation"/>
<disallow pkg="javax.ejb"/>
<disallow pkg="javax.persistence"/>
<disallow pkg="javax.servlet"/>
@@ -59,7 +59,7 @@
<disallow pkg="org.apache.naming"/>
</subpackage>
<subpackage name="ha">
- <disallow pkg="javax.annotation"/>
+ <disallow pkg="jakarta.annotation"/>
<disallow pkg="javax.ejb"/>
<disallow pkg="javax.persistence"/>
<disallow pkg="org.apache.coyote"/>
@@ -72,7 +72,7 @@
<allow pkg="org.apache.catalina.tribes"/>
</subpackage>
<subpackage name="tribes">
- <disallow pkg="javax.annotation"/>
+ <disallow pkg="jakarta.annotation"/>
<disallow pkg="javax.ejb"/>
<disallow pkg="javax.persistence"/>
<disallow pkg="javax.servlet"/>
diff --git a/test/org/apache/catalina/startup/TesterServletWithAnnotations.java
b/test/org/apache/catalina/startup/TesterServletWithAnnotations.java
index 30a019c..28a1232 100644
--- a/test/org/apache/catalina/startup/TesterServletWithAnnotations.java
+++ b/test/org/apache/catalina/startup/TesterServletWithAnnotations.java
@@ -19,12 +19,13 @@ package org.apache.catalina.startup;
import java.io.IOException;
-import javax.annotation.Resource;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import jakarta.annotation.Resource;
+
public class TesterServletWithAnnotations extends HttpServlet {
private static final long serialVersionUID = 1L;
diff --git
a/test/org/apache/catalina/startup/TesterServletWithLifeCycleMethods.java
b/test/org/apache/catalina/startup/TesterServletWithLifeCycleMethods.java
index a6a7c45..0d4ffaa 100644
--- a/test/org/apache/catalina/startup/TesterServletWithLifeCycleMethods.java
+++ b/test/org/apache/catalina/startup/TesterServletWithLifeCycleMethods.java
@@ -19,13 +19,14 @@ package org.apache.catalina.startup;
import java.io.IOException;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
+
public class TesterServletWithLifeCycleMethods extends HttpServlet {
private static final long serialVersionUID = 1L;
diff --git a/test/webapp/annotations.jsp b/test/webapp/annotations.jsp
index 180743d..04b63ce 100644
--- a/test/webapp/annotations.jsp
+++ b/test/webapp/annotations.jsp
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
--%>
-<%@page import="javax.annotation.PostConstruct"%>
+<%@page import="jakarta.annotation.PostConstruct"%>
<html>
<head><title>Annotations test case</title></head>
<body>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
