return leading slash to @WebServlet annotations

jakartaee · Feb 18, 2022 · cf519cd · cf519cd
1 parent 2c037ad
commit cf519cd
Show file tree

Hide file tree

Showing 29 changed files with 29 additions and 30 deletions.
diff --git a/...src/main/java/ee/jakarta/tck/concurrent/api/ManagedExecutors/ManagedExecutorsServlet.java b/...src/main/java/ee/jakarta/tck/concurrent/api/ManagedExecutors/ManagedExecutorsServlet.java
@@ -32,7 +32,7 @@
 import jakarta.enterprise.concurrent.ManagedTask;
 import jakarta.servlet.annotation.WebServlet;
 
-@WebServlet("ManagedExecutorsServlet")
+@WebServlet("/ManagedExecutorsServlet")
 public class ManagedExecutorsServlet extends TestServlet{
 
 	private static final TestLogger log = TestLogger.get(ManagedExecutorsServlet.class);

diff --git a/...oncurrent/api/ManagedScheduledExecutorService/ManagedScheduledExecutorServiceServlet.java b/...oncurrent/api/ManagedScheduledExecutorService/ManagedScheduledExecutorServiceServlet.java
@@ -26,7 +26,7 @@
 import jakarta.servlet.annotation.WebServlet;
 
 @SuppressWarnings("serial")
-@WebServlet("ManagedScheduledExecutorServiceServlet")
+@WebServlet("/ManagedScheduledExecutorServiceServlet")
 public class ManagedScheduledExecutorServiceServlet extends TestServlet{
 
 	public static final String CALLABLETESTTASK1_RUN_RESULT = "CallableTestTask1";

diff --git a/...va/ee/jakarta/tck/concurrent/spec/ContextService/contextPropagate/ClassloaderServlet.java b/...va/ee/jakarta/tck/concurrent/spec/ContextService/contextPropagate/ClassloaderServlet.java
@@ -26,7 +26,7 @@
 import jakarta.servlet.http.HttpServletResponse;
 
 @SuppressWarnings("serial")
-@WebServlet("ClassloaderServlet")
+@WebServlet("/ClassloaderServlet")
 public class ClassloaderServlet extends TestServlet {
 
 	@EJB

diff --git a/...ncurrent/spec/ContextService/contextPropagate/ContextServiceDefinitionFromEJBServlet.java b/...ncurrent/spec/ContextService/contextPropagate/ContextServiceDefinitionFromEJBServlet.java
@@ -45,7 +45,7 @@
 import jakarta.transaction.SystemException;
 import jakarta.transaction.UserTransaction;
 
-@WebServlet("ContextServiceDefinitionFromEJBServlet")
+@WebServlet("/ContextServiceDefinitionFromEJBServlet")
 public class ContextServiceDefinitionFromEJBServlet extends TestServlet {
     private static final long serialVersionUID = 1L;
     private static final long MAX_WAIT_SECONDS = TimeUnit.MINUTES.toSeconds(2);

diff --git a/.../tck/concurrent/spec/ContextService/contextPropagate/ContextServiceDefinitionServlet.java b/.../tck/concurrent/spec/ContextService/contextPropagate/ContextServiceDefinitionServlet.java
@@ -64,7 +64,7 @@
                           unchanged = { APPLICATION, IntContext.NAME },
                           propagated = ALL_REMAINING)
 @ContextServiceDefinition(name = "java:comp/concurrent/ContextC")
-@WebServlet("ContextServiceDefinitionServlet")
+@WebServlet("/ContextServiceDefinitionServlet")
 public class ContextServiceDefinitionServlet extends TestServlet {
     private static final long serialVersionUID = 1L;
     private static final long MAX_WAIT_SECONDS = TimeUnit.MINUTES.toSeconds(2);

diff --git a/...main/java/ee/jakarta/tck/concurrent/spec/ContextService/contextPropagate/JNDIServlet.java b/...main/java/ee/jakarta/tck/concurrent/spec/ContextService/contextPropagate/JNDIServlet.java
@@ -26,7 +26,7 @@
 import jakarta.servlet.http.HttpServletResponse;
 
 @SuppressWarnings("serial")
-@WebServlet("JNDIServlet")
+@WebServlet("/JNDIServlet")
 public class JNDIServlet extends TestServlet {
 
 	@EJB

diff --git a/...va/ee/jakarta/tck/concurrent/spec/ContextService/contextPropagate/JSPSecurityServlet.java b/...va/ee/jakarta/tck/concurrent/spec/ContextService/contextPropagate/JSPSecurityServlet.java
@@ -15,7 +15,7 @@
 @ManagedExecutorDefinition(name = "java:app/concurrent/executor1")
 @ManagedExecutorDefinition(name = "java:app/concurrent/executor2",
 						   context = "java:app/concurrent/securityUnchangedContextSvc")
-@WebServlet("JSPSecurityServlet")
+@WebServlet("/JSPSecurityServlet")
 public class JSPSecurityServlet extends TestServlet{
 
 }
diff --git a/.../java/ee/jakarta/tck/concurrent/spec/ContextService/contextPropagate/SecurityServlet.java b/.../java/ee/jakarta/tck/concurrent/spec/ContextService/contextPropagate/SecurityServlet.java
@@ -26,7 +26,7 @@
 import jakarta.servlet.http.HttpServletResponse;
 
 @SuppressWarnings("serial")
-@WebServlet("SecurityServlet")
+@WebServlet("/SecurityServlet")
 public class SecurityServlet extends TestServlet {
 
 	@EJB

diff --git a/...karta/tck/concurrent/spec/ContextService/contextPropagate_servlet/DeserializeServlet.java b/...karta/tck/concurrent/spec/ContextService/contextPropagate_servlet/DeserializeServlet.java
@@ -31,7 +31,7 @@
 import jakarta.servlet.http.HttpServletResponse;
 
 @SuppressWarnings("serial")
-@WebServlet("DeserializeServlet")
+@WebServlet("/DeserializeServlet")
 public class DeserializeServlet extends HttpServlet {
 
 	@Override

diff --git a/...arta/tck/concurrent/spec/ContextService/contextPropagate_servlet/ProxyCreatorServlet.java b/...arta/tck/concurrent/spec/ContextService/contextPropagate_servlet/ProxyCreatorServlet.java
@@ -32,7 +32,7 @@
 import jakarta.servlet.http.HttpServletResponse;
 
 @SuppressWarnings("serial")
-@WebServlet("ProxyCreatorServlet")
+@WebServlet("/ProxyCreatorServlet")
 public class ProxyCreatorServlet extends TestServlet {
 
 	private static final TestLogger log = TestLogger.get(ProxyCreatorServlet.class);

diff --git a/...rta/tck/concurrent/spec/ContextService/contextPropagate_servlet/WorkInterfaceServlet.java b/...rta/tck/concurrent/spec/ContextService/contextPropagate_servlet/WorkInterfaceServlet.java
@@ -28,7 +28,7 @@
 import jakarta.servlet.http.HttpServletResponse;
 
 @SuppressWarnings("serial")
-@WebServlet("WorkInterfaceServlet")
+@WebServlet("/WorkInterfaceServlet")
 public class WorkInterfaceServlet extends HttpServlet {
 
 	@Override

diff --git a/tck/src/main/java/ee/jakarta/tck/concurrent/spec/ContextService/tx/TransactionServlet.java b/tck/src/main/java/ee/jakarta/tck/concurrent/spec/ContextService/tx/TransactionServlet.java
@@ -37,7 +37,7 @@
 import jakarta.transaction.UserTransaction;
 
 @SuppressWarnings({"serial", "unused"})
-@WebServlet("TransactionServlet")
+@WebServlet("/TransactionServlet")
 @DataSourceDefinition(
 	name = Constants.DS_JNDI_NAME, 
 	className = "org.apache.derby.jdbc.EmbeddedDataSource", 

diff --git a/...ava/ee/jakarta/tck/concurrent/spec/ManagedExecutorService/inheritedapi/CommonServlet.java b/...ava/ee/jakarta/tck/concurrent/spec/ManagedExecutorService/inheritedapi/CommonServlet.java
@@ -33,7 +33,7 @@
 import jakarta.servlet.annotation.WebServlet;
 
 @SuppressWarnings("serial")
-@WebServlet("CommonServlet")
+@WebServlet("/CommonServlet")
 public class CommonServlet extends TestServlet {
 
 	@Resource

diff --git a/...concurrent/spec/ManagedExecutorService/managed_servlet/forbiddenapi/ForbiddenServlet.java b/...concurrent/spec/ManagedExecutorService/managed_servlet/forbiddenapi/ForbiddenServlet.java
@@ -26,7 +26,7 @@
 import jakarta.servlet.annotation.WebServlet;
 
 @SuppressWarnings("serial")
-@WebServlet("ForbiddenServlet")
+@WebServlet("/ForbiddenServlet")
 public class ForbiddenServlet extends TestServlet {
 
 	@Resource

diff --git a/...urrent/spec/ManagedExecutorService/resourcedef/ManagedExecutorDefinitionOnEJBServlet.java b/...urrent/spec/ManagedExecutorService/resourcedef/ManagedExecutorDefinitionOnEJBServlet.java
@@ -33,11 +33,10 @@
 import jakarta.ejb.EJB;
 import jakarta.enterprise.concurrent.ManagedExecutorService;
 import jakarta.inject.Inject;
-import jakarta.servlet.ServletException;
 import jakarta.servlet.annotation.WebServlet;
 import jakarta.transaction.UserTransaction;
 
-@WebServlet("ManagedExecutorDefinitionOnEJBServlet")
+@WebServlet("/ManagedExecutorDefinitionOnEJBServlet")
 public class ManagedExecutorDefinitionOnEJBServlet extends TestServlet {
 	private static final long serialVersionUID = 1L;
 	private static final long MAX_WAIT_SECONDS = TimeUnit.MINUTES.toSeconds(2);

diff --git a/.../concurrent/spec/ManagedExecutorService/resourcedef/ManagedExecutorDefinitionServlet.java b/.../concurrent/spec/ManagedExecutorService/resourcedef/ManagedExecutorDefinitionServlet.java
@@ -57,7 +57,7 @@
                            context = "java:module/concurrent/ContextB",
                            maxAsync = 1)
 @ManagedExecutorDefinition(name = "java:comp/concurrent/ExecutorC")
-@WebServlet("ManagedExecutorDefinitionServlet")
+@WebServlet("/ManagedExecutorDefinitionServlet")
 public class ManagedExecutorDefinitionServlet extends TestServlet {
     private static final long serialVersionUID = 1L;
     private static final long MAX_WAIT_SECONDS = TimeUnit.MINUTES.toSeconds(2);

diff --git a/.../java/ee/jakarta/tck/concurrent/spec/ManagedExecutorService/security/SecurityServlet.java b/.../java/ee/jakarta/tck/concurrent/spec/ManagedExecutorService/security/SecurityServlet.java
@@ -30,7 +30,7 @@
 import jakarta.servlet.http.HttpServletResponse;
 
 @SuppressWarnings("serial")
-@WebServlet("SecurityServlet")
+@WebServlet("/SecurityServlet")
 public class SecurityServlet extends TestServlet {
 
 	@Resource

diff --git a/...urrent/spec/ManagedScheduledExecutorService/inheritedapi_servlet/InheritedAPIServlet.java b/...urrent/spec/ManagedScheduledExecutorService/inheritedapi_servlet/InheritedAPIServlet.java
@@ -36,7 +36,7 @@
 import jakarta.servlet.annotation.WebServlet;
 
 @SuppressWarnings("serial")
-@WebServlet("InheritedAPIServlet")
+@WebServlet("/InheritedAPIServlet")
 public class InheritedAPIServlet extends TestServlet {
 
 	@Override

diff --git a/...dScheduledExecutorService/resourcedef/ManagedScheduledExecutorDefinitionOnEJBServlet.java b/...dScheduledExecutorService/resourcedef/ManagedScheduledExecutorDefinitionOnEJBServlet.java
@@ -43,7 +43,7 @@
 import jakarta.transaction.Status;
 import jakarta.transaction.UserTransaction;
 
-@WebServlet("ManagedScheduledExecutorDefinitionOnEJBServlet")
+@WebServlet("/ManagedScheduledExecutorDefinitionOnEJBServlet")
 public class ManagedScheduledExecutorDefinitionOnEJBServlet extends TestServlet {
     private static final long serialVersionUID = 1L;
     private static final long MAX_WAIT_SECONDS = TimeUnit.MINUTES.toSeconds(2);

diff --git a/...anagedScheduledExecutorService/resourcedef/ManagedScheduledExecutorDefinitionServlet.java b/...anagedScheduledExecutorService/resourcedef/ManagedScheduledExecutorDefinitionServlet.java
@@ -68,7 +68,7 @@
                            context = "java:module/concurrent/ContextB",
                            maxAsync = 4)
 @ManagedScheduledExecutorDefinition(name = "java:comp/concurrent/ScheduledExecutorC")
-@WebServlet("ManagedScheduledExecutorDefinitionServlet")
+@WebServlet("/ManagedScheduledExecutorDefinitionServlet")
 public class ManagedScheduledExecutorDefinitionServlet extends TestServlet {
     private static final long serialVersionUID = 1L;
     private static final long MAX_WAIT_SECONDS = TimeUnit.MINUTES.toSeconds(2);

diff --git a/...jakarta/tck/concurrent/spec/ManagedScheduledExecutorService/security/SecurityServlet.java b/...jakarta/tck/concurrent/spec/ManagedScheduledExecutorService/security/SecurityServlet.java
@@ -32,7 +32,7 @@
 import jakarta.servlet.http.HttpServletResponse;
 
 @SuppressWarnings("serial")
-@WebServlet("SecurityServlet")
+@WebServlet("/SecurityServlet")
 public class SecurityServlet extends TestServlet {
 
 	public void managedScheduledExecutorServiceAPISecurityTest(HttpServletRequest req, HttpServletResponse res) throws Exception {

diff --git a/...ee/jakarta/tck/concurrent/spec/ManagedScheduledExecutorService/tx/TransactionServlet.java b/...ee/jakarta/tck/concurrent/spec/ManagedScheduledExecutorService/tx/TransactionServlet.java
@@ -39,7 +39,7 @@
 import jakarta.servlet.http.HttpServletResponse;
 
 @SuppressWarnings({"serial", "unused"})
-@WebServlet("TransactionServlet")
+@WebServlet("/TransactionServlet")
 @DataSourceDefinition(
 	name = Constants.DS_JNDI_NAME, 
 	className = "org.apache.derby.jdbc.EmbeddedDataSource", 

diff --git a/...rc/main/java/ee/jakarta/tck/concurrent/spec/ManagedThreadFactory/apitests/APIServlet.java b/...rc/main/java/ee/jakarta/tck/concurrent/spec/ManagedThreadFactory/apitests/APIServlet.java
@@ -30,7 +30,7 @@
 import jakarta.servlet.http.HttpServletResponse;
 
 @SuppressWarnings("serial")
-@WebServlet("APIServlet")
+@WebServlet("/APIServlet")
 public class APIServlet extends TestServlet {
 
 	@Resource(lookup = TestConstants.DefaultManagedThreadFactory)

diff --git a/...ain/java/ee/jakarta/tck/concurrent/spec/ManagedThreadFactory/context/SecurityServlet.java b/...ain/java/ee/jakarta/tck/concurrent/spec/ManagedThreadFactory/context/SecurityServlet.java
@@ -31,7 +31,7 @@
 import jakarta.servlet.http.HttpServletResponse;
 
 @SuppressWarnings("serial")
-@WebServlet("SecurityServlet")
+@WebServlet("/SecurityServlet")
 public class SecurityServlet extends TestServlet {
 
 	@EJB

diff --git a/...a/ee/jakarta/tck/concurrent/spec/ManagedThreadFactory/context_servlet/ContextServlet.java b/...a/ee/jakarta/tck/concurrent/spec/ManagedThreadFactory/context_servlet/ContextServlet.java
@@ -30,7 +30,7 @@
 import jakarta.servlet.http.HttpServletResponse;
 
 @SuppressWarnings("serial")
-@WebServlet("ContextServlet")
+@WebServlet("/ContextServlet")
 public class ContextServlet extends TestServlet {
 
 	private static final String TEST_JNDI_EVN_ENTRY_VALUE = "hello";

diff --git a/...ent/spec/ManagedThreadFactory/resourcedef/ManagedThreadFactoryDefinitionOnEJBServlet.java b/...ent/spec/ManagedThreadFactory/resourcedef/ManagedThreadFactoryDefinitionOnEJBServlet.java
@@ -46,7 +46,7 @@
 import jakarta.transaction.Status;
 import jakarta.transaction.UserTransaction;
 
-@WebServlet("ManagedThreadFactoryDefinitionOnEJBServlet")
+@WebServlet("/ManagedThreadFactoryDefinitionOnEJBServlet")
 public class ManagedThreadFactoryDefinitionOnEJBServlet extends TestServlet {
     private static final long serialVersionUID = 1L;
     private static final long MAX_WAIT_SECONDS = TimeUnit.MINUTES.toSeconds(2);

diff --git a/...ncurrent/spec/ManagedThreadFactory/resourcedef/ManagedThreadFactoryDefinitionServlet.java b/...ncurrent/spec/ManagedThreadFactory/resourcedef/ManagedThreadFactoryDefinitionServlet.java
@@ -52,7 +52,7 @@
                                 context = "java:app/concurrent/ContextA",
                                 priority = 4)
 @ManagedThreadFactoryDefinition(name = "java:comp/concurrent/ThreadFactoryB")
-@WebServlet("ManagedThreadFactoryDefinitionServlet")
+@WebServlet("/ManagedThreadFactoryDefinitionServlet")
 public class ManagedThreadFactoryDefinitionServlet extends TestServlet {
     private static final long serialVersionUID = 1L;
     private static final long MAX_WAIT_SECONDS = TimeUnit.MINUTES.toSeconds(2);

diff --git a/.../main/java/ee/jakarta/tck/concurrent/spec/ManagedThreadFactory/tx/TransactionServlet.java b/.../main/java/ee/jakarta/tck/concurrent/spec/ManagedThreadFactory/tx/TransactionServlet.java
@@ -37,7 +37,7 @@
 import jakarta.servlet.http.HttpServletResponse;
 
 @SuppressWarnings({"serial", "unused"})
-@WebServlet("TransactionServlet")
+@WebServlet("/TransactionServlet")
 @DataSourceDefinition(
 	name = Constants.DS_JNDI_NAME, 
 	className = "org.apache.derby.jdbc.EmbeddedDataSource", 

diff --git a/tck/src/main/java/ee/jakarta/tck/concurrent/spec/signature/SignatureTestServlet.java b/tck/src/main/java/ee/jakarta/tck/concurrent/spec/signature/SignatureTestServlet.java
@@ -38,7 +38,7 @@
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 
-@WebServlet("SignatureTestServlet")
+@WebServlet("/SignatureTestServlet")
 public class SignatureTestServlet extends TestServlet {
     private static final long serialVersionUID = 1L;