Remove the SingleThreadModel tests as the interface has been removed

scottmarlow · Jan 14, 2022 · 17a15fd · 17a15fd
1 parent 32e03e6
commit 17a15fd
Show file tree

Hide file tree

Showing 15 changed files with 8 additions and 865 deletions.
diff --git a/install/connector/bin/ts.jte b/install/connector/bin/ts.jte
@@ -484,20 +484,9 @@ certLoginUserAlias=cts
 #
 # @webServerHost  hostname for the Vendor's Java EE Web Server
 # @webServerPort  port number of the Vendor's Java EE Web Server
-# @ServletClientThreads  The ServletClientThreads property configures
-#                        the number of threads used by the client for
-#                        the SingleThreadModel servlet test. If the
-#                        container implementation supports pooling of
-#                        SingleThreadModel servlets, set the value of
-#                        ServletClientThreads to twice the value of
-#                        the default servlet instance pool size.  If
-#                        the container implementation only maintains
-#                        a single instance of a SingleTheadModel
-#                        servlet, leave the default value of 2.
 #####################################################################
 webServerHost=${orb.host}
 webServerPort=8001
-ServletClientThreads=2
 
 
 #########################################################################

diff --git a/install/servlet/bin/ts.jte b/install/servlet/bin/ts.jte
@@ -269,20 +269,9 @@ certLoginUserAlias=cts
 #
 # @webServerHost  hostname for the Vendor's Java EE Web Server
 # @webServerPort  port number of the Vendor's Java EE Web Server
-# @ServletClientThreads  The ServletClientThreads property configures
-#                        the number of threads used by the client for
-#                        the SingleThreadModel servlet test. If the
-#                        container implementation supports pooling of
-#                        SingleThreadModel servlets, set the value of
-#                        ServletClientThreads to twice the value of
-#                        the default servlet instance pool size.  If
-#                        the container implementation only maintains
-#                        a single instance of a SingleTheadModel
-#                        servlet, leave the default value of 2.
 #####################################################################
 webServerHost=
 webServerPort=
-ServletClientThreads=2
 
 #########################################################################
 ## The following properties must be set before running any security

diff --git a/install/servlet/docs/assertions/ServletJavadocAssertions.html b/install/servlet/docs/assertions/ServletJavadocAssertions.html
@@ -3,7 +3,7 @@
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <!--
 
-    Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -8530,7 +8530,7 @@ <h2>Jakarta Servlet<br>Servlet - 5.0<br>
 	)
 	<br>throws
 											IllegalArgumentException<br>
-</font></TD><TD align="left" valign="center"><font size="1PT">if the given servlet instance implements SingleThreadModel, , or servletName is null or an empty String</font></TD><TD align="center" valign="center"><font size="1PT">true</font></TD><TD align="center" valign="center"><font size="1PT">
+</font></TD><TD align="left" valign="center"><font size="1PT">if the given servletName is null or an empty String</font></TD><TD align="center" valign="center"><font size="1PT">true</font></TD><TD align="center" valign="center"><font size="1PT">
 <br>
 </font></TD><TD align="center" valign="center"><font size="1PT">true</font></TD>
 </TR>

diff --git a/install/servlet/docs/assertions/ServletSpecAssertions.html b/install/servlet/docs/assertions/ServletSpecAssertions.html
@@ -3,7 +3,7 @@
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <!--
 
-    Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -113,7 +113,7 @@ <h2>Jakarta Servlet<br>Servlet - 5.0<br>
 </font></TD><TD align="center" valign="center"><font size="1PT">false</font></TD><TD align="center" valign="center"><font size="1PT">technology</font></TD><TD align="center" valign="center"><font size="1PT">active</font></TD><TD align="center" valign="center"><font size="1PT">false</font></TD>
 </TR>
 <TR>
-<TD align="center" valign="center"><a name="Servlet:SPEC:10"></a><font size="1PT">Servlet:SPEC:10</font></TD><TD align="center" valign="center"><font size="1PT">2</font></TD><TD align="center" valign="center"><font size="1PT">3.3.1</font></TD><TD align="left" valign="center"><font size="1PT">For servlets not implementing the SingleThreadModel interface, if the service method (or methods such as doGet or doPost which are dispatched to the service method of the HttpServlet abstract class) has been defined with the synchronized keyword, the servlet container must serialize request through it.</font></TD><TD align="center" valign="center"><font size="1PT">true</font></TD><TD align="center" valign="center"><font size="1PT">
+<TD align="center" valign="center"><a name="Servlet:SPEC:10"></a><font size="1PT">Servlet:SPEC:10</font></TD><TD align="center" valign="center"><font size="1PT">2</font></TD><TD align="center" valign="center"><font size="1PT">3.3.1</font></TD><TD align="left" valign="center"><font size="1PT">For servlets where the service method (or methods such as doGet or doPost which are dispatched to the service method of the HttpServlet abstract class) has been defined with the synchronized keyword, the servlet container must serialize request through it.</font></TD><TD align="center" valign="center"><font size="1PT">true</font></TD><TD align="center" valign="center"><font size="1PT">
 <br>
 </font></TD><TD align="center" valign="center"><font size="1PT">false</font></TD><TD align="center" valign="center"><font size="1PT">technology</font></TD><TD align="center" valign="center"><font size="1PT">deprecated</font></TD><TD align="center" valign="center"><font size="1PT">true</font></TD>
 </TR>

diff --git a/internal/docs/servlet/ServletJavadocAssertions.xml b/internal/docs/servlet/ServletJavadocAssertions.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE javadoc SYSTEM "https://raw.githubusercontent.com/eclipse-ee4j/jakartaee-tck/master/internal/docs/dtd/javadoc_assertions.dtd">
 <!--
 
-    Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -9236,7 +9236,7 @@ Returns: true if this request has an id for a valid session in the current sessi
     </assertion>
     <assertion required="true" impl-spec="false" status="active" testable="true">
         <id>Servlet:JAVADOC:675.9</id>
-        <description>if the given servlet instance implements SingleThreadModel, , or servletName is null or an empty String</description>
+        <description>if the given servlet servletName is null or an empty String</description>
         <package>jakarta.servlet</package>
         <class-interface>ServletContext</class-interface>
         <method name="addServlet" return-type="jakarta.servlet.ServletRegistration.ServletRegistration.Dynamic">

diff --git a/internal/docs/servlet/ServletSpecAssertions.xml b/internal/docs/servlet/ServletSpecAssertions.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -416,7 +416,7 @@
         </assertion>
         <assertion required="true" impl-spec="false" defined-by="technology" status="deprecated" testable="true">
             <id>Servlet:SPEC:10</id>
-            <description>For servlets not implementing the SingleThreadModel interface, if the service method (or methods such as doGet or doPost which are dispatched to the service method of the HttpServlet abstract class) has been defined with the synchronized keyword, the servlet container must serialize request through it.</description>
+            <description>For servlets where the service method (or methods such as doGet or doPost which are dispatched to the service method of the HttpServlet abstract class) has been defined with the synchronized keyword, the servlet container must serialize request through it.</description>
             <location chapter="2" section="3.3.1"/>
             <comment>Revisit -- wording seems incorrect.</comment>
         </assertion>

diff --git a/src/com/sun/ts/tests/servlet/api/jakarta_servlet/singlethreadmodel/STMClientServlet.java b/src/com/sun/ts/tests/servlet/api/jakarta_servlet/singlethreadmodel/STMClientServlet.java