Merge pull request #27221 from KyleAure/27098-concurrent-3.1-dd-model

Concurrent-3.1 Update Deployment Descriptors
OpenLiberty · Jan 3, 2024 · 74397b4 · 74397b4
2 parents f3f0e74 + 12c7502
commit 74397b4
Show file tree

Hide file tree

Showing 26 changed files with 1,040 additions and 237 deletions.
diff --git a/...re.appserver.features/visibility/private/com.ibm.websphere.appserver.javaeedd-1.0.feature b/...re.appserver.features/visibility/private/com.ibm.websphere.appserver.javaeedd-1.0.feature
@@ -19,7 +19,7 @@ IBM-Process-Types: server, \
  com.ibm.ws.javaee.dd.common, \
  com.ibm.ws.javaee.dd.ejb
 -jars=com.ibm.websphere.appserver.spi.javaeedd; location:=dev/spi/ibm/
--files=dev/spi/ibm/javadoc/com.ibm.websphere.appserver.spi.javaeedd_1.7-javadoc.zip
+-files=dev/spi/ibm/javadoc/com.ibm.websphere.appserver.spi.javaeedd_1.8-javadoc.zip
 kind=ga
 edition=core
 WLP-Activation-Type: parallel
diff --git a/dev/com.ibm.websphere.appserver.spi.javaeedd/bnd.bnd b/dev/com.ibm.websphere.appserver.spi.javaeedd/bnd.bnd
@@ -1,5 +1,5 @@
 #*******************************************************************************
-# Copyright (c) 2017, 2022 IBM Corporation and others.
+# Copyright (c) 2017, 2023 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
@@ -11,15 +11,33 @@
 #     IBM Corporation - initial API and implementation
 #*******************************************************************************
 -include= ~../cnf/resources/bnd/bundle.props
-bVersion: 1.7
+bVersion: 1.8
 
 Bundle-Name: WebSphere Bindings and Extensions SPI
 Bundle-Description: WebSphere Bindings and Extensions SPI, version ${bVersion}
 Bundle-SymbolicName: com.ibm.websphere.appserver.spi.javaeedd
 
-Import-Package: com.ibm.ws.javaee.dd.appbnd,com.ibm.ws.javaee.dd.common,com.ibm.ws.javaee.dd.commonbnd,com.ibm.ws.javaee.dd.commonext,com.ibm.ws.javaee.dd.jsp,com.ibm.ws.javaee.dd.web,com.ibm.ws.javaee.dd.web.common,com.ibm.ws.javaee.dd.webbnd,com.ibm.ws.javaee.dd.webext
+Import-Package: \
+	com.ibm.ws.javaee.dd.appbnd,\
+	com.ibm.ws.javaee.dd.common,\
+	com.ibm.ws.javaee.dd.commonbnd,\
+	com.ibm.ws.javaee.dd.commonext,\
+	com.ibm.ws.javaee.dd.jsp,\
+	com.ibm.ws.javaee.dd.web,\
+	com.ibm.ws.javaee.dd.web.common,\
+	com.ibm.ws.javaee.dd.webbnd,\
+	com.ibm.ws.javaee.dd.webext
 
-Export-Package: com.ibm.ws.javaee.dd.appbnd,com.ibm.ws.javaee.dd.common,com.ibm.ws.javaee.dd.commonbnd,com.ibm.ws.javaee.dd.commonext,com.ibm.ws.javaee.dd.jsp,com.ibm.ws.javaee.dd.web,com.ibm.ws.javaee.dd.web.common,com.ibm.ws.javaee.dd.webbnd,com.ibm.ws.javaee.dd.webext
+Export-Package: \
+	com.ibm.ws.javaee.dd.appbnd,\
+	com.ibm.ws.javaee.dd.common,\
+	com.ibm.ws.javaee.dd.commonbnd,\
+	com.ibm.ws.javaee.dd.commonext,\
+	com.ibm.ws.javaee.dd.jsp,\
+	com.ibm.ws.javaee.dd.web,\
+	com.ibm.ws.javaee.dd.web.common,\
+	com.ibm.ws.javaee.dd.webbnd,\
+	com.ibm.ws.javaee.dd.webext
 
 -includeresource: {META-INF/maven/com.ibm.websphere.appserver.spi/com.ibm.websphere.appserver.spi.javaeedd/pom.xml=com.ibm.websphere.appserver.spi.javaeedd.pom}
 

