This is an automated email from the ASF dual-hosted git repository. pepness pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit d3008ab7991fdeed1457a785b2df2fd14403e8e3 Merge: 94555c4f55a 6f869f28eae Author: José Contreras <[email protected]> AuthorDate: Mon Feb 26 17:09:00 2024 -0600 Merge pull request #6988 from pepness/glassfish-8.0.0 Add support for Jakarta EE 11 - Add support for GlassFish 8 - Add support for Jakarta EE 11 - Add xsd, mdd, and xml files for Jakarta EE 11 - Add support for CDI 4.1 - Add support for JSP 4.0 - Add support for Servlet 6.1 - Add support for Validation 3.1 (with Constraint 3.1) - Add support for JSF 4.1 - Add support for Persistence 3.2 - Add support for JPA 3.2 - Add Jakarta EE 11 support for GlassFish - Add Jakarta EE 11 support for Gradle projects - Add Jakarta EE 11 support for Maven projects - Add Jakarta EE 11 support for Payara, Tomcat, and WildFly servers - Add Jakarta EE 11 rat exclusions - Add new Jakarta EE 11 modules `jakartaee11.api` and `jakartaee11.platform` - Refactor `versionToResourceFilesIndexes` method - Add three new methods to Profile.class `isWebProfile`, `isAtMost` and `isFullProfile` - Refactor some code and use new `isAtLeast()` method - Change some variable names to be more descriptive - Refactor code and avoid searching many times over a collection - Add new method `isAtMost()` to JsfVersion.class - Re-generate signature that failed in `ant check-sigtests` - Use milestone 1 version for maven projects - Bump GlassFish version to 8.0.0-M2 - Add missing Jakarta EE 10 logic for JSF 4.0 - Add missing support for Jakarta EE 10 in `RunTimeDDCatalog.java` - Add missing test for GlassFish 7 - Add missing Jakarta EE 10 xsd files - EJB 3.1 is not supported on Jakarta EE 9 and onward - Add missing Jakarta EE 10 logic, licenses info, and xsd's files - Add missing Jakarta EE 10 properties, schemas, and actions .../modules/j2ee/jboss4/ide/JpaSupportImpl.java | 11 +- .../j2ee/weblogic9/j2ee/JpaSupportImpl.java | 6 +- .../modules/glassfish/common/Bundle.properties | 1 + .../common/GlassfishInstanceProvider.java | 8 +- .../modules/glassfish/common/ServerDetails.java | 11 + .../common/registration/AutomaticRegistration.java | 5 +- .../glassfish/common/wizards/Bundle.properties | 3 + .../common/wizards/GlassfishWizardProvider.java | 9 +- .../modules/glassfish/spi/ServerUtilities.java | 6 + .../registration/AutomaticRegistrationTest.java | 32 + .../eecommon/api/config/AppClientVersion.java | 9 + .../eecommon/api/config/ApplicationVersion.java | 7 + .../eecommon/api/config/EjbJarVersion.java | 8 + .../api/config/GlassfishConfiguration.java | 29 +- .../eecommon/api/config/J2eeModuleHelper.java | 14 + .../eecommon/api/config/ServletVersion.java | 7 + .../javaee/AbstractHk2ConfigurationFactory.java | 9 +- .../modules/glassfish/javaee/Bundle.properties | 2 + .../glassfish/javaee/Hk2DeploymentFactory.java | 17 + .../glassfish/javaee/Hk2JavaEEPlatformFactory.java | 27 +- .../glassfish/javaee/Hk2JavaEEPlatformImpl.java | 4 + .../modules/glassfish/javaee/Hk2JaxWsStack.java | 36 +- .../glassfish/javaee/Hk2JpaSupportImpl.java | 30 +- .../glassfish/javaee/Hk2OptionalFactory.java | 6 + .../javaee/JavaEEServerModuleFactory.java | 11 +- .../modules/glassfish/javaee/RunTimeDDCatalog.java | 72 + .../netbeans/modules/glassfish/javaee/layer.xml | 71 +- .../modules/glassfish/javaee/nbdepjakartaee11.xml | 54 + .../glassfish/tooling/data/GlassFishVersion.java | 10 +- .../server/config/ConfigBuilderProvider.java | 7 +- .../tooling/server/config/GlassFishV8_0_0.xml | 88 + .../tooling/server/config/JavaEEProfile.java | 12 +- .../glassfish/tooling/admin/AdminFactoryTest.java | 26 + .../tooling/data/GlassFishVersionTest.java | 6 +- .../glassfish/tooling/utils/EnumUtilsTest.java | 13 + .../gradle/javaee/GradleJavaEEProjectSettings.java | 14 +- .../web/newproject/ServerSelectionPanelVisual.java | 4 +- .../newproject/WebApplicationProjectWizard.java | 6 + .../j2ee/clientproject/AppClientProvider.java | 44 +- .../api/AppClientProjectGenerator.java | 110 +- .../ui/customizer/AppClientProjectProperties.java | 34 +- .../AppClientProjectJAXWSClientSupport.java | 59 +- enterprise/j2ee.common/licenseinfo.xml | 6 + .../j2ee/common/J2eeProjectCapabilities.java | 59 +- .../netbeans/modules/j2ee/common/dd/DDHelper.java | 20 +- .../modules/j2ee/common/dd/resources/beans-4.1.xml | 7 + .../j2ee/common/dd/resources/constraint-3.1.xml | 10 + .../modules/j2ee/common/dd/resources/ear-11.xml | 7 + .../j2ee/common/dd/resources/validation-3.1.xml | 10 + .../modules/j2ee/common/dd/resources/web-6.1.xml | 8 + .../j2ee/common/dd/resources/web-fragment-6.1.xml | 8 + .../j2ee/common/J2eeProjectCapabilitiesTest.java | 40 + .../src/org/netbeans/api/j2ee/core/Profile.java | 57 +- .../org/netbeans/api/j2ee/core/ProfileTest.java | 20 + enterprise/j2ee.dd/.gitignore | 6 +- enterprise/j2ee.dd/build.xml | 234 ++ enterprise/j2ee.dd/licenseinfo.xml | 13 + .../j2ee/dd/api/application/Application.java | 12 +- .../j2ee/dd/api/application/DDProvider.java | 14 +- .../modules/j2ee/dd/api/client/AppClient.java | 1 + .../netbeans/modules/j2ee/dd/api/web/WebApp.java | 4 + .../j2ee/dd/api/web/WebFragmentProvider.java | 7 +- .../modules/j2ee/dd/impl/common/DDUtils.java | 4 + .../dd/impl/resources/application-client_11.mdd | 385 +++ .../dd/impl/resources/application-client_11.xsd | 252 ++ .../j2ee/dd/impl/resources/application_11.mdd | 111 + .../j2ee/dd/impl/resources/application_11.xsd | 390 +++ .../modules/j2ee/dd/impl/resources/beans_4_0.xsd | 372 ++ .../modules/j2ee/dd/impl/resources/beans_4_1.xsd | 372 ++ .../j2ee/dd/impl/resources/connector_2_1.xsd | 1165 +++++++ .../j2ee/dd/impl/resources/jakartaee_11.xsd | 3631 ++++++++++++++++++++ .../modules/j2ee/dd/impl/resources/jsp_4_0.xsd | 380 ++ .../j2ee/dd/impl/resources/permissions_10.xsd | 151 + .../modules/j2ee/dd/impl/resources/web-app_6_1.mdd | 856 +++++ .../modules/j2ee/dd/impl/resources/web-app_6_1.xsd | 351 ++ .../j2ee/dd/impl/resources/web-common_6_1.xsd | 1526 ++++++++ .../j2ee/dd/impl/resources/web-fragment_6_1.mdd | 910 +++++ .../j2ee/dd/impl/resources/web-fragment_6_1.xsd | 316 ++ .../modules/j2ee/dd/impl/web/WebAppProxy.java | 3 + .../modules/j2ee/ddloaders/Bundle.properties | 5 + .../modules/j2ee/ddloaders/app/EarDataLoader.java | 3 + .../j2ee/ddloaders/catalog/EnterpriseCatalog.java | 20 +- .../j2ee/ddloaders/client/ClientDataLoader.java | 2 + .../resources/dd-loaders-mime-resolver.xml | 40 + .../modules/j2ee/ddloaders/resources/layer.xml | 226 ++ .../modules/j2ee/ddloaders/web/DDDataObject.java | 3 +- .../j2ee/ddloaders/web/DDWeb60DataLoader.java | 4 +- .../ddloaders/web/DDWebFragment60DataLoader.java | 5 +- .../modules/j2ee/earproject/ProjectEar.java | 4 +- .../org/netbeans/modules/j2ee/ejbcore/Utils.java | 20 +- .../ejb/wizard/dd/EjbJarXmlWizardIterator.java | 6 +- .../ejb/wizard/jpa/dao/EjbFacadeVisualPanel2.java | 3 +- .../j2ee/ejbcore/ejb/wizard/mdb/MdbWizard.java | 6 +- .../j2ee/ejbjarproject/EjbJarJPAModuleInfo.java | 5 +- .../jaxws/EjbProjectJAXWSClientSupport.java | 59 +- .../jaxws/EjbProjectJAXWSSupport.java | 59 +- .../ui/customizer/EjbJarProjectProperties.java | 25 +- .../ui/wizards/NewEjbJarProjectWizardIterator.java | 6 +- .../rules/PersistentTimerInEjbLite.java | 29 +- .../modules/j2ee/sun/dd/api/ASDDVersion.java | 26 + .../j2ee/deployment/devmodules/api/J2eeModule.java | 4 +- .../jakarta/web/beans/wizard/BeansXmlIterator.java | 4 +- enterprise/jakartaee11.api/build.xml | 25 + .../external/binaries-list} | 19 +- .../jakarta.jakartaee-api-11.0.0-license.txt | 93 + .../jakarta.jakartaee-web-api-11.0.0-license.txt | 93 + enterprise/jakartaee11.api/manifest.mf | 8 + .../nbproject/project.properties} | 20 +- enterprise/jakartaee11.api/nbproject/project.xml | 31 + .../modules/jakartaee11/api}/Bundle.properties | 24 +- .../modules/jakartaee11/api/jakartaee-api-11.0.xml | 41 + .../jakartaee11/api/jakartaee-web-api-11.0.xml | 41 + .../org/netbeans/modules/jakartaee11/api/layer.xml | 35 + enterprise/jakartaee11.platform/arch.xml | 908 +++++ enterprise/jakartaee11.platform/build.xml | 47 + .../external/binaries-list} | 17 +- ...akarta.jakartaee-api-11.0.0-javadoc-license.txt | 93 + enterprise/jakartaee11.platform/manifest.mf | 7 + .../nbproject/project.properties} | 22 +- .../jakartaee11.platform/nbproject/project.xml | 32 + .../jakartaee11/platform}/Bundle.properties | 22 +- .../api/PersistenceProviderSupplierImpl.java | 22 +- .../project/api/ant/ui/wizard/Bundle.properties | 4 + .../api/ant/ui/wizard/J2eeVersionWarningPanel.java | 37 + .../api/ant/ui/wizard/ProjectServerPanel.java | 21 +- .../org-netbeans-modules-javaee-specs-support.sig | 6 +- .../javaee/specs/support/api/JpaProvider.java | 4 + .../support/bridge/BridgingJpaSupportImpl.java | 22 +- .../specs/support/spi/JpaProviderFactory.java | 8 +- .../support/spi/JpaProviderImplementation.java | 2 + .../modules/javaee/wildfly/ide/JpaSupportImpl.java | 11 +- .../wildfly/ide/WildflyJ2eePlatformFactory.java | 3 + .../netbeans/modules/maven/j2ee/JPAStuffImpl.java | 3 +- .../MavenJsfReferenceImplementationProvider.java | 7 +- .../netbeans/modules/maven/j2ee/ear/EarImpl.java | 2 + .../j2ee/ui/customizer/impl/CustomizerRunWeb.java | 2 + .../j2ee/ui/wizard/ServerSelectionHelper.java | 4 + .../archetype/BaseJ2eeArchetypeProvider.java | 11 +- .../j2ee/ui/wizard/archetype/Bundle.properties | 3 + .../ui/wizard/archetype/J2eeArchetypeFactory.java | 6 + .../modules/maven/j2ee/web/WebModuleImpl.java | 18 +- .../maven/j2ee/web/WebRecoPrivTemplates.java | 5 +- .../maven/j2ee/JavaEEProjectSettingsImplTest.java | 2 + .../modules/maven/j2ee/web/WebModuleImplTest.java | 20 +- .../payara/jakartaee/Hk2JavaEEPlatformImpl.java | 4 + .../payara/jakartaee/Hk2JpaSupportImpl.java | 11 +- .../modules/payara/jakartaee/RunTimeDDCatalog.java | 73 +- .../tooling/server/config/JavaEEProfile.java | 12 +- .../modules/tomcat5/deploy/TomcatManager.java | 10 +- .../modules/tomcat5/j2ee/JpaSupportImpl.java | 12 +- .../modules/tomcat5/j2ee/TomcatPlatformImpl.java | 9 +- .../modules/tomcat5/util/TomcatProperties.java | 2 + .../modules/web/beans/wizard/BeansXmlIterator.java | 4 +- .../netbeans/modules/web/wizards/PageIterator.java | 9 +- .../jsf/editor/facelets/mojarra/ConfigManager.java | 2 + enterprise/web.jsf/licenseinfo.xml | 2 + .../org/netbeans/modules/web/jsf/JSFCatalog.java | 146 +- .../modules/web/jsf/JSFFrameworkProvider.java | 13 +- .../src/org/netbeans/modules/web/jsf/JSFUtils.java | 6 +- .../modules/web/jsf/api/ConfigurationUtils.java | 3 +- .../web/jsf/api/facesmodel/JsfVersionUtils.java | 5 +- .../resources/templates/simpleFacelets.template | 4 +- .../jsf/impl/facesmodel/JSFConfigModelImpl.java | 8 +- .../web/jsf/impl/facesmodel/JSFConfigQNames.java | 111 + .../modules/web/jsf/resources/faces-config_4_1.xml | 27 + .../templates/compositeComponent.template | 4 +- .../jsf/resources/web-facelettaglibrary_4_1.xsd | 751 ++++ .../web/jsf/resources/web-faces-mime-resolver.xml | 10 + .../web/jsf/resources/web-facesconfig_4_1.xsd | 3447 +++++++++++++++++++ .../wizards/CompositeComponentWizardIterator.java | 6 +- .../web/jsf/wizards/FacesConfigIterator.java | 9 +- .../jsf/wizards/JSFConfigurationPanelVisual.java | 4 +- .../modules/web/jsfapi/api/JsfVersion.java | 21 +- .../modules/web/jsfapi/api/NamespaceUtils.java | 21 +- .../modules/web/jsfapi/api/JsfVersionTest.java | 28 +- .../modules/web/project/ProjectWebModule.java | 48 +- .../modules/web/project/WebJPAModuleInfo.java | 3 +- .../netbeans/modules/web/project/WebProject.java | 24 +- .../web/project/api/WebProjectUtilities.java | 9 +- .../jaxws/WebProjectJAXWSClientSupport.java | 59 +- .../web/project/jaxws/WebProjectJAXWSSupport.java | 59 +- .../ui/customizer/WebProjectProperties.java | 34 +- .../modules/web/project/WebProjectTest.java | 2 + .../websocket/editor/WebSocketMethodsTask.java | 9 +- .../modules/websocket/wizard/WebSocketPanel.java | 13 +- .../jaxws/client/ProjectJAXWSClientSupport.java | 1 + .../websvc/jaxws/spi/ProjectJAXWSSupport.java | 1 + .../modules/websvc/rest/editor/AsyncConverter.java | 14 +- .../websvc/rest/wizard/InterceptorPanel.java | 13 +- .../websvc/rest/wizard/JaxRsFilterPanel.java | 13 +- .../modules/websvc/rest/spi/RestSupport.java | 27 +- .../parsing/impl/indexing/IndexerCache.java | 6 + java/j2ee.persistence/licenseinfo.xml | 3 + .../j2ee/persistence/dd/PersistenceMetadata.java | 4 +- .../j2ee/persistence/dd/PersistenceUtils.java | 8 +- .../j2ee/persistence/dd/common/JPAParseUtils.java | 4 +- .../j2ee/persistence/dd/common/Persistence.java | 12 +- .../persistence/dd/orm/model_3_2/package-info.java | 40 +- .../dd/persistence/model_3_2/package-info.java | 39 +- .../j2ee/persistence/dd/resources/orm_3_2.mdd | 377 ++ .../j2ee/persistence/dd/resources/orm_3_2.xsd | 2447 +++++++++++++ .../persistence/dd/resources/persistence_3_2.mdd | 100 + .../persistence/dd/resources/persistence_3_2.xsd | 342 ++ .../j2ee/persistence/provider/Provider.java | 8 +- .../j2ee/persistence/provider/ProviderUtil.java | 112 +- .../EntityManagerGenerationStrategySupport.java | 4 +- .../j2ee/persistence/ui/resources/layer.xml | 1 + .../persistence/ui/resources/persistence-3.2.xml | 7 + .../j2ee/persistence/unit/PUDataObject.java | 5 +- .../j2ee/persistence/unit/PersistenceCatalog.java | 2 + .../persistence/unit/PersistenceCfgProperties.java | 12 + .../unit/PersistenceToolBarMVElement.java | 5 +- .../persistence/unit/PersistenceUnitPanel.java | 16 +- .../modules/j2ee/persistence/unit/Util.java | 3 +- .../util/PersistenceProviderComboboxHelper.java | 3 +- .../modules/j2ee/persistence/wizard/Util.java | 23 +- .../wizard/unit/PersistenceUnitWizard.java | 4 +- .../persistence/provider/ProviderUtilTest.java | 48 + .../unit/PersistenceUnitDataObjectTest.java | 4 +- .../persistence/unit/PersistenceValidatorTest.java | 16 +- .../org/netbeans/nbbuild/extlibs/ignored-overlaps | 1 + nbbuild/cluster.properties | 2 + nbbuild/rat-exclusions.txt | 4 + 223 files changed, 22922 insertions(+), 864 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected] For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
