You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by ma...@apache.org on 2023/01/17 22:02:49 UTC
[netbeans] branch master updated (a97c3587f2 -> ad297ed60f)
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
from a97c3587f2 Merge pull request #5300 from apache/php82-support
new b8f0e560c4 Jakarta EE 10 support
new 273af6c126 Servlet 6.0, Application 10.0, JSF and Beans Resolver
new e20d037e42 Schema update
new b08bbe629a Payara Server - Jakarta EE 10 support
new e1c4d14852 JAKARTA EE 10 Archetype
new 59aecb4be5 Update Jakarta EE 10 version to Payara Config
new a2f73f3e64 Adding support for JakartaEE in WildFly plugin
new e6d965f201 Make JakartaEE 10 modules load on JDK 11+ only.
new 48bf793464 GlassFish 7 was tested with up to java 19 and use Jersey 3.1.0 (Same with Payara)
new dcfddc2ebb Fix one Jakarta 10 validation Add some missing Jakarta 10 validation
new 903f91d7f9 Add missing Jakarta EE 10 entries to rat.exclusions and servlet build.xml files
new 9df0dda994 Add support for Jakarta EE 10 to Tomcat
new 7b55d2a757 Add support for javadoc that contains only the element-list file. The jakartaee-10 javadoc is not accessible in the IDE otherwise.
new be2b078c59 return both WEB + FULL profiles for WF 27+.
new ad297ed60f Merge pull request #4692 from jGauravGupta/JAKARTA_EE_10.0.0
The 8003 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org-netbeans-modules-glassfish-common.sig | 7 +-
.../modules/glassfish/common/Bundle.properties | 1 +
.../common/GlassfishInstanceProvider.java | 6 +-
.../modules/glassfish/common/ServerDetails.java | 14 +
.../common/registration/AutomaticRegistration.java | 5 +-
.../glassfish/common/wizards/Bundle.properties | 3 +
.../common/wizards/GlassfishWizardProvider.java | 7 +
.../modules/glassfish/spi/ServerUtilities.java | 6 +
.../org-netbeans-modules-glassfish-eecommon.sig | 3 +
.../eecommon/api/config/AppClientVersion.java | 9 +
.../eecommon/api/config/ApplicationVersion.java | 9 +
.../api/config/GlassfishConfiguration.java | 15 +-
.../glassfish/eecommon/api/config/J2EEVersion.java | 8 +
.../org-netbeans-modules-glassfish-javaee.sig | 2 +
.../javaee/AbstractHk2ConfigurationFactory.java | 9 +-
.../modules/glassfish/javaee/Bundle.properties | 2 +
.../glassfish/javaee/Hk2DeploymentFactory.java | 17 +
.../glassfish/javaee/Hk2JavaEEPlatformFactory.java | 15 +-
.../glassfish/javaee/Hk2JavaEEPlatformImpl.java | 4 +
.../modules/glassfish/javaee/Hk2JaxWsStack.java | 27 +-
.../glassfish/javaee/Hk2OptionalFactory.java | 6 +
.../javaee/JavaEEServerModuleFactory.java | 7 +-
.../modules/glassfish/javaee/RunTimeDDCatalog.java | 42 +-
.../netbeans/modules/glassfish/javaee/layer.xml | 61 +
.../modules/glassfish/javaee/nbdepjakartaee10.xml | 54 +
.../org-netbeans-modules-glassfish-tooling.sig | 5 +-
.../glassfish/tooling/data/GlassFishVersion.java | 10 +-
.../server/config/ConfigBuilderProvider.java | 7 +-
.../tooling/server/config/GlassFishV7_0_0.xml} | 67 +-
.../tooling/server/config/JavaEEProfile.java | 12 +-
.../tooling/data/GlassFishVersionTest.java | 2 +
.../gradle/javaee/GradleJavaEEProjectSettings.java | 2 +
.../web/newproject/ServerSelectionPanelVisual.java | 10 +-
.../newproject/WebApplicationProjectWizard.java | 12 +
enterprise/j2ee.clientproject/licenseinfo.xml | 7 +
.../j2ee/clientproject/AppClientProvider.java | 4 +-
.../api/AppClientProjectGenerator.java | 4 +
.../ui/customizer/AppClientProjectProperties.java | 2 +-
.../ui/resources/application-client-10.xml | 7 +
.../ui/resources/application-client-9.xml | 7 +
.../j2ee/clientproject/ui/resources/layer.xml | 2 +
.../AppClientProjectJAXWSClientSupport.java | 4 +
enterprise/j2ee.common/licenseinfo.xml | 4 +
.../j2ee/common/J2eeProjectCapabilities.java | 16 +-
.../netbeans/modules/j2ee/common/dd/DDHelper.java | 34 +-
.../modules/j2ee/common/dd/resources/beans-4.0.xml | 7 +
.../modules/j2ee/common/dd/resources/ear-10.xml | 7 +
.../modules/j2ee/common/dd/resources/web-6.0.xml | 8 +
.../j2ee/common/dd/resources/web-fragment-6.0.xml | 8 +
.../j2ee/common/J2eeProjectCapabilitiesTest.java | 40 +
.../nbproject/org-netbeans-modules-j2ee-core.sig | 14 +-
.../org/netbeans/api/j2ee/core/Bundle.properties | 2 +
.../src/org/netbeans/api/j2ee/core/Profile.java | 10 +
.../org/netbeans/api/j2ee/core/ProfileTest.java | 40 +-
enterprise/j2ee.dd/.gitignore | 6 +-
enterprise/j2ee.dd/build.xml | 234 ++
enterprise/j2ee.dd/licenseinfo.xml | 11 +
.../nbproject/org-netbeans-modules-j2ee-dd.sig | 2 +
.../j2ee/dd/api/application/Application.java | 4 +
.../j2ee/dd/api/application/DDProvider.java | 2 +
.../modules/j2ee/dd/api/client/AppClient.java | 1 +
.../netbeans/modules/j2ee/dd/api/web/WebApp.java | 4 +
.../j2ee/dd/api/web/WebFragmentProvider.java | 6 +-
.../modules/j2ee/dd/impl/common/DDUtils.java | 4 +
.../dd/impl/resources/application-client_10.mdd | 385 +++
.../dd/impl/resources/application-client_10.xsd | 246 ++
.../j2ee/dd/impl/resources/application_10.mdd | 111 +
.../j2ee/dd/impl/resources/application_10.xsd | 381 +++
.../j2ee/dd/impl/resources/jakartaee_10.xsd | 3491 ++++++++++++++++++++
.../modules/j2ee/dd/impl/resources/jsp_3_1.xsd | 378 +++
.../modules/j2ee/dd/impl/resources/web-app_6_0.mdd | 856 +++++
.../modules/j2ee/dd/impl/resources/web-app_6_0.xsd | 343 ++
.../j2ee/dd/impl/resources/web-common_6_0.xsd | 1507 +++++++++
.../j2ee/dd/impl/resources/web-fragment_6_0.mdd | 910 +++++
.../j2ee/dd/impl/resources/web-fragment_6_0.xsd | 316 ++
.../modules/j2ee/dd/impl/web/WebAppProxy.java | 3 +
.../modules/j2ee/ddloaders/Bundle.properties | 3 +
.../j2ee/ddloaders/client/ClientDataLoader.java | 2 +
.../j2ee/ddloaders/ejb/EjbJar40DataLoader.java | 2 +-
.../resources/dd-loaders-mime-resolver.xml | 40 +
.../modules/j2ee/ddloaders/resources/layer.xml | 214 +-
.../modules/j2ee/ddloaders/web/DDDataObject.java | 3 +-
.../j2ee/ddloaders/web/DDWeb60DataLoader.java | 56 +
.../ddloaders/web/DDWebFragment60DataLoader.java | 57 +
.../web/multiview/FiltersMultiViewElement.java | 3 +-
.../web/multiview/OverviewMultiViewElement.java | 3 +-
.../web/multiview/PagesMultiViewElement.java | 3 +-
.../web/multiview/ReferencesMultiViewElement.java | 3 +-
.../web/multiview/SecurityMultiViewElement.java | 5 +-
.../web/multiview/ServletsMultiViewElement.java | 3 +-
.../modules/j2ee/earproject/ProjectEar.java | 4 +-
.../org/netbeans/modules/j2ee/ejbcore/Utils.java | 33 +-
.../ejb/wizard/dd/EjbJarXmlWizardIterator.java | 2 +-
.../wizard/jpa/dao/AppServerValidationPanel.java | 13 +-
.../ejb/wizard/jpa/dao/EjbFacadeVisualPanel2.java | 8 +-
.../j2ee/ejbcore/ejb/wizard/mdb/MdbWizard.java | 6 +-
.../ejb/wizard/session/SessionEJBWizard.java | 13 +-
.../jaxws/EjbProjectJAXWSClientSupport.java | 4 +
.../jaxws/EjbProjectJAXWSSupport.java | 4 +
.../ui/customizer/EjbJarProjectProperties.java | 2 +-
.../ui/wizards/NewEjbJarProjectWizardIterator.java | 4 +-
.../rules/PersistentTimerInEjbLite.java | 2 +
enterprise/j2ee.kit/manifest.mf | 2 +-
.../modules/j2ee/sun/dd/api/ASDDVersion.java | 26 +
.../modules/j2ee/deployment/impl/layer.xml | 3 +-
.../build.xml} | 17 +-
.../external/binaries-list} | 20 +-
.../jakarta.jakartaee-api-10.0.0-license.txt | 93 +
.../jakarta.jakartaee-web-api-10.0.0-license.txt | 93 +
enterprise/jakartaee10.api/manifest.mf | 8 +
.../nbproject/project.properties} | 21 +-
.../nbproject/project.xml} | 23 +-
.../modules/jakartaee10/api}/Bundle.properties | 25 +-
.../jakartaee10/api/jakartaee-api-10.0.xml} | 33 +-
.../jakartaee10/api/jakartaee-web-api-10.0.xml} | 33 +-
.../netbeans/modules/jakartaee10/api/layer.xml} | 25 +-
enterprise/jakartaee10.platform/arch.xml | 908 +++++
enterprise/jakartaee10.platform/build.xml | 47 +
.../external/binaries-list} | 18 +-
...akarta.jakartaee-api-10.0.0-javadoc-license.txt | 93 +
...akarta.jakartaee-api-10.0.0-javadoc-license.txt | 93 +
enterprise/jakartaee10.platform/manifest.mf | 7 +
.../nbproject/project.properties} | 23 +-
.../nbproject/project.xml} | 24 +-
.../jakartaee10}/platform/Bundle.properties | 0
.../api/PersistenceProviderSupplierImpl.java | 3 +-
.../project/api/ant/ui/wizard/Bundle.properties | 6 +-
.../api/ant/ui/wizard/J2eeVersionWarningPanel.java | 8 +-
.../api/ant/ui/wizard/ProjectServerPanel.java | 20 +-
.../wildfly/ide/WildflyJ2eePlatformFactory.java | 47 +-
.../javaee/wildfly/ide/ui/WildflyPluginUtils.java | 16 +
.../j2ee/ui/customizer/impl/CustomizerRunWeb.java | 2 +
.../j2ee/ui/wizard/ServerSelectionHelper.java | 6 +-
.../archetype/BaseJ2eeArchetypeProvider.java | 7 +
.../j2ee/ui/wizard/archetype/Bundle.properties | 3 +
.../ui/wizard/archetype/J2eeArchetypeFactory.java | 6 +
.../modules/maven/j2ee/web/WebModuleImpl.java | 14 +
.../maven/j2ee/web/WebRecoPrivTemplates.java | 13 +-
.../modules/maven/j2ee/JavaEEMavenTestBase.java | 1 +
.../maven/j2ee/JavaEEProjectSettingsImplTest.java | 2 +
.../modules/maven/j2ee/utils/CreateDDTest.java | 14 +
.../modules/maven/j2ee/web/WebModuleImplTest.java | 16 +
.../org-netbeans-modules-payara-eecommon.sig | 8 +
.../eecommon/api/config/AppClientVersion.java | 39 +-
.../eecommon/api/config/ApplicationVersion.java | 36 +
.../payara/eecommon/api/config/J2EEVersion.java | 36 +-
.../payara/jakartaee/Hk2JavaEEPlatformImpl.java | 4 +
.../modules/payara/jakartaee/RunTimeDDCatalog.java | 647 ++--
.../org-netbeans-modules-payara-tooling.sig | 3 +
.../tooling/server/config/JavaEEProfile.java | 12 +-
.../payara/tooling/server/config/PayaraV6.xml | 6 +-
enterprise/servletjspapi/build.xml | 6 +
.../modules/tomcat5/j2ee/TomcatPlatformImpl.java | 14 +-
.../modules/tomcat5/util/TomcatProperties.java | 9 +-
.../modules/web/beans/resources/BeansResolver.xml | 8 +
.../modules/web/beans/wizard/BeansXmlIterator.java | 4 +-
enterprise/web.jsf/licenseinfo.xml | 2 +
.../org/netbeans/modules/web/jsf/JSFCatalog.java | 29 +-
.../modules/web/jsf/JSFFrameworkProvider.java | 6 +-
.../src/org/netbeans/modules/web/jsf/JSFUtils.java | 2 +
.../modules/web/jsf/api/ConfigurationUtils.java | 2 +-
.../modules/web/jsf/api/facesmodel/JSFVersion.java | 8 +-
.../jsf/impl/facesmodel/JSFConfigModelImpl.java | 8 +-
.../web/jsf/impl/facesmodel/JSFConfigQNames.java | 107 +
.../web/jsf/resources/faces-config_4_0.xml} | 19 +-
.../jsf/resources/web-facelettaglibrary_4_0.xsd | 751 +++++
.../web/jsf/resources/web-faces-mime-resolver.xml | 21 +-
.../web/jsf/resources/web-facesconfig_4_0.xsd | 3447 +++++++++++++++++++
.../web/jsf/wizards/FacesConfigIterator.java | 8 +-
.../jsf/wizards/JSFConfigurationPanelVisual.java | 4 +-
.../modules/web/project/ProjectWebModule.java | 4 +-
.../netbeans/modules/web/project/WebProject.java | 18 +-
.../jaxws/WebProjectJAXWSClientSupport.java | 4 +
.../web/project/jaxws/WebProjectJAXWSSupport.java | 4 +
.../ui/customizer/WebProjectProperties.java | 2 +-
.../modules/web/project/WebProjectTest.java | 6 +
.../websocket/editor/WebSocketMethodsTask.java | 3 +-
.../modules/websocket/wizard/WebSocketPanel.java | 23 +-
.../org-netbeans-modules-websvc-clientapi.sig | 1 +
.../jaxws/client/ProjectJAXWSClientSupport.java | 1 +
.../org-netbeans-modules-websvc-jaxwsapi.sig | 1 +
.../websvc/jaxws/spi/ProjectJAXWSSupport.java | 1 +
.../modules/ws/qaf/WebServicesTestBase.java | 14 +-
.../modules/websvc/rest/editor/AsyncConverter.java | 4 +-
.../websvc/rest/wizard/InterceptorPanel.java | 23 +-
.../websvc/rest/wizard/JaxRsFilterPanel.java | 23 +-
.../org-netbeans-modules-websvc-restapi.sig | 3 +-
.../modules/websvc/rest/spi/RestSupport.java | 25 +-
.../java/j2seplatform/libraries/Bundle.properties | 2 +-
.../support/JavadocAndSourceRootDetection.java | 3 +-
.../support/JavadocAndSourceRootDetectionTest.java | 6 +-
.../modules/javadoc/search/IndexBuilder.java | 18 +-
.../org/netbeans/nbbuild/extlibs/ignored-overlaps | 3 +
nbbuild/cluster.properties | 2 +
nbbuild/rat-exclusions.txt | 4 +
195 files changed, 17002 insertions(+), 647 deletions(-)
create mode 100644 enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/nbdepjakartaee10.xml
copy enterprise/{payara.tooling/src/org/netbeans/modules/payara/tooling/server/config/PayaraV6.xml => glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV7_0_0.xml} (56%)
create mode 100644 enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/resources/application-client-10.xml
create mode 100644 enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/resources/application-client-9.xml
create mode 100644 enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/beans-4.0.xml
create mode 100644 enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/ear-10.xml
create mode 100644 enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/web-6.0.xml
create mode 100644 enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/web-fragment-6.0.xml
create mode 100644 enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/resources/application-client_10.mdd
create mode 100644 enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/resources/application-client_10.xsd
create mode 100644 enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/resources/application_10.mdd
create mode 100644 enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/resources/application_10.xsd
create mode 100644 enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/resources/jakartaee_10.xsd
create mode 100644 enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/resources/jsp_3_1.xsd
create mode 100644 enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/resources/web-app_6_0.mdd
create mode 100644 enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/resources/web-app_6_0.xsd
create mode 100644 enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/resources/web-common_6_0.xsd
create mode 100644 enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/resources/web-fragment_6_0.mdd
create mode 100644 enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/resources/web-fragment_6_0.xsd
create mode 100644 enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/DDWeb60DataLoader.java
create mode 100644 enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/DDWebFragment60DataLoader.java
copy enterprise/{web.beans/src/org/netbeans/modules/web/beans/resources/BeansResolver.xml => jakartaee10.api/build.xml} (68%)
copy enterprise/{j2ee.core/src/org/netbeans/api/j2ee/core/Bundle.properties => jakartaee10.api/external/binaries-list} (58%)
create mode 100644 enterprise/jakartaee10.api/external/jakarta.jakartaee-api-10.0.0-license.txt
create mode 100644 enterprise/jakartaee10.api/external/jakarta.jakartaee-web-api-10.0.0-license.txt
create mode 100644 enterprise/jakartaee10.api/manifest.mf
copy enterprise/{j2ee.core/src/org/netbeans/api/j2ee/core/Bundle.properties => jakartaee10.api/nbproject/project.properties} (58%)
copy enterprise/{web.beans/src/org/netbeans/modules/web/beans/resources/BeansResolver.xml => jakartaee10.api/nbproject/project.xml} (68%)
copy enterprise/{j2ee.core/src/org/netbeans/api/j2ee/core => jakartaee10.api/src/org/netbeans/modules/jakartaee10/api}/Bundle.properties (58%)
copy enterprise/{web.beans/src/org/netbeans/modules/web/beans/resources/BeansResolver.xml => jakartaee10.api/src/org/netbeans/modules/jakartaee10/api/jakartaee-api-10.0.xml} (52%)
copy enterprise/{web.beans/src/org/netbeans/modules/web/beans/resources/BeansResolver.xml => jakartaee10.api/src/org/netbeans/modules/jakartaee10/api/jakartaee-web-api-10.0.xml} (52%)
copy enterprise/{web.beans/src/org/netbeans/modules/web/beans/resources/BeansResolver.xml => jakartaee10.api/src/org/netbeans/modules/jakartaee10/api/layer.xml} (56%)
create mode 100644 enterprise/jakartaee10.platform/arch.xml
create mode 100644 enterprise/jakartaee10.platform/build.xml
copy enterprise/{j2ee.core/src/org/netbeans/api/j2ee/core/Bundle.properties => jakartaee10.platform/external/binaries-list} (58%)
create mode 100644 enterprise/jakartaee10.platform/external/generated-jakarta.jakartaee-api-10.0.0-javadoc-license.txt
create mode 100644 enterprise/jakartaee10.platform/external/jakarta.jakartaee-api-10.0.0-javadoc-license.txt
create mode 100644 enterprise/jakartaee10.platform/manifest.mf
copy enterprise/{j2ee.core/src/org/netbeans/api/j2ee/core/Bundle.properties => jakartaee10.platform/nbproject/project.properties} (58%)
copy enterprise/{web.beans/src/org/netbeans/modules/web/beans/resources/BeansResolver.xml => jakartaee10.platform/nbproject/project.xml} (66%)
copy enterprise/{jakartaee8.platform/src/org/netbeans/modules/jakartaee8 => jakartaee10.platform/src/org/netbeans/modules/jakartaee10}/platform/Bundle.properties (100%)
copy enterprise/{web.beans/src/org/netbeans/modules/web/beans/resources/BeansResolver.xml => web.jsf/src/org/netbeans/modules/web/jsf/resources/faces-config_4_0.xml} (65%)
create mode 100644 enterprise/web.jsf/src/org/netbeans/modules/web/jsf/resources/web-facelettaglibrary_4_0.xsd
create mode 100644 enterprise/web.jsf/src/org/netbeans/modules/web/jsf/resources/web-facesconfig_4_0.xsd
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists