[581077] Version increments, minor formatting and bug fixes Change-Id: Icf2d3eceb22f2360661e64148700e1fc6ed23ad8
diff --git a/plugins/org.eclipse.jst.ejb.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.ejb.ui/META-INF/MANIFEST.MF index 767e5a7..0e97ed6 100644 --- a/plugins/org.eclipse.jst.ejb.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.jst.ejb.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.jst.ejb.ui; singleton:=true -Bundle-Version: 1.1.912.qualifier +Bundle-Version: 1.1.1000.qualifier Bundle-Activator: org.eclipse.jst.ejb.ui.internal.plugin.EJBUIPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/project/facet/EjbProjectFirstPage.java b/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/project/facet/EjbProjectFirstPage.java index 04c3afe..cf3e61d 100644 --- a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/project/facet/EjbProjectFirstPage.java +++ b/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/project/facet/EjbProjectFirstPage.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2006 IBM Corporation and others. + * Copyright (c) 2005, 2023 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at
diff --git a/plugins/org.eclipse.jst.ejb.ui/pom.xml b/plugins/org.eclipse.jst.ejb.ui/pom.xml index cddae87..ac7df9a 100644 --- a/plugins/org.eclipse.jst.ejb.ui/pom.xml +++ b/plugins/org.eclipse.jst.ejb.ui/pom.xml
@@ -21,6 +21,6 @@ <groupId>org.eclipse.webtools.ejb</groupId> <artifactId>org.eclipse.jst.ejb.ui</artifactId> - <version>1.1.912-SNAPSHOT</version> + <version>1.1.1000-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
diff --git a/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/util/internal/JavaEEQuickPeek.java b/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/util/internal/JavaEEQuickPeek.java index df3688c..ffd0ec0 100644 --- a/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/util/internal/JavaEEQuickPeek.java +++ b/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/util/internal/JavaEEQuickPeek.java
@@ -29,13 +29,30 @@ private static final int UNSET = -2; - static final String SIMPLE_WEBAPP_SCHEMA_2_4 = lastSegment(J2EEConstants.WEBAPP_SCHEMA_2_4); - static final String SIMPLE_WEBAPP_SCHEMA_2_5 = lastSegment(J2EEConstants.WEBAPP_SCHEMA_2_5); - static final String SIMPLE_WEBAPP_SCHEMA_3_0 = lastSegment(J2EEConstants.WEBAPP_SCHEMA_3_0); - static final String SIMPLE_WEBAPP_SCHEMA_3_1 = lastSegment(J2EEConstants.WEBAPP_SCHEMA_3_1); - static final String SIMPLE_WEBAPP_SCHEMA_4_0 = lastSegment(J2EEConstants.WEBAPP_SCHEMA_4_0); - static final String SIMPLE_WEBAPP_SCHEMA_5_0 = lastSegment(J2EEConstants.WEBAPP_SCHEMA_5_0); - static final String SIMPLE_WEBAPP_SCHEMA_6_0 = lastSegment(J2EEConstants.WEBAPP_SCHEMA_6_0); + private static final String SIMPLE_WEBAPP_SCHEMA_2_4 = lastSegment(J2EEConstants.WEBAPP_SCHEMA_2_4); + private static final String SIMPLE_WEBAPP_SCHEMA_2_5 = lastSegment(J2EEConstants.WEBAPP_SCHEMA_2_5); + private static final String SIMPLE_WEBAPP_SCHEMA_3_0 = lastSegment(J2EEConstants.WEBAPP_SCHEMA_3_0); + private static final String SIMPLE_WEBAPP_SCHEMA_3_1 = lastSegment(J2EEConstants.WEBAPP_SCHEMA_3_1); + private static final String SIMPLE_WEBAPP_SCHEMA_4_0 = lastSegment(J2EEConstants.WEBAPP_SCHEMA_4_0); + private static final String SIMPLE_WEBAPP_SCHEMA_5_0 = lastSegment(J2EEConstants.WEBAPP_SCHEMA_5_0); + private static final String SIMPLE_WEBAPP_SCHEMA_6_0 = lastSegment(J2EEConstants.WEBAPP_SCHEMA_6_0); + private static final String SIMPLE_APPLICATION_SCHEMA_5 = lastSegment(J2EEConstants.APPLICATION_SCHEMA_5); + private static final String SIMPLE_APPLICATION_SCHEMA_6 = lastSegment(J2EEConstants.APPLICATION_SCHEMA_6); + private static final String SIMPLE_APPLICATION_SCHEMA_7 = lastSegment(J2EEConstants.APPLICATION_SCHEMA_7); + private static final String SIMPLE_APPLICATION_SCHEMA_8 = lastSegment(J2EEConstants.APPLICATION_SCHEMA_8); + private static final String SIMPLE_APPLICATION_SCHEMA_9 = lastSegment(J2EEConstants.APPLICATION_SCHEMA_9); + private static final String SIMPLE_APPLICATION_SCHEMA_10 = lastSegment(J2EEConstants.APPLICATION_SCHEMA_10); + private static final String SIMPLE_EJBJAR_SCHEMA_2_1 = lastSegment(J2EEConstants.EJBJAR_SCHEMA_2_1); + private static final String SIMPLE_EJBJAR_SCHEMA_3_0 = lastSegment(J2EEConstants.EJBJAR_SCHEMA_3_0); + private static final String SIMPLE_EJBJAR_SCHEMA_3_1 = lastSegment(J2EEConstants.EJBJAR_SCHEMA_3_1); + private static final String SIMPLE_EJBJAR_SCHEMA_3_2 = lastSegment(J2EEConstants.EJBJAR_SCHEMA_3_2); + private static final String SIMPLE_EJBJAR_SCHEMA_4_0 = lastSegment(J2EEConstants.EJBJAR_SCHEMA_4_0); + private static final String SIMPLE_WEBFRAGMENT_SCHEMA_3_0 = lastSegment(J2EEConstants.WEBFRAGMENT_SCHEMA_3_0); + private static final String SIMPLE_WEBFRAGMENT_SCHEMA_3_1 = lastSegment(J2EEConstants.WEBFRAGMENT_SCHEMA_3_1); + private static final String SIMPLE_WEBFRAGMENT_SCHEMA_4_0 = lastSegment(J2EEConstants.WEBFRAGMENT_SCHEMA_4_0); + private static final String SIMPLE_WEBFRAGMENT_SCHEMA_5_0 = lastSegment(J2EEConstants.WEBFRAGMENT_SCHEMA_5_0); + private static final String SIMPLE_WEBFRAGMENT_SCHEMA_6_0 = lastSegment(J2EEConstants.WEBFRAGMENT_SCHEMA_6_0); + private XMLRootHandler handler = null; @@ -179,19 +196,19 @@ version = J2EEVersionConstants.J2EE_1_2_ID; } } else if (schemaName != null) { - if (schemaName.indexOf(J2EEConstants.APP_CLIENT_SCHEMA_1_4)!= -1) { + if (schemaName.indexOf(lastSegment(J2EEConstants.APP_CLIENT_SCHEMA_1_4))!= -1) { version = J2EEVersionConstants.J2EE_1_4_ID; - } else if (schemaName.indexOf(J2EEConstants.APP_CLIENT_SCHEMA_5)!= -1) { + } else if (schemaName.indexOf(lastSegment(J2EEConstants.APP_CLIENT_SCHEMA_5))!= -1) { version = J2EEVersionConstants.JEE_5_0_ID; - } else if (schemaName.indexOf(J2EEConstants.APP_CLIENT_SCHEMA_6)!= -1) { + } else if (schemaName.indexOf(lastSegment(J2EEConstants.APP_CLIENT_SCHEMA_6))!= -1) { version = J2EEVersionConstants.JEE_6_0_ID; - } else if (schemaName.indexOf(J2EEConstants.APP_CLIENT_SCHEMA_7)!= -1) { + } else if (schemaName.indexOf(lastSegment(J2EEConstants.APP_CLIENT_SCHEMA_7))!= -1) { version = J2EEVersionConstants.JEE_7_0_ID; - } else if (schemaName.indexOf(J2EEConstants.APP_CLIENT_SCHEMA_8) != -1) { + } else if (schemaName.indexOf(lastSegment(J2EEConstants.APP_CLIENT_SCHEMA_8)) != -1) { version = J2EEVersionConstants.JEE_8_0_ID; - }else if (schemaName.indexOf(J2EEConstants.APP_CLIENT_SCHEMA_8) != -1) { - version = J2EEVersionConstants.JEE_8_0_ID; - }else if (schemaName.indexOf(J2EEConstants.APP_CLIENT_SCHEMA_10) != -1) { + }else if (schemaName.indexOf(lastSegment(J2EEConstants.APP_CLIENT_SCHEMA_9)) != -1) { + version = J2EEVersionConstants.JEE_9_0_ID; + }else if (schemaName.indexOf(lastSegment(J2EEConstants.APP_CLIENT_SCHEMA_10)) != -1) { version = J2EEVersionConstants.JEE_10_0_ID; } } @@ -208,15 +225,17 @@ } else if (schemaName != null) { if (schemaName.indexOf(J2EEConstants.APPLICATION_SCHEMA_1_4) != -1) { version = J2EEVersionConstants.J2EE_1_4_ID; - } else if (schemaName.indexOf(J2EEConstants.APPLICATION_SCHEMA_5) != -1) { + } else if (schemaName.indexOf(SIMPLE_APPLICATION_SCHEMA_5) != -1) { version = J2EEVersionConstants.JEE_5_0_ID; - } else if (schemaName.indexOf(J2EEConstants.APPLICATION_SCHEMA_6) != -1) { + } else if (schemaName.indexOf(SIMPLE_APPLICATION_SCHEMA_6) != -1) { version = J2EEVersionConstants.JEE_6_0_ID; - } else if (schemaName.indexOf(J2EEConstants.APPLICATION_SCHEMA_7) != -1){ + } else if (schemaName.indexOf(SIMPLE_APPLICATION_SCHEMA_7) != -1){ version = J2EEVersionConstants.JEE_7_0_ID; - } else if (schemaName.indexOf(J2EEConstants.APPLICATION_SCHEMA_8) != -1) { + } else if (schemaName.indexOf(SIMPLE_APPLICATION_SCHEMA_8) != -1) { version = J2EEVersionConstants.JEE_8_0_ID; - } else if (schemaName.indexOf(J2EEConstants.APPLICATION_SCHEMA_10) != -1) { + } else if (schemaName.indexOf(SIMPLE_APPLICATION_SCHEMA_9) != -1) { + version = J2EEVersionConstants.JEE_9_0_ID; + } else if (schemaName.indexOf(SIMPLE_APPLICATION_SCHEMA_10) != -1) { version = J2EEVersionConstants.JEE_10_0_ID; } } @@ -229,15 +248,15 @@ version = J2EEVersionConstants.EJB_1_1_ID; } } else if (schemaName != null) { - if (schemaName.indexOf(J2EEConstants.EJBJAR_SCHEMA_2_1) != -1) { + if (schemaName.indexOf(SIMPLE_EJBJAR_SCHEMA_2_1) != -1) { version = J2EEVersionConstants.EJB_2_1_ID; - } else if (schemaName.indexOf(J2EEConstants.EJBJAR_SCHEMA_3_0) != -1) { + } else if (schemaName.indexOf(SIMPLE_EJBJAR_SCHEMA_3_0) != -1) { version = J2EEVersionConstants.EJB_3_0_ID; - } else if (schemaName.indexOf(J2EEConstants.EJBJAR_SCHEMA_3_1) != -1) { + } else if (schemaName.indexOf(SIMPLE_EJBJAR_SCHEMA_3_1) != -1) { version = J2EEVersionConstants.EJB_3_1_ID; - } else if (schemaName.indexOf(J2EEConstants.EJBJAR_SCHEMA_3_2) != -1) { + } else if (schemaName.indexOf(SIMPLE_EJBJAR_SCHEMA_3_2) != -1) { version = J2EEVersionConstants.EJB_3_2_ID; - } else if (schemaName.indexOf(J2EEConstants.EJBJAR_SCHEMA_4_0) != -1) { + } else if (schemaName.indexOf(SIMPLE_EJBJAR_SCHEMA_4_0) != -1) { version = J2EEVersionConstants.EJB_4_0_ID; } } @@ -346,22 +365,21 @@ break; case WEBFRAGMENT_TYPE: if (schemaName != null) { - if (schemaName.indexOf(J2EEConstants.WEBFRAGMENT_SCHEMA_6_0) != -1) { + if (schemaName.indexOf(SIMPLE_WEBFRAGMENT_SCHEMA_6_0) != -1) { version = J2EEVersionConstants.WEBFRAGMENT_6_0_ID; } - else if (schemaName.indexOf(J2EEConstants.WEBFRAGMENT_SCHEMA_5_0) != -1) { + else if (schemaName.indexOf(SIMPLE_WEBFRAGMENT_SCHEMA_5_0) != -1) { version = J2EEVersionConstants.WEBFRAGMENT_5_0_ID; } - else if (schemaName.indexOf(J2EEConstants.WEBFRAGMENT_SCHEMA_4_0) != -1) { + else if (schemaName.indexOf(SIMPLE_WEBFRAGMENT_SCHEMA_4_0) != -1) { version = J2EEVersionConstants.WEBFRAGMENT_4_0_ID; } - else if (schemaName.indexOf(J2EEConstants.WEBFRAGMENT_SCHEMA_3_1) != -1) { + else if (schemaName.indexOf(SIMPLE_WEBFRAGMENT_SCHEMA_3_1) != -1) { version = J2EEVersionConstants.WEBFRAGMENT_3_1_ID; } - else if (schemaName.indexOf(J2EEConstants.WEBFRAGMENT_SCHEMA_3_0) != -1) { + else if (schemaName.indexOf(SIMPLE_WEBFRAGMENT_SCHEMA_3_0) != -1) { version = J2EEVersionConstants.WEBFRAGMENT_3_0_ID; } - } break; default: @@ -418,7 +436,7 @@ break; case J2EEVersionConstants.EJB_4_0_ID: javaEEVersion = J2EEConstants.JEE_10_0_ID; - break; + break; } break; case CONNECTOR_TYPE: @@ -490,7 +508,7 @@ break; case J2EEVersionConstants.WEBSERVICES_2_0_ID: javaEEVersion = J2EEVersionConstants.JEE_10_0_ID; - break; + break; } break;
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/util/J2EEFileUtil.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/util/J2EEFileUtil.java index 208ae3d..f0709a1 100644 --- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/util/J2EEFileUtil.java +++ b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/util/J2EEFileUtil.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2001, 2021 IBM Corporation and others. + * Copyright (c) 2001, 2023 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -320,7 +320,7 @@ version = J2EEVersionConstants.EJB_3_1_ID; } else if (versionAttr.equals(J2EEVersionConstants.VERSION_3_2_TEXT)) { version = J2EEVersionConstants.EJB_3_2_ID; - } else if (versionAttr.equals(J2EEVersionConstants.VERSION_4_0_TEXT)) { + } else if (versionAttr.equals(J2EEVersionConstants.VERSION_4_0_TEXT)) { version = J2EEVersionConstants.EJB_4_0_ID; } } else if (isApplicationClientFile(fileURI)) { @@ -394,7 +394,7 @@ } } else if (isEJBJarFile(fileURI)) { if ((schemaName.indexOf(J2EEConstants.EJBJAR_SCHEMA_4_0_NS)) != -1) { - version = J2EEVersionConstants.EJB_4_0_ID; + version = J2EEVersionConstants.EJB_4_0_ID; } else if ((schemaName.indexOf(J2EEConstants.EJBJAR_SCHEMA_3_2_NS)) != -1) { version = J2EEVersionConstants.EJB_3_2_ID; } else if ((schemaName.indexOf(J2EEConstants.EJBJAR_SCHEMA_3_1_NS)) != -1) {
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/application/internal/metadata/ApplicationPackage.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/application/internal/metadata/ApplicationPackage.java index a4f0b0d..86db903 100644 --- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/application/internal/metadata/ApplicationPackage.java +++ b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/application/internal/metadata/ApplicationPackage.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 IBM Corporation and others. + * Copyright (c) 2007, 2023 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -292,7 +292,8 @@ String eNS_URI2 = J2EEConstants.APPLICATION_SCHEMA_LOC_6; String eNS_URI3 = J2EEConstants.APPLICATION_SCHEMA_LOC_7; String eNS_URI4 = J2EEConstants.APPLICATION_SCHEMA_LOC_8; - String eNS_URI5 = J2EEConstants.APPLICATION_SCHEMA_LOC_10; + String eNS_URI5 = J2EEConstants.APPLICATION_SCHEMA_LOC_9; + String eNS_URI6 = J2EEConstants.APPLICATION_SCHEMA_LOC_10; /** * The package namespace name. * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/applicationclient/internal/impl/ApplicationclientPackageImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/applicationclient/internal/impl/ApplicationclientPackageImpl.java index d937281..4476e7c 100644 --- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/applicationclient/internal/impl/ApplicationclientPackageImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/applicationclient/internal/impl/ApplicationclientPackageImpl.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 IBM Corporation and others. + * Copyright (c) 2007, 2023 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -112,6 +112,7 @@ EPackage.Registry.INSTANCE.put(ApplicationclientPackage.eNS_URI3, theApplicationclientPackage); EPackage.Registry.INSTANCE.put(ApplicationclientPackage.eNS_URI4, theApplicationclientPackage); EPackage.Registry.INSTANCE.put(ApplicationclientPackage.eNS_URI5, theApplicationclientPackage); + EPackage.Registry.INSTANCE.put(ApplicationclientPackage.eNS_URI6, theApplicationclientPackage); J2EEInit.initEMFModels(); return theApplicationclientPackage;
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/applicationclient/internal/metadata/ApplicationclientPackage.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/applicationclient/internal/metadata/ApplicationclientPackage.java index 5e42227..141cbfc 100644 --- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/applicationclient/internal/metadata/ApplicationclientPackage.java +++ b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/applicationclient/internal/metadata/ApplicationclientPackage.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 IBM Corporation and others. + * Copyright (c) 2007, 2023 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -293,7 +293,8 @@ String eNS_URI2 = J2EEConstants.APP_CLIENT_SCHEMA_LOC_6; String eNS_URI3 = J2EEConstants.APP_CLIENT_SCHEMA_LOC_7; String eNS_URI4 = J2EEConstants.APP_CLIENT_SCHEMA_LOC_8; - String eNS_URI5 = J2EEConstants.APP_CLIENT_SCHEMA_LOC_10; + String eNS_URI5 = J2EEConstants.APP_CLIENT_SCHEMA_LOC_9; + String eNS_URI6 = J2EEConstants.APP_CLIENT_SCHEMA_LOC_10; /** * The package namespace name. * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/JavaeePackageImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/JavaeePackageImpl.java index 30f7706..762e3e2 100644 --- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/JavaeePackageImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/JavaeePackageImpl.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 IBM Corporation and others. + * Copyright (c) 2007, 2023 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -694,12 +694,11 @@ // Mark meta-data to indicate it can't be changed theJavaeePackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(JavaeePackage.eNS_URI, theJavaeePackage); EPackage.Registry.INSTANCE.put(JavaeePackage.eNS_URI2, theJavaeePackage); EPackage.Registry.INSTANCE.put(JavaeePackage.eNS_URI3, theJavaeePackage); - + J2EEInit.initEMFModels(); return theJavaeePackage; }
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/metadata/JavaeePackage.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/metadata/JavaeePackage.java index 4c68db6..eb00494 100644 --- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/metadata/JavaeePackage.java +++ b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/metadata/JavaeePackage.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 IBM Corporation and others. + * Copyright (c) 2007, 2023 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/util/JavaEEExtendedMetaData.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/util/JavaEEExtendedMetaData.java index c344ab6..f4786c6 100644 --- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/util/JavaEEExtendedMetaData.java +++ b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/util/JavaEEExtendedMetaData.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2013 IBM Corporation and others. + * Copyright (c) 2013, 2023 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -95,22 +95,30 @@ if (a != null) { version = a.getVersion(); - if(J2EEVersionConstants.VERSION_5_TEXT.equals(version)) { - uri = J2EEConstants.APPLICATION_SCHEMA_LOC_5; - javaeeUri = J2EEConstants.JAVAEE_NS_URL; + if(J2EEVersionConstants.VERSION_10_TEXT.equals(version)) { + uri = J2EEConstants.APPLICATION_SCHEMA_LOC_10; + javaeeUri = J2EEConstants.JAKARTAEE10_NS_URL; + } + else if(J2EEVersionConstants.VERSION_9_TEXT.equals(version)) { + uri = J2EEConstants.APPLICATION_SCHEMA_LOC_9; + javaeeUri = J2EEConstants.JAKARTAEE9_NS_URL; + } + else if(J2EEVersionConstants.VERSION_8_TEXT.equals(version)) { + uri = J2EEConstants.APPLICATION_SCHEMA_LOC_8; + javaeeUri = J2EEConstants.JAVAEE7_NS_URL; + } + else if(J2EEVersionConstants.VERSION_7_TEXT.equals(version)) { + uri = J2EEConstants.APPLICATION_SCHEMA_LOC_7; + javaeeUri = J2EEConstants.JAVAEE7_NS_URL; } else if(J2EEVersionConstants.VERSION_6_TEXT.equals(version)) { uri = J2EEConstants.APPLICATION_SCHEMA_LOC_6; javaeeUri = J2EEConstants.JAVAEE_NS_URL; } - else if(J2EEVersionConstants.VERSION_7_TEXT.equals(version)) { - uri = J2EEConstants.APPLICATION_SCHEMA_LOC_7; - javaeeUri = J2EEConstants.JAVAEE7_NS_URL; + else if(J2EEVersionConstants.VERSION_5_TEXT.equals(version)) { + uri = J2EEConstants.APPLICATION_SCHEMA_LOC_5; + javaeeUri = J2EEConstants.JAVAEE_NS_URL; } - else if(J2EEVersionConstants.VERSION_10_TEXT.equals(version)) { - uri = J2EEConstants.APPLICATION_SCHEMA_LOC_10; - javaeeUri = J2EEConstants.JAKARTAEE10_NS_URL; - } else { uri = J2EEConstants.APPLICATION_SCHEMA_LOC_8; javaeeUri = J2EEConstants.JAVAEE7_NS_URL; @@ -205,29 +213,33 @@ { WebAppVersionType wavt = wa.getVersion(); version = wavt.getLiteral(); - if(J2EEVersionConstants.VERSION_2_5_TEXT.equals(version)) { - uri = J2EEConstants.WEB_APP_SCHEMA_LOC_2_5; - javaeeUri = J2EEConstants.JAVAEE_NS_URL; - } - else if(J2EEVersionConstants.VERSION_3_0_TEXT.equals(version)) { - uri = J2EEConstants.WEB_APP_SCHEMA_LOC_3_0; - javaeeUri = J2EEConstants.JAVAEE_NS_URL; + if(J2EEVersionConstants.VERSION_6_0_TEXT.equals(version)) { + uri = J2EEConstants.WEB_APP_SCHEMA_LOC_6_0; + javaeeUri = J2EEConstants.JAKARTAEE10_NS_URL; + } + else if(J2EEVersionConstants.VERSION_5_0_TEXT.equals(version)) { + uri = J2EEConstants.WEB_APP_SCHEMA_LOC_5_0; + javaeeUri = J2EEConstants.JAKARTAEE9_NS_URL; + } + else if(J2EEVersionConstants.VERSION_4_0_TEXT.equals(version)) { + uri = J2EEConstants.WEB_APP_SCHEMA_LOC_4_0; + javaeeUri = J2EEConstants.JAVAEE7_NS_URL; } else if(J2EEVersionConstants.VERSION_3_1_TEXT.equals(version)) { uri = J2EEConstants.WEB_APP_SCHEMA_LOC_3_1; javaeeUri = J2EEConstants.JAVAEE7_NS_URL; } - else if(J2EEVersionConstants.VERSION_5_0_TEXT.equals(version)) { - uri = J2EEConstants.WEB_APP_SCHEMA_LOC_5_0; - javaeeUri = J2EEConstants.JAKARTAEE9_NS_URL; - } - else if(J2EEVersionConstants.VERSION_6_0_TEXT.equals(version)) { + else if(J2EEVersionConstants.VERSION_3_0_TEXT.equals(version)) { + uri = J2EEConstants.WEB_APP_SCHEMA_LOC_3_0; + javaeeUri = J2EEConstants.JAVAEE_NS_URL; + } + else if(J2EEVersionConstants.VERSION_2_5_TEXT.equals(version)) { + uri = J2EEConstants.WEB_APP_SCHEMA_LOC_2_5; + javaeeUri = J2EEConstants.JAVAEE_NS_URL; + } + else { uri = J2EEConstants.WEB_APP_SCHEMA_LOC_6_0; javaeeUri = J2EEConstants.JAKARTAEE10_NS_URL; - } - else { - uri = J2EEConstants.WEB_APP_SCHEMA_LOC_4_0; - javaeeUri = J2EEConstants.JAVAEE7_NS_URL; } // release the resource to make sure there is no memory leak resource = null; @@ -240,26 +252,30 @@ { WebAppVersionType wavt = wf.getVersion(); version = wavt.getLiteral(); - if(J2EEVersionConstants.VERSION_3_0_TEXT.equals(version)) { - uri = J2EEConstants.WEBFRAGMENT_SCHEMA_LOC_3_0; - javaeeUri = J2EEConstants.JAVAEE_NS_URL; + if(J2EEVersionConstants.VERSION_6_0_TEXT.equals(version)) { + uri = J2EEConstants.WEBFRAGMENT_SCHEMA_LOC_6_0; + javaeeUri = J2EEConstants.JAKARTAEE10_NS_URL; + } + else if(J2EEVersionConstants.VERSION_5_0_TEXT.equals(version)) { + uri = J2EEConstants.WEBFRAGMENT_SCHEMA_LOC_5_0; + javaeeUri = J2EEConstants.JAKARTAEE9_NS_URL; + } + else if(J2EEVersionConstants.VERSION_4_0_TEXT.equals(version)) { + uri = J2EEConstants.WEBFRAGMENT_SCHEMA_LOC_4_0; + javaeeUri = J2EEConstants.JAVAEE7_NS_URL; } else if(J2EEVersionConstants.VERSION_3_1_TEXT.equals(version)) { uri = J2EEConstants.WEBFRAGMENT_SCHEMA_LOC_3_1; javaeeUri = J2EEConstants.JAVAEE7_NS_URL; } - else if(J2EEVersionConstants.VERSION_5_0_TEXT.equals(version)) { - uri = J2EEConstants.WEBFRAGMENT_SCHEMA_LOC_5_0; - javaeeUri = J2EEConstants.JAKARTAEE9_NS_URL; - } - else if(J2EEVersionConstants.VERSION_6_0_TEXT.equals(version)) { - uri = J2EEConstants.WEBFRAGMENT_SCHEMA_LOC_6_0; - javaeeUri = J2EEConstants.JAKARTAEE10_NS_URL; - } + else if(J2EEVersionConstants.VERSION_3_0_TEXT.equals(version)) { + uri = J2EEConstants.WEBFRAGMENT_SCHEMA_LOC_3_0; + javaeeUri = J2EEConstants.JAVAEE_NS_URL; + } else { - uri = J2EEConstants.WEBFRAGMENT_SCHEMA_LOC_4_0; - javaeeUri = J2EEConstants.JAVAEE7_NS_URL; + uri = J2EEConstants.WEBFRAGMENT_SCHEMA_LOC_6_0; + javaeeUri = J2EEConstants.JAKARTAEE10_NS_URL; } // release the resource to make sure there is no memory leak resource = null;
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/EjbPackageImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/EjbPackageImpl.java index 2fdf453..e7bfc99 100644 --- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/EjbPackageImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/EjbPackageImpl.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 IBM Corporation and others. + * Copyright (c) 2007, 2023 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/metadata/EjbPackage.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/metadata/EjbPackage.java index 1a49830..abaa6f2 100644 --- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/metadata/EjbPackage.java +++ b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/metadata/EjbPackage.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 IBM Corporation and others. + * Copyright (c) 2007, 2023 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/util/EjbXMLHelperImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/util/EjbXMLHelperImpl.java index 7424197..ed1618e 100644 --- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/util/EjbXMLHelperImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/util/EjbXMLHelperImpl.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2007 IBM Corporation and others. + * Copyright (c) 2005, 2023 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/jca/internal/impl/JcaPackageImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/jca/internal/impl/JcaPackageImpl.java index aa10468..72f5961 100644 --- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/jca/internal/impl/JcaPackageImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/jca/internal/impl/JcaPackageImpl.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009 IBM Corporation and others. + * Copyright (c) 2009, 2023 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/jca/internal/metadata/JcaPackage.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/jca/internal/metadata/JcaPackage.java index 88f49bc..1d898e7 100644 --- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/jca/internal/metadata/JcaPackage.java +++ b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/jca/internal/metadata/JcaPackage.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009 IBM Corporation and others. + * Copyright (c) 2009, 2023 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/WebPackageImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/WebPackageImpl.java index c49ae08..fd45b38 100644 --- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/WebPackageImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/WebPackageImpl.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 IBM Corporation and others. + * Copyright (c) 2007, 2023 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/metadata/WebPackage.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/metadata/WebPackage.java index 150b39a..59b8cb1 100644 --- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/metadata/WebPackage.java +++ b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/metadata/WebPackage.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2022 IBM Corporation and others. + * Copyright (c) 2007, 2023 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/webfragment/internal/impl/WebfragmentPackageImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/webfragment/internal/impl/WebfragmentPackageImpl.java index fcdfda7..0d8cf1f 100644 --- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/webfragment/internal/impl/WebfragmentPackageImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/webfragment/internal/impl/WebfragmentPackageImpl.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009 IBM Corporation and others. + * Copyright (c) 2009 ,2023 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -102,7 +102,6 @@ EPackage.Registry.INSTANCE.put(WebfragmentPackage.eNS_URI3, theWebfragmentPackage); EPackage.Registry.INSTANCE.put(WebfragmentPackage.eNS_URI4, theWebfragmentPackage); EPackage.Registry.INSTANCE.put(WebfragmentPackage.eNS_URI5, theWebfragmentPackage); - J2EEInit.initEMFModels(); return theWebfragmentPackage;
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/webfragment/internal/metadata/WebfragmentPackage.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/webfragment/internal/metadata/WebfragmentPackage.java index bc85b47..78b62ec 100644 --- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/webfragment/internal/metadata/WebfragmentPackage.java +++ b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/webfragment/internal/metadata/WebfragmentPackage.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009 IBM Corporation and others. + * Copyright (c) 2009, 2023 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/EJBResourceImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/EJBResourceImpl.java index de0a8e8..813410b 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/EJBResourceImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/ejb/internal/impl/EJBResourceImpl.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2001, 2006 IBM Corporation and others. + * Copyright (c) 2001, 2023 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -160,7 +160,7 @@ case J2EEVersionConstants.EJB_3_2_ID : return J2EEVersionConstants.JEE_7_0_ID; case J2EEVersionConstants.EJB_4_0_ID : - return J2EEVersionConstants.JEE_10_0_ID; + return J2EEVersionConstants.JEE_10_0_ID; default : return J2EEVersionConstants.J2EE_1_4_ID; } @@ -184,10 +184,10 @@ public void setModuleVersionID(int id) { super.setVersionID(id); switch (id) { - case (EJB_4_0_ID) : - super.setDoctypeValues(null, null); - primSetVersionID(EJB_4_0_ID); - break; + case (EJB_4_0_ID) : + super.setDoctypeValues(null, null); + primSetVersionID(EJB_4_0_ID); + break; case (EJB_3_2_ID) : super.setDoctypeValues(null, null); primSetVersionID(EJB_3_2_ID); @@ -212,7 +212,6 @@ break; case (EJB_1_0_ID) : super.setDoctypeValues(getJ2EE_1_2_PublicID(), getJ2EE_1_2_SystemID()); - } syncVersionOfRootObject(); } @@ -226,6 +225,7 @@ primSetDoctypeValues(null, null); primSetVersionID(EJB_4_0_ID); break; + case (JEE_9_0_ID) : case (JEE_8_0_ID) : case (JEE_7_0_ID) : primSetDoctypeValues(null, null);
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/J2EEConstants.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/J2EEConstants.java index 4704e54..419aaa2 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/J2EEConstants.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/J2EEConstants.java
@@ -55,6 +55,7 @@ String APP_CLIENT_SCHEMA_6 = "http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/application-client_6.xsd"; //$NON-NLS-1$ String APP_CLIENT_SCHEMA_7 = "http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/application-client_7.xsd"; //$NON-NLS-1$ String APP_CLIENT_SCHEMA_8 = "http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/application-client_8.xsd"; //$NON-NLS-1$ + String APP_CLIENT_SCHEMA_9 = "https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/application-client_9.xsd"; //$NON-NLS-1$ String APP_CLIENT_SCHEMA_10 = "https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/application-client_10.xsd"; //$NON-NLS-1$ //Application constants @@ -83,6 +84,7 @@ String APPLICATION_SCHEMA_6 = "http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/application_6.xsd"; //$NON-NLS-1$ String APPLICATION_SCHEMA_7 = "http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/application_7.xsd"; //$NON-NLS-1$ String APPLICATION_SCHEMA_8 = "http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/application_8.xsd"; //$NON-NLS-1$ + String APPLICATION_SCHEMA_9 = "http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/application_9.xsd"; //$NON-NLS-1$ String APPLICATION_SCHEMA_10 = "https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/application_10.xsd"; //$NON-NLS-1$ //EJB Jar Constants @@ -111,11 +113,9 @@ String EJBJAR_SCHEMA_3_1_NS = "http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd"; //$NON-NLS-1$ String EJBJAR_SCHEMA_3_2 = "http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/ejb-jar_3_2.xsd"; //$NON-NLS-1$ String EJBJAR_SCHEMA_3_2_NS = "http://xmlns.jcp.org/xml/ns/javaee/ejb-jar_3_2.xsd"; //$NON-NLS-1$ - String EJBJAR_SCHEMA_4_0 = "https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/ejb-jar_4_0.xsd"; //$NON-NLS-1$ - String EJBJAR_SCHEMA_4_0_NS = "https://jakarta.ee/xml/ns/jakartaee/ejb-jar_4_0.xsd"; //$NON-NLS-1$ - - - + String EJBJAR_SCHEMA_4_0 = "https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/ejb-jar_4_0.xsd"; //$NON-NLS-1$ + String EJBJAR_SCHEMA_4_0_NS = "https://jakarta.ee/xml/ns/jakartaee/ejb-jar_4_0.xsd"; //$NON-NLS-1$ + // EAR constants String EAR_ROOT_DIR = "/"; //$NON-NLS-1$ @@ -213,7 +213,7 @@ String WEBSERVICE_SCHEMA_2_0 = "https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/jakartaee_web_services_2_0.xsd";//$NON-NLS-1$ String WEBSERVICE_SCHEMA_LOC_2_0 = "https://jakarta.ee/xml/ns/jakartaee/jakartaee_web_services_2_0.xsd";//$NON-NLS-1$ - + //Miscellaneous constants /** "UTF-8" */ String DEFAULT_XML_ENCODING = "UTF-8"; //$NON-NLS-1$ @@ -236,12 +236,14 @@ String APPLICATION_SCHEMA_LOC_6 = "http://java.sun.com/xml/ns/javaee/application_6.xsd"; //$NON-NLS-1$ String APPLICATION_SCHEMA_LOC_7 = "http://xmlns.jcp.org/xml/ns/javaee/application_7.xsd"; //$NON-NLS-1$ String APPLICATION_SCHEMA_LOC_8 = "http://xmlns.jcp.org/xml/ns/javaee/application_8.xsd"; //$NON-NLS-1$ + String APPLICATION_SCHEMA_LOC_9 = "https://jakarta.ee/xml/ns/jakartaee/application_9.xsd"; //$NON-NLS-1$ String APPLICATION_SCHEMA_LOC_10 = "https://jakarta.ee/xml/ns/jakartaee/application_10.xsd"; //$NON-NLS-1$ String APP_CLIENT_SCHEMA_LOC_1_4 = "http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd"; //$NON-NLS-1$ String APP_CLIENT_SCHEMA_LOC_5 = "http://java.sun.com/xml/ns/javaee/application-client_5.xsd"; //$NON-NLS-1$ String APP_CLIENT_SCHEMA_LOC_6 = "http://java.sun.com/xml/ns/javaee/application-client_6.xsd"; //$NON-NLS-1$ String APP_CLIENT_SCHEMA_LOC_7 = "http://xmlns.jcp.org/xml/ns/javaee/application-client_7.xsd"; //$NON-NLS-1$ String APP_CLIENT_SCHEMA_LOC_8 = "http://xmlns.jcp.org/xml/ns/javaee/application-client_8.xsd"; //$NON-NLS-1$ + String APP_CLIENT_SCHEMA_LOC_9 = "https://jakarta.ee/xml/ns/jakartaee/application-client_9.xsd"; //$NON-NLS-1$ String APP_CLIENT_SCHEMA_LOC_10 = "https://jakarta.ee/xml/ns/jakartaee/application-client_10.xsd"; //$NON-NLS-1$ String EJB_JAR_SCHEMA_LOC_2_1 = "http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd"; //$NON-NLS-1$ String EJB_JAR_SCHEMA_LOC_3_0 = "http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd"; //$NON-NLS-1$ @@ -252,7 +254,7 @@ String CONNECTOR_SCHEMA_LOC_1_6 = "http://java.sun.com/xml/ns/javaee/connector_1_6.xsd"; //$NON-NLS-1$ String CONNECTOR_SCHEMA_LOC_1_7 = "http://xmlns.jcp.org/xml/ns/javaee/connector_1_7.xsd"; //$NON-NLS-1$ String CONNECTOR_SCHEMA_LOC_2_1 = "https://jakarta.ee/xml/ns/jakartaee/connector_2_1.xsd"; //$NON-NLS-1$ - + String WEB_APP_SCHEMA_LOC_2_4 = "http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"; //$NON-NLS-1$ String WEB_APP_SCHEMA_LOC_2_5 = "http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"; //$NON-NLS-1$ String WEB_APP_SCHEMA_LOC_3_0 = "http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"; //$NON-NLS-1$
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee.ejb/META-INF/MANIFEST.MF index 72f7967..854daf3 100644 --- a/plugins/org.eclipse.jst.j2ee.ejb/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.jst.j2ee.ejb/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.eclipse.jst.j2ee.ejb; singleton:=true -Bundle-Version: 1.1.902.qualifier +Bundle-Version: 1.1.1000.qualifier Bundle-Activator: org.eclipse.jst.j2ee.ejb.internal.plugin.EjbPlugin Bundle-Vendor: %Bundle-Vendor.0 Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/AddEjbTimerTemplateModel.java b/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/AddEjbTimerTemplateModel.java index 5e50497..53aa79c 100644 --- a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/AddEjbTimerTemplateModel.java +++ b/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/AddEjbTimerTemplateModel.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011, 2014 Oracle and others. + * Copyright (c) 2011, 2023 Oracle and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/CreateEnterpriseBeanTemplateModel.java b/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/CreateEnterpriseBeanTemplateModel.java index 46c8129..22682b8 100644 --- a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/CreateEnterpriseBeanTemplateModel.java +++ b/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/CreateEnterpriseBeanTemplateModel.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008 SAP AG and others. + * Copyright (c) 2008, 2023 SAP AG and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -40,7 +40,7 @@ else throw new IllegalStateException("illegal transaction type: " + transactionType); //$NON-NLS-1$ } - + public String convertToJakartaPackage(String qualifiedName) { if (dataModel.getBooleanProperty(USE_JAKARTA_PACKAGENAME)) { return qualifiedName.replace(CreateEnterpriseBeanTemplateModel.JAVAX, CreateEnterpriseBeanTemplateModel.JAKARTA);
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/CreateMessageDrivenBeanTemplateModel.java b/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/CreateMessageDrivenBeanTemplateModel.java index 173c753..104b46e 100644 --- a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/CreateMessageDrivenBeanTemplateModel.java +++ b/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/CreateMessageDrivenBeanTemplateModel.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008 SAP AG and others. + * Copyright (c) 2008, 2023 SAP AG and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/CreateSessionBeanTemplateModel.java b/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/CreateSessionBeanTemplateModel.java index bd5f535..fd02a7c 100644 --- a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/CreateSessionBeanTemplateModel.java +++ b/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/CreateSessionBeanTemplateModel.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2014 SAP AG and others. + * Copyright (c) 2007, 2023 SAP AG and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/INewEnterpriseBeanClassDataModelProperties.java b/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/INewEnterpriseBeanClassDataModelProperties.java index 0001afd..97f286a 100644 --- a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/INewEnterpriseBeanClassDataModelProperties.java +++ b/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/INewEnterpriseBeanClassDataModelProperties.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2008 SAP AG and others. + * Copyright (c) 2007, 2023 SAP AG and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/LocalBusinessInterfaceTemplate.java b/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/LocalBusinessInterfaceTemplate.java index 8ef1107..c7ba709 100644 --- a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/LocalBusinessInterfaceTemplate.java +++ b/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/LocalBusinessInterfaceTemplate.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2012 SAP AG and others. + * Copyright (c) 2007, 2023 SAP AG and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/LocalComponentInterfaceTemplate.java b/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/LocalComponentInterfaceTemplate.java index 607e900..a4a471b 100644 --- a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/LocalComponentInterfaceTemplate.java +++ b/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/LocalComponentInterfaceTemplate.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2012 SAP AG and others. + * Copyright (c) 2007, 2023 SAP AG and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/NewEnterpriseBeanClassDataModelProvider.java b/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/NewEnterpriseBeanClassDataModelProvider.java index 6af161b..e465935 100644 --- a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/NewEnterpriseBeanClassDataModelProvider.java +++ b/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/NewEnterpriseBeanClassDataModelProvider.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2014 SAP AG and others. + * Copyright (c) 2008, 2023 SAP AG and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -237,7 +237,6 @@ return retVal; } - protected boolean ejb4xOrLater() { boolean retVal = false; IProject project = getTargetProject(); @@ -272,5 +271,4 @@ } return retVal; } - }
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/NewMessageDrivenBeanClassDataModelProvider.java b/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/NewMessageDrivenBeanClassDataModelProvider.java index b559abe..d6daf72 100644 --- a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/NewMessageDrivenBeanClassDataModelProvider.java +++ b/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/NewMessageDrivenBeanClassDataModelProvider.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008 SAP AG and others. + * Copyright (c) 2008, 2023 SAP AG and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -34,7 +34,7 @@ public static final String QUALIFIED_JMS_MESSAGELISTENER = "javax.jms.MessageListener"; //$NON-NLS-1$ public static final String QUALIFIED_JMS_MESSAGELISTENER_JAKARTA = "jakarta.jms.MessageListener"; //$NON-NLS-1$ - + @Override public IDataModelOperation getDefaultOperation() { return new AddMessageDrivenBeanOperation(getDataModel()); @@ -76,7 +76,7 @@ if(ejb4xOrLater()) { list.add(QUALIFIED_JMS_MESSAGELISTENER_JAKARTA); }else { - list.add(QUALIFIED_JMS_MESSAGELISTENER); + list.add(QUALIFIED_JMS_MESSAGELISTENER); } return list; } else if (propertyName.equals(SUPERCLASS)) {
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/RemoteBusinessInterfaceTemplate.java b/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/RemoteBusinessInterfaceTemplate.java index c055f5e..dd32e08 100644 --- a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/RemoteBusinessInterfaceTemplate.java +++ b/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/RemoteBusinessInterfaceTemplate.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2012 SAP AG and others. + * Copyright (c) 2007, 2023 SAP AG and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/RemoteComponentInterfaceTemplate.java b/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/RemoteComponentInterfaceTemplate.java index d53ea1a..7946373 100644 --- a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/RemoteComponentInterfaceTemplate.java +++ b/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/RemoteComponentInterfaceTemplate.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2012 SAP AG and others. + * Copyright (c) 2007, 2023 SAP AG and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/RemoteHomeInterfaceTemplate.java b/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/RemoteHomeInterfaceTemplate.java index 8d50d6d..657b701 100644 --- a/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/RemoteHomeInterfaceTemplate.java +++ b/plugins/org.eclipse.jst.j2ee.ejb/ejb/org/eclipse/jst/j2ee/ejb/internal/operations/RemoteHomeInterfaceTemplate.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2011 SAP AG and others. + * Copyright (c) 2007, 2023 SAP AG and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/ejb/project/facet/EjbFacetInstallDelegate.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/ejb/project/facet/EjbFacetInstallDelegate.java index d6f1ae2..d7a70da 100644 --- a/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/ejb/project/facet/EjbFacetInstallDelegate.java +++ b/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/ejb/project/facet/EjbFacetInstallDelegate.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2011 IBM Corporation and others. + * Copyright (c) 2005, 2023 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/plugin.xml b/plugins/org.eclipse.jst.j2ee.ejb/plugin.xml index 2cbb80b..670d8d1 100644 --- a/plugins/org.eclipse.jst.j2ee.ejb/plugin.xml +++ b/plugins/org.eclipse.jst.j2ee.ejb/plugin.xml
@@ -209,14 +209,14 @@ </project-facet-version> <project-facet-version facet="jst.ejb" version="4.0"> - <constraint> - <and> - <requires facet="jst.java" version="[11"/> - <conflicts group="modules"/> - </and> - </constraint> - <group-member id="modules"/> - </project-facet-version> + <constraint> + <and> + <requires facet="jst.java" version="[11"/> + <conflicts group="modules"/> + </and> + </constraint> + <group-member id="modules"/> + </project-facet-version> <action facet="jst.ejb" type="INSTALL" id="jst.ejb.install"> <delegate class="org.eclipse.jst.j2ee.ejb.project.facet.EjbFacetInstallDelegate"/>
diff --git a/plugins/org.eclipse.jst.j2ee.ejb/pom.xml b/plugins/org.eclipse.jst.j2ee.ejb/pom.xml index 56eba7b..d079379 100644 --- a/plugins/org.eclipse.jst.j2ee.ejb/pom.xml +++ b/plugins/org.eclipse.jst.j2ee.ejb/pom.xml
@@ -21,6 +21,6 @@ <groupId>org.eclipse.webtools.ejb</groupId> <artifactId>org.eclipse.jst.j2ee.ejb</artifactId> - <version>1.1.902-SNAPSHOT</version> + <version>1.1.1000-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee.jca.ui/META-INF/MANIFEST.MF index 29b9231..94fb750 100644 --- a/plugins/org.eclipse.jst.j2ee.jca.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.jst.j2ee.jca.ui/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Automatic-Module-Name: org.eclipse.jst.j2ee.jca.ui Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.jst.j2ee.jca.ui; singleton:=true -Bundle-Version: 1.1.602.qualifier +Bundle-Version: 1.1.700.qualifier Bundle-Activator: org.eclipse.jst.j2ee.jca.ui.internal.plugin.JCAUIPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/ConnectorProjectFirstPage.java b/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/ConnectorProjectFirstPage.java index 0265969..479bdd3 100644 --- a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/ConnectorProjectFirstPage.java +++ b/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/ConnectorProjectFirstPage.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2007 IBM Corporation and others. + * Copyright (c) 2005, 2023 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -55,7 +55,7 @@ if( primaryFacetVersion == IJ2EEFacetConstants.JCA_21) { facets.add(JavaFacet.VERSION_11); - } + } else if( primaryFacetVersion == IJ2EEFacetConstants.JCA_17) { facets.add(JavaFacet.VERSION_1_7);
diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/pom.xml b/plugins/org.eclipse.jst.j2ee.jca.ui/pom.xml index 74d23f6..a62cb1b 100644 --- a/plugins/org.eclipse.jst.j2ee.jca.ui/pom.xml +++ b/plugins/org.eclipse.jst.j2ee.jca.ui/pom.xml
@@ -21,6 +21,6 @@ <groupId>org.eclipse.webtools.javaee</groupId> <artifactId>org.eclipse.jst.j2ee.jca.ui</artifactId> - <version>1.1.602-SNAPSHOT</version> + <version>1.1.700-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
diff --git a/plugins/org.eclipse.jst.j2ee.jca/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee.jca/META-INF/MANIFEST.MF index e2a60ac..b458c7f 100644 --- a/plugins/org.eclipse.jst.j2ee.jca/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.jst.j2ee.jca/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.jst.j2ee.jca; singleton:=true -Bundle-Version: 1.1.1001.qualifier +Bundle-Version: 1.1.1100.qualifier Bundle-Activator: org.eclipse.jst.j2ee.jca.internal.plugin.JcaPlugin Bundle-Vendor: %pluginVendor Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/internal/jca/project/facet/ConnectorFacetInstallDataModelProvider.java b/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/internal/jca/project/facet/ConnectorFacetInstallDataModelProvider.java index 97d5dd0..4ab70f1 100644 --- a/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/internal/jca/project/facet/ConnectorFacetInstallDataModelProvider.java +++ b/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/internal/jca/project/facet/ConnectorFacetInstallDataModelProvider.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2007 IBM Corporation and others. + * Copyright (c) 2005, 2023 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/project/facet/ConnectorFacetInstallDelegate.java b/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/project/facet/ConnectorFacetInstallDelegate.java index fade953..4a38e62 100644 --- a/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/project/facet/ConnectorFacetInstallDelegate.java +++ b/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/project/facet/ConnectorFacetInstallDelegate.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2011 IBM Corporation and others. + * Copyright (c) 2005, 2023 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -126,7 +126,7 @@ } } } - } + } else if( fv == IJ2EEFacetConstants.JCA_17) { if(model.getBooleanProperty(IJ2EEFacetInstallDataModelProperties.GENERATE_DD)){
diff --git a/plugins/org.eclipse.jst.j2ee.jca/pom.xml b/plugins/org.eclipse.jst.j2ee.jca/pom.xml index b7dd4c9..6dcdf36 100644 --- a/plugins/org.eclipse.jst.j2ee.jca/pom.xml +++ b/plugins/org.eclipse.jst.j2ee.jca/pom.xml
@@ -21,6 +21,6 @@ <groupId>org.eclipse.webtools.javaee</groupId> <artifactId>org.eclipse.jst.j2ee.jca</artifactId> - <version>1.1.1001-SNAPSHOT</version> + <version>1.1.1100-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/appclient/AppClientProjectFirstPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/appclient/AppClientProjectFirstPage.java index d4984f8..4a2e7c0 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/appclient/AppClientProjectFirstPage.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/appclient/AppClientProjectFirstPage.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2017 IBM Corporation and others. + * Copyright (c) 2005, 2023 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at
diff --git a/plugins/org.eclipse.jst.j2ee.web/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee.web/META-INF/MANIFEST.MF index 9a95202..fbafc4e 100644 --- a/plugins/org.eclipse.jst.j2ee.web/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.jst.j2ee.web/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Web Plug-in Bundle-SymbolicName: org.eclipse.jst.j2ee.web; singleton:=true -Bundle-Version: 1.2.201.qualifier +Bundle-Version: 1.2.300.qualifier Bundle-Activator: org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin Bundle-Vendor: Eclipse.org Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.jst.j2ee.web/pom.xml b/plugins/org.eclipse.jst.j2ee.web/pom.xml index ba6075f..15628d1 100644 --- a/plugins/org.eclipse.jst.j2ee.web/pom.xml +++ b/plugins/org.eclipse.jst.j2ee.web/pom.xml
@@ -21,6 +21,6 @@ <groupId>org.eclipse.webtools.javaee</groupId> <artifactId>org.eclipse.jst.j2ee.web</artifactId> - <version>1.2.201-SNAPSHOT</version> + <version>1.2.300-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetInstallDataModelProvider.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetInstallDataModelProvider.java index 2c13347..030bc38 100644 --- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetInstallDataModelProvider.java +++ b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetInstallDataModelProvider.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2003, 2021 IBM Corporation and others. + * Copyright (c) 2003, 2023 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -97,24 +97,24 @@ return projectName + IJ2EEModuleConstants.WAR_EXT; } else if (propertyName.equals(GENERATE_DD)) { String facetVersion = getStringProperty(FACET_VERSION_STR); - if(J2EEVersionConstants.VERSION_2_5_TEXT.equals(facetVersion)) { - return Boolean.valueOf(J2EEPlugin.getDefault().getJ2EEPreferences().getBoolean(J2EEPreferences.Keys.DYNAMIC_WEB_GENERATE_DD)); - } - else if(J2EEVersionConstants.VERSION_3_0_TEXT.equals(facetVersion)) { - return Boolean.valueOf(J2EEPlugin.getDefault().getJ2EEPreferences().getBoolean(J2EEPreferences.Keys.EE6_DYNAMIC_WEB_GENERATE_DD)); - } - else if(J2EEVersionConstants.VERSION_3_1_TEXT.equals(facetVersion)) { - return Boolean.valueOf(J2EEPlugin.getDefault().getJ2EEPreferences().getBoolean(J2EEPreferences.Keys.EE7_DYNAMIC_WEB_GENERATE_DD)); + if(J2EEVersionConstants.VERSION_6_0_TEXT.equals(facetVersion)) { + return Boolean.valueOf(J2EEPlugin.getDefault().getJ2EEPreferences().getBoolean(J2EEPreferences.Keys.EE10_DYNAMIC_WEB_GENERATE_DD)); + } + else if(J2EEVersionConstants.VERSION_5_0_TEXT.equals(facetVersion)) { + return Boolean.valueOf(J2EEPlugin.getDefault().getJ2EEPreferences().getBoolean(J2EEPreferences.Keys.EE9_DYNAMIC_WEB_GENERATE_DD)); } else if(J2EEVersionConstants.VERSION_4_0_TEXT.equals(facetVersion)) { return Boolean.valueOf(J2EEPlugin.getDefault().getJ2EEPreferences().getBoolean(J2EEPreferences.Keys.EE8_DYNAMIC_WEB_GENERATE_DD)); } - else if(J2EEVersionConstants.VERSION_5_0_TEXT.equals(facetVersion)) { - return Boolean.valueOf(J2EEPlugin.getDefault().getJ2EEPreferences().getBoolean(J2EEPreferences.Keys.EE9_DYNAMIC_WEB_GENERATE_DD)); + else if(J2EEVersionConstants.VERSION_3_1_TEXT.equals(facetVersion)) { + return Boolean.valueOf(J2EEPlugin.getDefault().getJ2EEPreferences().getBoolean(J2EEPreferences.Keys.EE7_DYNAMIC_WEB_GENERATE_DD)); } - else if(J2EEVersionConstants.VERSION_6_0_TEXT.equals(facetVersion)) { - return Boolean.valueOf(J2EEPlugin.getDefault().getJ2EEPreferences().getBoolean(J2EEPreferences.Keys.EE10_DYNAMIC_WEB_GENERATE_DD)); - } + else if(J2EEVersionConstants.VERSION_3_0_TEXT.equals(facetVersion)) { + return Boolean.valueOf(J2EEPlugin.getDefault().getJ2EEPreferences().getBoolean(J2EEPreferences.Keys.EE6_DYNAMIC_WEB_GENERATE_DD)); + } + else if(J2EEVersionConstants.VERSION_2_5_TEXT.equals(facetVersion)) { + return Boolean.valueOf(J2EEPlugin.getDefault().getJ2EEPreferences().getBoolean(J2EEPreferences.Keys.DYNAMIC_WEB_GENERATE_DD)); + } return Boolean.TRUE; }else if (propertyName.equals(INSTALL_WEB_LIBRARY)){ return J2EEComponentClasspathContainerUtils.getDefaultUseWebAppLibraries();
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFragmentFacetInstallDelegate.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFragmentFacetInstallDelegate.java index 680de64..c219ca9 100644 --- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFragmentFacetInstallDelegate.java +++ b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFragmentFacetInstallDelegate.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010, 2011 IBM Corporation and others. + * Copyright (c) 2010, 2023 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -131,13 +131,13 @@ } else if (fv == IJ2EEFacetConstants.WEBFRAGMENT_50) { webFragXmlContents = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<web-fragment id=\"WebFragment_ID\" version=\"5.0\" xmlns=\"https://jakarta.ee/xml/ns/jakartaee\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-fragment_5_0.xsd\">\n<display-name>" + XMLWriter.getEscaped(project.getName())+ "</display-name> \n <name>"+ XMLWriter.getEscaped(projectNamewithoutSpecialChars) + "</name> \n </web-fragment>"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } + } else if (fv == IJ2EEFacetConstants.WEBFRAGMENT_40) { webFragXmlContents = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<web-fragment id=\"WebFragment_ID\" version=\"4.0\" xmlns=\"http://xmlns.jcp.org/xml/ns/javaee\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-fragment_4_0.xsd\">\n<display-name>" + XMLWriter.getEscaped(project.getName())+ "</display-name> \n <name>"+ XMLWriter.getEscaped(projectNamewithoutSpecialChars) + "</name> \n </web-fragment>"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } + } else if( fv == IJ2EEFacetConstants.WEBFRAGMENT_31 ) { webFragXmlContents = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<web-fragment id=\"WebFragment_ID\" version=\"3.1\" xmlns=\"http://xmlns.jcp.org/xml/ns/javaee\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-fragment_3_1.xsd\">\n<display-name>" + XMLWriter.getEscaped(project.getName())+ "</display-name> \n <name>"+ XMLWriter.getEscaped(projectNamewithoutSpecialChars) + "</name> \n </web-fragment>"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } + } else { webFragXmlContents = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<web-fragment id=\"WebFragment_ID\" version=\"3.0\" xmlns=\"http://java.sun.com/xml/ns/javaee\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-fragment_3_0.xsd\">\n<display-name>" + XMLWriter.getEscaped(project.getName())+ "</display-name> \n <name>"+ XMLWriter.getEscaped(projectNamewithoutSpecialChars) + "</name> \n </web-fragment>"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ }
diff --git a/plugins/org.eclipse.jst.j2ee/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee/META-INF/MANIFEST.MF index 930cc99..fde2bcd 100644 --- a/plugins/org.eclipse.jst.j2ee/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.jst.j2ee/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.eclipse.jst.j2ee; singleton:=true -Bundle-Version: 1.2.701.qualifier +Bundle-Version: 1.2.800.qualifier Bundle-Activator: org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin Bundle-Vendor: %Bundle-Vendor.0 Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/project/facet/AppClientFacetInstallDelegate.java b/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/project/facet/AppClientFacetInstallDelegate.java index 57b1ca8..0c28c95 100644 --- a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/project/facet/AppClientFacetInstallDelegate.java +++ b/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/project/facet/AppClientFacetInstallDelegate.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2017 IBM Corporation and others. + * Copyright (c) 2005, 2023 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/JavaEEArchiveUtilities.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/JavaEEArchiveUtilities.java index c9548a0..432f4db 100644 --- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/JavaEEArchiveUtilities.java +++ b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/JavaEEArchiveUtilities.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2020 IBM Corporation and others. + * Copyright (c) 2005, 2023 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/J2EEVersionUtil.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/J2EEVersionUtil.java index c4d1dda..5598ea6 100644 --- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/J2EEVersionUtil.java +++ b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/J2EEVersionUtil.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2021 IBM Corporation and others. + * Copyright (c) 2005, 2023 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -50,9 +50,9 @@ case J2EEVersionConstants.SERVLET_5_0: return J2EEVersionConstants.VERSION_5_0_TEXT; - + case J2EEVersionConstants.SERVLET_6_0: - return J2EEVersionConstants.VERSION_6_0_TEXT; + return J2EEVersionConstants.VERSION_6_0_TEXT; } return ""; //$NON-NLS-1$ @@ -103,7 +103,7 @@ case J2EEVersionConstants.JCA_2_1_ID: return J2EEVersionConstants.VERSION_2_1_TEXT; - + } return ""; //$NON-NLS-1$ } @@ -132,7 +132,7 @@ return J2EEVersionConstants.VERSION_8_0_TEXT; case J2EEVersionConstants.JEE_10_0_ID: - return J2EEVersionConstants.VERSION_10_0_TEXT; + return J2EEVersionConstants.VERSION_10_0_TEXT; } return "";//$NON-NLS-1$ }
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEArtifactImportDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEArtifactImportDataModelProvider.java index bb3892f..53bac5f 100644 --- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEArtifactImportDataModelProvider.java +++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEArtifactImportDataModelProvider.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2003, 2013 IBM Corporation and others. + * Copyright (c) 2003, 2023 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -350,9 +350,10 @@ break; case J2EEVersionConstants.JEE_8_0_ID: javaFacetVersion = JavaFacet.VERSION_1_8; + break; case J2EEVersionConstants.JEE_10_0_ID: javaFacetVersion = JavaFacet.VERSION_11; - + break; } } if(javaFacetVersion != null){ @@ -517,7 +518,7 @@ if(archiveType == JavaEEQuickPeek.CONNECTOR_TYPE || runtime == null || runtime.supports(highestProjectFacetVersion[EE8]) ){ return new JavaEEQuickPeek(jqp.getType(), highestJQPVersion[EE8]); } else if(runtime.supports(highestProjectFacetVersion[EE10]) ){ - return new JavaEEQuickPeek(jqp.getType(), highestJQPVersion[EE10]); + return new JavaEEQuickPeek(jqp.getType(), highestJQPVersion[EE10]); } else if(runtime.supports(highestProjectFacetVersion[EE7]) ){ return new JavaEEQuickPeek(jqp.getType(), highestJQPVersion[EE7]); } else if(runtime.supports(highestProjectFacetVersion[EE6]) ){
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/EarFacetInstallDelegate.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/EarFacetInstallDelegate.java index 10c9715..9ccb1fd 100644 --- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/EarFacetInstallDelegate.java +++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/EarFacetInstallDelegate.java
@@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2005, 2011 BEA Systems, Inc. and others + * Copyright (c) 2005, 2023 BEA Systems, Inc. and others * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/JavaEEProjectUtilities.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/JavaEEProjectUtilities.java index 55ecffb..7f94a74 100644 --- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/JavaEEProjectUtilities.java +++ b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/JavaEEProjectUtilities.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2014 IBM Corporation and others. + * Copyright (c) 2007, 2023 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/facet/IJ2EEFacetConstants.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/facet/IJ2EEFacetConstants.java index aa8042f..88fe9b7 100644 --- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/facet/IJ2EEFacetConstants.java +++ b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/facet/IJ2EEFacetConstants.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2015 IBM Corporation and others. + * Copyright (c) 2007, 2023 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at
diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/JavaEEPreferencesInitializer.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/JavaEEPreferencesInitializer.java index e83889b..7cbb77b 100644 --- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/JavaEEPreferencesInitializer.java +++ b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/JavaEEPreferencesInitializer.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2021 IBM Corporation and others. + * Copyright (c) 2009, 2023 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -99,7 +99,7 @@ * @since 3.24 */ static final String EE9_DYNAMIC_WEB_GENERATE_DD = "ee9_dynamic_web_generate_dd"; //$NON-NLS-1$ - + static final String EE10_DYNAMIC_WEB_GENERATE_DD = "ee10_dynamic_web_generate_dd"; //$NON-NLS-1$ /** @@ -155,7 +155,7 @@ static final String EE7_CONNECTOR_GENERATE_DD = "ee7_connector_generate_dd"; //$NON-NLS-1$ static final String EE10_CONNECTOR_GENERATE_DD = "ee10_connector_generate_dd"; //$NON-NLS-1$ - + /** * Used to determine if the business interface annotations should be added to the bean class during EJB creation. */
diff --git a/plugins/org.eclipse.jst.j2ee/pom.xml b/plugins/org.eclipse.jst.j2ee/pom.xml index c8e5433..121efee 100644 --- a/plugins/org.eclipse.jst.j2ee/pom.xml +++ b/plugins/org.eclipse.jst.j2ee/pom.xml
@@ -21,6 +21,6 @@ <groupId>org.eclipse.webtools.javaee</groupId> <artifactId>org.eclipse.jst.j2ee</artifactId> - <version>1.2.701-SNAPSHOT</version> + <version>1.2.800-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
diff --git a/plugins/org.eclipse.jst.jee.ejb/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.jee.ejb/META-INF/MANIFEST.MF index 3c26d08..5a4e7a1 100644 --- a/plugins/org.eclipse.jst.jee.ejb/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.jst.jee.ejb/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.eclipse.jst.jee.ejb;singleton:=true -Bundle-Version: 1.0.501.qualifier +Bundle-Version: 1.0.600.qualifier Bundle-Activator: org.eclipse.jst.jee.ejb.Activator Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)", org.eclipse.wst.common.modulecore;bundle-version="[1.1.0,2.0.0)",
diff --git a/plugins/org.eclipse.jst.jee.ejb/ejb/org/eclipse/jst/jee/model/internal/Ejb3ModelProvider.java b/plugins/org.eclipse.jst.jee.ejb/ejb/org/eclipse/jst/jee/model/internal/Ejb3ModelProvider.java index 0d8534b..49d5dc7 100644 --- a/plugins/org.eclipse.jst.jee.ejb/ejb/org/eclipse/jst/jee/model/internal/Ejb3ModelProvider.java +++ b/plugins/org.eclipse.jst.jee.ejb/ejb/org/eclipse/jst/jee/model/internal/Ejb3ModelProvider.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2007 IBM Corporation and others. + * Copyright (c) 2005, 2023 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at
diff --git a/plugins/org.eclipse.jst.jee.ejb/ejb/org/eclipse/jst/jee/model/internal/EjbAnnotationFactory.java b/plugins/org.eclipse.jst.jee.ejb/ejb/org/eclipse/jst/jee/model/internal/EjbAnnotationFactory.java index f5e2177..d591029 100644 --- a/plugins/org.eclipse.jst.jee.ejb/ejb/org/eclipse/jst/jee/model/internal/EjbAnnotationFactory.java +++ b/plugins/org.eclipse.jst.jee.ejb/ejb/org/eclipse/jst/jee/model/internal/EjbAnnotationFactory.java
@@ -1,5 +1,5 @@ /*********************************************************************** - * Copyright (c) 2008 by SAP AG, Walldorf. + * Copyright (c) 2008, 2023 by SAP AG, Walldorf. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at
diff --git a/plugins/org.eclipse.jst.jee.ejb/pom.xml b/plugins/org.eclipse.jst.jee.ejb/pom.xml index cfc456c..b62cce5 100644 --- a/plugins/org.eclipse.jst.jee.ejb/pom.xml +++ b/plugins/org.eclipse.jst.jee.ejb/pom.xml
@@ -21,6 +21,6 @@ <groupId>org.eclipse.webtools.ejb</groupId> <artifactId>org.eclipse.jst.jee.ejb</artifactId> - <version>1.0.501-SNAPSHOT</version> + <version>1.0.600-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
diff --git a/plugins/org.eclipse.jst.jee.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.jee.ui/META-INF/MANIFEST.MF index 36e51ca..4fe6929 100644 --- a/plugins/org.eclipse.jst.jee.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.jst.jee.ui/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Automatic-Module-Name: org.eclipse.jst.jee.ui Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.eclipse.jst.jee.ui;singleton:=true -Bundle-Version: 1.0.1201.qualifier +Bundle-Version: 1.0.1300.qualifier Bundle-Activator: org.eclipse.jst.jee.ui.plugin.JEEUIPlugin Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
diff --git a/plugins/org.eclipse.jst.jee.ui/pom.xml b/plugins/org.eclipse.jst.jee.ui/pom.xml index f1530a3..bf958ac 100644 --- a/plugins/org.eclipse.jst.jee.ui/pom.xml +++ b/plugins/org.eclipse.jst.jee.ui/pom.xml
@@ -21,6 +21,6 @@ <groupId>org.eclipse.webtools.javaee</groupId> <artifactId>org.eclipse.jst.jee.ui</artifactId> - <version>1.0.1201-SNAPSHOT</version> + <version>1.0.1300-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/Ejb3LabelProvider.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/Ejb3LabelProvider.java index 19b3ee4..b009d39 100644 --- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/Ejb3LabelProvider.java +++ b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/Ejb3LabelProvider.java
@@ -1,5 +1,5 @@ /*********************************************************************** - * Copyright (c) 2008, 2013 by SAP AG, Walldorf. + * Copyright (c) 2008, 2023 by SAP AG, Walldorf. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -58,7 +58,7 @@ private Image resourceRefImage; private Image serviceRefImage; private Image activationConfigImage; - + public Ejb3LabelProvider() { new J2EEAdapterFactoryLabelProvider(new DynamicAdapterFactory(IJ2EENavigatorConstants.VIEWER_ID)); @@ -176,7 +176,7 @@ } return ejb40Image; } - + private Image getSessionBeanImage() { if (sessionBeanImage == null) { URL url = (URL) J2EEPlugin.getPlugin().getImage("sessionBean_obj"); //$NON-NLS-1$
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/appclient/GroupAppClientProvider.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/appclient/GroupAppClientProvider.java index a10b419..53ec005 100644 --- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/appclient/GroupAppClientProvider.java +++ b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/appclient/GroupAppClientProvider.java
@@ -1,5 +1,5 @@ /*********************************************************************** - * Copyright (c) 2008, 2017 by SAP AG, Walldorf. + * Copyright (c) 2008, 2023 by SAP AG, Walldorf. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -50,6 +50,7 @@ private Image appClient60Image; private Image appClient70Image; private Image appClient80Image; + private Image appClient90Image; private Image appClient100Image; private IFile ddFile; @@ -93,6 +94,8 @@ return getAppClient70Image(); } else if (J2EEVersionConstants.VERSION_8_TEXT.equals(version)) { return getAppClient80Image(); + } else if (J2EEVersionConstants.VERSION_9_TEXT.equals(version)) { + return getAppClient90Image(); } else if (J2EEVersionConstants.VERSION_10_TEXT.equals(version)) { return getAppClient100Image(); } @@ -148,6 +151,13 @@ return appClient80Image; } + private Image getAppClient90Image() { + if (appClient90Image == null) { + appClient90Image = JEEUIPlugin.getDefault().getImageDescriptor(JEEUIPluginIcons.APP_CLIENT90).createImage(); + } + return appClient90Image; + } + private Image getAppClient100Image() { if (appClient100Image == null) { appClient100Image = JEEUIPlugin.getDefault().getImageDescriptor(JEEUIPluginIcons.APP_CLIENT100).createImage();
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ear/GroupEARProvider.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ear/GroupEARProvider.java index ead4444..a099374 100644 --- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ear/GroupEARProvider.java +++ b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ear/GroupEARProvider.java
@@ -1,5 +1,5 @@ /*********************************************************************** - * Copyright (c) 2008, 2017 by SAP AG, Walldorf. + * Copyright (c) 2008, 2023 by SAP AG, Walldorf. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -171,7 +171,7 @@ } return ear80Image; } - + private Image getEar100Image() { if (ear100Image == null) { ear100Image = JEEUIPlugin.getDefault().getImageDescriptor(JEEUIPluginIcons.EAR10_IMAGE).createImage();
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ra/RaGroupContentProvider.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ra/RaGroupContentProvider.java index e6dc6a6..a20b805 100644 --- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ra/RaGroupContentProvider.java +++ b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ra/RaGroupContentProvider.java
@@ -1,5 +1,5 @@ /*********************************************************************** - * Copyright (c) 2010, 2013 by SAP AG, Walldorf. + * Copyright (c) 2010, 2023 by SAP AG, Walldorf. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -81,12 +81,12 @@ } return CONNECTOR_17_IMAGE; } - + private Image getConnector21Image() { if (CONNECTOR_21_IMAGE == null) { CONNECTOR_21_IMAGE = JEEUIPlugin.getDefault().getImage(JEEUIPluginIcons.IMG_EE10CONNECTOR); } return CONNECTOR_21_IMAGE; } - + } \ No newline at end of file
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/web/WebAppProvider.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/web/WebAppProvider.java index 5e12b04..a382063 100644 --- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/web/WebAppProvider.java +++ b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/web/WebAppProvider.java
@@ -1,5 +1,5 @@ /*********************************************************************** - * Copyright (c) 2008, 2022 by SAP AG, Walldorf, and others + * Copyright (c) 2008, 2023 by SAP AG, Walldorf, and others * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -181,7 +181,7 @@ } return web50Image; } - + private Image getWeb60Image() { if (web60Image == null) { web60Image = JEEUIPlugin.getDefault().getImageDescriptor(JEEUIPluginIcons.IMG_WEBEE10MODEL).createImage();
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/plugin/JEEUIPluginIcons.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/plugin/JEEUIPluginIcons.java index bf80b06..3fc2612 100644 --- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/plugin/JEEUIPluginIcons.java +++ b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/plugin/JEEUIPluginIcons.java
@@ -1,5 +1,5 @@ /*********************************************************************** - * Copyright (c) 2008, 2022 by SAP AG, Walldorf, and others + * Copyright (c) 2008, 2023 by SAP AG, Walldorf, and others * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -16,6 +16,7 @@ public static String IMG_EJBEEMODEL = "30_ejbjar_obj"; //$NON-NLS-1$ public static String IMG_EJBEE6MODEL = "31_ejbjar_obj"; //$NON-NLS-1$ public static String IMG_EJBEE7MODEL = "32_ejbjar_obj"; //$NON-NLS-1$ + /* TODO: create a unique image */ public static String IMG_EJBEE10MODEL = "32_ejbjar_obj"; //$NON-NLS-1$ public static String IMG_WEBEEMODEL = "webapp_25"; //$NON-NLS-1$ public static String IMG_WEBEE6MODEL = "webapp_30"; //$NON-NLS-1$ @@ -56,6 +57,7 @@ public static String APP_CLIENT60 = "appclient_60"; //$NON-NLS-1$ public static String APP_CLIENT70 = "appclient_70"; //$NON-NLS-1$ public static String APP_CLIENT80 = "appclient_80"; //$NON-NLS-1$ + public static String APP_CLIENT90 = "appclient_80"; //$NON-NLS-1$ public static String APP_CLIENT100 = "appclient_80"; //$NON-NLS-1$ } \ No newline at end of file
diff --git a/plugins/org.eclipse.jst.jee.web/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.jee.web/META-INF/MANIFEST.MF index ea6e180..79338a7 100644 --- a/plugins/org.eclipse.jst.jee.web/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.jst.jee.web/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.eclipse.jst.jee.web;singleton:=true -Bundle-Version: 1.0.1100.qualifier +Bundle-Version: 1.0.1200.qualifier Bundle-Activator: org.eclipse.jst.jee.web.Activator Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)", org.eclipse.wst.common.project.facet.core;bundle-version="[1.3.0,2.0.0)",
diff --git a/plugins/org.eclipse.jst.jee.web/pom.xml b/plugins/org.eclipse.jst.jee.web/pom.xml index 0eb3ad0..27417c7 100644 --- a/plugins/org.eclipse.jst.jee.web/pom.xml +++ b/plugins/org.eclipse.jst.jee.web/pom.xml
@@ -21,6 +21,6 @@ <groupId>org.eclipse.webtools.javaee</groupId> <artifactId>org.eclipse.jst.jee.web</artifactId> - <version>1.0.1100-SNAPSHOT</version> + <version>1.0.1200-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
diff --git a/plugins/org.eclipse.jst.jee.web/web/org/eclipse/jst/jee/model/internal/Web25ModelProvider.java b/plugins/org.eclipse.jst.jee.web/web/org/eclipse/jst/jee/model/internal/Web25ModelProvider.java index 66e444b..b20b6ea 100644 --- a/plugins/org.eclipse.jst.jee.web/web/org/eclipse/jst/jee/model/internal/Web25ModelProvider.java +++ b/plugins/org.eclipse.jst.jee.web/web/org/eclipse/jst/jee/model/internal/Web25ModelProvider.java
@@ -86,9 +86,9 @@ dd.getXMLNSPrefixMap().put("", J2EEConstants.JAKARTAEE9_NS_URL); //$NON-NLS-1$ dd.getXSISchemaLocation().put(J2EEConstants.JAKARTAEE9_NS_URL, J2EEConstants.WEB_APP_SCHEMA_LOC_5_0); // note that later EMF generations remove the _LITERAL from the enum - war.setVersion(WebAppVersionType._40); + war.setVersion(WebAppVersionType._50); } - else { //if (J2EEVersionConstants.VERSION_5_0_TEXT.equals(version)) { + else { //if (J2EEVersionConstants.VERSION_6_0_TEXT.equals(version)) { dd.getXMLNSPrefixMap().put("", J2EEConstants.JAKARTAEE10_NS_URL); //$NON-NLS-1$ dd.getXSISchemaLocation().put(J2EEConstants.JAKARTAEE10_NS_URL, J2EEConstants.WEB_APP_SCHEMA_LOC_6_0); // note that later EMF generations remove the _LITERAL from the enum
diff --git a/plugins/org.eclipse.jst.jee.web/web/org/eclipse/jst/jee/model/internal/WebAnnotationFactory.java b/plugins/org.eclipse.jst.jee.web/web/org/eclipse/jst/jee/model/internal/WebAnnotationFactory.java index f09b796..4580302 100644 --- a/plugins/org.eclipse.jst.jee.web/web/org/eclipse/jst/jee/model/internal/WebAnnotationFactory.java +++ b/plugins/org.eclipse.jst.jee.web/web/org/eclipse/jst/jee/model/internal/WebAnnotationFactory.java
@@ -1,5 +1,5 @@ /*********************************************************************** - * Copyright (c) 2008, 2014 by SAP AG, Walldorf and others. + * Copyright (c) 2008, 2023 by SAP AG, Walldorf and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at
diff --git a/plugins/org.eclipse.jst.jee.web/web/org/eclipse/jst/jee/model/internal/WebFragment30ModelProvider.java b/plugins/org.eclipse.jst.jee.web/web/org/eclipse/jst/jee/model/internal/WebFragment30ModelProvider.java index f3c3c30..872e6a0 100644 --- a/plugins/org.eclipse.jst.jee.web/web/org/eclipse/jst/jee/model/internal/WebFragment30ModelProvider.java +++ b/plugins/org.eclipse.jst.jee.web/web/org/eclipse/jst/jee/model/internal/WebFragment30ModelProvider.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010 IBM Corporation and others. + * Copyright (c) 2010, 2023 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -73,6 +73,12 @@ // note that later EMF generations remove the _LITERAL from the enum webFragment.setVersion(WebAppVersionType._31); } + else if (version != null && version.equals(J2EEVersionConstants.VERSION_4_0_TEXT)) { + dd.getXMLNSPrefixMap().put("", J2EEConstants.JAVAEE7_NS_URL); //$NON-NLS-1$ + dd.getXSISchemaLocation().put(J2EEConstants.JAVAEE7_NS_URL, J2EEConstants.WEBFRAGMENT_SCHEMA_LOC_4_0); + // note that later EMF generations remove the _LITERAL from the enum + webFragment.setVersion(WebAppVersionType._40); + } else if (version != null && version.equals(J2EEVersionConstants.VERSION_5_0_TEXT)) { dd.getXMLNSPrefixMap().put("", J2EEConstants.JAKARTAEE9_NS_URL); //$NON-NLS-1$ dd.getXSISchemaLocation().put(J2EEConstants.JAKARTAEE9_NS_URL, J2EEConstants.WEBFRAGMENT_SCHEMA_LOC_5_0); @@ -84,13 +90,13 @@ dd.getXSISchemaLocation().put(J2EEConstants.JAKARTAEE10_NS_URL, J2EEConstants.WEBFRAGMENT_SCHEMA_LOC_6_0); // note that later EMF generations remove the _LITERAL from the enum webFragment.setVersion(WebAppVersionType._60); - } + } else { - dd.getXMLNSPrefixMap().put("", J2EEConstants.JAVAEE7_NS_URL); //$NON-NLS-1$ - dd.getXSISchemaLocation().put(J2EEConstants.JAVAEE7_NS_URL, J2EEConstants.WEBFRAGMENT_SCHEMA_LOC_4_0); - // note that later EMF generations remove the _LITERAL from the enum - webFragment.setVersion(WebAppVersionType._40); + dd.getXMLNSPrefixMap().put("", J2EEConstants.JAKARTAEE10_NS_URL); //$NON-NLS-1$ + dd.getXSISchemaLocation().put(J2EEConstants.JAKARTAEE10_NS_URL, J2EEConstants.WEBFRAGMENT_SCHEMA_LOC_6_0); + // note that later EMF generations remove the _LITERAL from the enum + webFragment.setVersion(WebAppVersionType._60); } dd.setWebFragment(webFragment); res.getContents().add((EObject) dd);
diff --git a/plugins/org.eclipse.jst.jee/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.jee/META-INF/MANIFEST.MF index a8f8abc..e764501 100644 --- a/plugins/org.eclipse.jst.jee/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.jst.jee/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.eclipse.jst.jee;singleton:=true -Bundle-Version: 1.0.1101.qualifier +Bundle-Version: 1.0.1200.qualifier Bundle-Activator: org.eclipse.jst.jee.JEEPlugin Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)", org.eclipse.wst.common.project.facet.core;bundle-version="[1.3.0,2.0.0)",
diff --git a/plugins/org.eclipse.jst.jee/earproject/org/eclipse/jst/jee/project/facet/EarFacetInstallDelegate.java b/plugins/org.eclipse.jst.jee/earproject/org/eclipse/jst/jee/project/facet/EarFacetInstallDelegate.java index 59c5934..22a19c9 100644 --- a/plugins/org.eclipse.jst.jee/earproject/org/eclipse/jst/jee/project/facet/EarFacetInstallDelegate.java +++ b/plugins/org.eclipse.jst.jee/earproject/org/eclipse/jst/jee/project/facet/EarFacetInstallDelegate.java
@@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright (c) 2005 BEA Systems, Inc. + * Copyright (c) 2005, 2023 BEA Systems, Inc. and others * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at
diff --git a/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/contenttype/JEE10ContentDescriber.java b/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/contenttype/JEE10ContentDescriber.java index 9151b8b..8f2c412 100644 --- a/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/contenttype/JEE10ContentDescriber.java +++ b/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/contenttype/JEE10ContentDescriber.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2001, 2021 IBM Corporation and others. + * Copyright (c) 2023 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at
diff --git a/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/model/internal/AppClient5ModelProvider.java b/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/model/internal/AppClient5ModelProvider.java index e1b4210..f691016 100644 --- a/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/model/internal/AppClient5ModelProvider.java +++ b/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/model/internal/AppClient5ModelProvider.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2017 IBM Corporation and others. + * Copyright (c) 2005, 2023 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at
diff --git a/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/model/internal/Connector16ModelProvider.java b/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/model/internal/Connector16ModelProvider.java index a7ba261..6b800e5 100644 --- a/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/model/internal/Connector16ModelProvider.java +++ b/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/model/internal/Connector16ModelProvider.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009 IBM Corporation and others. + * Copyright (c) 2009, 2023 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at
diff --git a/plugins/org.eclipse.jst.jee/plugin.xml b/plugins/org.eclipse.jst.jee/plugin.xml index 0047029..8787009 100644 --- a/plugins/org.eclipse.jst.jee/plugin.xml +++ b/plugins/org.eclipse.jst.jee/plugin.xml
@@ -229,9 +229,9 @@ <contentTypeBinding contentTypeId="org.eclipse.jst.jee.ee10webfragmentDD"> </contentTypeBinding> - </resourceFactory> + </resourceFactory> </extension> - + <extension point="org.eclipse.emf.ecore.generated_package"> <package @@ -329,7 +329,7 @@ <test property="org.eclipse.wst.common.project.facet.core.projectFacet" value="jst.ejb:3.2]"/> <test property="org.eclipse.wst.common.project.facet.core.projectFacet" value="jst.utility:1.0]"/> <test property="org.eclipse.wst.common.project.facet.core.projectFacet" value="jst.connector:1.7]"/> - <test property="org.eclipse.wst.common.project.facet.core.projectFacet" value="jst.web:5.0]"/> + <test property="org.eclipse.wst.common.project.facet.core.projectFacet" value="jst.web:6.0]"/> <test property="org.eclipse.wst.common.project.facet.core.projectFacet" value="jst.ear:[5.0-10.0]"/> <test property="org.eclipse.wst.common.project.facet.core.projectFacet" value="jst.webfragment:5.0]"/> </or>
diff --git a/plugins/org.eclipse.jst.jee/pom.xml b/plugins/org.eclipse.jst.jee/pom.xml index ce56d03..ec322f9 100644 --- a/plugins/org.eclipse.jst.jee/pom.xml +++ b/plugins/org.eclipse.jst.jee/pom.xml
@@ -21,6 +21,6 @@ <groupId>org.eclipse.webtools.javaee</groupId> <artifactId>org.eclipse.jst.jee</artifactId> - <version>1.0.1101-SNAPSHOT</version> + <version>1.0.1200-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>