diff --git a/dev/com.ibm.websphere.appserver.spi.javaeedd/com.ibm.websphere.appserver.spi.javaeedd.pom b/dev/com.ibm.websphere.appserver.spi.javaeedd/com.ibm.websphere.appserver.spi.javaeedd.pom
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright (c) 2012,2022 IBM Corporation and others.
+    Copyright (c) 2012, 2023 IBM Corporation and others.
     All rights reserved. This program and the accompanying materials
     are made available under the terms of the Eclipse Public License 2.0
     which accompanies this distribution, and is available at
@@ -27,5 +27,5 @@
   <artifactId>com.ibm.websphere.appserver.spi.javaeedd</artifactId>
   <version>${bFullVersion}</version>
   <name>WebSphere Bindings and Extensions SPI</name>
-  <description>WebSphere Bindings and Extensions SPI, version 1.7</description>
+  <description>WebSphere Bindings and Extensions SPI, version 1.8</description>
 </project>
diff --git a/dev/com.ibm.ws.javaee.dd.common/src/com/ibm/ws/javaee/dd/PlatformVersion.java b/dev/com.ibm.ws.javaee.dd.common/src/com/ibm/ws/javaee/dd/PlatformVersion.java
@@ -1,10 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2014, 2022 IBM Corporation and others.
+ * Copyright (c) 2014, 2023 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-2.0/
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
@@ -22,6 +22,7 @@ public interface PlatformVersion {
     // 8,   http://xmlns.jcp.org/xml/ns/javaee  // last javax
     // 9,   https://jakarta.ee/xml/ns/jakartaee // jakarta EE 9
     // 10,  https://jakarta.ee/xml/ns/jakartaee // jakarta EE 10
+    // 11,  https://jakarta.ee/xml/ns/jakartaee // jakarta EE 11
 
     String NAMESPACE_SUN_J2EE   = "http://java.sun.com/xml/ns/j2ee";
     String NAMESPACE_SUN_JAVAEE = "http://java.sun.com/xml/ns/javaee";
@@ -33,14 +34,16 @@ public interface PlatformVersion {
     String VERSION_1_4_STR  =  "1.4";
     String VERSION_5_0_STR  =  "5.0";
     String VERSION_6_0_STR  =  "6.0";
-    String VERSION_7_STR    =  "7";    
+    String VERSION_7_STR    =  "7";
     String VERSION_7_0_STR  =  "7.0";
     String VERSION_8_0_STR  =  "8.0";
     String VERSION_9_STR    =  "9";
     String VERSION_9_0_STR  =  "9.0";
     String VERSION_10_STR   = "10";
     String VERSION_10_0_STR = "10.0";
-
+    String VERSION_11_STR   = "11";
+    String VERSION_11_0_STR = "11.0";
+
     int VERSION_1_2_INT  =  12;
     int VERSION_1_3_INT  =  13;
     int VERSION_1_4_INT  =  14;
@@ -50,68 +53,73 @@ public interface PlatformVersion {
     int VERSION_8_0_INT  =  80;
     int VERSION_9_0_INT  =  90;
     int VERSION_10_0_INT = 100;
+    int VERSION_11_0_INT = 110;
 
     //
 
     public static String getDottedVersionText(int version) {
         switch ( version ) {
-            case 0: return null;
-            case 9: return "0.9";
-            case 10: return "1.0";
-            case 11: return "1.1";
-            case 12: return "1.2";
-            case 13: return "1.3";
-            case 14: return "1.4";
-            case 15: return "1.5";
-            case 16: return "1.6";
-            case 17: return "1.7";
-            case 20: return "2.0";
-            case 21: return "2.1";
-            case 22: return "2.2";
-            case 23: return "2.3";
-            case 24: return "2.4";
-            case 25: return "2.5";
-            case 30: return "3.0";
-            case 31: return "3.1";
-            case 32: return "3.2";
-            case 40: return "4.0";
-            case 50: return "5.0";
-            case 60: return "6.0";
-            case 70: return "7.0";
-            case 80: return "8.0";
-            case 90: return "9.0";
+            case 0:   return null;
+            case 9:   return "0.9";
+            case 10:  return "1.0";
+            case 11:  return "1.1";
+            case 12:  return "1.2";
+            case 13:  return "1.3";
+            case 14:  return "1.4";
+            case 15:  return "1.5";
+            case 16:  return "1.6";
+            case 17:  return "1.7";
+            case 20:  return "2.0";
+            case 21:  return "2.1";
+            case 22:  return "2.2";
+            case 23:  return "2.3";
+            case 24:  return "2.4";
+            case 25:  return "2.5";
+            case 30:  return "3.0";
+            case 31:  return "3.1";
+            case 32:  return "3.2";
+            case 40:  return "4.0";
+            case 50:  return "5.0";
+            case 60:  return "6.0";
+            case 61:  return "6.1";
+            case 70:  return "7.0";
+            case 80:  return "8.0";
+            case 90:  return "9.0";
             case 100: return "10.0";
-            default: throw new IllegalArgumentException("Unknown schema version [ " + version + " ]");
+            case 110: return "11.0";
+            default:  throw new IllegalArgumentException("Unknown schema version [ " + version + " ]");
         }
     }
 
     public static String getVersionText(int version) {
         switch ( version ) {
-            case 0: return null;
-            case 11: return "1.1";
-            case 12: return "1.2";
-            case 13: return "1.3";
-            case 14: return "1.4";
-            case 15: return "1.5";
-            case 16: return "1.6";
-            case 17: return "1.7";
-            case 20: return "2.0";
-            case 21: return "2.1";
-            case 22: return "2.2";            
-            case 23: return "2.3";
-            case 24: return "2.4";
-            case 25: return "2.5";
-            case 30: return "3.0";
-            case 31: return "3.1";
-            case 32: return "3.2";
-            case 40: return "4";
-            case 50: return "5";
-            case 60: return "6";
-            case 70: return "7";
-            case 80: return "8";
-            case 90: return "9";
+            case 0:   return null;
+            case 11:  return "1.1";
+            case 12:  return "1.2";
+            case 13:  return "1.3";
+            case 14:  return "1.4";
+            case 15:  return "1.5";
+            case 16:  return "1.6";
+            case 17:  return "1.7";
+            case 20:  return "2.0";
+            case 21:  return "2.1";
+            case 22:  return "2.2";
+            case 23:  return "2.3";
+            case 24:  return "2.4";
+            case 25:  return "2.5";
+            case 30:  return "3.0";
+            case 31:  return "3.1";
+            case 32:  return "3.2";
+            case 40:  return "4";
+            case 50:  return "5";
+            case 60:  return "6";
+            case 61:  return "6.1";
+            case 70:  return "7";
+            case 80:  return "8";
+            case 90:  return "9";
             case 100: return "10";
-            default: throw new IllegalArgumentException("Unknown schema version [ " + version + " ]");
+            case 110: return "11";
+            default:  throw new IllegalArgumentException("Unknown schema version [ " + version + " ]");
         }
-    }    
+    }
 }
diff --git a/dev/com.ibm.ws.javaee.dd.common/src/com/ibm/ws/javaee/dd/common/ContextService.java b/dev/com.ibm.ws.javaee.dd.common/src/com/ibm/ws/javaee/dd/common/ContextService.java
@@ -1,10 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2021,2022 IBM Corporation and others.
+ * Copyright (c) 2021, 2023 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-2.0/
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
@@ -33,6 +33,11 @@ public interface ContextService extends JNDIEnvironmentRef, Describable {
      */
     String[] getUnchanged();
 
+    /**
+     * @return &lt;qualifier&gt; elements as a read-only list
+     */
+    String[] getQualifiers();
+
     /**
      * @return &lt;property&gt; elements as a read-only list
      */

diff --git a/dev/com.ibm.ws.javaee.dd.common/src/com/ibm/ws/javaee/dd/common/ManagedExecutor.java b/dev/com.ibm.ws.javaee.dd.common/src/com/ibm/ws/javaee/dd/common/ManagedExecutor.java
@@ -1,10 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2021,2022 IBM Corporation and others.
+ * Copyright (c) 2021, 2023 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-2.0/
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
@@ -17,7 +17,7 @@
 /**
  * Represents &lt;managed-executor&gt;.
  */
-public interface ManagedExecutor extends JNDIEnvironmentRef, Describable {   
+public interface ManagedExecutor extends JNDIEnvironmentRef, Describable {
     /**
      * @return &lt;context-service-ref&gt;, or null if unspecified
      */
@@ -47,8 +47,25 @@ public interface ManagedExecutor extends JNDIEnvironmentRef, Describable {
      */
     boolean isSetMaxAsync();
 
+    /**
+     * @return &lt;virtual&gt; if specified
+     * @see #isSetVirutal
+     */
+    boolean isVirtual();
+
+    /**
+     * @return true if &lt;virtual&gt; is specified
+     * @see #isVirtual
+     */
+    boolean isSetVirtual();
+
+    /**
+     * @return &lt;qualifier&gt; elements as a read-only list
+     */
+    String[] getQualifiers();
+
     /**
      * @return &lt;property&gt; elements as a read-only list
      */
-    List<Property> getProperties();    
+    List<Property> getProperties();
 }
diff --git a/...com.ibm.ws.javaee.dd.common/src/com/ibm/ws/javaee/dd/common/ManagedScheduledExecutor.java b/...com.ibm.ws.javaee.dd.common/src/com/ibm/ws/javaee/dd/common/ManagedScheduledExecutor.java
@@ -1,10 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2021,2022 IBM Corporation and others.
+ * Copyright (c) 2021, 2023 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-2.0/
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
@@ -46,7 +46,24 @@ public interface ManagedScheduledExecutor extends JNDIEnvironmentRef, Describabl
      * @see #getMaxAsync
      */
     boolean isSetMaxAsync();
-
+
+    /**
+     * @return &lt;virtual&gt; if specified
+     * @see #isSetVirutal
+     */
+    boolean isVirtual();
+
+    /**
+     * @return true if &lt;virtual&gt; is specified
+     * @see #isVirtual
+     */
+    boolean isSetVirtual();
+
+    /**
+     * @return &lt;qualifier&gt; elements as a read-only list
+     */
+    String[] getQualifiers();
+
     /**
      * @return &lt;property&gt; elements as a read-only list
      */

diff --git a/dev/com.ibm.ws.javaee.dd.common/src/com/ibm/ws/javaee/dd/common/ManagedThreadFactory.java b/dev/com.ibm.ws.javaee.dd.common/src/com/ibm/ws/javaee/dd/common/ManagedThreadFactory.java
@@ -1,10 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2021,2022 IBM Corporation and others.
+ * Copyright (c) 2021, 2023 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-2.0/
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
@@ -34,7 +34,24 @@ public interface ManagedThreadFactory extends JNDIEnvironmentRef, Describable {
      * @see #getPriority
      */
     boolean isSetPriority();
-
+
+    /**
+     * @return &lt;virtual&gt; if specified
+     * @see #isSetVirutal
+     */
+    boolean isVirtual();
+
+    /**
+     * @return true if &lt;virtual&gt; is specified
+     * @see #isVirtual
+     */
+    boolean isSetVirtual();
+
+    /**
+     * @return &lt;qualifier&gt; elements as a read-only list
+     */
+    String[] getQualifiers();
+
     /**
      * @return &lt;property&gt; elements as a read-only list
      */