Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update deployment descriptors for Concurrency 3.1 #27148

Closed
wants to merge 8 commits into from
Closed

Update deployment descriptors for Concurrency 3.1 #27148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c903cf4
Update deployment descriptors
KyleAure Dec 6, 2023
35bac11
Update deployment descriptor model
KyleAure Dec 6, 2023
8e9b987
Merge deployment descriptor values
KyleAure Dec 7, 2023
0ed395a
Update application.xml and web.xml to allow EE 11 schema
KyleAure Dec 11, 2023
fd28bc2
Add EE 11 tests for concurrency to AppTest and WebAppTest
KyleAure Dec 11, 2023
1e35b32
Feedback updates
KyleAure Dec 12, 2023
b181523
Ensure empty qualifier from xml can override annotations
KyleAure Dec 19, 2023
5c7b812
Additional review comments
KyleAure Dec 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
118 changes: 63 additions & 55 deletions dev/com.ibm.ws.javaee.dd.common/src/com/ibm/ws/javaee/dd/PlatformVersion.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand All @@ -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";
Expand All @@ -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;
Expand All @@ -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 + " ]");
}
}
}
}
9 changes: 7 additions & 2 deletions dev/com.ibm.ws.javaee.dd.common/src/com/ibm/ws/javaee/dd/common/ContextService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand Down Expand Up @@ -33,6 +33,11 @@ public interface ContextService extends JNDIEnvironmentRef, Describable {
*/
String[] getUnchanged();

/**
* @return <qualifier> elements as a read-only list
*/
String[] getQualifiers();

/**
* @return <property> elements as a read-only list
*/
Expand Down
25 changes: 21 additions & 4 deletions dev/com.ibm.ws.javaee.dd.common/src/com/ibm/ws/javaee/dd/common/ManagedExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand All @@ -17,7 +17,7 @@
/**
* Represents <managed-executor>.
*/
public interface ManagedExecutor extends JNDIEnvironmentRef, Describable {
public interface ManagedExecutor extends JNDIEnvironmentRef, Describable {
/**
* @return <context-service-ref>, or null if unspecified
*/
Expand Down Expand Up @@ -47,8 +47,25 @@ public interface ManagedExecutor extends JNDIEnvironmentRef, Describable {
*/
boolean isSetMaxAsync();

/**
* @return <virtual> if specified
* @see #isSetVirutal
*/
boolean isVirtual();

/**
* @return true if <virtual> is specified
* @see #isVirtual
*/
boolean isSetVirtual();

/**
* @return <qualifier> elements as a read-only list
*/
String[] getQualifiers();

/**
* @return <property> elements as a read-only list
*/
List<Property> getProperties();
List<Property> getProperties();
}
23 changes: 20 additions & 3 deletions ...com.ibm.ws.javaee.dd.common/src/com/ibm/ws/javaee/dd/common/ManagedScheduledExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand Down Expand Up @@ -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
*/
Expand Down
23 changes: 20 additions & 3 deletions dev/com.ibm.ws.javaee.dd.common/src/com/ibm/ws/javaee/dd/common/ManagedThreadFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand Down Expand Up @@ -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
*/
Expand Down
22 changes: 12 additions & 10 deletions dev/com.ibm.ws.javaee.dd/src/com/ibm/ws/javaee/dd/app/Application.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
/*******************************************************************************
* Copyright (c) 2011, 2022 IBM Corporation and others.
* Copyright (c) 2011, 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:
Expand Down Expand Up @@ -33,20 +33,22 @@ public interface Application extends DeploymentDescriptor, DescriptionGroup, JND
int VERSION_8 = 80;
int VERSION_9 = 90;
int VERSION_10 = 100;
int VERSION_11 = 110;

int[] VERSIONS = {
VERSION_1_2, VERSION_1_3, // dtd
VERSION_1_4, // sun j2ee
VERSION_5, VERSION_6, // sun javaee
VERSION_7, VERSION_8, // jcp java
VERSION_9, VERSION_10, VERSION_11 // Jakarta
};

int [] VERSIONS = {
VERSION_1_2, VERSION_1_3, // dtd
VERSION_1_4, // sun j2ee
VERSION_5, VERSION_6, // sun javaee
VERSION_7, VERSION_8, // jcp java
VERSION_9, VERSION_10 // Jakarta
};

String getVersion();

String getApplicationName();

boolean isSetInitializeInOrder();

boolean isInitializeInOrder();

List<Module> getModules();
Expand Down
Loading