You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by pe...@apache.org on 2022/07/12 18:15:21 UTC
[netbeans] branch master updated: Add initial support for Jakarta 9.1 and improve GlassFish support for all released versions (#4364)
This is an automated email from the ASF dual-hosted git repository.
pepness pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 05d8a71e4a Add initial support for Jakarta 9.1 and improve GlassFish support for all released versions (#4364)
05d8a71e4a is described below
commit 05d8a71e4a6bfb41da5e4f0a0680369f832d745e
Author: José Contreras <pe...@apache.org>
AuthorDate: Tue Jul 12 18:15:14 2022 +0000
Add initial support for Jakarta 9.1 and improve GlassFish support for all released versions (#4364)
Changes for NetBeans in general
- Add initial support for Jakarta EE 9.1 (missing schemas)
- Add java 11 validations for Jakarta EE 9.1
- Add some missing Java EE validations
- Remove not working logic to preselect a server
- Use switch-case instead of long if-else statements
Changes only for GlassFish
- Add support for Jakarta EE 9.1
- Add missing support for GlassFish 4 (JEE 7)
- Add support for every GlassFish version released up to 6.2.5
- Add tests for GlassFish automatic registration
- Tailored config files for every GlassFish version
---
.../glassfish.common/nbproject/project.properties | 2 +-
.../modules/glassfish/common/Bundle.properties | 7 +-
.../common/GlassfishInstanceProvider.java | 15 +-
.../modules/glassfish/common/ServerDetails.java | 90 ++++++++--
.../common/registration/AutomaticRegistration.java | 25 +--
.../glassfish/common/wizards/Bundle.properties | 8 +-
.../modules/glassfish/spi/ServerUtilities.java | 16 +-
.../registration/AutomaticRegistrationTest.java | 129 ++++++++++++++
.../eecommon/api/config/AppClientVersion.java | 30 +++-
.../eecommon/api/config/ApplicationVersion.java | 27 +++
.../api/config/GlassfishConfiguration.java | 1 +
.../glassfish/eecommon/api/config/J2EEVersion.java | 8 +
.../eecommon/api/config/ServletVersion.java | 22 ++-
.../glassfish.javaee/nbproject/project.properties | 2 +-
.../javaee/AbstractHk2ConfigurationFactory.java | 45 +++--
.../modules/glassfish/javaee/Bundle.properties | 2 +
.../glassfish/javaee/Hk2DeploymentFactory.java | 23 ++-
.../glassfish/javaee/Hk2JavaEEPlatformFactory.java | 14 +-
.../glassfish/javaee/Hk2JavaEEPlatformImpl.java | 4 +
.../modules/glassfish/javaee/Hk2JaxWsStack.java | 4 +-
.../glassfish/javaee/Hk2OptionalFactory.java | 6 +
.../netbeans/modules/glassfish/javaee/layer.xml | 63 ++++++-
.../netbeans/modules/glassfish/javaee/nbdepee7.xml | 54 ++++++
.../glassfish/tooling/admin/AdminFactory.java | 19 ++
.../glassfish/tooling/data/GlassFishVersion.java | 59 +++++-
.../server/config/ConfigBuilderProvider.java | 28 ++-
.../tooling/server/config/GlassFishV4.xml | 5 +-
.../tooling/server/config/GlassFishV4_1.xml | 5 +-
.../tooling/server/config/GlassFishV5.xml | 9 +-
.../tooling/server/config/GlassFishV5_1_0.xml | 13 +-
.../tooling/server/config/GlassFishV6.xml | 29 +--
.../tooling/server/config/GlassFishV6_1_0.xml | 31 +---
.../{GlassFishV6_1_0.xml => GlassFishV6_2_0.xml} | 36 ++--
.../tooling/server/config/GlassFishV6_2_1.xml | 39 ++--
.../{GlassFishV6_1_0.xml => GlassFishV6_2_2.xml} | 39 ++--
.../{GlassFishV6_1_0.xml => GlassFishV6_2_3.xml} | 39 ++--
.../{GlassFishV6_1_0.xml => GlassFishV6_2_4.xml} | 40 ++---
.../tooling/server/config/JavaEEProfile.java | 12 +-
.../tooling/server/config/JavaSEPlatform.java | 44 ++++-
.../tooling/data/GlassFishVersionTest.java | 50 ++++--
.../tooling/server/config/ConfigBuilderTest.java | 2 +-
.../j2ee/clientproject/AppClientProvider.java | 6 +-
.../api/AppClientProjectGenerator.java | 8 +
.../ui/customizer/AppClientProjectProperties.java | 4 +-
.../AppClientProjectJAXWSClientSupport.java | 4 +
.../netbeans/modules/j2ee/common/dd/DDHelper.java | 8 +-
.../org/netbeans/api/j2ee/core/Bundle.properties | 2 +
.../src/org/netbeans/api/j2ee/core/Profile.java | 10 ++
.../modules/j2ee/dd/api/client/AppClient.java | 1 +
.../org/netbeans/modules/j2ee/ejbcore/Utils.java | 3 +-
.../wizard/jpa/dao/AppServerValidationPanel.java | 3 +-
.../ejb/wizard/session/SessionEJBWizard.java | 3 +-
.../jaxws/EjbProjectJAXWSClientSupport.java | 16 ++
.../jaxws/EjbProjectJAXWSSupport.java | 16 ++
.../ui/customizer/EjbJarProjectProperties.java | 4 +-
enterprise/j2eeserver/nbproject/project.properties | 1 +
.../modules/j2ee/deployment/impl/layer.xml | 5 +-
.../project/api/ant/ui/wizard/Bundle.properties | 10 +-
.../api/ant/ui/wizard/J2eeVersionWarningPanel.java | 198 +++++++++++++--------
.../api/ant/ui/wizard/ProjectServerPanel.java | 136 +++++++-------
enterprise/web.jsf/nbproject/project.properties | 2 +-
.../modules/web/jsf/JSFFrameworkProvider.java | 2 +-
.../web.project/nbproject/project.properties | 4 +-
.../jaxws/WebProjectJAXWSClientSupport.java | 12 +-
.../web/project/jaxws/WebProjectJAXWSSupport.java | 4 +
.../ui/customizer/WebProjectProperties.java | 16 +-
.../websvc.clientapi/nbproject/project.properties | 4 +-
.../jaxws/client/ProjectJAXWSClientSupport.java | 1 +
.../websvc.jaxwsapi/nbproject/project.properties | 4 +-
.../websvc/jaxws/spi/ProjectJAXWSSupport.java | 1 +
.../websvc.restapi/nbproject/project.properties | 4 +-
.../modules/websvc/rest/spi/RestSupport.java | 4 +-
72 files changed, 1099 insertions(+), 493 deletions(-)
diff --git a/enterprise/glassfish.common/nbproject/project.properties b/enterprise/glassfish.common/nbproject/project.properties
index d30ade68f0..5a892536fc 100644
--- a/enterprise/glassfish.common/nbproject/project.properties
+++ b/enterprise/glassfish.common/nbproject/project.properties
@@ -16,7 +16,7 @@
# under the License.
javac.compilerargs=-Xlint -Xlint:-serial
-javac.source=1.7
+javac.source=1.8
test.config.stableBTD.includes=**/*Test.class
test.config.stableBTD.excludes=\
diff --git a/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/Bundle.properties b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/Bundle.properties
index d99b73f318..ffe88bc244 100644
--- a/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/Bundle.properties
+++ b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/Bundle.properties
@@ -159,8 +159,13 @@ STR_50_SERVER_NAME=GlassFish Server 5.0
STR_501_SERVER_NAME=GlassFish Server 5.0.1
STR_510_SERVER_NAME=GlassFish Server 5.1.0
STR_6_SERVER_NAME=GlassFish Server 6
-STR_610_SERVER_NAME=GlassFish Server 6.1
+STR_610_SERVER_NAME=GlassFish Server 6.1.0
+STR_620_SERVER_NAME=GlassFish Server 6.2.0
STR_621_SERVER_NAME=GlassFish Server 6.2.1
+STR_622_SERVER_NAME=GlassFish Server 6.2.2
+STR_623_SERVER_NAME=GlassFish Server 6.2.3
+STR_624_SERVER_NAME=GlassFish Server 6.2.4
+STR_625_SERVER_NAME=GlassFish Server 6.2.5
# CommonServerSupport.java
MSG_FLAKEY_NETWORK=<html>Network communication problem<br/>Could not establish \
diff --git a/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/GlassfishInstanceProvider.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/GlassfishInstanceProvider.java
index 8b1d8fc5fc..81bbc8afdb 100644
--- a/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/GlassfishInstanceProvider.java
+++ b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/GlassfishInstanceProvider.java
@@ -63,6 +63,7 @@ public final class GlassfishInstanceProvider implements ServerInstanceProvider,
private static volatile GlassfishInstanceProvider glassFishProvider;
public static final String EE6_DEPLOYER_FRAGMENT = "deployer:gfv3ee6"; // NOI18N
+ public static final String EE7_DEPLOYER_FRAGMENT = "deployer:gfv4ee7"; // NOI18N
public static final String EE8_DEPLOYER_FRAGMENT = "deployer:gfv5ee8"; // NOI18N
public static final String JAKARTAEE8_DEPLOYER_FRAGMENT = "deployer:gfv510ee8";
public static final String JAKARTAEE9_DEPLOYER_FRAGMENT = "deployer:gfv6ee9";
@@ -70,11 +71,11 @@ public final class GlassfishInstanceProvider implements ServerInstanceProvider,
public static final String EE6WC_DEPLOYER_FRAGMENT = "deployer:gfv3ee6wc"; // NOI18N
public static final String PRELUDE_DEPLOYER_FRAGMENT = "deployer:gfv3"; // NOI18N
private static String EE6_INSTANCES_PATH = "/GlassFishEE6/Instances"; // NOI18N
+ private static String EE7_INSTANCES_PATH = "/GlassFishEE7/Instances"; // NOI18N
private static String EE8_INSTANCES_PATH = "/GlassFishEE8/Instances"; // NOI18N
- private static String EE9_INSTANCES_PATH = "/GlassFishEE9/Instances"; // NOI18N
private static String JAKARTAEE8_INSTANCES_PATH = "/GlassFishJakartaEE8/Instances"; // NOI18N
private static String JAKARTAEE9_INSTANCES_PATH = "/GlassFishJakartaEE9/Instances"; // NOI18N
- // static private String JAKARTAEE91_INSTANCES_PATH = "/GlassFishJakartaEE91/Instances"; // NOI18N
+ private static String JAKARTAEE91_INSTANCES_PATH = "/GlassFishJakartaEE91/Instances"; // NOI18N
private static String EE6WC_INSTANCES_PATH = "/GlassFishEE6WC/Instances"; // NOI18N
public static String PRELUDE_DEFAULT_NAME = "GlassFish_v3_Prelude"; //NOI18N
@@ -96,8 +97,14 @@ public final class GlassfishInstanceProvider implements ServerInstanceProvider,
if (glassFishProvider == null) {
runInit = true;
glassFishProvider = new GlassfishInstanceProvider(
- new String[]{EE6_DEPLOYER_FRAGMENT, EE6WC_DEPLOYER_FRAGMENT, EE8_DEPLOYER_FRAGMENT, JAKARTAEE8_DEPLOYER_FRAGMENT, JAKARTAEE9_DEPLOYER_FRAGMENT},
- new String[]{EE6_INSTANCES_PATH, EE6WC_INSTANCES_PATH, EE8_INSTANCES_PATH, JAKARTAEE8_INSTANCES_PATH, JAKARTAEE9_INSTANCES_PATH},
+ new String[]{EE6_DEPLOYER_FRAGMENT, EE6WC_DEPLOYER_FRAGMENT,
+ EE7_DEPLOYER_FRAGMENT, EE8_DEPLOYER_FRAGMENT,
+ JAKARTAEE8_DEPLOYER_FRAGMENT, JAKARTAEE9_DEPLOYER_FRAGMENT,
+ JAKARTAEE91_DEPLOYER_FRAGMENT},
+ new String[]{EE6_INSTANCES_PATH, EE6WC_INSTANCES_PATH,
+ EE7_INSTANCES_PATH, EE8_INSTANCES_PATH,
+ JAKARTAEE8_INSTANCES_PATH, JAKARTAEE9_INSTANCES_PATH,
+ JAKARTAEE91_INSTANCES_PATH},
null,
true,
new String[]{"--nopassword"}, // NOI18N
diff --git a/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ServerDetails.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ServerDetails.java
index 93000f8800..630fb0a5e8 100644
--- a/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ServerDetails.java
+++ b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ServerDetails.java
@@ -120,7 +120,7 @@ public enum ServerDetails {
* details for an instance of GlassFish Server 4.0.0
*/
GLASSFISH_SERVER_4_0(NbBundle.getMessage(ServerDetails.class, "STR_40_SERVER_NAME", new Object[]{}), // NOI18N
- "deployer:gfv3ee6wc", // NOI18N
+ "deployer:gfv4ee7", // NOI18N
400,
"https://download.oracle.com/glassfish/4.0/release/glassfish-4.0-ml.zip", // NOI18N
"https://download.oracle.com/glassfish/4.0/release/glassfish-4.0-ml.zip", // NOI18N
@@ -131,7 +131,7 @@ public enum ServerDetails {
* details for an instance of GlassFish Server 4.0.1
*/
GLASSFISH_SERVER_4_0_1(NbBundle.getMessage(ServerDetails.class, "STR_401_SERVER_NAME", new Object[]{}), // NOI18N
- "deployer:gfv3ee6wc", // NOI18N
+ "deployer:gfv4ee7", // NOI18N
401,
"https://download.oracle.com/glassfish/4.0.1/release/glassfish-4.0.1-ml.zip", // NOI18N
"https://download.oracle.com/glassfish/4.0.1/release/glassfish-4.0.1-ml.zip", // NOI18N
@@ -139,10 +139,10 @@ public enum ServerDetails {
),
/**
- * details for an instance of GlassFish Server 4.1 and dev 4.2
+ * details for an instance of GlassFish Server 4.1
*/
GLASSFISH_SERVER_4_1(NbBundle.getMessage(ServerDetails.class, "STR_41_SERVER_NAME", new Object[]{}), // NOI18N
- "deployer:gfv3ee6wc", // NOI18N
+ "deployer:gfv4ee7", // NOI18N
410,
"https://download.oracle.com/glassfish/4.1/release/glassfish-4.1.zip", // NOI18N
"https://download.oracle.com/glassfish/4.1/release/glassfish-4.1.zip", // NOI18N
@@ -150,10 +150,10 @@ public enum ServerDetails {
),
/**
- * details for an instance of GlassFish Server 4.1.1 and dev 4.2
+ * details for an instance of GlassFish Server 4.1.1
*/
GLASSFISH_SERVER_4_1_1(NbBundle.getMessage(ServerDetails.class, "STR_411_SERVER_NAME", new Object[]{}), // NOI18N
- "deployer:gfv3ee6wc", // NOI18N
+ "deployer:gfv4ee7", // NOI18N
411,
"https://download.oracle.com/glassfish/4.1.1/release/glassfish-4.1.1.zip", // NOI18N
"https://download.oracle.com/glassfish/4.1.1/release/glassfish-4.1.1.zip", // NOI18N
@@ -164,7 +164,7 @@ public enum ServerDetails {
* details for an instance of GlassFish Server 4.1.2
*/
GLASSFISH_SERVER_4_1_2(NbBundle.getMessage(ServerDetails.class, "STR_412_SERVER_NAME", new Object[]{}), // NOI18N
- "deployer:gfv3ee6wc", // NOI18N
+ "deployer:gfv4ee7", // NOI18N
412,
"https://download.oracle.com/glassfish/4.1.2/release/glassfish-4.1.2.zip", // NOI18N
"https://download.oracle.com/glassfish/4.1.2/release/glassfish-4.1.2.zip", // NOI18N
@@ -183,7 +183,7 @@ public enum ServerDetails {
),
/**
- * details for an instance of GlassFish Server 5
+ * details for an instance of GlassFish Server 5.0.1
*/
GLASSFISH_SERVER_5_0_1(NbBundle.getMessage(ServerDetails.class, "STR_501_SERVER_NAME", new Object[]{}), // NOI18N
"deployer:gfv5ee8", // NOI18N
@@ -194,7 +194,7 @@ public enum ServerDetails {
),
/**
- * details for an instance of GlassFish Server 5
+ * details for an instance of GlassFish Server 5.1.0
*/
GLASSFISH_SERVER_5_1_0(NbBundle.getMessage(ServerDetails.class, "STR_510_SERVER_NAME", new Object[]{}), // NOI18N
"deployer:gfv510ee8", // NOI18N
@@ -205,7 +205,7 @@ public enum ServerDetails {
),
/**
- * details for an instance of GlassFish Server 6
+ * details for an instance of GlassFish Server 6.0.0
*/
GLASSFISH_SERVER_6(NbBundle.getMessage(ServerDetails.class, "STR_6_SERVER_NAME", new Object[]{}), // NOI18N
"deployer:gfv6ee9", // NOI18N
@@ -226,6 +226,17 @@ public enum ServerDetails {
"http://www.eclipse.org/legal/epl-2.0" //NOI18N
),
+ /**
+ * details for an instance of GlassFish Server 6.2.0
+ */
+ GLASSFISH_SERVER_6_2_0(NbBundle.getMessage(ServerDetails.class, "STR_620_SERVER_NAME", new Object[]{}), // NOI18N
+ "deployer:gfv610ee9", // NOI18N
+ 620,
+ "https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/6.2.0/glassfish-6.2.0.zip", // NOI18N
+ "https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/6.2.0/glassfish-6.2.0.zip", // NOI18N
+ "http://www.eclipse.org/legal/epl-2.0" //NOI18N
+ ),
+
/**
* details for an instance of GlassFish Server 6.2.1
*/
@@ -235,6 +246,50 @@ public enum ServerDetails {
"https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/6.2.1/glassfish-6.2.1.zip", // NOI18N
"https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/6.2.1/glassfish-6.2.1.zip", // NOI18N
"http://www.eclipse.org/legal/epl-2.0" //NOI18N
+ ),
+
+ /**
+ * details for an instance of GlassFish Server 6.2.2
+ */
+ GLASSFISH_SERVER_6_2_2(NbBundle.getMessage(ServerDetails.class, "STR_622_SERVER_NAME", new Object[]{}), // NOI18N
+ "deployer:gfv610ee9", // NOI18N
+ 622,
+ "https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/6.2.2/glassfish-6.2.2.zip", // NOI18N
+ "https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/6.2.2/glassfish-6.2.2.zip", // NOI18N
+ "http://www.eclipse.org/legal/epl-2.0" //NOI18N
+ ),
+
+ /**
+ * details for an instance of GlassFish Server 6.2.3
+ */
+ GLASSFISH_SERVER_6_2_3(NbBundle.getMessage(ServerDetails.class, "STR_623_SERVER_NAME", new Object[]{}), // NOI18N
+ "deployer:gfv610ee9", // NOI18N
+ 623,
+ "https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/6.2.3/glassfish-6.2.3.zip", // NOI18N
+ "https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/6.2.3/glassfish-6.2.3.zip", // NOI18N
+ "http://www.eclipse.org/legal/epl-2.0" //NOI18N
+ ),
+
+ /**
+ * details for an instance of GlassFish Server 6.2.4
+ */
+ GLASSFISH_SERVER_6_2_4(NbBundle.getMessage(ServerDetails.class, "STR_624_SERVER_NAME", new Object[]{}), // NOI18N
+ "deployer:gfv610ee9", // NOI18N
+ 624,
+ "https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/6.2.4/glassfish-6.2.4.zip", // NOI18N
+ "https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/6.2.4/glassfish-6.2.4.zip", // NOI18N
+ "http://www.eclipse.org/legal/epl-2.0" //NOI18N
+ ),
+
+ /**
+ * details for an instance of GlassFish Server 6.2.5
+ */
+ GLASSFISH_SERVER_6_2_5(NbBundle.getMessage(ServerDetails.class, "STR_625_SERVER_NAME", new Object[]{}), // NOI18N
+ "deployer:gfv610ee9", // NOI18N
+ 625,
+ "https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/6.2.5/glassfish-6.2.5.zip", // NOI18N
+ "https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/6.2.5/glassfish-6.2.5.zip", // NOI18N
+ "http://www.eclipse.org/legal/epl-2.0" //NOI18N
);
/**
@@ -246,7 +301,12 @@ public enum ServerDetails {
public static WizardDescriptor.InstantiatingIterator
getInstantiatingIterator() {
return new ServerWizardIterator(new ServerDetails[]{
+ GLASSFISH_SERVER_6_2_5,
+ GLASSFISH_SERVER_6_2_4,
+ GLASSFISH_SERVER_6_2_3,
+ GLASSFISH_SERVER_6_2_2,
GLASSFISH_SERVER_6_2_1,
+ GLASSFISH_SERVER_6_2_0,
GLASSFISH_SERVER_6_1_0,
GLASSFISH_SERVER_6,
GLASSFISH_SERVER_5_1_0,
@@ -264,7 +324,12 @@ public enum ServerDetails {
GLASSFISH_SERVER_3_0_1,
GLASSFISH_SERVER_3},
new ServerDetails[]{
+ GLASSFISH_SERVER_6_2_5,
+ GLASSFISH_SERVER_6_2_4,
+ GLASSFISH_SERVER_6_2_3,
+ GLASSFISH_SERVER_6_2_2,
GLASSFISH_SERVER_6_2_1,
+ GLASSFISH_SERVER_6_2_0,
GLASSFISH_SERVER_6_1_0,
GLASSFISH_SERVER_6,
GLASSFISH_SERVER_5_1_0,
@@ -311,7 +376,12 @@ public enum ServerDetails {
case GF_5_1_0: return GLASSFISH_SERVER_5_1_0.getVersion();
case GF_6: return GLASSFISH_SERVER_6.getVersion();
case GF_6_1_0: return GLASSFISH_SERVER_6_1_0.getVersion();
+ case GF_6_2_0: return GLASSFISH_SERVER_6_2_0.getVersion();
case GF_6_2_1: return GLASSFISH_SERVER_6_2_1.getVersion();
+ case GF_6_2_2: return GLASSFISH_SERVER_6_2_2.getVersion();
+ case GF_6_2_3: return GLASSFISH_SERVER_6_2_3.getVersion();
+ case GF_6_2_4: return GLASSFISH_SERVER_6_2_4.getVersion();
+ case GF_6_2_5: return GLASSFISH_SERVER_6_2_5.getVersion();
default: return -1;
}
}
diff --git a/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/registration/AutomaticRegistration.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/registration/AutomaticRegistration.java
index add2ec6035..2fbacb6ad0 100644
--- a/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/registration/AutomaticRegistration.java
+++ b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/registration/AutomaticRegistration.java
@@ -84,20 +84,23 @@ public class AutomaticRegistration {
String deployer = "deployer:gfv3ee6";
String defaultDisplayNamePrefix = "GlassFish Server ";
GlassFishVersion version = ServerUtils.getServerVersion(glassfishRoot);
- if (GlassFishVersion.ge(version, GlassFishVersion.GF_3_1)) {
- deployer = "deployer:gfv3ee6wc";
- } else if (GlassFishVersion.ge(version, GlassFishVersion.GF_5)) {
- deployer = "deployer:gfv5ee8";
- config = "GlassFishEE8/Instances";
- } else if (GlassFishVersion.ge(version, GlassFishVersion.GF_5_1_0)) {
- deployer = "deployer:gfv510ee8";
- config = "GlassFishJakartaEE8/Instances";
+ if (GlassFishVersion.ge(version, GlassFishVersion.GF_6_1_0)) {
+ deployer = "deployer:gfv610ee9";
+ config = "GlassFishJakartaEE91/Instances";
} else if (GlassFishVersion.ge(version, GlassFishVersion.GF_6)) {
deployer = "deployer:gfv6ee9";
config = "GlassFishJakartaEE9/Instances";
- } else if (GlassFishVersion.ge(version, GlassFishVersion.GF_6_1_0)) {
- deployer = "deployer:gfv610ee9";
- config = "GlassFishJakartaEE9/Instances";
+ } else if (GlassFishVersion.ge(version, GlassFishVersion.GF_5_1_0)) {
+ deployer = "deployer:gfv510ee8";
+ config = "GlassFishJakartaEE8/Instances";
+ } else if (GlassFishVersion.ge(version, GlassFishVersion.GF_5)) {
+ deployer = "deployer:gfv5ee8";
+ config = "GlassFishEE8/Instances";
+ } else if (GlassFishVersion.ge(version, GlassFishVersion.GF_4)) {
+ deployer = "deployer:gfv4ee7";
+ config = "GlassFishEE7/Instances";
+ } else if (GlassFishVersion.ge(version, GlassFishVersion.GF_3_1)) {
+ deployer = "deployer:gfv3ee6wc";
}
StringBuilder sb = new StringBuilder(
defaultDisplayNamePrefix.length() + 12);
diff --git a/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/wizards/Bundle.properties b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/wizards/Bundle.properties
index 893cab1d74..5005c2cd26 100644
--- a/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/wizards/Bundle.properties
+++ b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/wizards/Bundle.properties
@@ -156,9 +156,15 @@ STR_5_SERVER_NAME=GlassFish Server 5.0
STR_501_SERVER_NAME=GlassFish Server 5.0.1
STR_510_SERVER_NAME=GlassFish Server 5.1.0
+STR_V6_FAMILY_NAME=GlassFish Server
STR_6_SERVER_NAME=GlassFish Server 6.0.0
STR_610_SERVER_NAME=GlassFish Server 6.1.0
-STR_V6_FAMILY_NAME=GlassFish Server
+STR_620_SERVER_NAME=GlassFish Server 6.2.0
+STR_621_SERVER_NAME=GlassFish Server 6.2.1
+STR_622_SERVER_NAME=GlassFish Server 6.2.2
+STR_623_SERVER_NAME=GlassFish Server 6.2.3
+STR_624_SERVER_NAME=GlassFish Server 6.2.4
+STR_625_SERVER_NAME=GlassFish Server 6.2.5
LBL_SELECT_BITS=Select
LBL_ChooseOne=Choose server to download:
diff --git a/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/spi/ServerUtilities.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/spi/ServerUtilities.java
index 1e5b28d0fe..ff3afc7b4e 100644
--- a/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/spi/ServerUtilities.java
+++ b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/spi/ServerUtilities.java
@@ -321,9 +321,8 @@ public final class ServerUtilities {
} else if(!candidate.getNameExt().endsWith(".jar")) {
continue;
}
- JarFile jarFile = null;
- try {
- jarFile = new JarFile(FileUtil.toFile(candidate), false);
+
+ try (JarFile jarFile = new JarFile(FileUtil.toFile(candidate), false)) {
Manifest manifest = jarFile.getManifest();
if(manifest != null) {
Attributes attrs = manifest.getMainAttributes();
@@ -342,18 +341,7 @@ public final class ServerUtilities {
} catch (IOException ex) {
Logger.getLogger(ServerUtilities.class.getName()).log(Level.INFO,
candidate.getPath(), ex);
- } finally {
- if (null != jarFile) {
- try {
- jarFile.close();
- } catch (IOException ex) {
- Logger.getLogger(ServerUtilities.class.getName()).log(Level.INFO,
- candidate.getPath(), ex);
- }
- jarFile = null;
- }
}
-
}
} else {
Logger.getLogger(ServerUtilities.class.getName()).log(Level.FINER,
diff --git a/enterprise/glassfish.common/test/unit/src/org/netbeans/modules/glassfish/common/registration/AutomaticRegistrationTest.java b/enterprise/glassfish.common/test/unit/src/org/netbeans/modules/glassfish/common/registration/AutomaticRegistrationTest.java
new file mode 100644
index 0000000000..0be18423d0
--- /dev/null
+++ b/enterprise/glassfish.common/test/unit/src/org/netbeans/modules/glassfish/common/registration/AutomaticRegistrationTest.java
@@ -0,0 +1,129 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.modules.glassfish.common.registration;
+
+import org.junit.Test;
+import static org.junit.Assert.*;
+import org.netbeans.modules.glassfish.tooling.data.GlassFishVersion;
+
+/**
+ *
+ * @author pepness
+ */
+public class AutomaticRegistrationTest {
+
+ @Test
+ public void testRegistrationGF625() {
+ GlassFishVersion version = GlassFishVersion.GF_6_2_5;
+ if (GlassFishVersion.ge(version, GlassFishVersion.GF_6_1_0)) {
+ assertTrue("Success!", true);
+ } else if (GlassFishVersion.ge(version, GlassFishVersion.GF_6)) {
+ fail("GF_6");
+ } else if (GlassFishVersion.ge(version, GlassFishVersion.GF_5_1_0)) {
+ fail("GF_5_1_0");
+ } else if (GlassFishVersion.ge(version, GlassFishVersion.GF_5)) {
+ fail("GF_5");
+ } else if (GlassFishVersion.ge(version, GlassFishVersion.GF_3_1)) {
+ fail("GF_3_1");
+ }
+ }
+
+ @Test
+ public void testRegistrationGF6() {
+ GlassFishVersion version = GlassFishVersion.GF_6;
+ if (GlassFishVersion.ge(version, GlassFishVersion.GF_6_1_0)) {
+ fail("GF_6_1_0");
+ } else if (GlassFishVersion.ge(version, GlassFishVersion.GF_6)) {
+ assertTrue("Success!", true);
+ } else if (GlassFishVersion.ge(version, GlassFishVersion.GF_5_1_0)) {
+ fail("GF_5_1_0");
+ } else if (GlassFishVersion.ge(version, GlassFishVersion.GF_5)) {
+ fail("GF_5");
+ } else if (GlassFishVersion.ge(version, GlassFishVersion.GF_3_1)) {
+ fail("GF_3_1");
+ }
+ }
+
+ @Test
+ public void testRegistrationGF510() {
+ GlassFishVersion version = GlassFishVersion.GF_5_1_0;
+ if (GlassFishVersion.ge(version, GlassFishVersion.GF_6_1_0)) {
+ fail("GF_6_1_0");
+ } else if (GlassFishVersion.ge(version, GlassFishVersion.GF_6)) {
+ fail("GF_6");
+ } else if (GlassFishVersion.ge(version, GlassFishVersion.GF_5_1_0)) {
+ assertTrue("Success!", true);
+ } else if (GlassFishVersion.ge(version, GlassFishVersion.GF_5)) {
+ fail("GF_5");
+ } else if (GlassFishVersion.ge(version, GlassFishVersion.GF_3_1)) {
+ fail("GF_3_1");
+ }
+ }
+
+ @Test
+ public void testRegistrationGF5() {
+ GlassFishVersion version = GlassFishVersion.GF_5;
+ if (GlassFishVersion.ge(version, GlassFishVersion.GF_6_1_0)) {
+ fail("GF_6_1_0");
+ } else if (GlassFishVersion.ge(version, GlassFishVersion.GF_6)) {
+ fail("GF_6");
+ } else if (GlassFishVersion.ge(version, GlassFishVersion.GF_5_1_0)) {
+ fail("GF_5_1_0");
+ } else if (GlassFishVersion.ge(version, GlassFishVersion.GF_5)) {
+ assertTrue("Success!", true);
+ } else if (GlassFishVersion.ge(version, GlassFishVersion.GF_3_1)) {
+ fail("GF_3_1");
+ }
+ }
+
+ @Test
+ public void testRegistrationGF4() {
+ GlassFishVersion version = GlassFishVersion.GF_4_1_2;
+ if (GlassFishVersion.ge(version, GlassFishVersion.GF_6_1_0)) {
+ fail("GF_6_1_0");
+ } else if (GlassFishVersion.ge(version, GlassFishVersion.GF_6)) {
+ fail("GF_6");
+ } else if (GlassFishVersion.ge(version, GlassFishVersion.GF_5_1_0)) {
+ fail("GF_5_1_0");
+ } else if (GlassFishVersion.ge(version, GlassFishVersion.GF_5)) {
+ fail("GF_5");
+ } else if (GlassFishVersion.ge(version, GlassFishVersion.GF_4)) {
+ assertTrue("Success!", true);
+ } else if (GlassFishVersion.ge(version, GlassFishVersion.GF_3_1)) {
+ fail("GF_3_1");
+ }
+ }
+
+ @Test
+ public void testRegistrationGF31() {
+ GlassFishVersion version = GlassFishVersion.GF_3_1;
+ if (GlassFishVersion.ge(version, GlassFishVersion.GF_6_1_0)) {
+ fail("GF_6_1_0");
+ } else if (GlassFishVersion.ge(version, GlassFishVersion.GF_6)) {
+ fail("GF_6");
+ } else if (GlassFishVersion.ge(version, GlassFishVersion.GF_5_1_0)) {
+ fail("GF_5_1_0");
+ } else if (GlassFishVersion.ge(version, GlassFishVersion.GF_5)) {
+ fail("GF_5");
+ } else if (GlassFishVersion.ge(version, GlassFishVersion.GF_3_1)) {
+ assertTrue("Success!", true);
+ }
+ }
+
+}
diff --git a/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/AppClientVersion.java b/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/AppClientVersion.java
index c15838aa8e..0f4d3c6f29 100644
--- a/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/AppClientVersion.java
+++ b/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/AppClientVersion.java
@@ -47,13 +47,33 @@ public final class AppClientVersion extends J2EEBaseVersion {
"5.0", 5000 // NOI18N
);
-
/** Represents application-client version 6.0
*/
public static final AppClientVersion APP_CLIENT_6_0 = new AppClientVersion(
"6.0", 6000, // NOI18N
"6.0", 6000 // NOI18N
);
+
+ /** Represents application-client version 7.0
+ */
+ public static final AppClientVersion APP_CLIENT_7_0 = new AppClientVersion(
+ "7.0", 7000, // NOI18N
+ "7.0", 7000 // NOI18N
+ );
+
+ /** Represents application-client version 8.0
+ */
+ public static final AppClientVersion APP_CLIENT_8_0 = new AppClientVersion(
+ "8.0", 8000, // NOI18N
+ "8.0", 8000 // NOI18N
+ );
+
+ /** Represents application-client version 9.0
+ */
+ public static final AppClientVersion APP_CLIENT_9_0 = new AppClientVersion(
+ "9.0", 9000, // NOI18N
+ "9.0", 9000 // NOI18N
+ );
/** -----------------------------------------------------------------------
* Implementation
*/
@@ -85,6 +105,14 @@ public final class AppClientVersion extends J2EEBaseVersion {
result = APP_CLIENT_1_4;
} else if(APP_CLIENT_5_0.toString().equals(version)) {
result = APP_CLIENT_5_0;
+ } else if(APP_CLIENT_6_0.toString().equals(version)) {
+ result = APP_CLIENT_6_0;
+ } else if(APP_CLIENT_7_0.toString().equals(version)) {
+ result = APP_CLIENT_7_0;
+ } else if(APP_CLIENT_8_0.toString().equals(version)) {
+ result = APP_CLIENT_8_0;
+ } else if(APP_CLIENT_9_0.toString().equals(version)) {
+ result = APP_CLIENT_9_0;
}
return result;
diff --git a/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/ApplicationVersion.java b/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/ApplicationVersion.java
index a071e9e972..f23b9c258d 100644
--- a/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/ApplicationVersion.java
+++ b/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/ApplicationVersion.java
@@ -53,6 +53,27 @@ public final class ApplicationVersion extends J2EEBaseVersion {
"6.0", 6000, // NOI18N
"6.0", 6000 // NOI18N
);
+
+ /** Represents application version 7.0
+ */
+ public static final ApplicationVersion APPLICATION_7_0 = new ApplicationVersion(
+ "7.0", 7000, // NOI18N
+ "7.0", 7000 // NOI18N
+ );
+
+ /** Represents application version 8.0
+ */
+ public static final ApplicationVersion APPLICATION_8_0 = new ApplicationVersion(
+ "8.0", 8000, // NOI18N
+ "8.0", 8000 // NOI18N
+ );
+
+ /** Represents application version 9.0
+ */
+ public static final ApplicationVersion APPLICATION_9_0 = new ApplicationVersion(
+ "9.0", 9000, // NOI18N
+ "9.0", 9000 // NOI18N
+ );
/** -----------------------------------------------------------------------
* Implementation
@@ -87,6 +108,12 @@ public final class ApplicationVersion extends J2EEBaseVersion {
result = APPLICATION_5_0;
} else if(APPLICATION_6_0.toString().equals(version)) {
result = APPLICATION_6_0;
+ } else if(APPLICATION_7_0.toString().equals(version)) {
+ result = APPLICATION_7_0;
+ } else if(APPLICATION_8_0.toString().equals(version)) {
+ result = APPLICATION_8_0;
+ } else if(APPLICATION_9_0.toString().equals(version)) {
+ result = APPLICATION_9_0;
}
return result;
diff --git a/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/GlassfishConfiguration.java b/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/GlassfishConfiguration.java
index 1808fcdb15..7d19e72686 100644
--- a/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/GlassfishConfiguration.java
+++ b/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/GlassfishConfiguration.java
@@ -506,6 +506,7 @@ public abstract class GlassfishConfiguration implements
"gfv3",
"gfv3ee6",
"gfv3ee6wc",
+ "gfv4ee7",
"gfv5ee8",
"gfv510ee8",
"gfv6ee9",
diff --git a/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/J2EEVersion.java b/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/J2EEVersion.java
index 6d80425fb8..f5404a316a 100644
--- a/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/J2EEVersion.java
+++ b/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/J2EEVersion.java
@@ -80,6 +80,12 @@ public final class J2EEVersion extends J2EEBaseVersion {
"9.0.0", 90000, // NOI18N
"9.0.0", 90000); // NOI18N
+ /** Represents Jakarta EE version 9.1.0
+ */
+ public static final J2EEVersion JAKARTAEE_9_1 = new J2EEVersion(
+ "9.1.0", 91000, // NOI18N
+ "9.1.0", 91000); // NOI18N
+
/** -----------------------------------------------------------------------
* Implementation
*/
@@ -121,6 +127,8 @@ public final class J2EEVersion extends J2EEBaseVersion {
result = JAKARTAEE_8_0;
} else if(JAKARTAEE_9_0.toString().equals(version)) {
result = JAKARTAEE_9_0;
+ } else if(JAKARTAEE_9_1.toString().equals(version)) {
+ result = JAKARTAEE_9_1;
}
return result;
diff --git a/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/ServletVersion.java b/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/ServletVersion.java
index 5224a85f08..e2ac6ee3a6 100644
--- a/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/ServletVersion.java
+++ b/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/ServletVersion.java
@@ -54,11 +54,25 @@ public final class ServletVersion extends J2EEBaseVersion {
"6.0", 6000 // NOI18N
);
+ /** Represents servlet version 3.1
+ */
+ public static final ServletVersion SERVLET_3_1 = new ServletVersion(
+ "3.1", 3100, // NOI18N
+ "7.0", 7000 // NOI18N
+ );
+
/** Represents servlet version 4.0
*/
public static final ServletVersion SERVLET_4_0 = new ServletVersion(
- "4.0", 3000, // NOI18N
- "6.0", 6000 // NOI18N
+ "4.0", 4000, // NOI18N
+ "8.0", 8000 // NOI18N
+ );
+
+ /** Represents servlet version 5.0
+ */
+ public static final ServletVersion SERVLET_5_0 = new ServletVersion(
+ "5.0", 5000, // NOI18N
+ "9.0", 9000 // NOI18N
);
/** -----------------------------------------------------------------------
@@ -94,8 +108,12 @@ public final class ServletVersion extends J2EEBaseVersion {
result = SERVLET_2_5;
} else if(SERVLET_3_0.toString().equals(version)) {
result = SERVLET_3_0;
+ } else if(SERVLET_3_1.toString().equals(version)) {
+ result = SERVLET_3_1;
} else if(SERVLET_4_0.toString().equals(version)) {
result = SERVLET_4_0;
+ } else if(SERVLET_5_0.toString().equals(version)) {
+ result = SERVLET_5_0;
}
return result;
diff --git a/enterprise/glassfish.javaee/nbproject/project.properties b/enterprise/glassfish.javaee/nbproject/project.properties
index 28785bdc0c..0bedac5ee3 100644
--- a/enterprise/glassfish.javaee/nbproject/project.properties
+++ b/enterprise/glassfish.javaee/nbproject/project.properties
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
javac.compilerargs=-Xlint -Xlint:-serial
-javac.source=1.7
+javac.source=1.8
test.config.stableBTD.includes=**/*Test.class
test.config.stableBTD.excludes=\
diff --git a/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/AbstractHk2ConfigurationFactory.java b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/AbstractHk2ConfigurationFactory.java
index 265eddafad..8d0b58da61 100644
--- a/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/AbstractHk2ConfigurationFactory.java
+++ b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/AbstractHk2ConfigurationFactory.java
@@ -107,25 +107,28 @@ abstract class AbstractHk2ConfigurationFactory implements ModuleConfigurationFac
? instance.getVersion() : null;
try {
Hk2DeploymentManager evaluatedDm = null;
- if(version != null && GlassFishVersion.ge(version, GlassFishVersion.GF_6_1_0)){
- evaluatedDm = (Hk2DeploymentManager) Hk2DeploymentFactory.createJakartaEe91()
- .getDisconnectedDeploymentManager(instanceUrl);
- } else if(version != null && GlassFishVersion.ge(version, GlassFishVersion.GF_6)){
- evaluatedDm = (Hk2DeploymentManager) Hk2DeploymentFactory.createJakartaEe9()
- .getDisconnectedDeploymentManager(instanceUrl);
- } else if(version != null && GlassFishVersion.ge(version, GlassFishVersion.GF_5_1_0)){
- evaluatedDm = (Hk2DeploymentManager) Hk2DeploymentFactory.createJakartaEe8()
- .getDisconnectedDeploymentManager(instanceUrl);
- } else if(version != null && GlassFishVersion.ge(version, GlassFishVersion.GF_5)){
- evaluatedDm = (Hk2DeploymentManager) Hk2DeploymentFactory.createEe8()
- .getDisconnectedDeploymentManager(instanceUrl);
- } else if(version != null && GlassFishVersion.ge(version, GlassFishVersion.GF_3_1)){
- evaluatedDm = (Hk2DeploymentManager) Hk2DeploymentFactory.createEe6()
- .getDisconnectedDeploymentManager(instanceUrl);
- } else {
- evaluatedDm = (Hk2DeploymentManager) Hk2DeploymentFactory.createEe8()
- .getDisconnectedDeploymentManager(instanceUrl);
- }
+ if(version != null && GlassFishVersion.ge(version, GlassFishVersion.GF_6_1_0)) {
+ evaluatedDm = (Hk2DeploymentManager) Hk2DeploymentFactory.createJakartaEe91()
+ .getDisconnectedDeploymentManager(instanceUrl);
+ } else if(version != null && GlassFishVersion.ge(version, GlassFishVersion.GF_6)) {
+ evaluatedDm = (Hk2DeploymentManager) Hk2DeploymentFactory.createJakartaEe9()
+ .getDisconnectedDeploymentManager(instanceUrl);
+ } else if(version != null && GlassFishVersion.ge(version, GlassFishVersion.GF_5_1_0)) {
+ evaluatedDm = (Hk2DeploymentManager) Hk2DeploymentFactory.createJakartaEe8()
+ .getDisconnectedDeploymentManager(instanceUrl);
+ } else if(version != null && GlassFishVersion.ge(version, GlassFishVersion.GF_5)) {
+ evaluatedDm = (Hk2DeploymentManager) Hk2DeploymentFactory.createEe8()
+ .getDisconnectedDeploymentManager(instanceUrl);
+ } else if(version != null && GlassFishVersion.ge(version, GlassFishVersion.GF_4)) {
+ evaluatedDm = (Hk2DeploymentManager) Hk2DeploymentFactory.createEe7()
+ .getDisconnectedDeploymentManager(instanceUrl);
+ } else if(version != null && GlassFishVersion.ge(version, GlassFishVersion.GF_3_1)) {
+ evaluatedDm = (Hk2DeploymentManager) Hk2DeploymentFactory.createEe6()
+ .getDisconnectedDeploymentManager(instanceUrl);
+ } else {
+ evaluatedDm = (Hk2DeploymentManager) Hk2DeploymentFactory.createEe8()
+ .getDisconnectedDeploymentManager(instanceUrl);
+ }
final Hk2DeploymentManager dm = hk2dm != null
? hk2dm
: evaluatedDm;
@@ -145,6 +148,10 @@ abstract class AbstractHk2ConfigurationFactory implements ModuleConfigurationFac
&& GlassFishVersion.ge(version, GlassFishVersion.GF_5)) {
retVal = new ModuleConfigurationImpl(
module, new Hk2Configuration(module, version), dm);
+ } else if (version != null
+ && GlassFishVersion.ge(version, GlassFishVersion.GF_4)) {
+ retVal = new ModuleConfigurationImpl(
+ module, new Hk2Configuration(module, version), dm);
} else if (version != null
&& GlassFishVersion.ge(version, GlassFishVersion.GF_3_1)) {
retVal = new ModuleConfigurationImpl(
diff --git a/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Bundle.properties b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Bundle.properties
index ee377c2e50..3651566a66 100644
--- a/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Bundle.properties
+++ b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Bundle.properties
@@ -48,6 +48,7 @@ LBL_V5ServerLibraries=GlassFish Server 5 Libraries
LBL_V51ServerLibraries=GlassFish Server 5.1 Libraries
LBL_V6ServerLibraries=GlassFish Server 6 Libraries
LBL_V610ServerLibraries=GlassFish Server 6.1 Libraries
+LBL_V620ServerLibraries=GlassFish Server 6.2 Libraries
MSG_V1ServerPlatform=Unsupported GlassFish Server 1 Platform
MSG_V2ServerPlatform=Unsupported GlassFish Server 2 Platform
@@ -57,6 +58,7 @@ MSG_V5ServerPlatform=GlassFish Server 5 Platform
MSG_V51ServerPlatform=GlassFish Server 5.1 Platform
MSG_V6ServerPlatform=GlassFish Server 6 Platform
MSG_V610ServerPlatform=GlassFish Server 6.1 Platform
+MSG_V620ServerPlatform=GlassFish Server 6.2 Platform
LBL_V3RunTimeDDCatalog=GlassFish Server 3 Catalog
DESC_V3RunTimeDDCatalog=List of all the runtime descriptors DTDs for GlassFish Server 3
diff --git a/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2DeploymentFactory.java b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2DeploymentFactory.java
index 5b786165c4..a5002dac01 100644
--- a/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2DeploymentFactory.java
+++ b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2DeploymentFactory.java
@@ -80,7 +80,7 @@ public class Hk2DeploymentFactory implements DeploymentFactory {
// FIXME -- these strings should come from some constant place
if (ee7Instance == null) {
ServerUtilities tmp = ServerUtilities.getEe7Utilities();
- ee7Instance = new Hk2DeploymentFactory(new String[]{"deployer:gfv4ee7:", "deployer:gfv4ee7wc:", "deployer:gfv4"}, "0.2", // NOI18N
+ ee7Instance = new Hk2DeploymentFactory(new String[]{"deployer:gfv4ee7:", "deployer:gfv4ee7wc:", "deployer:gfv4"}, "0.3", // NOI18N
NbBundle.getMessage(Hk2DeploymentFactory.class, "TXT_FactoryDisplayName")); // NOI18N
DeploymentFactoryManager.getInstance().registerDeploymentFactory(ee7Instance);
ee7Instance.setServerUtilities(tmp);
@@ -96,7 +96,7 @@ public class Hk2DeploymentFactory implements DeploymentFactory {
// FIXME -- these strings should come from some constant place
if (ee8Instance == null) {
ServerUtilities tmp = ServerUtilities.getEe8Utilities();
- ee8Instance = new Hk2DeploymentFactory(new String[]{"deployer:gfv5ee8:", "deployer:gfv5"}, "0.2", // NOI18N
+ ee8Instance = new Hk2DeploymentFactory(new String[]{"deployer:gfv5ee8:", "deployer:gfv5"}, "0.4", // NOI18N
NbBundle.getMessage(Hk2DeploymentFactory.class, "TXT_FactoryDisplayName")); // NOI18N
DeploymentFactoryManager.getInstance().registerDeploymentFactory(ee8Instance);
ee8Instance.setServerUtilities(tmp);
@@ -112,7 +112,7 @@ public class Hk2DeploymentFactory implements DeploymentFactory {
// FIXME -- these strings should come from some constant place
if (jakartaee8Instance == null) {
ServerUtilities tmp = ServerUtilities.getJakartaEe8Utilities();
- jakartaee8Instance = new Hk2DeploymentFactory(new String[]{"deployer:gfv510ee8:", "deployer:gfv510"}, "0.3", // NOI18N
+ jakartaee8Instance = new Hk2DeploymentFactory(new String[]{"deployer:gfv510ee8:", "deployer:gfv510"}, "0.5", // NOI18N
NbBundle.getMessage(Hk2DeploymentFactory.class, "TXT_FactoryDisplayName")); // NOI18N
DeploymentFactoryManager.getInstance().registerDeploymentFactory(jakartaee8Instance);
jakartaee8Instance.setServerUtilities(tmp);
@@ -128,7 +128,7 @@ public class Hk2DeploymentFactory implements DeploymentFactory {
// FIXME -- these strings should come from some constant place
if (jakartaee9Instance == null) {
ServerUtilities tmp = ServerUtilities.getJakartaEe9Utilities();
- jakartaee9Instance = new Hk2DeploymentFactory(new String[]{"deployer:gfv6ee9:", "deployer:gfv6"}, "0.4", // NOI18N
+ jakartaee9Instance = new Hk2DeploymentFactory(new String[]{"deployer:gfv6ee9:", "deployer:gfv6"}, "0.6", // NOI18N
NbBundle.getMessage(Hk2DeploymentFactory.class, "TXT_FactoryDisplayName")); // NOI18N
DeploymentFactoryManager.getInstance().registerDeploymentFactory(jakartaee9Instance);
jakartaee9Instance.setServerUtilities(tmp);
@@ -137,20 +137,19 @@ public class Hk2DeploymentFactory implements DeploymentFactory {
}
/**
- * Stubbed in for NetBeans 12.4, awaiting release of Jakarta EE 9.1. Once Released,
- * this will need to be modified accordingly.
+ *
* @return
*/
public static synchronized DeploymentFactory createJakartaEe91() {
// FIXME -- these strings should come from some constant place
- if (jakartaee9Instance == null) {
- ServerUtilities tmp = ServerUtilities.getJakartaEe9Utilities();
- jakartaee9Instance = new Hk2DeploymentFactory(new String[]{"deployer:gfv610ee9:", "deployer:gfv610"}, "0.5", // NOI18N
+ if (jakartaee91Instance == null) {
+ ServerUtilities tmp = ServerUtilities.getJakartaEe91Utilities();
+ jakartaee91Instance = new Hk2DeploymentFactory(new String[]{"deployer:gfv610ee9:", "deployer:gfv610"}, "0.7", // NOI18N
NbBundle.getMessage(Hk2DeploymentFactory.class, "TXT_FactoryDisplayName")); // NOI18N
- DeploymentFactoryManager.getInstance().registerDeploymentFactory(jakartaee9Instance);
- jakartaee9Instance.setServerUtilities(tmp);
+ DeploymentFactoryManager.getInstance().registerDeploymentFactory(jakartaee91Instance);
+ jakartaee91Instance.setServerUtilities(tmp);
}
- return jakartaee9Instance;
+ return jakartaee91Instance;
}
/**
diff --git a/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2JavaEEPlatformFactory.java b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2JavaEEPlatformFactory.java
index 1cc49530a0..ed079aeb1b 100644
--- a/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2JavaEEPlatformFactory.java
+++ b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2JavaEEPlatformFactory.java
@@ -65,6 +65,10 @@ public class Hk2JavaEEPlatformFactory extends J2eePlatformFactory {
* when changing it. */
private static final String V5_LOOKUP_KEY = "J2EE/DeploymentPlugins/gfv5ee8/Lookup";
private static final String V510_LOOKUP_KEY = "J2EE/DeploymentPlugins/gfv510ee8/Lookup";
+
+ /** GlassFish V6 JakartaEE platform lookup key.
+ * <p/>We will keep V3 value now because no one knows what will get broken
+ * when changing it. */
private static final String V6_LOOKUP_KEY = "J2EE/DeploymentPlugins/gfv6ee9/Lookup";
private static final String V610_LOOKUP_KEY = "J2EE/DeploymentPlugins/gfv610ee9/Lookup";
@@ -102,7 +106,10 @@ public class Hk2JavaEEPlatformFactory extends J2eePlatformFactory {
*/
private static String getDisplayName(final GlassFishVersion version) {
final int ord = version.ordinal();
- if(ord >= GlassFishVersion.GF_6_1_0.ordinal()) {
+ if(ord >= GlassFishVersion.GF_6_2_0.ordinal()) {
+ return NbBundle.getMessage(
+ Hk2JavaEEPlatformFactory.class, "MSG_V620ServerPlatform");
+ } else if(ord >= GlassFishVersion.GF_6_1_0.ordinal()) {
return NbBundle.getMessage(
Hk2JavaEEPlatformFactory.class, "MSG_V610ServerPlatform");
} else if(ord >= GlassFishVersion.GF_6.ordinal()) {
@@ -139,7 +146,10 @@ public class Hk2JavaEEPlatformFactory extends J2eePlatformFactory {
*/
private static String getLibraryName(final GlassFishVersion version) {
final int ord = version.ordinal();
- if (ord >= GlassFishVersion.GF_6_1_0.ordinal()) {
+ if (ord >= GlassFishVersion.GF_6_2_0.ordinal()) {
+ return NbBundle.getMessage(
+ Hk2JavaEEPlatformFactory.class, "LBL_V620ServerLibraries");
+ } else if (ord >= GlassFishVersion.GF_6_1_0.ordinal()) {
return NbBundle.getMessage(
Hk2JavaEEPlatformFactory.class, "LBL_V610ServerLibraries");
} else if (ord >= GlassFishVersion.GF_6.ordinal()) {
diff --git a/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2JavaEEPlatformImpl.java b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2JavaEEPlatformImpl.java
index 9a519bcd6e..c757c4d4ec 100644
--- a/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2JavaEEPlatformImpl.java
+++ b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2JavaEEPlatformImpl.java
@@ -202,6 +202,10 @@ public class Hk2JavaEEPlatformImpl extends J2eePlatformImpl2 {
break;
case v9_0_0: profiles[index++] = Profile.JAKARTA_EE_9_FULL;
break;
+ case v9_1_0_web: profiles[index++] = Profile.JAKARTA_EE_9_1_WEB;
+ break;
+ case v9_1_0: profiles[index++] = Profile.JAKARTA_EE_9_1_FULL;
+ break;
}
} else {
profiles = new Profile[0];
diff --git a/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2JaxWsStack.java b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2JaxWsStack.java
index a024adf98a..8b33450a54 100644
--- a/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2JaxWsStack.java
+++ b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2JaxWsStack.java
@@ -73,7 +73,9 @@ public class Hk2JaxWsStack implements WSStackImplementation<JaxWs> {
@Override
public WSStackVersion getVersion() {
Set<Profile> supportedProfiles = platform.getSupportedProfiles();
- if (supportedProfiles.contains(Profile.JAKARTA_EE_9_FULL) ||
+ if (supportedProfiles.contains(Profile.JAKARTA_EE_9_1_FULL) ||
+ supportedProfiles.contains(Profile.JAKARTA_EE_9_1_WEB) ||
+ supportedProfiles.contains(Profile.JAKARTA_EE_9_FULL) ||
supportedProfiles.contains(Profile.JAKARTA_EE_9_WEB) ||
supportedProfiles.contains(Profile.JAKARTA_EE_8_FULL) ||
supportedProfiles.contains(Profile.JAKARTA_EE_8_WEB) ||
diff --git a/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2OptionalFactory.java b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2OptionalFactory.java
index 6ab85052d4..3664f6ce02 100644
--- a/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2OptionalFactory.java
+++ b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2OptionalFactory.java
@@ -68,6 +68,12 @@ public class Hk2OptionalFactory extends OptionalDeploymentManagerFactory {
t, true);
}
+ public static Hk2OptionalFactory createEe7() {
+ ServerUtilities t = ServerUtilities.getEe7Utilities();
+ return null == t ? null : new Hk2OptionalFactory(Hk2DeploymentFactory.createEe7(),
+ t, true);
+ }
+
public static Hk2OptionalFactory createEe8() {
ServerUtilities t = ServerUtilities.getEe8Utilities();
return null == t ? null : new Hk2OptionalFactory(Hk2DeploymentFactory.createEe8(),
diff --git a/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/layer.xml b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/layer.xml
index fbbd790958..e2e06bf237 100644
--- a/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/layer.xml
+++ b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/layer.xml
@@ -102,6 +102,67 @@
</folder>
</folder>
</folder>
+ <folder name="gfv4ee7">
+ <file name="Descriptor" url="nbdepee7.xml"/>
+ <!-- -->
+ <file name="Factory.instance">
+ <attr name="urlPattern" stringvalue="^\[.*deployer:gfv4ee7[w]?[c]?:.*$"/>
+ <attr name="instanceCreate" methodvalue="org.netbeans.modules.j2ee.deployment.plugins.spi.support.ProxyDeploymentFactory.create"/>
+ <attr name="delegate" methodvalue="org.netbeans.modules.glassfish.javaee.Hk2DeploymentFactory.createEe7"/>
+ <attr name="instanceClass" stringvalue="org.netbeans.modules.j2ee.deployment.plugins.spi.support.ProxyDeploymentFactory"/>
+ <attr name="instanceOf" stringvalue="javax.enterprise.deploy.spi.factories.DeploymentFactory"/>
+ </file>
+ <file name="J2eePlatformFactory.instance">
+ <attr name="instanceCreate" methodvalue="org.netbeans.modules.glassfish.javaee.Hk2JavaEEPlatformFactory.getFactory"/>
+ <attr name="instanceClass" stringvalue="org.netbeans.modules.glassfish.javaee.Hk2JavaEEPlatformFactory"/>
+ <attr name="instanceOf" stringvalue="org.netbeans.modules.j2ee.deployment.plugins.spi.J2eePlatformFactory"/>
+ </file>
+ <file name="OptionalFactory.instance">
+ <attr name="instanceCreate" methodvalue="org.netbeans.modules.j2ee.deployment.plugins.spi.support.ProxyOptionalFactory.create"/>
+ <attr name="delegate" methodvalue="org.netbeans.modules.glassfish.javaee.Hk2OptionalFactory.createEe7"/>
+ <attr name="instanceOf" stringvalue="org.netbeans.modules.j2ee.deployment.plugins.spi.OptionalDeploymentManagerFactory"/>
+ </file>
+ <file name="ModuleConfigFactory.instance">
+ <attr name="instanceCreate" newvalue="org.netbeans.modules.glassfish.javaee.Hk2ModuleConfigFactory"/>
+ <attr name="instanceClass" stringvalue="org.netbeans.modules.glassfish.javaee.Hk2ModuleConfigFactory"/>
+ <attr name="instanceOf" stringvalue="org.netbeans.modules.j2ee.deployment.plugins.spi.config.ModuleConfigurationFactory"/>
+ </file>
+ <file name="J2eeVerifierSupport.instance">
+ <attr name="instanceCreate" newvalue="org.netbeans.modules.glassfish.javaee.verifier.VerifierImpl"/>
+ <attr name="instanceClass" stringvalue="org.netbeans.modules.glassfish.javaee.verifier.VerifierImpl"/>
+ <attr name="instanceOf" stringvalue="org.netbeans.modules.j2ee.deployment.plugins.spi.VerifierSupport"/>
+ </file>
+ <!-- -->
+ <folder name="DeploymentFileNames">
+ <folder name="WAR">
+ <file name="WEB-INF\sun-web.xml"/>
+ <file name="WEB-INF\glassfish-web.xml"/>
+ <file name="WEB-INF\glassfish-resources.xml"/>
+ </folder>
+ <folder name="EJB">
+ <file name="META-INF\sun-ejb-jar.xml"/>
+ <file name="META-INF\sun-cmp-mappings.xml"/>
+ <file name="META-INF\glassfish-ejb-jar.xml"/>
+ <file name="META-INF\glassfish-cmp-mappings.xml"/>
+ <file name="META-INF\glassfish-resources.xml"/>
+ </folder>
+ <folder name="EAR">
+ <file name="META-INF\sun-application.xml"/>
+ <file name="META-INF\glassfish-application.xml"/>
+ <file name="META-INF\glassfish-resources.xml"/>
+ </folder>
+ <folder name="RAR">
+ <file name="META-INF\sun-ra.xml"/>
+ <file name="META-INF\glassfish-ra.xml"/>
+ <file name="META-INF\glassfish-resources.xml"/>
+ </folder>
+ <folder name="CAR">
+ <file name="META-INF\sun-application-client.xml"/>
+ <file name="META-INF\glassfish-application-client.xml"/>
+ <file name="META-INF\glassfish-resources.xml"/>
+ </folder>
+ </folder>
+ </folder>
<folder name="gfv5ee8">
<file name="Descriptor" url="nbdepee8.xml"/>
<!-- -->
@@ -286,7 +347,7 @@
</folder>
</folder>
<folder name="gfv610ee9">
- <file name="Descriptor" url="nbdepjakartaee9.xml"/>
+ <file name="Descriptor" url="nbdepjakartaee91.xml"/>
<!-- -->
<file name="Factory.instance">
<attr name="urlPattern" stringvalue="^\[.*deployer:gfv610ee9[w]?[c]?:.*$"/>
diff --git a/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/nbdepee7.xml b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/nbdepee7.xml
new file mode 100644
index 0000000000..6a62c15434
--- /dev/null
+++ b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/nbdepee7.xml
@@ -0,0 +1,54 @@
+<netbeans-deployment>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+ <!--
+ The icon element contains a path to the icon to be used to present the server
+ in the server registry.
+ -->
+ <icon>org/netbeans/modules/glassfish/common/resources/server</icon>
+
+ <!--
+ The disconnected-string element contains the String parameter to DeploymentFactory.getDisconnectedDeploymentManager()
+ -->
+ <disconnected-string>deployer:gfv4ee7</disconnected-string>
+
+ <!--
+ The container-limitation element modifies a plugin to say that not all j2ee deployments are valid.
+ For example, a web-only server would include
+ <container-limitation> <war-deploy/> </container-limitation>
+ to indicate that only war deployments are accepted.
+ If a container-limitation element is not present, all j2ee deployments are assumed valid.
+ If a container-limitation element is present, then only j2ee deployment types explicitly
+ mentioned are allowed.
+ -->
+ <!-- v3 ee6 has no limitations...
+ <container-limitation>
+ <ear-deploy/>
+ <war-deploy/>
+ <ejbjar-deploy/>
+ </container-limitation>
+ -->
+ <web-context-root>
+ <xpath>/</xpath>
+ <prop-name>contextRoot</prop-name>
+ </web-context-root>
+
+</netbeans-deployment>
diff --git a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/AdminFactory.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/AdminFactory.java
index e2db48e2ab..8103d85bee 100644
--- a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/AdminFactory.java
+++ b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/AdminFactory.java
@@ -72,7 +72,26 @@ public abstract class AdminFactory {
case GF_3_1:
case GF_3_1_1:
case GF_3_1_2:
+ case GF_3_1_2_2:
+ case GF_3_1_2_3:
+ case GF_3_1_2_4:
+ case GF_3_1_2_5:
case GF_4:
+ case GF_4_0_1:
+ case GF_4_1:
+ case GF_4_1_1:
+ case GF_4_1_2:
+ case GF_5:
+ case GF_5_0_1:
+ case GF_5_1_0:
+ case GF_6:
+ case GF_6_1_0:
+ case GF_6_2_0:
+ case GF_6_2_1:
+ case GF_6_2_2:
+ case GF_6_2_3:
+ case GF_6_2_4:
+ case GF_6_2_5:
return AdminFactoryRest.getInstance();
// Anything else is not unknown.
default:
diff --git a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/GlassFishVersion.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/GlassFishVersion.java
index 2242ad4f09..c47a114445 100644
--- a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/GlassFishVersion.java
+++ b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/GlassFishVersion.java
@@ -41,7 +41,7 @@ public enum GlassFishVersion {
/** GlassFish v1. */
GF_1 ((short) 1, (short) 0, (short) 0, (short) 0, GlassFishVersion.GF_1_STR),
- /** GlassFish v2. */
+ /** GlassFish v2. */
GF_2 ((short) 2, (short) 0, (short) 0, (short) 0, GlassFishVersion.GF_2_STR),
/** GlassFish v2.1. */
GF_2_1 ((short) 2, (short) 1, (short) 0, (short) 0, GlassFishVersion.GF_2_1_STR),
@@ -85,8 +85,18 @@ public enum GlassFishVersion {
GF_6 ((short) 6, (short) 0, (short) 0, (short) 0, GlassFishVersion.GF_6_STR),
/** GlassFish 6.1.0 */
GF_6_1_0 ((short) 6, (short) 1, (short) 0, (short) 0, GlassFishVersion.GF_6_1_0_STR),
+ /** GlassFish 6.2.0 */
+ GF_6_2_0 ((short) 6, (short) 2, (short) 0, (short) 0, GlassFishVersion.GF_6_2_0_STR),
/** GlassFish 6.2.1 */
- GF_6_2_1 ((short) 6, (short) 2, (short) 1, (short) 0, GlassFishVersion.GF_6_2_1_STR);
+ GF_6_2_1 ((short) 6, (short) 2, (short) 1, (short) 0, GlassFishVersion.GF_6_2_1_STR),
+ /** GlassFish 6.2.2 */
+ GF_6_2_2 ((short) 6, (short) 2, (short) 2, (short) 0, GlassFishVersion.GF_6_2_2_STR),
+ /** GlassFish 6.2.3 */
+ GF_6_2_3 ((short) 6, (short) 2, (short) 3, (short) 0, GlassFishVersion.GF_6_2_3_STR),
+ /** GlassFish 6.2.4 */
+ GF_6_2_4 ((short) 6, (short) 2, (short) 4, (short) 0, GlassFishVersion.GF_6_2_4_STR),
+ /** GlassFish 6.2.5 */
+ GF_6_2_5 ((short) 6, (short) 2, (short) 5, (short) 0, GlassFishVersion.GF_6_2_5_STR);
////////////////////////////////////////////////////////////////////////////
// Class attributes //
////////////////////////////////////////////////////////////////////////////
@@ -186,28 +196,56 @@ public enum GlassFishVersion {
static final String GF_5_STR = "5";
/** Additional <code>String</code> representations of GF_5 value. */
static final String GF_5_STR_NEXT[] = {"5.0", "5.0.0", "5.0.0.0"};
-
+
/** A <code>String</code> representation of GF_5_0_1 value. */
static final String GF_5_0_1_STR = "5.0.1";
/** Additional <code>String</code> representations of GF_5_0_1 value. */
static final String GF_5_0_1_STR_NEXT[] = {"5.0.1", "5.0.1.0"};
-
+
/** A <code>String</code> representation of GF_5_1_0 value. */
static final String GF_5_1_0_STR = "5.1.0";
/** Additional <code>String</code> representations of GF_5_1_0 value. */
static final String GF_5_1_0_STR_NEXT[] = {"5.1.0", "5.1.0.0"};
+
/** A <code>String</code> representation of GF_6 value. */
static final String GF_6_STR = "6";
/** Additional <code>String</code> representations of GF_6 value. */
- static final String GF_6_STR_NEXT[] = {"6.0", "6.0.0"};
+ static final String GF_6_STR_NEXT[] = {"6.0", "6.0.0", "6.0.0.0"};
+
/** A <code>String</code> representation of GF_6_1_0 value. */
static final String GF_6_1_0_STR = "6.1.0";
/** Additional <code>String</code> representations of GF_6_1_0 value. */
- static final String GF_6_1_0_STR_NEXT[] = {"6.1", "6.1.0"};
- /** A <code>String</code> representation of GF_6_1_0 value. */
+ static final String GF_6_1_0_STR_NEXT[] = {"6.1", "6.1.0", "6.1.0.0"};
+
+ /** A <code>String</code> representation of GF_6_2_0 value. */
+ static final String GF_6_2_0_STR = "6.2.0";
+ /** Additional <code>String</code> representations of GF_6_2_0 value. */
+ static final String GF_6_2_0_STR_NEXT[] = {"6.2", "6.2.0", "6.2.0.0"};
+
+ /** A <code>String</code> representation of GF_6_2_1 value. */
static final String GF_6_2_1_STR = "6.2.1";
/** Additional <code>String</code> representations of GF_6_2_1 value. */
- static final String GF_6_2_1_STR_NEXT[] = {"6.2.1"};
+ static final String GF_6_2_1_STR_NEXT[] = {"6.2.1", "6.2.1.0"};
+
+ /** A <code>String</code> representation of GF_6_2_2 value. */
+ static final String GF_6_2_2_STR = "6.2.2";
+ /** Additional <code>String</code> representations of GF_6_2_2 value. */
+ static final String GF_6_2_2_STR_NEXT[] = {"6.2.2", "6.2.2.0"};
+
+ /** A <code>String</code> representation of GF_6_2_3 value. */
+ static final String GF_6_2_3_STR = "6.2.3";
+ /** Additional <code>String</code> representations of GF_6_2_3 value. */
+ static final String GF_6_2_3_STR_NEXT[] = {"6.2.3", "6.2.3.0"};
+
+ /** A <code>String</code> representation of GF_6_2_4 value. */
+ static final String GF_6_2_4_STR = "6.2.4";
+ /** Additional <code>String</code> representations of GF_6_2_4 value. */
+ static final String GF_6_2_4_STR_NEXT[] = {"6.2.4", "6.2.4.0"};
+
+ /** A <code>String</code> representation of GF_6_2_5 value. */
+ static final String GF_6_2_5_STR = "6.2.5";
+ /** Additional <code>String</code> representations of GF_6_2_5 value. */
+ static final String GF_6_2_5_STR_NEXT[] = {"6.2.5", "6.2.5.0"};
/**
* Stored <code>String</code> values for backward <code>String</code>
@@ -239,7 +277,12 @@ public enum GlassFishVersion {
initStringValuesMapFromArray(GF_5_1_0, GF_5_1_0_STR_NEXT);
initStringValuesMapFromArray(GF_6, GF_6_STR_NEXT);
initStringValuesMapFromArray(GF_6_1_0, GF_6_1_0_STR_NEXT);
+ initStringValuesMapFromArray(GF_6_2_0, GF_6_2_0_STR_NEXT);
initStringValuesMapFromArray(GF_6_2_1, GF_6_2_1_STR_NEXT);
+ initStringValuesMapFromArray(GF_6_2_2, GF_6_2_2_STR_NEXT);
+ initStringValuesMapFromArray(GF_6_2_3, GF_6_2_3_STR_NEXT);
+ initStringValuesMapFromArray(GF_6_2_4, GF_6_2_4_STR_NEXT);
+ initStringValuesMapFromArray(GF_6_2_5, GF_6_2_5_STR_NEXT);
}
////////////////////////////////////////////////////////////////////////////
diff --git a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/ConfigBuilderProvider.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/ConfigBuilderProvider.java
index 7bfbe78d26..a9e1deddcd 100644
--- a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/ConfigBuilderProvider.java
+++ b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/ConfigBuilderProvider.java
@@ -84,16 +84,42 @@ public class ConfigBuilderProvider {
= new Config.Next(GlassFishVersion.GF_6_1_0,
ConfigBuilderProvider.class.getResource("GlassFishV6_1_0.xml"));
+ /** Library builder configuration since GlassFish 6.2.0. */
+ private static final Config.Next CONFIG_V6_2_0
+ = new Config.Next(GlassFishVersion.GF_6_2_0,
+ ConfigBuilderProvider.class.getResource("GlassFishV6_2_0.xml"));
+
/** Library builder configuration since GlassFish 6.2.1. */
private static final Config.Next CONFIG_V6_2_1
= new Config.Next(GlassFishVersion.GF_6_2_1,
ConfigBuilderProvider.class.getResource("GlassFishV6_2_1.xml"));
+
+ /** Library builder configuration since GlassFish 6.2.2. */
+ private static final Config.Next CONFIG_V6_2_2
+ = new Config.Next(GlassFishVersion.GF_6_2_2,
+ ConfigBuilderProvider.class.getResource("GlassFishV6_2_2.xml"));
+
+ /** Library builder configuration since GlassFish 6.2.3. */
+ private static final Config.Next CONFIG_V6_2_3
+ = new Config.Next(GlassFishVersion.GF_6_2_3,
+ ConfigBuilderProvider.class.getResource("GlassFishV6_2_3.xml"));
+
+ /** Library builder configuration since GlassFish 6.2.4. */
+ private static final Config.Next CONFIG_V6_2_4
+ = new Config.Next(GlassFishVersion.GF_6_2_4,
+ ConfigBuilderProvider.class.getResource("GlassFishV6_2_4.xml"));
+
+ /** Library builder configuration since GlassFish 6.2.5. */
+ private static final Config.Next CONFIG_V6_2_5
+ = new Config.Next(GlassFishVersion.GF_6_2_5,
+ ConfigBuilderProvider.class.getResource("GlassFishV6_2_4.xml"));
/** Library builder configuration for GlassFish cloud. */
private static final Config config
= new Config(CONFIG_V3, CONFIG_V4, CONFIG_V4_1, CONFIG_V5,
CONFIG_V5_0_1, CONFIG_V5_1, CONFIG_V6, CONFIG_V6_1_0,
- CONFIG_V6_2_1);
+ CONFIG_V6_2_0, CONFIG_V6_2_1, CONFIG_V6_2_2,
+ CONFIG_V6_2_3, CONFIG_V6_2_4, CONFIG_V6_2_5);
/** Builders array for each server instance. */
private static final Map<GlassFishServer, ConfigBuilder> builders
diff --git a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV4.xml b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV4.xml
index 43fb1e0f1b..e245b1df08 100644
--- a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV4.xml
+++ b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV4.xml
@@ -50,8 +50,6 @@
<include name="javax\..+\.jar"/>
<include name="bean-validator.jar"/>
<include name="jaxb-osgi.jar"/>
- <include name="jaxr-api-osgi.jar"/>
- <include name="jaxrpc-api-osgi.jar"/>
<include name="webservices-osgi.jar"/>
<include name="weld-osgi-bundle.jar"/>
</fileset>
@@ -73,13 +71,12 @@
<fileset dir="modules">
<include name="guava.+\.jar"/>
<include name="jackson.+\.jar"/>
- <!-- include name="javax.ws.+\.jar"/ -->
<include name="jersey.+\.jar"/>
<include name="jettison.*\.jar"/>
</fileset>
</classpath>
<javadocs>
- <link url="https://repo1.maven.org/maven2/org/glassfish/jersey/jersey-documentation/2.0-m05-2/jersey-documentation-2.0-m05-2-docbook.zip"/>
+ <link url="https://repo1.maven.org/maven2/org/glassfish/jersey/jersey-documentation/2.0/jersey-documentation-2.0-docbook.zip"/>
</javadocs>
<sources>
</sources>
diff --git a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV4_1.xml b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV4_1.xml
index 8caee8754e..5408fc2971 100644
--- a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV4_1.xml
+++ b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV4_1.xml
@@ -51,8 +51,6 @@
<include name="bean-validator.jar"/>
<include name="cdi-api.jar"/>
<include name="jaxb-osgi.jar"/>
- <include name="jaxr-api-osgi.jar"/>
- <include name="jaxrpc-api-osgi.jar"/>
<include name="webservices-osgi.jar"/>
<include name="weld-osgi-bundle.jar"/>
</fileset>
@@ -74,13 +72,12 @@
<fileset dir="modules">
<include name="guava.+\.jar"/>
<include name="jackson.+\.jar"/>
- <!-- include name="javax.ws.+\.jar"/ -->
<include name="jersey.+\.jar"/>
<include name="jettison.*\.jar"/>
</fileset>
</classpath>
<javadocs>
- <link url="https://repo1.maven.org/maven2/org/glassfish/jersey/jersey-documentation/2.0-m05-2/jersey-documentation-2.0-m05-2-docbook.zip"/>
+ <link url="https://repo1.maven.org/maven2/org/glassfish/jersey/jersey-documentation/2.21/jersey-documentation-2.21-docbook.zip"/>
</javadocs>
<sources>
</sources>
diff --git a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV5.xml b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV5.xml
index 8731d53f34..456dcba918 100644
--- a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV5.xml
+++ b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV5.xml
@@ -24,7 +24,6 @@
<asadmin jar="client/appserver-cli.jar"/>
</tools>
<java version="1.8">
- <platform version="1.7"/>
<platform version="1.8"/>
</java>
<javaee version="1.8">
@@ -53,8 +52,6 @@
<include name="bean-validator.jar"/>
<include name="cdi-api.jar"/>
<include name="jaxb-osgi.jar"/>
- <include name="jaxr-api-osgi.jar"/>
- <include name="jaxrpc-api-osgi.jar"/>
<include name="webservices-osgi.jar"/>
<include name="weld-osgi-bundle.jar"/>
</fileset>
@@ -74,15 +71,13 @@
<library id="Jersey 2">
<classpath>
<fileset dir="modules">
- <include name="guava.+\.jar"/>
<include name="jackson.+\.jar"/>
- <!-- include name="javax.ws.+\.jar"/ -->
<include name="jersey.+\.jar"/>
<include name="jettison.*\.jar"/>
</fileset>
</classpath>
<javadocs>
- <link url="https://repo1.maven.org/maven2/org/glassfish/jersey/jersey-documentation/2.0-m05-2/jersey-documentation-2.0-m05-2-docbook.zip"/>
+ <link url="https://repo1.maven.org/maven2/org/glassfish/jersey/jersey-documentation/2.28/jersey-documentation-2.28-docbook.zip"/>
</javadocs>
<sources>
</sources>
@@ -90,7 +85,7 @@
<library id="JAX-RS">
<classpath>
<fileset dir="modules">
- <include name="javax.ws.rs-api.jar"/>
+ <include name="jakarta.ws.rs-api.jar"/>
</fileset>
</classpath>
<javadocs>
diff --git a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV5_1_0.xml b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV5_1_0.xml
index b5ff004486..cc9fad3130 100644
--- a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV5_1_0.xml
+++ b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV5_1_0.xml
@@ -24,10 +24,9 @@
<asadmin jar="client/appserver-cli.jar"/>
</tools>
<java version="1.8">
- <platform version="1.7"/>
<platform version="1.8"/>
</java>
- <javaee version="1.8">
+ <javaee version="8.0.0">
<profile version="1.3" type="full"/>
<profile version="1.4" type="full"/>
<profile version="1.5" type="full"/>
@@ -51,12 +50,10 @@
<library id="Java EE">
<classpath>
<fileset dir="modules">
- <include name="javax\..+\.jar"/>
+ <include name="jakarta\..+\.jar"/>
<include name="bean-validator.jar"/>
<include name="cdi-api.jar"/>
<include name="jaxb-osgi.jar"/>
- <include name="jaxr-api-osgi.jar"/>
- <include name="jaxrpc-api-osgi.jar"/>
<include name="webservices-osgi.jar"/>
<include name="weld-osgi-bundle.jar"/>
</fileset>
@@ -76,15 +73,13 @@
<library id="Jersey 2">
<classpath>
<fileset dir="modules">
- <include name="guava.+\.jar"/>
<include name="jackson.+\.jar"/>
- <!-- include name="javax.ws.+\.jar"/ -->
<include name="jersey.+\.jar"/>
<include name="jettison.*\.jar"/>
</fileset>
</classpath>
<javadocs>
- <link url="https://repo1.maven.org/maven2/org/glassfish/jersey/jersey-documentation/2.0-m05-2/jersey-documentation-2.0-m05-2-docbook.zip"/>
+ <link url="https://repo1.maven.org/maven2/org/glassfish/jersey/jersey-documentation/2.28/jersey-documentation-2.28-docbook.zip"/>
</javadocs>
<sources>
</sources>
@@ -92,7 +87,7 @@
<library id="JAX-RS">
<classpath>
<fileset dir="modules">
- <include name="javax.ws.rs-api.jar"/>
+ <include name="jakarta.ws.rs-api.jar"/>
</fileset>
</classpath>
<javadocs>
diff --git a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV6.xml b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV6.xml
index b25bfad01c..99beb41746 100644
--- a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV6.xml
+++ b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV6.xml
@@ -24,21 +24,9 @@
<asadmin jar="client/appserver-cli.jar"/>
</tools>
<java version="1.8">
- <platform version="1.7"/>
<platform version="1.8"/>
</java>
- <javaee version="1.8">
- <profile version="1.3" type="full"/>
- <profile version="1.4" type="full"/>
- <profile version="1.5" type="full"/>
- <profile version="1.6" type="web"/>
- <profile version="1.6" type="full" check="full"/>
- <profile version="1.7" type="web"/>
- <profile version="1.7" type="full" check="full"/>
- <profile version="1.8" type="web"/>
- <profile version="1.8" type="full" check="full"/>
- <profile version="8.0.0" type="web"/>
- <profile version="8.0.0" type="full" check="full"/>
+ <javaee version="9.0.0">
<profile version="9.0.0" type="web"/>
<profile version="9.0.0" type="full" check="full"/>
<module type="war"/>
@@ -54,20 +42,15 @@
<classpath>
<fileset dir="modules">
<include name="jakarta\..+\.jar"/>
- <include name="jakarta.validation-api-3.0.0.jar"/>
- <include name="jakarta.enterprise.cdi-api-3.0.0.jar"/>
+ <include name="jakarta.enterprise.cdi-api.jar"/>
+ <include name="jakarta.validation-api.jar"/>
<include name="jaxb-osgi.jar"/>
- <include name="jaxr-api-osgi.jar"/>
- <include name="jaxrpc-api-osgi.jar"/>
<include name="webservices-osgi.jar"/>
<include name="weld-osgi-bundle.jar"/>
</fileset>
<fileset dir="modules/endorsed">
<include name=".+\.jar"/>
</fileset>
- <fileset dir="../mq/lib">
- <include name="jaxm-api.jar"/>
- </fileset>
</classpath>
<javadocs>
<lookup path="docs/javaee-doc-api.jar"/>
@@ -75,18 +58,16 @@
<sources>
</sources>
</library>
- <library id="Jersey 2">
+ <library id="Jersey 3">
<classpath>
<fileset dir="modules">
- <include name="guava.+\.jar"/>
<include name="jackson.+\.jar"/>
- <!-- include name="javax.ws.+\.jar"/ -->
<include name="jersey.+\.jar"/>
<include name="jettison.*\.jar"/>
</fileset>
</classpath>
<javadocs>
- <link url="https://repo1.maven.org/maven2/org/glassfish/jersey/jersey-documentation/2.0-m05-2/jersey-documentation-2.0-m05-2-docbook.zip"/>
+ <link url="https://repo1.maven.org/maven2/org/glassfish/jersey/jersey-documentation/3.0.0-M1/jersey-documentation-3.0.0-M1-docbook.zip"/>
</javadocs>
<sources>
</sources>
diff --git a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV6_1_0.xml b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV6_1_0.xml
index f68a7d284a..bcc4232660 100644
--- a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV6_1_0.xml
+++ b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV6_1_0.xml
@@ -25,22 +25,10 @@
</tools>
<java version="11">
<platform version="11"/>
- <platform version="16"/>
</java>
- <javaee version="1.8">
- <profile version="1.3" type="full"/>
- <profile version="1.4" type="full"/>
- <profile version="1.5" type="full"/>
- <profile version="1.6" type="web"/>
- <profile version="1.6" type="full" check="full"/>
- <profile version="1.7" type="web"/>
- <profile version="1.7" type="full" check="full"/>
- <profile version="1.8" type="web"/>
- <profile version="1.8" type="full" check="full"/>
- <profile version="8.0.0" type="web"/>
- <profile version="8.0.0" type="full" check="full"/>
- <profile version="9.0.0" type="web"/>
- <profile version="9.0.0" type="full" check="full"/>
+ <javaee version="9.1.0">
+ <profile version="9.1.0" type="web"/>
+ <profile version="9.1.0" type="full" check="full"/>
<module type="war"/>
<module type="car" check="full"/>
<module type="ear" check="full"/>
@@ -54,20 +42,15 @@
<classpath>
<fileset dir="modules">
<include name="jakarta\..+\.jar"/>
- <include name="jakarta.validation-api-3.0.0.jar"/>
- <include name="jakarta.enterprise.cdi-api-3.0.0.jar"/>
+ <include name="jakarta.validation-api.jar"/>
+ <include name="jakarta.enterprise.cdi-api.jar"/>
<include name="jaxb-osgi.jar"/>
- <include name="jaxr-api-osgi.jar"/>
- <include name="jaxrpc-api-osgi.jar"/>
<include name="webservices-osgi.jar"/>
<include name="weld-osgi-bundle.jar"/>
</fileset>
<fileset dir="modules/endorsed">
<include name=".+\.jar"/>
</fileset>
- <fileset dir="../mq/lib">
- <include name="jaxm-api.jar"/>
- </fileset>
</classpath>
<javadocs>
<lookup path="docs/jakartaee9-doc-api.jar"/>
@@ -75,12 +58,10 @@
<sources>
</sources>
</library>
- <library id="Jersey 2">
+ <library id="Jersey 3">
<classpath>
<fileset dir="modules">
- <include name="guava.+\.jar"/>
<include name="jackson.+\.jar"/>
- <!-- include name="javax.ws.+\.jar"/ -->
<include name="jersey.+\.jar"/>
<include name="jettison.*\.jar"/>
</fileset>
diff --git a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV6_1_0.xml b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV6_2_0.xml
similarity index 69%
copy from enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV6_1_0.xml
copy to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV6_2_0.xml
index f68a7d284a..2a18c9c5bf 100644
--- a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV6_1_0.xml
+++ b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV6_2_0.xml
@@ -23,24 +23,17 @@
<tools lib="lib">
<asadmin jar="client/appserver-cli.jar"/>
</tools>
- <java version="11">
+ <java version="16">
<platform version="11"/>
+ <platform version="12"/>
+ <platform version="13"/>
+ <platform version="14"/>
+ <platform version="15"/>
<platform version="16"/>
</java>
- <javaee version="1.8">
- <profile version="1.3" type="full"/>
- <profile version="1.4" type="full"/>
- <profile version="1.5" type="full"/>
- <profile version="1.6" type="web"/>
- <profile version="1.6" type="full" check="full"/>
- <profile version="1.7" type="web"/>
- <profile version="1.7" type="full" check="full"/>
- <profile version="1.8" type="web"/>
- <profile version="1.8" type="full" check="full"/>
- <profile version="8.0.0" type="web"/>
- <profile version="8.0.0" type="full" check="full"/>
- <profile version="9.0.0" type="web"/>
- <profile version="9.0.0" type="full" check="full"/>
+ <javaee version="9.1.0">
+ <profile version="9.1.0" type="web"/>
+ <profile version="9.1.0" type="full" check="full"/>
<module type="war"/>
<module type="car" check="full"/>
<module type="ear" check="full"/>
@@ -54,20 +47,15 @@
<classpath>
<fileset dir="modules">
<include name="jakarta\..+\.jar"/>
- <include name="jakarta.validation-api-3.0.0.jar"/>
- <include name="jakarta.enterprise.cdi-api-3.0.0.jar"/>
+ <include name="jakarta.validation-api.jar"/>
+ <include name="jakarta.enterprise.cdi-api.jar"/>
<include name="jaxb-osgi.jar"/>
- <include name="jaxr-api-osgi.jar"/>
- <include name="jaxrpc-api-osgi.jar"/>
<include name="webservices-osgi.jar"/>
<include name="weld-osgi-bundle.jar"/>
</fileset>
<fileset dir="modules/endorsed">
<include name=".+\.jar"/>
</fileset>
- <fileset dir="../mq/lib">
- <include name="jaxm-api.jar"/>
- </fileset>
</classpath>
<javadocs>
<lookup path="docs/jakartaee9-doc-api.jar"/>
@@ -75,12 +63,10 @@
<sources>
</sources>
</library>
- <library id="Jersey 2">
+ <library id="Jersey 3">
<classpath>
<fileset dir="modules">
- <include name="guava.+\.jar"/>
<include name="jackson.+\.jar"/>
- <!-- include name="javax.ws.+\.jar"/ -->
<include name="jersey.+\.jar"/>
<include name="jettison.*\.jar"/>
</fileset>
diff --git a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV6_2_1.xml b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV6_2_1.xml
index 7be14e09a0..d26c2a8786 100644
--- a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV6_2_1.xml
+++ b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV6_2_1.xml
@@ -23,24 +23,18 @@
<tools lib="lib">
<asadmin jar="client/appserver-cli.jar"/>
</tools>
- <java version="11">
+ <java version="17">
<platform version="11"/>
+ <platform version="12"/>
+ <platform version="13"/>
+ <platform version="14"/>
+ <platform version="15"/>
+ <platform version="16"/>
<platform version="17"/>
</java>
- <javaee version="1.8">
- <profile version="1.3" type="full"/>
- <profile version="1.4" type="full"/>
- <profile version="1.5" type="full"/>
- <profile version="1.6" type="web"/>
- <profile version="1.6" type="full" check="full"/>
- <profile version="1.7" type="web"/>
- <profile version="1.7" type="full" check="full"/>
- <profile version="1.8" type="web"/>
- <profile version="1.8" type="full" check="full"/>
- <profile version="8.0.0" type="web"/>
- <profile version="8.0.0" type="full" check="full"/>
- <profile version="9.0.0" type="web"/>
- <profile version="9.0.0" type="full" check="full"/>
+ <javaee version="9.1.0">
+ <profile version="9.1.0" type="web"/>
+ <profile version="9.1.0" type="full" check="full"/>
<module type="war"/>
<module type="car" check="full"/>
<module type="ear" check="full"/>
@@ -54,20 +48,15 @@
<classpath>
<fileset dir="modules">
<include name="jakarta\..+\.jar"/>
- <include name="jakarta.validation-api-3.0.0.jar"/>
- <include name="jakarta.enterprise.cdi-api-3.0.0.jar"/>
+ <include name="jakarta.validation-api.jar"/>
+ <include name="jakarta.enterprise.cdi-api.jar"/>
<include name="jaxb-osgi.jar"/>
- <include name="jaxr-api-osgi.jar"/>
- <include name="jaxrpc-api-osgi.jar"/>
<include name="webservices-osgi.jar"/>
<include name="weld-osgi-bundle.jar"/>
</fileset>
<fileset dir="modules/endorsed">
<include name=".+\.jar"/>
</fileset>
- <fileset dir="../mq/lib">
- <include name="jaxm-api.jar"/>
- </fileset>
</classpath>
<javadocs>
<lookup path="docs/jakartaee9-doc-api.jar"/>
@@ -75,18 +64,16 @@
<sources>
</sources>
</library>
- <library id="Jersey 2">
+ <library id="Jersey 3">
<classpath>
<fileset dir="modules">
- <include name="guava.+\.jar"/>
<include name="jackson.+\.jar"/>
- <!-- include name="javax.ws.+\.jar"/ -->
<include name="jersey.+\.jar"/>
<include name="jettison.*\.jar"/>
</fileset>
</classpath>
<javadocs>
- <link url="https://repo1.maven.org/maven2/org/glassfish/jersey/jersey-documentation/3.0.1/jersey-documentation-3.0.1-docbook.zip"/>
+ <link url="https://repo1.maven.org/maven2/org/glassfish/jersey/jersey-documentation/3.0.3/jersey-documentation-3.0.3-docbook.zip"/>
</javadocs>
<sources>
</sources>
diff --git a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV6_1_0.xml b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV6_2_2.xml
similarity index 67%
copy from enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV6_1_0.xml
copy to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV6_2_2.xml
index f68a7d284a..03db9ec466 100644
--- a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV6_1_0.xml
+++ b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV6_2_2.xml
@@ -23,24 +23,18 @@
<tools lib="lib">
<asadmin jar="client/appserver-cli.jar"/>
</tools>
- <java version="11">
+ <java version="17">
<platform version="11"/>
+ <platform version="12"/>
+ <platform version="13"/>
+ <platform version="14"/>
+ <platform version="15"/>
<platform version="16"/>
+ <platform version="17"/>
</java>
- <javaee version="1.8">
- <profile version="1.3" type="full"/>
- <profile version="1.4" type="full"/>
- <profile version="1.5" type="full"/>
- <profile version="1.6" type="web"/>
- <profile version="1.6" type="full" check="full"/>
- <profile version="1.7" type="web"/>
- <profile version="1.7" type="full" check="full"/>
- <profile version="1.8" type="web"/>
- <profile version="1.8" type="full" check="full"/>
- <profile version="8.0.0" type="web"/>
- <profile version="8.0.0" type="full" check="full"/>
- <profile version="9.0.0" type="web"/>
- <profile version="9.0.0" type="full" check="full"/>
+ <javaee version="9.1.0">
+ <profile version="9.1.0" type="web"/>
+ <profile version="9.1.0" type="full" check="full"/>
<module type="war"/>
<module type="car" check="full"/>
<module type="ear" check="full"/>
@@ -54,20 +48,15 @@
<classpath>
<fileset dir="modules">
<include name="jakarta\..+\.jar"/>
- <include name="jakarta.validation-api-3.0.0.jar"/>
- <include name="jakarta.enterprise.cdi-api-3.0.0.jar"/>
+ <include name="jakarta.validation-api.jar"/>
+ <include name="jakarta.enterprise.cdi-api.jar"/>
<include name="jaxb-osgi.jar"/>
- <include name="jaxr-api-osgi.jar"/>
- <include name="jaxrpc-api-osgi.jar"/>
<include name="webservices-osgi.jar"/>
<include name="weld-osgi-bundle.jar"/>
</fileset>
<fileset dir="modules/endorsed">
<include name=".+\.jar"/>
</fileset>
- <fileset dir="../mq/lib">
- <include name="jaxm-api.jar"/>
- </fileset>
</classpath>
<javadocs>
<lookup path="docs/jakartaee9-doc-api.jar"/>
@@ -75,18 +64,16 @@
<sources>
</sources>
</library>
- <library id="Jersey 2">
+ <library id="Jersey 3">
<classpath>
<fileset dir="modules">
- <include name="guava.+\.jar"/>
<include name="jackson.+\.jar"/>
- <!-- include name="javax.ws.+\.jar"/ -->
<include name="jersey.+\.jar"/>
<include name="jettison.*\.jar"/>
</fileset>
</classpath>
<javadocs>
- <link url="https://repo1.maven.org/maven2/org/glassfish/jersey/jersey-documentation/3.0.1/jersey-documentation-3.0.1-docbook.zip"/>
+ <link url="https://repo1.maven.org/maven2/org/glassfish/jersey/jersey-documentation/3.0.2/jersey-documentation-3.0.2-docbook.zip"/>
</javadocs>
<sources>
</sources>
diff --git a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV6_1_0.xml b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV6_2_3.xml
similarity index 67%
copy from enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV6_1_0.xml
copy to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV6_2_3.xml
index f68a7d284a..d26c2a8786 100644
--- a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV6_1_0.xml
+++ b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV6_2_3.xml
@@ -23,24 +23,18 @@
<tools lib="lib">
<asadmin jar="client/appserver-cli.jar"/>
</tools>
- <java version="11">
+ <java version="17">
<platform version="11"/>
+ <platform version="12"/>
+ <platform version="13"/>
+ <platform version="14"/>
+ <platform version="15"/>
<platform version="16"/>
+ <platform version="17"/>
</java>
- <javaee version="1.8">
- <profile version="1.3" type="full"/>
- <profile version="1.4" type="full"/>
- <profile version="1.5" type="full"/>
- <profile version="1.6" type="web"/>
- <profile version="1.6" type="full" check="full"/>
- <profile version="1.7" type="web"/>
- <profile version="1.7" type="full" check="full"/>
- <profile version="1.8" type="web"/>
- <profile version="1.8" type="full" check="full"/>
- <profile version="8.0.0" type="web"/>
- <profile version="8.0.0" type="full" check="full"/>
- <profile version="9.0.0" type="web"/>
- <profile version="9.0.0" type="full" check="full"/>
+ <javaee version="9.1.0">
+ <profile version="9.1.0" type="web"/>
+ <profile version="9.1.0" type="full" check="full"/>
<module type="war"/>
<module type="car" check="full"/>
<module type="ear" check="full"/>
@@ -54,20 +48,15 @@
<classpath>
<fileset dir="modules">
<include name="jakarta\..+\.jar"/>
- <include name="jakarta.validation-api-3.0.0.jar"/>
- <include name="jakarta.enterprise.cdi-api-3.0.0.jar"/>
+ <include name="jakarta.validation-api.jar"/>
+ <include name="jakarta.enterprise.cdi-api.jar"/>
<include name="jaxb-osgi.jar"/>
- <include name="jaxr-api-osgi.jar"/>
- <include name="jaxrpc-api-osgi.jar"/>
<include name="webservices-osgi.jar"/>
<include name="weld-osgi-bundle.jar"/>
</fileset>
<fileset dir="modules/endorsed">
<include name=".+\.jar"/>
</fileset>
- <fileset dir="../mq/lib">
- <include name="jaxm-api.jar"/>
- </fileset>
</classpath>
<javadocs>
<lookup path="docs/jakartaee9-doc-api.jar"/>
@@ -75,18 +64,16 @@
<sources>
</sources>
</library>
- <library id="Jersey 2">
+ <library id="Jersey 3">
<classpath>
<fileset dir="modules">
- <include name="guava.+\.jar"/>
<include name="jackson.+\.jar"/>
- <!-- include name="javax.ws.+\.jar"/ -->
<include name="jersey.+\.jar"/>
<include name="jettison.*\.jar"/>
</fileset>
</classpath>
<javadocs>
- <link url="https://repo1.maven.org/maven2/org/glassfish/jersey/jersey-documentation/3.0.1/jersey-documentation-3.0.1-docbook.zip"/>
+ <link url="https://repo1.maven.org/maven2/org/glassfish/jersey/jersey-documentation/3.0.3/jersey-documentation-3.0.3-docbook.zip"/>
</javadocs>
<sources>
</sources>
diff --git a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV6_1_0.xml b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV6_2_4.xml
similarity index 67%
copy from enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV6_1_0.xml
copy to enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV6_2_4.xml
index f68a7d284a..de0fc33d3a 100644
--- a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV6_1_0.xml
+++ b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV6_2_4.xml
@@ -23,24 +23,19 @@
<tools lib="lib">
<asadmin jar="client/appserver-cli.jar"/>
</tools>
- <java version="11">
+ <java version="18">
<platform version="11"/>
+ <platform version="12"/>
+ <platform version="13"/>
+ <platform version="14"/>
+ <platform version="15"/>
<platform version="16"/>
+ <platform version="17"/>
+ <platform version="18"/>
</java>
- <javaee version="1.8">
- <profile version="1.3" type="full"/>
- <profile version="1.4" type="full"/>
- <profile version="1.5" type="full"/>
- <profile version="1.6" type="web"/>
- <profile version="1.6" type="full" check="full"/>
- <profile version="1.7" type="web"/>
- <profile version="1.7" type="full" check="full"/>
- <profile version="1.8" type="web"/>
- <profile version="1.8" type="full" check="full"/>
- <profile version="8.0.0" type="web"/>
- <profile version="8.0.0" type="full" check="full"/>
- <profile version="9.0.0" type="web"/>
- <profile version="9.0.0" type="full" check="full"/>
+ <javaee version="9.1.0">
+ <profile version="9.1.0" type="web"/>
+ <profile version="9.1.0" type="full" check="full"/>
<module type="war"/>
<module type="car" check="full"/>
<module type="ear" check="full"/>
@@ -54,20 +49,15 @@
<classpath>
<fileset dir="modules">
<include name="jakarta\..+\.jar"/>
- <include name="jakarta.validation-api-3.0.0.jar"/>
- <include name="jakarta.enterprise.cdi-api-3.0.0.jar"/>
+ <include name="jakarta.enterprise.cdi-api.jar"/>
+ <include name="jakarta.validation-api.jar"/>
<include name="jaxb-osgi.jar"/>
- <include name="jaxr-api-osgi.jar"/>
- <include name="jaxrpc-api-osgi.jar"/>
<include name="webservices-osgi.jar"/>
<include name="weld-osgi-bundle.jar"/>
</fileset>
<fileset dir="modules/endorsed">
<include name=".+\.jar"/>
</fileset>
- <fileset dir="../mq/lib">
- <include name="jaxm-api.jar"/>
- </fileset>
</classpath>
<javadocs>
<lookup path="docs/jakartaee9-doc-api.jar"/>
@@ -75,18 +65,16 @@
<sources>
</sources>
</library>
- <library id="Jersey 2">
+ <library id="Jersey 3">
<classpath>
<fileset dir="modules">
- <include name="guava.+\.jar"/>
<include name="jackson.+\.jar"/>
- <!-- include name="javax.ws.+\.jar"/ -->
<include name="jersey.+\.jar"/>
<include name="jettison.*\.jar"/>
</fileset>
</classpath>
<javadocs>
- <link url="https://repo1.maven.org/maven2/org/glassfish/jersey/jersey-documentation/3.0.1/jersey-documentation-3.0.1-docbook.zip"/>
+ <link url="https://repo1.maven.org/maven2/org/glassfish/jersey/jersey-documentation/3.0.3/jersey-documentation-3.0.3-docbook.zip"/>
</javadocs>
<sources>
</sources>
diff --git a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/JavaEEProfile.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/JavaEEProfile.java
index 2681303353..938d31fbf7 100644
--- a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/JavaEEProfile.java
+++ b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/JavaEEProfile.java
@@ -72,7 +72,13 @@ public enum JavaEEProfile {
v9_0_0_web(Version.v9_0_0, Type.WEB, "9.0.0-web"),
/** JakartaEE 9 full profile. */
- v9_0_0(Version.v9_0_0, Type.FULL, "9.0.0");
+ v9_0_0(Version.v9_0_0, Type.FULL, "9.0.0"),
+
+ /** JakartaEE 9.1 web profile. */
+ v9_1_0_web(Version.v9_1_0, Type.WEB, "9.1.0-web"),
+
+ /** JakartaEE 9.1 full profile. */
+ v9_1_0(Version.v9_1_0, Type.FULL, "9.1.0");
////////////////////////////////////////////////////////////////////////////
// Inner enums //
@@ -128,7 +134,9 @@ public enum JavaEEProfile {
/** JakartaEE 8.0. */
v8_0_0("8.0.0"),
/** JakartaEE 9.0. */
- v9_0_0("9.0.0");
+ v9_0_0("9.0.0"),
+ /** JakartaEE 9.1. */
+ v9_1_0("9.1.0");
/** JavaEE profile type name. */
private final String name;
diff --git a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/JavaSEPlatform.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/JavaSEPlatform.java
index e5fd23a6a5..b7b05c7582 100644
--- a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/JavaSEPlatform.java
+++ b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/JavaSEPlatform.java
@@ -50,10 +50,24 @@ public enum JavaSEPlatform {
v1_8,
/** JavaSE 11. */
v11,
+ /** JavaSE 12. */
+ v12,
+ /** JavaSE 13. */
+ v13,
+ /** JavaSE 14. */
+ v14,
+ /** JavaSE 15. */
+ v15,
/** JavaSE 16. */
v16,
/** JavaSE 17. */
- v17;
+ v17,
+ /** JavaSE 18. */
+ v18,
+ /** JavaSE 19. */
+ v19,
+ /** JavaSE 20. */
+ v20;
////////////////////////////////////////////////////////////////////////////
// Class attributes //
@@ -91,12 +105,33 @@ public enum JavaSEPlatform {
/** A <code>String</code> representation of v11 value. */
static final String V11_STR = "11";
+
+ /** A <code>String</code> representation of v12 value. */
+ static final String V12_STR = "12";
+
+ /** A <code>String</code> representation of v13 value. */
+ static final String V13_STR = "13";
+
+ /** A <code>String</code> representation of v14 value. */
+ static final String V14_STR = "14";
+
+ /** A <code>String</code> representation of v15 value. */
+ static final String V15_STR = "15";
/** A <code>String</code> representation of v16 value. */
static final String V16_STR = "16";
/** A <code>String</code> representation of v17 value. */
static final String V17_STR = "17";
+
+ /** A <code>String</code> representation of v18 value. */
+ static final String V18_STR = "18";
+
+ /** A <code>String</code> representation of v19 value. */
+ static final String V19_STR = "19";
+
+ /** A <code>String</code> representation of v20 value. */
+ static final String V20_STR = "20";
/**
* Stored <code>String</code> values for backward <code>String</code>
@@ -158,8 +193,15 @@ public enum JavaSEPlatform {
case v1_7: return V1_7_STR;
case v1_8: return V1_8_STR;
case v11: return V11_STR;
+ case v12: return V12_STR;
+ case v13: return V13_STR;
+ case v14: return V14_STR;
+ case v15: return V15_STR;
case v16: return V16_STR;
case v17: return V17_STR;
+ case v18: return V18_STR;
+ case v19: return V19_STR;
+ case v20: return V20_STR;
// This is unrecheable. Being here means this class does not handle
// all possible values correctly.
diff --git a/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/data/GlassFishVersionTest.java b/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/data/GlassFishVersionTest.java
index 3ac43d8ddb..deaed386cc 100644
--- a/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/data/GlassFishVersionTest.java
+++ b/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/data/GlassFishVersionTest.java
@@ -85,6 +85,18 @@ public class GlassFishVersionTest {
GlassFishVersion.GF_3_1_STR_NEXT);
verifyToValueFromAdditionalArray(GlassFishVersion.GF_4,
GlassFishVersion.GF_4_STR_NEXT);
+ verifyToValueFromAdditionalArray(GlassFishVersion.GF_4_1_2,
+ GlassFishVersion.GF_4_1_2_STR_NEXT);
+ verifyToValueFromAdditionalArray(GlassFishVersion.GF_5,
+ GlassFishVersion.GF_5_STR_NEXT);
+ verifyToValueFromAdditionalArray(GlassFishVersion.GF_5_1_0,
+ GlassFishVersion.GF_5_1_0_STR_NEXT);
+ verifyToValueFromAdditionalArray(GlassFishVersion.GF_6,
+ GlassFishVersion.GF_6_STR_NEXT);
+ verifyToValueFromAdditionalArray(GlassFishVersion.GF_6_1_0,
+ GlassFishVersion.GF_6_1_0_STR_NEXT);
+ verifyToValueFromAdditionalArray(GlassFishVersion.GF_6_2_5,
+ GlassFishVersion.GF_6_2_5_STR_NEXT);
}
/**
@@ -93,26 +105,28 @@ public class GlassFishVersionTest {
@Test
public void testToValueIncomplete() {
GlassFishVersion versions[] = {
- GlassFishVersion.GF_1,
- GlassFishVersion.GF_2,
- GlassFishVersion.GF_2_1,
- GlassFishVersion.GF_2_1_1,
- GlassFishVersion.GF_3,
- GlassFishVersion.GF_3_1_2,
- GlassFishVersion.GF_3_1_2_2,
- GlassFishVersion.GF_3_1_2_3,
- GlassFishVersion.GF_3_1_2_4
+ GlassFishVersion.GF_1, GlassFishVersion.GF_2,
+ GlassFishVersion.GF_2_1, GlassFishVersion.GF_2_1_1,
+ GlassFishVersion.GF_3, GlassFishVersion.GF_3_1_2,
+ GlassFishVersion.GF_3_1_2_2, GlassFishVersion.GF_3_1_2_3,
+ GlassFishVersion.GF_3_1_2_4, GlassFishVersion.GF_3_1_2_5,
+ GlassFishVersion.GF_4, GlassFishVersion.GF_4_0_1,
+ GlassFishVersion.GF_4_1, GlassFishVersion.GF_4_1_1,
+ GlassFishVersion.GF_4_1_2, GlassFishVersion.GF_5,
+ GlassFishVersion.GF_5_0_1, GlassFishVersion.GF_5_1_0,
+ GlassFishVersion.GF_6, GlassFishVersion.GF_6_1_0,
+ GlassFishVersion.GF_6_2_0, GlassFishVersion.GF_6_2_1,
+ GlassFishVersion.GF_6_2_2, GlassFishVersion.GF_6_2_3,
+ GlassFishVersion.GF_6_2_4, GlassFishVersion.GF_6_2_5
};
String strings[] = {
- "1.0.1.4",
- "2.0.1.5",
- "2.1.0.3",
- "2.1.1.7",
- "3.0.0.1",
- "3.1.2.1",
- "3.1.2.2",
- "3.1.2.3",
- "3.1.2.4"
+ "1.0.1.4", "2.0.1.5", "2.1.0.3", "2.1.1.7",
+ "3.0.0.1", "3.1.2.1", "3.1.2.2", "3.1.2.3",
+ "3.1.2.4", "3.1.2.5", "4.0.0.0", "4.0.1.0",
+ "4.1.0.0", "4.1.1.0", "4.1.2.0", "5.0.0.0",
+ "5.0.1.0", "5.1.0.0", "6.0.0.0", "6.1.0.0",
+ "6.2.0.0", "6.2.1.0", "6.2.2.0", "6.2.3.0",
+ "6.2.4.0", "6.2.5.0"
};
for (int i = 0; i < versions.length; i++) {
GlassFishVersion version = GlassFishVersion.toValue(strings[i]);
diff --git a/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/server/config/ConfigBuilderTest.java b/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/server/config/ConfigBuilderTest.java
index aa1f2e4127..8a8b2bf9be 100644
--- a/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/server/config/ConfigBuilderTest.java
+++ b/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/server/config/ConfigBuilderTest.java
@@ -89,7 +89,7 @@ public class ConfigBuilderTest extends CommonTest {
GlassFishVersion.GF_4);
assertNotNull(lib);
try {
- lb.getLibraries(GlassFishVersion.GF_3_1_2);
+ lb.getLibraries(GlassFishVersion.GF_4);
fail("Library builder could not work for more than one GlassFish"
+ " version with a single server instance.");
} catch (ServerConfigException sce) {}
diff --git a/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientProvider.java b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientProvider.java
index e9b008598a..c7e41519d4 100644
--- a/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientProvider.java
+++ b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientProvider.java
@@ -351,7 +351,11 @@ public final class AppClientProvider extends J2eeModuleProvider
if (p == null) {
return AppClient.VERSION_6_0;
}
- if (Profile.JAKARTA_EE_8_FULL.equals(p) || Profile.JAKARTA_EE_8_WEB.equals(p)) {
+ if (Profile.JAKARTA_EE_9_1_FULL.equals(p) || Profile.JAKARTA_EE_9_1_WEB.equals(p)) {
+ return AppClient.VERSION_9_0;
+ } else if (Profile.JAKARTA_EE_9_FULL.equals(p) || Profile.JAKARTA_EE_9_WEB.equals(p)) {
+ return AppClient.VERSION_9_0;
+ } else if (Profile.JAKARTA_EE_8_FULL.equals(p) || Profile.JAKARTA_EE_8_FULL.equals(p)) {
return AppClient.VERSION_8_0;
} else if (Profile.JAVA_EE_8_FULL.equals(p) || Profile.JAVA_EE_8_WEB.equals(p)) {
return AppClient.VERSION_8_0;
diff --git a/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/api/AppClientProjectGenerator.java b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/api/AppClientProjectGenerator.java
index df22131205..64866d135e 100644
--- a/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/api/AppClientProjectGenerator.java
+++ b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/api/AppClientProjectGenerator.java
@@ -162,6 +162,10 @@ public class AppClientProjectGenerator {
String resource;
if(j2eeProfile == null) {
resource = "org-netbeans-modules-j2ee-clientproject/application-client-6.xml"; // NOI18N
+ } else if (Profile.JAKARTA_EE_9_1_FULL.equals(j2eeProfile) || Profile.JAKARTA_EE_9_1_WEB.equals(j2eeProfile)) {
+ resource = "org-netbeans-modules-j2ee-clientproject/application-client-9.xml"; // NOI18N
+ } else if (Profile.JAKARTA_EE_9_FULL.equals(j2eeProfile) || Profile.JAKARTA_EE_9_WEB.equals(j2eeProfile)) {
+ resource = "org-netbeans-modules-j2ee-clientproject/application-client-9.xml"; // NOI18N
} else if (Profile.JAKARTA_EE_8_FULL.equals(j2eeProfile) || Profile.JAKARTA_EE_8_WEB.equals(j2eeProfile)) {
resource = "org-netbeans-modules-j2ee-clientproject/application-client-8.xml"; // NOI18N
} else if (Profile.JAVA_EE_8_FULL.equals(j2eeProfile) || Profile.JAVA_EE_8_WEB.equals(j2eeProfile)) {
@@ -385,6 +389,10 @@ public class AppClientProjectGenerator {
String resource;
if (j2eeProfile == null) {
resource = "org-netbeans-modules-j2ee-clientproject/application-client-6.xml"; // NOI18N
+ } else if (Profile.JAKARTA_EE_9_1_FULL.equals(j2eeProfile) || Profile.JAKARTA_EE_9_1_WEB.equals(j2eeProfile)) {
+ resource = "org-netbeans-modules-j2ee-clientproject/application-client-9.xml"; // NOI18N
+ } else if (Profile.JAKARTA_EE_9_FULL.equals(j2eeProfile) || Profile.JAKARTA_EE_9_WEB.equals(j2eeProfile)) {
+ resource = "org-netbeans-modules-j2ee-clientproject/application-client-9.xml"; // NOI18N
} else if (Profile.JAKARTA_EE_8_FULL.equals(j2eeProfile) || Profile.JAKARTA_EE_8_WEB.equals(j2eeProfile)) {
resource = "org-netbeans-modules-j2ee-clientproject/application-client-8.xml"; // NOI18N
} else if (Profile.JAVA_EE_8_FULL.equals(j2eeProfile) || Profile.JAVA_EE_8_WEB.equals(j2eeProfile)) {
diff --git a/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/AppClientProjectProperties.java b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/AppClientProjectProperties.java
index e46cfae468..e4cd216c1a 100644
--- a/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/AppClientProjectProperties.java
+++ b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/AppClientProjectProperties.java
@@ -323,7 +323,9 @@ public final class AppClientProjectProperties {
PLATFORM_LIST_RENDERER = PlatformUiSupport.createPlatformListCellRenderer();
SpecificationVersion minimalSourceLevel = null;
Profile profile = Profile.fromPropertiesString(evaluator.getProperty(J2EE_PLATFORM));
- if (Profile.JAKARTA_EE_8_FULL.equals(profile) || Profile.JAVA_EE_8_FULL.equals(profile)) {
+ if (Profile.JAKARTA_EE_9_1_FULL.equals(profile)) {
+ minimalSourceLevel = new SpecificationVersion("11");
+ } else if (Profile.JAKARTA_EE_8_FULL.equals(profile) || Profile.JAVA_EE_8_FULL.equals(profile) || Profile.JAKARTA_EE_9_FULL.equals(profile)) {
minimalSourceLevel = new SpecificationVersion("1.8");
} else if (Profile.JAVA_EE_7_FULL.equals(profile)) {
minimalSourceLevel = new SpecificationVersion("1.7");
diff --git a/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/wsclient/AppClientProjectJAXWSClientSupport.java b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/wsclient/AppClientProjectJAXWSClientSupport.java
index 421a997441..825b1530da 100644
--- a/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/wsclient/AppClientProjectJAXWSClientSupport.java
+++ b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/wsclient/AppClientProjectJAXWSClientSupport.java
@@ -110,6 +110,10 @@ public class AppClientProjectJAXWSClientSupport extends ProjectJAXWSClientSuppor
return JAKARTA_EE_VERSION_9;
} else if (Profile.JAKARTA_EE_9_FULL.equals(j2eeClientModule.getJ2eeProfile())) {
return JAKARTA_EE_VERSION_9;
+ } else if (Profile.JAKARTA_EE_9_1_WEB.equals(j2eeClientModule.getJ2eeProfile())) {
+ return JAKARTA_EE_VERSION_91;
+ } else if (Profile.JAKARTA_EE_9_1_FULL.equals(j2eeClientModule.getJ2eeProfile())) {
+ return JAKARTA_EE_VERSION_91;
} else if (Profile.JAVA_EE_5.equals(j2eeClientModule.getJ2eeProfile())) {
return JAVA_EE_VERSION_15;
}
diff --git a/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/DDHelper.java b/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/DDHelper.java
index d42cfd4cc9..d050e06eb8 100644
--- a/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/DDHelper.java
+++ b/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/DDHelper.java
@@ -66,7 +66,9 @@ public class DDHelper {
*/
public static FileObject createWebXml(Profile j2eeProfile, boolean webXmlRequired, FileObject dir) throws IOException {
String template = null;
- if ((Profile.JAKARTA_EE_9_FULL == j2eeProfile || Profile.JAKARTA_EE_9_WEB == j2eeProfile) && webXmlRequired) {
+ if ((Profile.JAKARTA_EE_9_1_FULL == j2eeProfile || Profile.JAKARTA_EE_9_1_WEB == j2eeProfile) && webXmlRequired) {
+ template = "web-4.0.xml"; //NOI18N
+ } else if ((Profile.JAKARTA_EE_9_FULL == j2eeProfile || Profile.JAKARTA_EE_9_WEB == j2eeProfile) && webXmlRequired) {
template = "web-4.0.xml"; //NOI18N
} else if ((Profile.JAKARTA_EE_8_FULL == j2eeProfile || Profile.JAKARTA_EE_8_WEB == j2eeProfile) && webXmlRequired) {
template = "web-4.0.xml"; //NOI18N
@@ -103,7 +105,9 @@ public class DDHelper {
*/
public static FileObject createWebFragmentXml(Profile j2eeProfile, FileObject dir) throws IOException {
String template = null;
- if (Profile.JAKARTA_EE_9_FULL == j2eeProfile || Profile.JAKARTA_EE_9_WEB == j2eeProfile) {
+ if (Profile.JAKARTA_EE_9_1_FULL == j2eeProfile || Profile.JAKARTA_EE_9_1_WEB == j2eeProfile) {
+ template = "web-fragment-4.0.xml"; //NOI18N
+ } else if (Profile.JAKARTA_EE_9_FULL == j2eeProfile || Profile.JAKARTA_EE_9_WEB == j2eeProfile) {
template = "web-fragment-4.0.xml"; //NOI18N
} else if (Profile.JAKARTA_EE_8_FULL == j2eeProfile || Profile.JAKARTA_EE_8_WEB == j2eeProfile) {
template = "web-fragment-4.0.xml"; //NOI18N
diff --git a/enterprise/j2ee.core/src/org/netbeans/api/j2ee/core/Bundle.properties b/enterprise/j2ee.core/src/org/netbeans/api/j2ee/core/Bundle.properties
index 7dc01ef5d8..490a29e1c6 100644
--- a/enterprise/j2ee.core/src/org/netbeans/api/j2ee/core/Bundle.properties
+++ b/enterprise/j2ee.core/src/org/netbeans/api/j2ee/core/Bundle.properties
@@ -30,3 +30,5 @@ JakartaEE8Full.displayName=Jakarta EE 8
JakartaEE8Web.displayName=Jakarta EE 8 Web
JakartaEE9Full.displayName=Jakarta EE 9
JakartaEE9Web.displayName=Jakarta EE 9 Web
+JakartaEE91Full.displayName=Jakarta EE 9.1
+JakartaEE91Web.displayName=Jakarta EE 9.1 Web
diff --git a/enterprise/j2ee.core/src/org/netbeans/api/j2ee/core/Profile.java b/enterprise/j2ee.core/src/org/netbeans/api/j2ee/core/Profile.java
index 5e7d70e82e..7e282ff963 100644
--- a/enterprise/j2ee.core/src/org/netbeans/api/j2ee/core/Profile.java
+++ b/enterprise/j2ee.core/src/org/netbeans/api/j2ee/core/Profile.java
@@ -68,6 +68,10 @@ public final class Profile {
public static final Profile JAKARTA_EE_9_WEB = new Profile(12, "9.0", "web", "JakartaEE9Web.displayName");
public static final Profile JAKARTA_EE_9_FULL = new Profile(13, "9.0", null, "JakartaEE9Full.displayName");
+
+ public static final Profile JAKARTA_EE_9_1_WEB = new Profile(14, "9.1", "web", "JakartaEE91Web.displayName");
+
+ public static final Profile JAKARTA_EE_9_1_FULL = new Profile(15, "9.1", null, "JakartaEE91Full.displayName");
private final int order;
@@ -172,6 +176,12 @@ public final class Profile {
} else if (JAKARTA_EE_9_WEB.toPropertiesString().equals(valueMinusQuotes)
|| "JAKARTA_EE_9_WEB".equals(value)) {
return JAKARTA_EE_9_WEB;
+ } else if (JAKARTA_EE_9_1_FULL.toPropertiesString().equals(valueMinusQuotes)
+ || "JAKARTA_EE_9_1_FULL".equals(value)) {
+ return JAKARTA_EE_9_1_FULL;
+ } else if (JAKARTA_EE_9_1_WEB.toPropertiesString().equals(valueMinusQuotes)
+ || "JAKARTA_EE_9_1_WEB".equals(value)) {
+ return JAKARTA_EE_9_1_WEB;
} else {
return null;
}
diff --git a/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/client/AppClient.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/client/AppClient.java
index ba68a49a14..5492b1bc23 100644
--- a/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/client/AppClient.java
+++ b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/client/AppClient.java
@@ -44,6 +44,7 @@ public interface AppClient extends RootInterface {
*/
public static final String VERSION_7_0 = "7"; //NOI18N
public static final String VERSION_8_0 = "8"; //NOI18N
+ public static final String VERSION_9_0 = "9"; //NOI18N
public static final int STATE_VALID=0;
public static final int STATE_INVALID_PARSABLE=1;
public static final int STATE_INVALID_UNPARSABLE=2;
diff --git a/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/Utils.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/Utils.java
index 5afdb9a072..2c5e518f7b 100644
--- a/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/Utils.java
+++ b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/Utils.java
@@ -255,7 +255,8 @@ public class Utils {
Profile.JAVA_EE_7_WEB.equals(profile) || Profile.JAVA_EE_7_FULL.equals(profile) ||
Profile.JAVA_EE_8_WEB.equals(profile) || Profile.JAVA_EE_8_FULL.equals(profile) ||
Profile.JAKARTA_EE_8_WEB.equals(profile) || Profile.JAKARTA_EE_8_FULL.equals(profile) ||
- Profile.JAKARTA_EE_9_WEB.equals(profile) || Profile.JAKARTA_EE_9_FULL.equals(profile)))){
+ Profile.JAKARTA_EE_9_WEB.equals(profile) || Profile.JAKARTA_EE_9_FULL.equals(profile) ||
+ Profile.JAKARTA_EE_9_1_WEB.equals(profile) || Profile.JAKARTA_EE_9_1_FULL.equals(profile)))){
isEJBModule = true;
}
}
diff --git a/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/jpa/dao/AppServerValidationPanel.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/jpa/dao/AppServerValidationPanel.java
index 8aeb44bed9..4fbc2f4eaf 100644
--- a/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/jpa/dao/AppServerValidationPanel.java
+++ b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/jpa/dao/AppServerValidationPanel.java
@@ -60,7 +60,8 @@ public final class AppServerValidationPanel extends DelegatingWizardDescriptorPa
wm.getJ2eeProfile() == Profile.JAVA_EE_7_FULL || wm.getJ2eeProfile() == Profile.JAVA_EE_7_WEB ||
wm.getJ2eeProfile() == Profile.JAVA_EE_8_FULL || wm.getJ2eeProfile() == Profile.JAVA_EE_8_WEB ||
wm.getJ2eeProfile() == Profile.JAKARTA_EE_8_FULL || wm.getJ2eeProfile() == Profile.JAKARTA_EE_8_WEB ||
- wm.getJ2eeProfile() == Profile.JAKARTA_EE_9_FULL || wm.getJ2eeProfile() == Profile.JAKARTA_EE_9_WEB)) {
+ wm.getJ2eeProfile() == Profile.JAKARTA_EE_9_WEB || wm.getJ2eeProfile() == Profile.JAKARTA_EE_9_FULL ||
+ wm.getJ2eeProfile() == Profile.JAKARTA_EE_9_1_WEB || wm.getJ2eeProfile() == Profile.JAKARTA_EE_9_1_FULL)) {
// check that server is EJB lite sufficient
EjbSupport ejbSupport = EjbSupport.getInstance(j2eePlatform);
if (!ejbSupport.isEjb31LiteSupported(j2eePlatform)) {
diff --git a/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/session/SessionEJBWizard.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/session/SessionEJBWizard.java
index 4e6e7f0a11..50e9a99370 100644
--- a/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/session/SessionEJBWizard.java
+++ b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/session/SessionEJBWizard.java
@@ -92,7 +92,8 @@ public final class SessionEJBWizard implements WizardDescriptor.AsynchronousInst
Profile.JAVA_EE_7_FULL.equals(profile) || Profile.JAVA_EE_7_WEB.equals(profile) ||
Profile.JAVA_EE_8_FULL.equals(profile) || Profile.JAVA_EE_8_WEB.equals(profile) ||
Profile.JAKARTA_EE_8_FULL.equals(profile) || Profile.JAKARTA_EE_8_WEB.equals(profile) ||
- Profile.JAKARTA_EE_9_FULL.equals(profile) || Profile.JAKARTA_EE_9_WEB.equals(profile);
+ Profile.JAKARTA_EE_9_FULL.equals(profile) || Profile.JAKARTA_EE_9_WEB.equals(profile) ||
+ Profile.JAKARTA_EE_9_1_FULL.equals(profile) || Profile.JAKARTA_EE_9_1_WEB.equals(profile);
SessionGenerator sessionGenerator = SessionGenerator.create(
Templates.getTargetName(wiz),
pkg,
diff --git a/enterprise/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/jaxws/EjbProjectJAXWSClientSupport.java b/enterprise/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/jaxws/EjbProjectJAXWSClientSupport.java
index 4f95923558..19d717a4d2 100644
--- a/enterprise/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/jaxws/EjbProjectJAXWSClientSupport.java
+++ b/enterprise/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/jaxws/EjbProjectJAXWSClientSupport.java
@@ -95,6 +95,22 @@ public class EjbProjectJAXWSClientSupport extends ProjectJAXWSClientSupport/* im
return JAVA_EE_VERSION_17;
} else if (Profile.JAVA_EE_7_FULL.equals(ejbModule.getJ2eeProfile())) {
return JAVA_EE_VERSION_17;
+ } else if (Profile.JAVA_EE_8_WEB.equals(ejbModule.getJ2eeProfile())) {
+ return JAVA_EE_VERSION_18;
+ } else if (Profile.JAVA_EE_8_FULL.equals(ejbModule.getJ2eeProfile())) {
+ return JAVA_EE_VERSION_18;
+ } else if (Profile.JAKARTA_EE_8_WEB.equals(ejbModule.getJ2eeProfile())) {
+ return JAKARTA_EE_VERSION_8;
+ } else if (Profile.JAKARTA_EE_8_FULL.equals(ejbModule.getJ2eeProfile())) {
+ return JAKARTA_EE_VERSION_8;
+ } else if (Profile.JAKARTA_EE_9_WEB.equals(ejbModule.getJ2eeProfile())) {
+ return JAKARTA_EE_VERSION_9;
+ } else if (Profile.JAKARTA_EE_9_FULL.equals(ejbModule.getJ2eeProfile())) {
+ return JAKARTA_EE_VERSION_9;
+ } else if (Profile.JAKARTA_EE_9_1_WEB.equals(ejbModule.getJ2eeProfile())) {
+ return JAKARTA_EE_VERSION_91;
+ } else if (Profile.JAKARTA_EE_9_1_FULL.equals(ejbModule.getJ2eeProfile())) {
+ return JAKARTA_EE_VERSION_91;
} else if (Profile.JAVA_EE_5.equals(ejbModule.getJ2eeProfile())) {
return JAVA_EE_VERSION_15;
}
diff --git a/enterprise/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/jaxws/EjbProjectJAXWSSupport.java b/enterprise/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/jaxws/EjbProjectJAXWSSupport.java
index 5b2372ba1d..34b834fbe5 100644
--- a/enterprise/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/jaxws/EjbProjectJAXWSSupport.java
+++ b/enterprise/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/jaxws/EjbProjectJAXWSSupport.java
@@ -166,6 +166,22 @@ public String addService(String name, String serviceImpl, String wsdlUrl, String
return JAVA_EE_VERSION_17;
} else if (Profile.JAVA_EE_7_FULL.equals(ejbModule.getJ2eeProfile())) {
return JAVA_EE_VERSION_17;
+ } else if (Profile.JAVA_EE_8_WEB.equals(ejbModule.getJ2eeProfile())) {
+ return JAVA_EE_VERSION_18;
+ } else if (Profile.JAVA_EE_8_FULL.equals(ejbModule.getJ2eeProfile())) {
+ return JAVA_EE_VERSION_18;
+ } else if (Profile.JAKARTA_EE_8_WEB.equals(ejbModule.getJ2eeProfile())) {
+ return JAKARTA_EE_VERSION_8;
+ } else if (Profile.JAKARTA_EE_8_FULL.equals(ejbModule.getJ2eeProfile())) {
+ return JAKARTA_EE_VERSION_8;
+ } else if (Profile.JAKARTA_EE_9_WEB.equals(ejbModule.getJ2eeProfile())) {
+ return JAKARTA_EE_VERSION_9;
+ } else if (Profile.JAKARTA_EE_9_FULL.equals(ejbModule.getJ2eeProfile())) {
+ return JAKARTA_EE_VERSION_9;
+ } else if (Profile.JAKARTA_EE_9_1_WEB.equals(ejbModule.getJ2eeProfile())) {
+ return JAKARTA_EE_VERSION_91;
+ } else if (Profile.JAKARTA_EE_9_1_FULL.equals(ejbModule.getJ2eeProfile())) {
+ return JAKARTA_EE_VERSION_91;
} else if (Profile.JAVA_EE_5.equals(ejbModule.getJ2eeProfile())) {
return JAVA_EE_VERSION_15;
}
diff --git a/enterprise/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/customizer/EjbJarProjectProperties.java b/enterprise/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/customizer/EjbJarProjectProperties.java
index 65e75b61c6..56e2467be4 100644
--- a/enterprise/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/customizer/EjbJarProjectProperties.java
+++ b/enterprise/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/customizer/EjbJarProjectProperties.java
@@ -323,7 +323,9 @@ public final class EjbJarProjectProperties {
SpecificationVersion minimalSourceLevel = null;
Profile profile = Profile.fromPropertiesString(evaluator.getProperty(J2EE_PLATFORM));
- if (Profile.JAKARTA_EE_8_FULL.equals(profile) || Profile.JAVA_EE_8_FULL.equals(profile)) {
+ if (Profile.JAKARTA_EE_9_1_FULL.equals(profile)) {
+ minimalSourceLevel = new SpecificationVersion("11");
+ } else if (Profile.JAKARTA_EE_9_FULL.equals(profile) || Profile.JAKARTA_EE_8_FULL.equals(profile) || Profile.JAVA_EE_8_FULL.equals(profile)) {
minimalSourceLevel = new SpecificationVersion("1.8");
} else if (Profile.JAVA_EE_7_FULL.equals(profile)) {
minimalSourceLevel = new SpecificationVersion("1.7");
diff --git a/enterprise/j2eeserver/nbproject/project.properties b/enterprise/j2eeserver/nbproject/project.properties
index 7f20ce274d..54caaaf1ae 100644
--- a/enterprise/j2eeserver/nbproject/project.properties
+++ b/enterprise/j2eeserver/nbproject/project.properties
@@ -16,6 +16,7 @@
# under the License.
is.autoload=true
+javac.compilerargs=-Xlint -Xlint:-serial
javac.source=1.8
spec.version.base=1.128.0
diff --git a/enterprise/j2eeserver/src/org/netbeans/modules/j2ee/deployment/impl/layer.xml b/enterprise/j2eeserver/src/org/netbeans/modules/j2ee/deployment/impl/layer.xml
index 11fea1745f..083edc1181 100644
--- a/enterprise/j2eeserver/src/org/netbeans/modules/j2ee/deployment/impl/layer.xml
+++ b/enterprise/j2eeserver/src/org/netbeans/modules/j2ee/deployment/impl/layer.xml
@@ -55,10 +55,11 @@
<attr name="config-J2EE/InstalledServers/" boolvalue="true"/>
<!-- More appropriate place would be GF module, but that would need another action-->
<attr name="config-GlassFishEE6/Instances/" boolvalue="true"/>
+ <attr name="config-GlassFishEE7/Instances/" boolvalue="true"/>
<attr name="config-GlassFishEE8/Instances/" boolvalue="true"/>
<attr name="config-GlassFishJakartaEE8/Instances/" boolvalue="true"/>
<attr name="config-GlassFishJakartaEE9/Instances/" boolvalue="true"/>
- <!--attr name="config-GlassFishJakartaEE91/Instances/" boolvalue="true"/-->
+ <attr name="config-GlassFishJakartaEE91/Instances/" boolvalue="true"/>
<attr name="config-GlassFishEE6WC/Instances/" boolvalue="true"/>
</file>
</folder>
@@ -134,7 +135,7 @@
<folder name="OptionsExport">
<folder name="Advanced">
<file name="J2EE">
- <attr name="include" stringvalue="config/(J2EE|GlassFish|GlassFishEE6|GlassFishEE6WC|GlassFishEE8|GlassFishJakartaEE8|GlassFishJakartaEE9)/.*"/>
+ <attr name="include" stringvalue="config/(J2EE|GlassFish|GlassFishEE6|GlassFishEE6WC||GlassFishEE7|GlassFishEE8|GlassFishJakartaEE8|GlassFishJakartaEE9|GlassFishJakartaEE91)/.*"/>
<attr name="displayName" bundlevalue="org.netbeans.modules.j2ee.deployment.impl.Bundle#J2EE.Options.Export.displayName"/>
</file>
</folder>
diff --git a/enterprise/javaee.project/src/org/netbeans/modules/javaee/project/api/ant/ui/wizard/Bundle.properties b/enterprise/javaee.project/src/org/netbeans/modules/javaee/project/api/ant/ui/wizard/Bundle.properties
index 64784bb84a..9e07f4d8a8 100644
--- a/enterprise/javaee.project/src/org/netbeans/modules/javaee/project/api/ant/ui/wizard/Bundle.properties
+++ b/enterprise/javaee.project/src/org/netbeans/modules/javaee/project/api/ant/ui/wizard/Bundle.properties
@@ -133,9 +133,13 @@ MSG_RecommendationSetJdk7=<html>Note: JDK 7 will be used for Java EE 7 projects.
MSG_RecommendationSetSourceLevel7=<html>Note: Source Level 7 will be set for Java EE 7 project.
MSG_RecommendationJDK7=<html>Recommendation: JDK 7 should be used for Java EE 7 projects.
-MSG_RecommendationSetJdk8=<html>Note: JDK 8 will be used for Java EE 8 projects.
-MSG_RecommendationSetSourceLevel8=<html>Note: Source Level 8 will be set for Java EE 8 project.
-MSG_RecommendationJDK8=<html>Recommendation: JDK 8 should be used for Java EE 8 projects.
+MSG_RecommendationSetJdk8=<html>Note: JDK 8 will be used for Java EE 8, Jakarta EE 8 and Jakarta EE 9 projects.
+MSG_RecommendationSetSourceLevel8=<html>Note: Source Level 8 will be set for Java EE 8, Jakarta EE 8 and Jakarta EE 9 project.
+MSG_RecommendationJDK8=<html>Recommendation: JDK 8 should be used for Java EE 8, Jakarta EE 8 and Jakarta EE 9 projects.
+
+MSG_RecommendationSetJdk11=<html>Note: JDK 11 will be used for Jakarta EE 9.1 projects.
+MSG_RecommendationSetSourceLevel11=<html>Note: Source Level 11 will be set for Jakarta EE 9.1 project.
+MSG_RecommendationJDK11=<html>Recommendation: JDK 11 should be used for Jakarta EE 9.1 projects.
#Import wizard - existing sources
LBL_IW_ImportTitle=Add Existing Sources
diff --git a/enterprise/javaee.project/src/org/netbeans/modules/javaee/project/api/ant/ui/wizard/J2eeVersionWarningPanel.java b/enterprise/javaee.project/src/org/netbeans/modules/javaee/project/api/ant/ui/wizard/J2eeVersionWarningPanel.java
index 08a2997053..46f6881c29 100644
--- a/enterprise/javaee.project/src/org/netbeans/modules/javaee/project/api/ant/ui/wizard/J2eeVersionWarningPanel.java
+++ b/enterprise/javaee.project/src/org/netbeans/modules/javaee/project/api/ant/ui/wizard/J2eeVersionWarningPanel.java
@@ -41,15 +41,18 @@ final class J2eeVersionWarningPanel extends javax.swing.JPanel {
public static final String WARN_SET_JDK_6 = "warnSetJdk6"; // NOI18N
public static final String WARN_SET_JDK_7 = "warnSetJdk7"; // NOI18N
public static final String WARN_SET_JDK_8 = "warnSetJdk8"; // NOI18N
+ public static final String WARN_SET_JDK_11 = "warnSetJdk11"; // NOI18N
public static final String WARN_SET_SOURCE_LEVEL_15 = "warnSetSourceLevel15"; // NOI18N
public static final String WARN_SET_SOURCE_LEVEL_6 = "warnSetSourceLevel6"; // NOI18N
public static final String WARN_SET_SOURCE_LEVEL_7 = "warnSetSourceLevel7"; // NOI18N
- public static final String WARN_SET_SOURCE_LEVEL_8 = "warnSetSourceLevel8";
+ public static final String WARN_SET_SOURCE_LEVEL_8 = "warnSetSourceLevel8"; // NOI18N
+ public static final String WARN_SET_SOURCE_LEVEL_11 = "warnSetSourceLevel11"; // NOI18N
public static final String WARN_JDK_6_REQUIRED = "warnJdk6Required"; // NOI18N
public static final String WARN_JDK_7_REQUIRED = "warnJdk7Required"; // NOI18N
public static final String WARN_JDK_8_REQUIRED = "warnJdk8Required"; // NOI18N
+ public static final String WARN_JDK_11_REQUIRED = "warnJdk11Required"; // NOI18N
private String warningType;
@@ -65,70 +68,119 @@ final class J2eeVersionWarningPanel extends javax.swing.JPanel {
public void setWarningType(String warningType) {
String labelText = "";
this.warningType = warningType;
- if (WARN_SET_JDK_15.equals(warningType)) {
- labelText = NbBundle.getMessage(J2eeVersionWarningPanel.class, "MSG_RecommendationSetJdk15");
- } else if (WARN_SET_SOURCE_LEVEL_15.equals(warningType)) {
- labelText = NbBundle.getMessage(J2eeVersionWarningPanel.class, "MSG_RecommendationSetSourceLevel15");
- } else if (WARN_SET_JDK_6.equals(warningType)) {
- labelText = NbBundle.getMessage(J2eeVersionWarningPanel.class, "MSG_RecommendationSetJdk6");
- } else if (WARN_SET_JDK_7.equals(warningType)) {
- labelText = NbBundle.getMessage(J2eeVersionWarningPanel.class, "MSG_RecommendationSetJdk7");
- } else if (WARN_SET_JDK_8.equals(warningType)) {
- labelText = NbBundle.getMessage(J2eeVersionWarningPanel.class, "MSG_RecommendationSetJdk8");
- } else if (WARN_SET_SOURCE_LEVEL_6.equals(warningType)) {
- labelText = NbBundle.getMessage(J2eeVersionWarningPanel.class, "MSG_RecommendationSetSourceLevel6");
- } else if (WARN_SET_SOURCE_LEVEL_7.equals(warningType)) {
- labelText = NbBundle.getMessage(J2eeVersionWarningPanel.class, "MSG_RecommendationSetSourceLevel7");
- } else if (WARN_SET_SOURCE_LEVEL_8.equals(warningType)) {
- labelText = NbBundle.getMessage(J2eeVersionWarningPanel.class, "MSG_RecommendationSetSourceLevel8");
- } else if (WARN_JDK_6_REQUIRED.equals(warningType)) {
- labelText = NbBundle.getMessage(J2eeVersionWarningPanel.class, "MSG_RecommendationJDK6");
- } else if (WARN_JDK_7_REQUIRED.equals(warningType)) {
- labelText = NbBundle.getMessage(J2eeVersionWarningPanel.class, "MSG_RecommendationJDK7");
- } else if (WARN_JDK_8_REQUIRED.equals(warningType)) {
- labelText = NbBundle.getMessage(J2eeVersionWarningPanel.class, "MSG_RecommendationJDK8");
+ if (null != warningType) {
+ switch (warningType) {
+ case WARN_SET_JDK_15:
+ labelText = NbBundle.getMessage(J2eeVersionWarningPanel.class, "MSG_RecommendationSetJdk15");
+ break;
+ case WARN_SET_JDK_6:
+ labelText = NbBundle.getMessage(J2eeVersionWarningPanel.class, "MSG_RecommendationSetJdk6");
+ break;
+ case WARN_SET_JDK_7:
+ labelText = NbBundle.getMessage(J2eeVersionWarningPanel.class, "MSG_RecommendationSetJdk7");
+ break;
+ case WARN_SET_JDK_8:
+ labelText = NbBundle.getMessage(J2eeVersionWarningPanel.class, "MSG_RecommendationSetJdk8");
+ break;
+ case WARN_SET_JDK_11:
+ labelText = NbBundle.getMessage(J2eeVersionWarningPanel.class, "MSG_RecommendationSetJdk11");
+ break;
+ case WARN_SET_SOURCE_LEVEL_15:
+ labelText = NbBundle.getMessage(J2eeVersionWarningPanel.class, "MSG_RecommendationSetSourceLevel15");
+ break;
+ case WARN_SET_SOURCE_LEVEL_6:
+ labelText = NbBundle.getMessage(J2eeVersionWarningPanel.class, "MSG_RecommendationSetSourceLevel6");
+ break;
+ case WARN_SET_SOURCE_LEVEL_7:
+ labelText = NbBundle.getMessage(J2eeVersionWarningPanel.class, "MSG_RecommendationSetSourceLevel7");
+ break;
+ case WARN_SET_SOURCE_LEVEL_8:
+ labelText = NbBundle.getMessage(J2eeVersionWarningPanel.class, "MSG_RecommendationSetSourceLevel8");
+ break;
+ case WARN_SET_SOURCE_LEVEL_11:
+ labelText = NbBundle.getMessage(J2eeVersionWarningPanel.class, "MSG_RecommendationSetSourceLevel11");
+ break;
+ case WARN_JDK_6_REQUIRED:
+ labelText = NbBundle.getMessage(J2eeVersionWarningPanel.class, "MSG_RecommendationJDK6");
+ break;
+ case WARN_JDK_7_REQUIRED:
+ labelText = NbBundle.getMessage(J2eeVersionWarningPanel.class, "MSG_RecommendationJDK7");
+ break;
+ case WARN_JDK_8_REQUIRED:
+ labelText = NbBundle.getMessage(J2eeVersionWarningPanel.class, "MSG_RecommendationJDK8");
+ break;
+ case WARN_JDK_11_REQUIRED:
+ labelText = NbBundle.getMessage(J2eeVersionWarningPanel.class, "MSG_RecommendationJDK11");
+ break;
+ default:
+ break;
+ }
}
jLabel.setText(labelText);
}
public String getSuggestedJavaPlatformName() {
- if (WARN_SET_JDK_15.equals(warningType) ) {
- JavaPlatform[] javaPlatforms = getJavaPlatforms("1.5");
- return getPreferredPlatform(javaPlatforms).getDisplayName();
- }
- if (WARN_SET_JDK_6.equals(warningType) ) {
- JavaPlatform[] javaPlatforms = getJavaPlatforms("1.6");
- return getPreferredPlatform(javaPlatforms).getDisplayName();
+ if (null == warningType ) {
+ return JavaPlatform.getDefault().getDisplayName();
}
- if (WARN_SET_JDK_7.equals(warningType) ) {
- JavaPlatform[] javaPlatforms = getJavaPlatforms("1.7");
- return getPreferredPlatform(javaPlatforms).getDisplayName();
- }
- if (WARN_SET_JDK_8.equals(warningType) ) {
- JavaPlatform[] javaPlatforms = getJavaPlatforms("1.8");
- return getPreferredPlatform(javaPlatforms).getDisplayName();
+ else {
+ switch (warningType) {
+ case WARN_SET_JDK_15: {
+ JavaPlatform[] javaPlatforms = getJavaPlatforms("1.5");
+ return getPreferredPlatform(javaPlatforms).getDisplayName();
+ }
+ case WARN_SET_JDK_6: {
+ JavaPlatform[] javaPlatforms = getJavaPlatforms("1.6");
+ return getPreferredPlatform(javaPlatforms).getDisplayName();
+ }
+ case WARN_SET_JDK_7: {
+ JavaPlatform[] javaPlatforms = getJavaPlatforms("1.7");
+ return getPreferredPlatform(javaPlatforms).getDisplayName();
+ }
+ case WARN_SET_JDK_8: {
+ JavaPlatform[] javaPlatforms = getJavaPlatforms("1.8");
+ return getPreferredPlatform(javaPlatforms).getDisplayName();
+ }
+ case WARN_SET_JDK_11: {
+ JavaPlatform[] javaPlatforms = getJavaPlatforms("11");
+ return getPreferredPlatform(javaPlatforms).getDisplayName();
+ }
+ default:
+ return JavaPlatform.getDefault().getDisplayName();
+ }
}
- return JavaPlatform.getDefault().getDisplayName();
}
public Specification getSuggestedJavaPlatformSpecification() {
- if (WARN_SET_JDK_15.equals(warningType) ) {
- JavaPlatform[] javaPlatforms = getJavaPlatforms("1.5");
- return getPreferredPlatform(javaPlatforms).getSpecification();
- }
- if (WARN_SET_JDK_6.equals(warningType) ) {
- JavaPlatform[] javaPlatforms = getJavaPlatforms("1.6");
- return getPreferredPlatform(javaPlatforms).getSpecification();
+ if (null == warningType ) {
+ return JavaPlatform.getDefault().getSpecification();
}
- if (WARN_SET_JDK_7.equals(warningType) ) {
- JavaPlatform[] javaPlatforms = getJavaPlatforms("1.7");
- return getPreferredPlatform(javaPlatforms).getSpecification();
- }
- if (WARN_SET_JDK_8.equals(warningType) ) {
- JavaPlatform[] javaPlatforms = getJavaPlatforms("1.8");
- return getPreferredPlatform(javaPlatforms).getSpecification();
+ else {
+ switch (warningType) {
+ case WARN_SET_JDK_15: {
+ JavaPlatform[] javaPlatforms = getJavaPlatforms("1.5");
+ return getPreferredPlatform(javaPlatforms).getSpecification();
+ }
+ case WARN_SET_JDK_6: {
+ JavaPlatform[] javaPlatforms = getJavaPlatforms("1.6");
+ return getPreferredPlatform(javaPlatforms).getSpecification();
+ }
+ case WARN_SET_JDK_7: {
+ JavaPlatform[] javaPlatforms = getJavaPlatforms("1.7");
+ return getPreferredPlatform(javaPlatforms).getSpecification();
+ }
+ case WARN_SET_JDK_8: {
+ JavaPlatform[] javaPlatforms = getJavaPlatforms("1.8");
+ return getPreferredPlatform(javaPlatforms).getSpecification();
+ }
+ case WARN_SET_JDK_11: {
+ JavaPlatform[] javaPlatforms = getJavaPlatforms("11");
+ return getPreferredPlatform(javaPlatforms).getSpecification();
+ }
+ default:
+ return JavaPlatform.getDefault().getSpecification();
+ }
}
- return JavaPlatform.getDefault().getSpecification();
}
private static JavaPlatform getPreferredPlatform(@NullAllowed final JavaPlatform[] platforms) {
@@ -148,7 +200,7 @@ final class J2eeVersionWarningPanel extends javax.swing.JPanel {
JavaPlatform defaultPlatform = JavaPlatformManager.getDefault().getDefaultPlatform();
SpecificationVersion version = defaultPlatform.getSpecification().getVersion();
String sourceLevel = version.toString();
-
+
// no warning if 1.5 is the default for jee5
if (j2eeProfile == Profile.JAVA_EE_5 && isAcceptableSourceLevel("1.5", sourceLevel, acceptableSourceLevels)) { // NOI18N
return null;
@@ -168,14 +220,22 @@ final class J2eeVersionWarningPanel extends javax.swing.JPanel {
isAcceptableSourceLevel("1.8", sourceLevel, acceptableSourceLevels)) { // NOI18N
return null;
}
+ // no warning if 1.8 is the default for jakartaee8
if ((j2eeProfile == Profile.JAKARTA_EE_8_FULL || j2eeProfile == Profile.JAKARTA_EE_8_WEB) &&
isAcceptableSourceLevel("1.8", sourceLevel, acceptableSourceLevels)) { // NOI18N
return null;
}
+ // no warning if 1.8 is the default for jakartaee9
if ((j2eeProfile == Profile.JAKARTA_EE_9_FULL || j2eeProfile == Profile.JAKARTA_EE_9_WEB) &&
isAcceptableSourceLevel("1.8", sourceLevel, acceptableSourceLevels)) { // NOI18N
return null;
}
+ // no warning if 11 is the default for jakartaee9.1
+ if ((j2eeProfile == Profile.JAKARTA_EE_9_1_FULL || j2eeProfile == Profile.JAKARTA_EE_9_1_WEB) &&
+ isAcceptableSourceLevel("11", sourceLevel, acceptableSourceLevels)) { // NOI18N
+ return null;
+ }
+
if (j2eeProfile == Profile.JAVA_EE_5) {
JavaPlatform[] java15Platforms = getJavaPlatforms("1.5"); //NOI18N
if (java15Platforms.length > 0) {
@@ -205,7 +265,9 @@ final class J2eeVersionWarningPanel extends javax.swing.JPanel {
return WARN_JDK_7_REQUIRED;
}
}
- } else if (j2eeProfile == Profile.JAVA_EE_8_FULL || j2eeProfile == Profile.JAVA_EE_8_WEB) {
+ } else if (j2eeProfile == Profile.JAVA_EE_8_FULL || j2eeProfile == Profile.JAVA_EE_8_WEB ||
+ j2eeProfile == Profile.JAKARTA_EE_8_FULL || j2eeProfile == Profile.JAKARTA_EE_8_WEB ||
+ j2eeProfile == Profile.JAKARTA_EE_9_FULL || j2eeProfile == Profile.JAKARTA_EE_9_WEB) {
JavaPlatform[] java18Platforms = getJavaPlatforms("1.8"); //NOI18N
if (java18Platforms.length > 0) {
return WARN_SET_JDK_8;
@@ -216,27 +278,15 @@ final class J2eeVersionWarningPanel extends javax.swing.JPanel {
return WARN_JDK_8_REQUIRED;
}
}
- } else if (j2eeProfile == Profile.JAKARTA_EE_8_FULL || j2eeProfile == Profile.JAKARTA_EE_8_WEB) {
- JavaPlatform[] java18Platforms = getJavaPlatforms("1.8"); //NOI18N
- if (java18Platforms.length > 0) {
- return WARN_SET_JDK_8;
- } else {
- if (canSetSourceLevel("1.8")) {
- return WARN_SET_SOURCE_LEVEL_8;
- } else {
- return WARN_JDK_8_REQUIRED;
- }
- }
- } else if (j2eeProfile == Profile.JAKARTA_EE_9_FULL || j2eeProfile == Profile.JAKARTA_EE_9_WEB) {
- JavaPlatform[] java18Platforms = getJavaPlatforms("1.8"); //NOI18N
- if (java18Platforms.length > 0) {
- return WARN_SET_JDK_8;
-
+ } else if (j2eeProfile == Profile.JAKARTA_EE_9_1_FULL || j2eeProfile == Profile.JAKARTA_EE_9_1_WEB) {
+ JavaPlatform[] java11Platforms = getJavaPlatforms("11"); //NOI18N
+ if (java11Platforms.length > 0) {
+ return WARN_SET_JDK_11;
} else {
- if (canSetSourceLevel("1.8")) {
- return WARN_SET_SOURCE_LEVEL_8;
+ if (canSetSourceLevel("11")) {
+ return WARN_SET_SOURCE_LEVEL_11;
} else {
- return WARN_JDK_8_REQUIRED;
+ return WARN_JDK_11_REQUIRED;
}
}
} else {
diff --git a/enterprise/javaee.project/src/org/netbeans/modules/javaee/project/api/ant/ui/wizard/ProjectServerPanel.java b/enterprise/javaee.project/src/org/netbeans/modules/javaee/project/api/ant/ui/wizard/ProjectServerPanel.java
index b2d55cd82d..10e0d54426 100644
--- a/enterprise/javaee.project/src/org/netbeans/modules/javaee/project/api/ant/ui/wizard/ProjectServerPanel.java
+++ b/enterprise/javaee.project/src/org/netbeans/modules/javaee/project/api/ant/ui/wizard/ProjectServerPanel.java
@@ -62,7 +62,7 @@ import org.openide.util.NbBundle;
import org.openide.util.Utilities;
final class ProjectServerPanel extends javax.swing.JPanel implements DocumentListener {
-
+
private ProjectServerWizardPanel wizard;
private boolean contextModified = false;
private final DefaultComboBoxModel<ServerInstanceWrapper> serversModel = new DefaultComboBoxModel<>();
@@ -421,30 +421,38 @@ final class ProjectServerPanel extends javax.swing.JPanel implements DocumentLis
ServerInstanceWrapper serverInstanceWrapper = (ServerInstanceWrapper) serversModel.getSelectedItem();
j2eeSpecComboBox.removeAllItems();
if (serverInstanceWrapper != null) {
- J2eePlatform j2eePlatform = Deployment.getDefault().getJ2eePlatform(serverInstanceWrapper.getServerInstanceID());
- Set<Profile> profiles = new TreeSet<Profile>(Profile.UI_COMPARATOR);
- profiles.addAll(j2eePlatform.getSupportedProfiles(j2eeModuleType));
- for (Profile profile : profiles) {
- // j2ee 1.3 and 1.4 is not supported anymore
- if (Profile.J2EE_13.equals(profile) || Profile.J2EE_14.equals(profile)) {
- continue;
- }
- if (j2eeModuleType ==J2eeModule.Type.WAR) {
- if (Profile.JAVA_EE_6_FULL.equals(profile) || Profile.JAVA_EE_7_FULL.equals(profile) || Profile.JAVA_EE_8_FULL.equals(profile) || Profile.JAKARTA_EE_8_FULL.equals(profile) || Profile.JAKARTA_EE_9_FULL.equals(profile)) {
- // for web apps always offer only JAVA_EE_6_WEB profile and skip full one
+ try {
+ J2eePlatform j2eePlatform = Deployment.getDefault().getServerInstance(serverInstanceWrapper.getServerInstanceID()).getJ2eePlatform();
+ Set<Profile> profiles = new TreeSet<Profile>(Profile.UI_COMPARATOR);
+ profiles.addAll(j2eePlatform.getSupportedProfiles(j2eeModuleType));
+ for (Profile profile : profiles) {
+ // j2ee 1.3 and 1.4 is not supported anymore
+ if (Profile.J2EE_13.equals(profile) || Profile.J2EE_14.equals(profile)) {
continue;
}
- } else {
- if (Profile.JAVA_EE_6_WEB.equals(profile) || Profile.JAVA_EE_7_WEB.equals(profile) || Profile.JAVA_EE_8_WEB.equals(profile) || Profile.JAKARTA_EE_8_WEB.equals(profile) || Profile.JAKARTA_EE_9_WEB.equals(profile)) {
- // for EE apps always skip web profile
- continue;
+ if (j2eeModuleType ==J2eeModule.Type.WAR) {
+ if (Profile.JAVA_EE_6_FULL.equals(profile) || Profile.JAVA_EE_7_FULL.equals(profile) ||
+ Profile.JAVA_EE_8_FULL.equals(profile) || Profile.JAKARTA_EE_8_FULL.equals(profile) ||
+ Profile.JAKARTA_EE_9_FULL.equals(profile) || Profile.JAKARTA_EE_9_1_FULL.equals(profile)) {
+ // for web apps always offer only JAVA_EE_6_WEB profile and skip full one
+ continue;
+ }
+ } else {
+ if (Profile.JAVA_EE_6_WEB.equals(profile) || Profile.JAVA_EE_7_WEB.equals(profile) ||
+ Profile.JAVA_EE_8_WEB.equals(profile) || Profile.JAKARTA_EE_8_WEB.equals(profile) ||
+ Profile.JAKARTA_EE_9_WEB.equals(profile) || Profile.JAKARTA_EE_9_1_WEB.equals(profile)) {
+ // for EE apps always skip web profile
+ continue;
+ }
}
+
+ j2eeSpecComboBox.addItem(new ProfileItem(profile));
}
-
- j2eeSpecComboBox.addItem(new ProfileItem(profile));
- }
- if (prevSelectedItem != null) {
- j2eeSpecComboBox.setSelectedItem(prevSelectedItem);
+ if (prevSelectedItem != null) {
+ j2eeSpecComboBox.setSelectedItem(prevSelectedItem);
+ }
+ } catch (InstanceRemovedException ex) {
+ Exceptions.printStackTrace(ex);
}
}
// revalidate the form
@@ -627,21 +635,30 @@ private void serverLibraryCheckboxActionPerformed(java.awt.event.ActionEvent evt
if (j2ee != null) {
String warningType = warningPanel.getWarningType();
if (warningType != null) {
- if (warningType.equals(J2eeVersionWarningPanel.WARN_SET_SOURCE_LEVEL_8)) {
- sourceLevel = "1.8"; //NOI18N
- } else if (warningType.equals(J2eeVersionWarningPanel.WARN_SET_SOURCE_LEVEL_7)) {
- sourceLevel = "1.7"; //NOI18N
- } else if (warningType.equals(J2eeVersionWarningPanel.WARN_SET_SOURCE_LEVEL_6)) {
- sourceLevel = "1.6"; //NOI18N
- } else if (warningType.equals(J2eeVersionWarningPanel.WARN_SET_SOURCE_LEVEL_15)) {
- sourceLevel = "1.5"; //NOI18N
+ switch (warningType) {
+ case J2eeVersionWarningPanel.WARN_SET_SOURCE_LEVEL_11:
+ sourceLevel = "11"; //NOI18N
+ break;
+ case J2eeVersionWarningPanel.WARN_SET_SOURCE_LEVEL_8:
+ sourceLevel = "1.8"; //NOI18N
+ break;
+ case J2eeVersionWarningPanel.WARN_SET_SOURCE_LEVEL_7:
+ sourceLevel = "1.7"; //NOI18N
+ break;
+ case J2eeVersionWarningPanel.WARN_SET_SOURCE_LEVEL_6:
+ sourceLevel = "1.6"; //NOI18N
+ break;
+ case J2eeVersionWarningPanel.WARN_SET_SOURCE_LEVEL_15:
+ sourceLevel = "1.5"; //NOI18N
+ break;
+ default:
+ break;
}
}
}
} else {
d.putProperty(ProjectServerWizardPanel.JAVA_PLATFORM, JavaPlatform.getDefault().getDisplayName());
}
-
return sourceLevel;
}
@@ -692,7 +709,6 @@ private void serverLibraryCheckboxActionPerformed(java.awt.event.ActionEvent evt
}
-
// Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JButton addServerButton;
private javax.swing.JCheckBox cdiCheckbox;
@@ -727,12 +743,7 @@ private void serverLibraryCheckboxActionPerformed(java.awt.event.ActionEvent evt
serversModel.removeAllElements();
Set<ServerInstanceWrapper> servers = new TreeSet<ServerInstanceWrapper>();
ServerInstanceWrapper selectedItem = null;
- boolean sjasFound = false;
- boolean gfv3Found = false;
- boolean gfv3ee6Found = false;
- boolean gfv5Found = false;
- boolean gfv5ee8Found = false;
- boolean gfv510ee8Found = false;
+
for (String serverInstanceID : Deployment.getDefault().getServerInstanceIDs()) {
try {
ServerInstance si = Deployment.getDefault().getServerInstance(serverInstanceID);
@@ -741,47 +752,22 @@ private void serverLibraryCheckboxActionPerformed(java.awt.event.ActionEvent evt
if (displayName != null && j2eePlatform != null && j2eePlatform.getSupportedTypes().contains(j2eeModuleType)) {
ServerInstanceWrapper serverWrapper = new ServerInstanceWrapper(serverInstanceID, displayName);
// decide whether this server should be preselected
- if (selectedItem == null || !gfv3ee6Found) {
+ if (selectedItem == null) {
if (selectedServerInstanceID != null) {
if (selectedServerInstanceID.equals(serverInstanceID)) {
selectedItem = serverWrapper;
}
- } else {
- // preselect the best server ;)
- // FIXME replace with PriorityQueue mechanism
- String shortName = si.getServerID();
- if ("gfv510ee8".equals(shortName)) {
- selectedItem = serverWrapper;
- gfv510ee8Found = true;
- } else if ("gfv5ee8".equals(shortName)) { // NOI18N
- selectedItem = serverWrapper;
- gfv5ee8Found = true;
- } else if ("gfv3ee6".equals(shortName)) { // NOI18N
- selectedItem = serverWrapper;
- gfv3ee6Found = true;
- } else if ("gfv510".equals(shortName) && !gfv510ee8Found){
- selectedItem = serverWrapper;
- gfv510ee8Found = true;
- } else if ("gfv5".equals(shortName) && !gfv5ee8Found) { // NOI18N
- selectedItem = serverWrapper;
- gfv5Found = true;
- } else if ("gfv3".equals(shortName) && !gfv3ee6Found) { // NOI18N
- selectedItem = serverWrapper;
- gfv3Found = true;
- } else if ("J2EE".equals(shortName) && !(gfv3ee6Found || gfv3Found)) { // NOI18N
- selectedItem = serverWrapper;
- sjasFound = true;
- } else if ("JBoss4".equals(shortName) && !(gfv3ee6Found || gfv3Found || sjasFound)) { // NOI18N
- selectedItem = serverWrapper;
- }
}
+ // else {}
+ // FIXME replace with PriorityQueue mechanism to
+ // preselect the best server
}
servers.add(serverWrapper);
}
} catch (InstanceRemovedException ex) {
Exceptions.printStackTrace(ex);
}
- }
+ }
for (ServerInstanceWrapper item : servers) {
serversModel.addElement(item);
}
@@ -928,7 +914,7 @@ private void serverLibraryCheckboxActionPerformed(java.awt.event.ActionEvent evt
}
} else {
// suppose highest
- j2eeSpecComboBox.setSelectedItem(new ProfileItem(Profile.JAVA_EE_5));
+ j2eeSpecComboBox.setSelectedItem(new ProfileItem(Profile.JAVA_EE_8_FULL));
}
}
}
@@ -954,6 +940,14 @@ private void serverLibraryCheckboxActionPerformed(java.awt.event.ActionEvent evt
if(new BigDecimal(org.netbeans.modules.j2ee.dd.api.ejb.EjbJar.VERSION_2_1).equals(version)) {
j2eeSpecComboBox.setSelectedItem(new ProfileItem(Profile.J2EE_14));
+ } else if(new BigDecimal(org.netbeans.modules.j2ee.dd.api.ejb.EjbJar.VERSION_3_0).equals(version)) {
+ j2eeSpecComboBox.setSelectedItem(new ProfileItem(Profile.JAVA_EE_5));
+ } else if(new BigDecimal(org.netbeans.modules.j2ee.dd.api.ejb.EjbJar.VERSION_3_1).equals(version)) {
+ j2eeSpecComboBox.setSelectedItem(new ProfileItem(Profile.JAVA_EE_6_FULL));
+ } else if(new BigDecimal(org.netbeans.modules.j2ee.dd.api.ejb.EjbJar.VERSION_3_2).equals(version)) {
+ j2eeSpecComboBox.setSelectedItem(new ProfileItem(Profile.JAVA_EE_7_FULL));
+ } else if(new BigDecimal(org.netbeans.modules.j2ee.dd.api.ejb.EjbJar.VERSION_4_0).equals(version)) {
+ j2eeSpecComboBox.setSelectedItem(new ProfileItem(Profile.JAKARTA_EE_9_FULL));
}
} catch (IOException e) {
String message = NbBundle.getMessage(ProjectServerPanel.class, "MSG_EjbJarXmlCorrupted"); // NOI18N
@@ -983,6 +977,12 @@ private void serverLibraryCheckboxActionPerformed(java.awt.event.ActionEvent evt
j2eeSpecComboBox.setSelectedItem(new ProfileItem(Profile.JAVA_EE_5));
} else if(new BigDecimal(org.netbeans.modules.j2ee.dd.api.client.AppClient.VERSION_6_0).equals(version)) {
j2eeSpecComboBox.setSelectedItem(new ProfileItem(Profile.JAVA_EE_6_FULL));
+ } else if(new BigDecimal(org.netbeans.modules.j2ee.dd.api.client.AppClient.VERSION_7_0).equals(version)) {
+ j2eeSpecComboBox.setSelectedItem(new ProfileItem(Profile.JAVA_EE_7_FULL));
+ } else if(new BigDecimal(org.netbeans.modules.j2ee.dd.api.client.AppClient.VERSION_8_0).equals(version)) {
+ j2eeSpecComboBox.setSelectedItem(new ProfileItem(Profile.JAVA_EE_8_FULL));
+ } else if(new BigDecimal(org.netbeans.modules.j2ee.dd.api.client.AppClient.VERSION_9_0).equals(version)) {
+ j2eeSpecComboBox.setSelectedItem(new ProfileItem(Profile.JAKARTA_EE_9_FULL));
}
} catch (IOException e) {
String message = NbBundle.getMessage(ProjectServerPanel.class, "MSG_AppClientXmlCorrupted"); // NOI18N
diff --git a/enterprise/web.jsf/nbproject/project.properties b/enterprise/web.jsf/nbproject/project.properties
index 045add9bc2..12e6fef214 100644
--- a/enterprise/web.jsf/nbproject/project.properties
+++ b/enterprise/web.jsf/nbproject/project.properties
@@ -16,7 +16,7 @@
# under the License.
javac.compilerargs=-Xlint -Xlint:-serial
-javac.source=1.7
+javac.source=1.8
spec.version.base=1.86.0
test.config.stable.includes=\
diff --git a/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/JSFFrameworkProvider.java b/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/JSFFrameworkProvider.java
index 3e90e96bb7..b6a9341e12 100644
--- a/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/JSFFrameworkProvider.java
+++ b/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/JSFFrameworkProvider.java
@@ -741,7 +741,7 @@ public class JSFFrameworkProvider extends WebFrameworkProvider {
String shortName;
try {
shortName = Deployment.getDefault().getServerInstance(serverInstanceID).getServerID();
- if ("gfv610ee9".equals(shortName) || "gfv6ee9".equals(shortName) || "gfv510ee8".equals(shortName) || "gfv5ee8".equals(shortName) || "gfv5".equals(shortName) || "gfv3ee6".equals(shortName) || "gfv3".equals(shortName)) {
+ if ("gfv610ee9".equals(shortName) || "gfv6ee9".equals(shortName) || "gfv510ee8".equals(shortName) || "gfv5ee8".equals(shortName) || "gfv5".equals(shortName) || "gfv4ee7".equals(shortName) || "gfv4".equals(shortName) || "gfv3ee6".equals(shortName) || "gfv3".equals(shortName)) {
return true;
}
} catch (InstanceRemovedException ex) {
diff --git a/enterprise/web.project/nbproject/project.properties b/enterprise/web.project/nbproject/project.properties
index 71425ad338..247704bb95 100644
--- a/enterprise/web.project/nbproject/project.properties
+++ b/enterprise/web.project/nbproject/project.properties
@@ -27,8 +27,8 @@ extra.module.files=\
ant/extra/jspcompile.jar,\
ant/sources/org/netbeans/modules/web/project/ant/*.java
-javac.source=1.7
-javac.compilerargs=-Xlint:unchecked
+javac.source=1.8
+javac.compilerargs=-Xlint -Xlint:-serial
javadoc.arch=${basedir}/arch.xml
spec.version.base=1.91.0
diff --git a/enterprise/web.project/src/org/netbeans/modules/web/project/jaxws/WebProjectJAXWSClientSupport.java b/enterprise/web.project/src/org/netbeans/modules/web/project/jaxws/WebProjectJAXWSClientSupport.java
index 7805d98ed2..fe043087c0 100644
--- a/enterprise/web.project/src/org/netbeans/modules/web/project/jaxws/WebProjectJAXWSClientSupport.java
+++ b/enterprise/web.project/src/org/netbeans/modules/web/project/jaxws/WebProjectJAXWSClientSupport.java
@@ -126,10 +126,14 @@ public class WebProjectJAXWSClientSupport extends ProjectJAXWSClientSupport /*im
return JAKARTA_EE_VERSION_8;
} else if (Profile.JAKARTA_EE_8_FULL.equals(webModule.getJ2eeProfile())) {
return JAKARTA_EE_VERSION_8;
- } else if (Profile.JAKARTA_EE_9_WEB.equals(webModule.getJ2eeProfile())) {
- return JAKARTA_EE_VERSION_9;
- } else if (Profile.JAKARTA_EE_9_FULL.equals(webModule.getJ2eeProfile())) {
- return JAKARTA_EE_VERSION_9;
+ } else if (Profile.JAKARTA_EE_9_WEB.equals(webModule.getJ2eeProfile())) {
+ return JAKARTA_EE_VERSION_9;
+ } else if (Profile.JAKARTA_EE_9_FULL.equals(webModule.getJ2eeProfile())) {
+ return JAKARTA_EE_VERSION_9;
+ } else if (Profile.JAKARTA_EE_9_1_WEB.equals(webModule.getJ2eeProfile())) {
+ return JAKARTA_EE_VERSION_91;
+ } else if (Profile.JAKARTA_EE_9_1_FULL.equals(webModule.getJ2eeProfile())) {
+ return JAKARTA_EE_VERSION_91;
} else if (Profile.JAVA_EE_5.equals(webModule.getJ2eeProfile())) {
return JAVA_EE_VERSION_15;
}
diff --git a/enterprise/web.project/src/org/netbeans/modules/web/project/jaxws/WebProjectJAXWSSupport.java b/enterprise/web.project/src/org/netbeans/modules/web/project/jaxws/WebProjectJAXWSSupport.java
index 2b2caf5251..d1868e6a3b 100644
--- a/enterprise/web.project/src/org/netbeans/modules/web/project/jaxws/WebProjectJAXWSSupport.java
+++ b/enterprise/web.project/src/org/netbeans/modules/web/project/jaxws/WebProjectJAXWSSupport.java
@@ -615,6 +615,10 @@ public class WebProjectJAXWSSupport extends ProjectJAXWSSupport /*implements JAX
return JAKARTA_EE_VERSION_9;
} else if (Profile.JAKARTA_EE_9_FULL.equals(webModule.getJ2eeProfile())) {
return JAKARTA_EE_VERSION_9;
+ } else if (Profile.JAKARTA_EE_9_1_WEB.equals(webModule.getJ2eeProfile())) {
+ return JAKARTA_EE_VERSION_91;
+ } else if (Profile.JAKARTA_EE_9_1_FULL.equals(webModule.getJ2eeProfile())) {
+ return JAKARTA_EE_VERSION_91;
} else if (Profile.JAVA_EE_5.equals(webModule.getJ2eeProfile())) {
return JAVA_EE_VERSION_15;
}
diff --git a/enterprise/web.project/src/org/netbeans/modules/web/project/ui/customizer/WebProjectProperties.java b/enterprise/web.project/src/org/netbeans/modules/web/project/ui/customizer/WebProjectProperties.java
index ba02cc6d8f..29c88d582e 100644
--- a/enterprise/web.project/src/org/netbeans/modules/web/project/ui/customizer/WebProjectProperties.java
+++ b/enterprise/web.project/src/org/netbeans/modules/web/project/ui/customizer/WebProjectProperties.java
@@ -375,18 +375,16 @@ public final class WebProjectProperties {
PLATFORM_LIST_RENDERER = PlatformUiSupport.createPlatformListCellRenderer();
SpecificationVersion minimalSourceLevel = null;
Profile profile = Profile.fromPropertiesString(evaluator.getProperty(J2EE_PLATFORM));
- if (Profile.JAVA_EE_6_FULL.equals(profile)) {
+ if (Profile.JAKARTA_EE_9_1_FULL.equals(profile)) {
+ minimalSourceLevel = new SpecificationVersion("11");
+ } else if (Profile.JAKARTA_EE_8_FULL.equals(profile) || Profile.JAVA_EE_8_FULL.equals(profile) || Profile.JAKARTA_EE_9_FULL.equals(profile)) {
+ minimalSourceLevel = new SpecificationVersion("1.8");
+ } else if (Profile.JAVA_EE_7_FULL.equals(profile)) {
+ minimalSourceLevel = new SpecificationVersion("1.7");
+ } else if (Profile.JAVA_EE_6_FULL.equals(profile)) {
minimalSourceLevel = new SpecificationVersion("1.6");
} else if (Profile.JAVA_EE_5.equals(profile)) {
minimalSourceLevel = new SpecificationVersion("1.5");
- } else if (Profile.JAVA_EE_7_FULL.equals(profile)) {
- minimalSourceLevel = new SpecificationVersion("1.7");
- } else if (Profile.JAVA_EE_8_FULL.equals(profile)) {
- minimalSourceLevel = new SpecificationVersion("1.8");
- } else if (Profile.JAKARTA_EE_8_FULL.equals(profile)) {
- minimalSourceLevel = new SpecificationVersion("1.8.0");
- } else if (Profile.JAKARTA_EE_9_FULL.equals(profile)) {
- minimalSourceLevel = new SpecificationVersion("1.8.0");
}
JAVAC_SOURCE_MODEL = PlatformUiSupport.createSourceLevelComboBoxModel (PLATFORM_MODEL, evaluator.getProperty(JAVAC_SOURCE), evaluator.getProperty(JAVAC_TARGET), minimalSourceLevel);
JAVAC_SOURCE_RENDERER = PlatformUiSupport.createSourceLevelListCellRenderer ();
diff --git a/enterprise/websvc.clientapi/nbproject/project.properties b/enterprise/websvc.clientapi/nbproject/project.properties
index 62a0c39a5c..72ec9f2534 100644
--- a/enterprise/websvc.clientapi/nbproject/project.properties
+++ b/enterprise/websvc.clientapi/nbproject/project.properties
@@ -15,8 +15,8 @@
# specific language governing permissions and limitations
# under the License.
-javac.compilerargs=-Xlint:unchecked
-javac.source=1.6
+javac.compilerargs=-Xlint -Xlint:-serial
+javac.source=1.8
javadoc.overview=${basedir}/overview.html
javadoc.arch=${basedir}/arch.xml
diff --git a/enterprise/websvc.clientapi/src/org/netbeans/modules/websvc/spi/jaxws/client/ProjectJAXWSClientSupport.java b/enterprise/websvc.clientapi/src/org/netbeans/modules/websvc/spi/jaxws/client/ProjectJAXWSClientSupport.java
index c6ba92f7ec..f3edb2ec14 100644
--- a/enterprise/websvc.clientapi/src/org/netbeans/modules/websvc/spi/jaxws/client/ProjectJAXWSClientSupport.java
+++ b/enterprise/websvc.clientapi/src/org/netbeans/modules/websvc/spi/jaxws/client/ProjectJAXWSClientSupport.java
@@ -84,6 +84,7 @@ public abstract class ProjectJAXWSClientSupport implements JAXWSClientSupportImp
protected static final String JAVA_EE_VERSION_18="java-ee-version-18";
protected static final String JAKARTA_EE_VERSION_8="jakarta-ee-version-8"; //NOI18N
protected static final String JAKARTA_EE_VERSION_9="jakarta-ee-version-9"; //NOI18N
+ protected static final String JAKARTA_EE_VERSION_91="jakarta-ee-version-91"; //NOI18N
Project project;
private AntProjectHelper helper;
diff --git a/enterprise/websvc.jaxwsapi/nbproject/project.properties b/enterprise/websvc.jaxwsapi/nbproject/project.properties
index ea4586614f..13ec89a74c 100644
--- a/enterprise/websvc.jaxwsapi/nbproject/project.properties
+++ b/enterprise/websvc.jaxwsapi/nbproject/project.properties
@@ -14,7 +14,7 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-javac.compilerargs=-Xlint:unchecked
-javac.source=1.6
+javac.compilerargs=-Xlint -Xlint:-serial
+javac.source=1.8
test.config.stableBTD.includes=**/*Test.class
diff --git a/enterprise/websvc.jaxwsapi/src/org/netbeans/modules/websvc/jaxws/spi/ProjectJAXWSSupport.java b/enterprise/websvc.jaxwsapi/src/org/netbeans/modules/websvc/jaxws/spi/ProjectJAXWSSupport.java
index bf1bcd1e9e..4b0c0da016 100644
--- a/enterprise/websvc.jaxwsapi/src/org/netbeans/modules/websvc/jaxws/spi/ProjectJAXWSSupport.java
+++ b/enterprise/websvc.jaxwsapi/src/org/netbeans/modules/websvc/jaxws/spi/ProjectJAXWSSupport.java
@@ -80,6 +80,7 @@ public abstract class ProjectJAXWSSupport implements JAXWSSupportImpl {
protected static final String JAVA_EE_VERSION_18="java-ee-version-18"; //NOI18N
protected static final String JAKARTA_EE_VERSION_8="jakarta-ee-version-8"; //NOI18N
protected static final String JAKARTA_EE_VERSION_9="jakarta-ee-version-9"; //NOI18N
+ protected static final String JAKARTA_EE_VERSION_91="jakarta-ee-version-91"; //NOI18N
private Project project;
private AntProjectHelper antProjectHelper;
diff --git a/enterprise/websvc.restapi/nbproject/project.properties b/enterprise/websvc.restapi/nbproject/project.properties
index 29b310403c..add08bae03 100644
--- a/enterprise/websvc.restapi/nbproject/project.properties
+++ b/enterprise/websvc.restapi/nbproject/project.properties
@@ -18,5 +18,5 @@
#
is.autoload=true
-javac.compilerargs=-Xlint:unchecked
-javac.source=1.6
+javac.compilerargs=-Xlint -Xlint:-serial
+javac.source=1.8
diff --git a/enterprise/websvc.restapi/src/org/netbeans/modules/websvc/rest/spi/RestSupport.java b/enterprise/websvc.restapi/src/org/netbeans/modules/websvc/rest/spi/RestSupport.java
index d4c7f563e1..314f7ab77c 100644
--- a/enterprise/websvc.restapi/src/org/netbeans/modules/websvc/rest/spi/RestSupport.java
+++ b/enterprise/websvc.restapi/src/org/netbeans/modules/websvc/rest/spi/RestSupport.java
@@ -501,8 +501,10 @@ public abstract class RestSupport {
Profile.JAKARTA_EE_8_FULL.equals(profile);
boolean isJakartaee9 = Profile.JAKARTA_EE_9_WEB.equals(profile) ||
Profile.JAKARTA_EE_9_FULL.equals(profile);
+ boolean isJakartaee91 = Profile.JAKARTA_EE_9_1_WEB.equals(profile) ||
+ Profile.JAKARTA_EE_9_1_FULL.equals(profile);
// Fix for BZ#216345: JAVA_EE_6_WEB profile doesn't contain JAX-RS API
- return (isJee6 && MiscPrivateUtilities.supportsTargetProfile(project, Profile.JAVA_EE_6_FULL)) || isJee7;
+ return (isJee6 && MiscPrivateUtilities.supportsTargetProfile(project, Profile.JAVA_EE_6_FULL)) || isJee7 || isJee8 || isJakartaee8 || isJakartaee9 || isJakartaee91;
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists