Add jakarta.data.sig map file and adjust JakartaEESigTest to also val…

…idate Jakarta Data SPEC API classes Signed-off-by: Scott Marlow <[email protected]>
scottmarlow · Feb 5, 2025 · 0cca500 · 0cca500
1 parent 1405766
commit 0cca500
Show file tree

Hide file tree

Showing 2 changed files with 525 additions and 6 deletions.
diff --git a/...rm/signaturevalidation/src/main/java/com/sun/ts/tests/signaturetest/JakartaEESigTest.java b/...rm/signaturevalidation/src/main/java/com/sun/ts/tests/signaturetest/JakartaEESigTest.java
@@ -71,10 +71,10 @@ public class JakartaEESigTest extends SigTestEE {
   public static final String JAVAEE_WEB_KEYWORD = "javaee_web_profile";
 
   public static final String KEYWORD_JAVAEE = "ejb interceptors caj jms javamail"
-      + " cdi di beanval persistence connector"
+      + " cdi data beanval persistence connector"
       + " jacc jaspic jsonp jta el servlet jsf jaxrs websocket batch concurrency jsonb securityapi";
 
-  public static final String KEYWORD_WEB = "caj ejb persistence el jsf jsonp jsp servlet jta jaxrs cdi di beanval interceptors websocket concurrency jsonb securityapi";
+  public static final String KEYWORD_WEB = "caj ejb persistence el jsf jsonp jsp servlet jta jaxrs cdi data beanval interceptors websocket concurrency jsonb securityapi";
 
   public static final ArrayList<String> KEYWORD_JAVAEE_FULL_OPTIONAL_TECHS = new ArrayList<String>();
 
@@ -114,24 +114,24 @@ enum Containers {
     APPCLIENT_MAP.put("persistence",
         new String[] { "jakarta.persistence", "jakarta.persistence.spi",
             "jakarta.persistence.criteria", "jakarta.persistence.metamodel" });
-    // note: cdi API's actually utilize two different base packages and
-    // so will require two different sigfiles.
     APPCLIENT_MAP.put("cdi",
         new String[] { "jakarta.decorator", "jakarta.enterprise.context",
             "jakarta.enterprise.context.control",
             "jakarta.enterprise.context.spi", "jakarta.enterprise.event",
             "jakarta.enterprise.inject", "jakarta.enterprise.inject.spi",
             "jakarta.enterprise.inject.literal",
             "jakarta.enterprise.inject.spi.configurator",
-            "jakarta.enterprise.util" });
+            "jakarta.enterprise.util",
+            "jakarta.enterprise.inject.spi.el",
+            "jakarta.inject"
+        });
     APPCLIENT_MAP.put("beanval",
         new String[] { "jakarta.validation", "jakarta.validation.bootstrap",
             "jakarta.validation.constraints", "jakarta.validation.groups",
             "jakarta.validation.metadata",
             "jakarta.validation.constraintvalidation",
             "jakarta.validation.executable", "jakarta.validation.spi",
             "jakarta.validation.valueextraction" });
-    APPCLIENT_MAP.put("di", new String[] { "jakarta.inject" });
     APPCLIENT_MAP.put("jsonp",
         new String[] { "jakarta.json", "jakarta.json.spi", "jakarta.json.stream" });
     APPCLIENT_MAP.put("jsonb",