You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by pe...@apache.org on 2022/08/22 23:36:27 UTC
[netbeans] branch master updated: Improve Jakarta EE 9/9.1 support (#4438)
This is an automated email from the ASF dual-hosted git repository.
pepness pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new f0ed696648 Improve Jakarta EE 9/9.1 support (#4438)
f0ed696648 is described below
commit f0ed696648470561d9e05c03db965812893b3f51
Author: José Contreras <pe...@apache.org>
AuthorDate: Mon Aug 22 23:36:20 2022 +0000
Improve Jakarta EE 9/9.1 support (#4438)
- Add schemas for Jakarta EE 9
- Add xml descriptors for Jakarta EE 9
- Add mdd files for Jakarta EE 9 schemas
- Add Jakarta EE 9 build actions
- Add Jakarta EE 9 loaders and factories
- Add logic to support Jakarta EE 9/9.1 specs (EJB 4, CDI 3, JSF 3 and JPA 3)
- Add source level '11' as minimum for Jakarta EE 9.1
- Add Jakarta EE 9 mime-types
- Add some new tests
- Add support to create bean validation files based on the Profile version
- Add Maven support for Jakarta 9/9.1 (thanks Josh Juneau)
- Add missing maven test for Java/Jakarta EE profiles
- Add corresponding licenses for Jakarta 9/9.1 (mostly EDL and EPL)
- Add missing config files for Java EE
- Add missing DataLoader for Java EE 8 schemas
- Add missing tests for Profile comparisons
- Add GlassFish support for javadoc on Jakarta EE 8/9/9.1
- Add missing jar to GlassFish 5.1.0 deployer
- Fix wrong javadoc inside some GlassFish deployer's
Co-authored-by: Josh Juneau <ju...@gmail.com>
---
.../javaee/JavaEEServerModuleFactory.java | 64 +-
.../modules/glassfish/javaee/RunTimeDDCatalog.java | 671 ++--
.../tooling/server/config/GlassFishV5_1_0.xml | 3 +-
.../tooling/server/config/GlassFishV6.xml | 2 +-
.../api/AppClientProjectGenerator.java | 14 +-
enterprise/j2ee.common/licenseinfo.xml | 10 +
.../j2ee/common/J2eeProjectCapabilities.java | 60 +-
.../netbeans/modules/j2ee/common/dd/DDHelper.java | 102 +-
.../modules/j2ee/common/dd/resources/beans-3.0.xml | 7 +
.../j2ee/common/dd/resources/constraint-1.1.xml | 9 +
.../j2ee/common/dd/resources/constraint-2.0.xml | 10 +
.../j2ee/common/dd/resources/constraint-3.0.xml | 10 +
.../j2ee/common/dd/resources/constraint.xml | 8 +-
.../modules/j2ee/common/dd/resources/ear-9.xml | 7 +
.../j2ee/common/dd/resources/validation-1.1.xml | 9 +
.../j2ee/common/dd/resources/validation-2.0.xml | 10 +
.../j2ee/common/dd/resources/validation-3.0.xml | 10 +
.../j2ee/common/dd/resources/validation.xml | 8 +-
.../modules/j2ee/common/dd/resources/web-5.0.xml | 8 +
.../j2ee/common/dd/resources/web-fragment-5.0.xml | 8 +
.../j2ee/common/J2eeProjectCapabilitiesTest.java | 198 +-
.../org/netbeans/api/j2ee/core/ProfileTest.java | 59 +
enterprise/j2ee.dd/.gitignore | 7 +-
enterprise/j2ee.dd/build.xml | 358 ++-
enterprise/j2ee.dd/licenseinfo.xml | 26 +
.../j2ee/dd/api/application/Application.java | 7 +-
.../j2ee/dd/api/application/DDProvider.java | 18 +-
.../modules/j2ee/dd/api/ejb/DDProvider.java | 13 +-
.../netbeans/modules/j2ee/dd/api/web/WebApp.java | 10 +-
.../modules/j2ee/dd/api/web/WebFragment.java | 6 +-
.../j2ee/dd/api/web/WebFragmentProvider.java | 16 +-
.../j2ee/dd/impl/application/ApplicationProxy.java | 18 +-
.../j2ee/dd/impl/client/AppClientProxy.java | 17 +-
.../modules/j2ee/dd/impl/common/DDUtils.java | 4 +
.../modules/j2ee/dd/impl/common/EnclosingBean.java | 21 +-
.../modules/j2ee/dd/impl/common/ParseUtils.java | 2 +-
.../modules/j2ee/dd/impl/ejb/EjbJarProxy.java | 18 +-
.../dd/impl/resources/application-client_9.mdd | 385 +++
.../dd/impl/resources/application-client_9.xsd | 307 ++
.../j2ee/dd/impl/resources/application_9.mdd | 111 +
.../j2ee/dd/impl/resources/application_9.xsd | 390 +++
.../j2ee/dd/impl/resources/batchXML_2_0.xsd | 41 +
.../modules/j2ee/dd/impl/resources/beans_3_0.xsd | 366 +++
.../j2ee/dd/impl/resources/bindingschema_3_0.xsd | 482 +++
.../j2ee/dd/impl/resources/connector_2_0.xsd | 1165 +++++++
.../modules/j2ee/dd/impl/resources/ejb-jar_4_0.mdd | 732 +++++
.../modules/j2ee/dd/impl/resources/ejb-jar_4_0.xsd | 3351 ++++++++++++++++++++
.../modules/j2ee/dd/impl/resources/jakartaee_9.xsd | 3073 ++++++++++++++++++
.../impl/resources/jakartaee_web_services_2_0.xsd | 551 ++++
.../jakartaee_web_services_client_2_0.xsd | 714 +++++
.../modules/j2ee/dd/impl/resources/jobXML_2_0.xsd | 464 +++
.../modules/j2ee/dd/impl/resources/jsp_3_0.xsd | 365 +++
.../j2ee/dd/impl/resources/permissions_9.xsd | 151 +
.../modules/j2ee/dd/impl/resources/web-app_3_1.mdd | 4 +-
.../modules/j2ee/dd/impl/resources/web-app_5_0.mdd | 856 +++++
.../modules/j2ee/dd/impl/resources/web-app_5_0.xsd | 342 ++
.../j2ee/dd/impl/resources/web-common_5_0.xsd | 1450 +++++++++
.../j2ee/dd/impl/resources/web-fragment_3_1.mdd | 20 +-
.../j2ee/dd/impl/resources/web-fragment_4_0.mdd | 2493 ++++++---------
.../j2ee/dd/impl/resources/web-fragment_5_0.mdd | 910 ++++++
.../j2ee/dd/impl/resources/web-fragment_5_0.xsd | 316 ++
.../modules/j2ee/dd/impl/web/WebAppProxy.java | 18 +-
.../modules/j2ee/dd/impl/web/WebParseUtils.java | 16 +-
.../dd/impl/web/metadata/WebAppMetadataImpl.java | 25 +-
.../modules/j2ee/ddloaders/Bundle.properties | 5 +
.../modules/j2ee/ddloaders/app/EarDataLoader.java | 3 +
.../modules/j2ee/ddloaders/app/EarDataObject.java | 19 +-
.../j2ee/ddloaders/catalog/EnterpriseCatalog.java | 20 +-
.../j2ee/ddloaders/client/ClientDataLoader.java | 2 +
.../j2ee/ddloaders/client/ClientDataObject.java | 2 +-
.../j2ee/ddloaders/client/DDChangesPanel.java | 3 +-
.../common/xmlutils/XMLJ2eeDataObject.java | 6 +-
.../common/xmlutils/XMLJ2eeEditorSupport.java | 17 +-
.../modules/j2ee/ddloaders/ejb/DDChangesPanel.java | 3 +-
.../j2ee/ddloaders/ejb/EjbJar40DataLoader.java | 46 +
.../resources/dd-loaders-mime-resolver.xml | 50 +
.../modules/j2ee/ddloaders/resources/layer.xml | 403 ++-
.../modules/j2ee/ddloaders/web/DDDataObject.java | 10 +-
.../j2ee/ddloaders/web/DDWeb40DataLoader.java | 57 +
.../j2ee/ddloaders/web/DDWeb50DataLoader.java | 57 +
.../ddloaders/web/DDWebFragment40DataLoader.java | 57 +
.../ddloaders/web/DDWebFragment50DataLoader.java | 57 +
.../web/multiview/FiltersMultiViewElement.java | 7 +-
.../web/multiview/OverviewMultiViewElement.java | 7 +-
.../web/multiview/PagesMultiViewElement.java | 7 +-
.../web/multiview/ReferencesMultiViewElement.java | 7 +-
.../web/multiview/SecurityMultiViewElement.java | 11 +-
.../web/multiview/ServletsMultiViewElement.java | 7 +-
.../modules/j2ee/earproject/ProjectEar.java | 6 +-
.../org/netbeans/modules/j2ee/ejbcore/Utils.java | 21 +-
.../ejb/wizard/dd/EjbJarXmlWizardIterator.java | 4 +-
.../ejb/wizard/jpa/dao/EjbFacadeVisualPanel2.java | 9 +-
.../j2ee/ejbcore/ejb/wizard/mdb/MdbWizard.java | 19 +-
.../logicalview/ejb/shared/EjbViewController.java | 12 +-
enterprise/j2ee.ejbjarproject/licenseinfo.xml | 1 +
.../modules/j2ee/ejbjarproject/EjbJarProvider.java | 4 +-
.../ejbjarproject/ui/resources/ejb-jar-4.0.xml | 7 +
.../j2ee/ejbjarproject/ui/resources/layer.xml | 1 +
.../ui/wizards/NewEjbJarProjectWizardIterator.java | 6 +-
.../modules/j2ee/ejbverification/HintsUtils.java | 3 +-
.../rules/PersistentTimerInEjbLite.java | 22 +-
.../javaee.beanvalidation/nbproject/project.xml | 10 +-
.../ValidationConfigurationIterator.java | 11 +-
.../beanvalidation/ValidationMappingIterator.java | 11 +-
enterprise/javaee.project/nbproject/project.xml | 1 +
.../api/PersistenceProviderSupplierImpl.java | 6 +-
.../netbeans/modules/maven/j2ee/ear/EarImpl.java | 3 +
.../modules/maven/j2ee/ejb/EjbJarImpl.java | 3 +
.../j2ee/ui/customizer/impl/CustomizerRunWeb.java | 2 +
.../j2ee/ui/wizard/ServerSelectionHelper.java | 4 +
.../archetype/BaseJ2eeArchetypeProvider.java | 7 +
.../j2ee/ui/wizard/archetype/Bundle.properties | 3 +
.../ui/wizard/archetype/J2eeArchetypeFactory.java | 6 +
.../modules/maven/j2ee/web/WebModuleImpl.java | 32 +-
.../maven/j2ee/web/WebRecoPrivTemplates.java | 7 +-
.../maven/j2ee/JavaEEProjectSettingsImplTest.java | 6 +
.../modules/maven/j2ee/utils/CreateDDTest.java | 44 +
.../modules/maven/j2ee/web/WebModuleImplTest.java | 48 +
enterprise/servletjspapi/build.xml | 13 +
.../modules/web/beans/wizard/BeansXmlIterator.java | 4 +-
enterprise/web.core/licenseinfo.xml | 8 +
.../web/taglib/resources/web-jsptaglibrary_3_0.mdd | 745 +++++
.../web/taglib/resources/web-jsptaglibrary_3_0.xsd | 1109 +++++++
.../netbeans/modules/web/wizards/PageIterator.java | 11 +-
.../wizards/dd/WebFragmentXmlWizardIterator.java | 2 +-
.../nbproject/project.properties | 4 +-
enterprise/web.jsf/licenseinfo.xml | 7 +-
.../org/netbeans/modules/web/jsf/JSFCatalog.java | 9 +-
.../modules/web/jsf/JSFConfigUtilities.java | 24 +-
.../modules/web/jsf/JSFFrameworkProvider.java | 77 +-
.../src/org/netbeans/modules/web/jsf/JSFUtils.java | 12 +-
.../modules/web/jsf/api/ConfigurationUtils.java | 10 +-
.../modules/web/jsf/api/facesmodel/JSFVersion.java | 7 +-
.../resources/templates/simpleFacelets.template | 5 +-
.../jsf/impl/facesmodel/JSFConfigModelImpl.java | 8 +-
.../web/jsf/impl/facesmodel/JSFConfigQNames.java | 120 +-
.../templates/compositeComponent.template | 4 +-
.../jsf/resources/web-facelettaglibrary_3_0.xsd | 751 +++++
.../wizards/CompositeComponentWizardIterator.java | 6 +-
.../web/jsf/wizards/FacesConfigIterator.java | 55 +-
.../jsf/wizards/JSFConfigurationPanelVisual.java | 8 +-
.../modules/web/project/ProjectWebModule.java | 10 +-
.../netbeans/modules/web/project/WebProject.java | 24 +-
.../web/project/api/WebProjectUtilities.java | 5 +-
.../websocket/editor/WebSocketMethodsTask.java | 3 +-
.../modules/websocket/wizard/WebSocketPanel.java | 12 +-
enterprise/websvc.core/licenseinfo.xml | 8 +
...jakartaee_web_services_metadata_handler_3_0.xsd | 70 +
.../resources/wsdl_customizationschema_3_0.xsd | 420 +++
.../modules/websvc/rest/editor/AsyncConverter.java | 4 +-
.../websvc/rest/wizard/InterceptorPanel.java | 12 +-
.../websvc/rest/wizard/JaxRsFilterPanel.java | 4 +-
.../modules/websvc/rest/spi/MiscUtilities.java | 12 +-
.../modules/websvc/rest/spi/RestSupport.java | 17 +-
ide/ide.kit/test/qa-functional/data/blacklist.txt | 7 +
.../test/qa-functional/data/whitelist_1.txt | 4 +
.../parsing/impl/indexing/IndexerCache.java | 57 +-
ide/schema2beans/nbproject/project.properties | 1 +
java/j2ee.persistence/licenseinfo.xml | 22 +
.../j2ee/persistence/dd/resources/orm_2_2.xsd | 2336 ++++++++++++++
.../j2ee/persistence/dd/resources/orm_3_0.xsd | 2324 ++++++++++++++
.../persistence/dd/resources/persistence_2_2.xsd | 354 +++
.../persistence/dd/resources/persistence_3_0.xsd | 342 ++
.../j2ee/persistence/ui/resources/layer.xml | 2 +
.../persistence/ui/resources/persistence-2.2.xml | 8 +
.../persistence/ui/resources/persistence-3.0.xml | 8 +
nbbuild/rat-exclusions.txt | 5 +
167 files changed, 28863 insertions(+), 2315 deletions(-)
diff --git a/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/JavaEEServerModuleFactory.java b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/JavaEEServerModuleFactory.java
index 4578d815e1..3ef59b0da2 100644
--- a/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/JavaEEServerModuleFactory.java
+++ b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/JavaEEServerModuleFactory.java
@@ -39,6 +39,7 @@ import org.netbeans.modules.glassfish.spi.GlassfishModule;
import org.netbeans.modules.glassfish.spi.GlassfishModuleFactory;
import org.netbeans.modules.glassfish.spi.RegisteredDerbyServer;
import org.netbeans.modules.glassfish.spi.ServerUtilities;
+import org.netbeans.modules.glassfish.tooling.data.GlassFishVersion;
import org.netbeans.modules.j2ee.deployment.plugins.api.InstanceCreationException;
import org.netbeans.spi.project.libraries.LibraryTypeProvider;
import org.netbeans.spi.project.libraries.support.LibrariesSupport;
@@ -56,6 +57,7 @@ import org.openide.util.Utilities;
public class JavaEEServerModuleFactory implements GlassfishModuleFactory {
private static final JavaEEServerModuleFactory singleton = new JavaEEServerModuleFactory();
+ private static final Logger LOG = Logger.getLogger(JavaEEServerModuleFactory.class.getName());
private JavaEEServerModuleFactory() {
}
@@ -106,12 +108,12 @@ public class JavaEEServerModuleFactory implements GlassfishModuleFactory {
// exception
ip = InstanceProperties.getInstanceProperties(url);
if (null == ip) {
- Logger.getLogger("glassfish-javaee").log(Level.WARNING, null, ex); // NOI18N
+ LOG.log(Level.WARNING, null, ex); // NOI18N
}
}
if(ip == null) {
- Logger.getLogger("glassfish-javaee").log(Level.INFO, "Unable to create/locate J2EE InstanceProperties for {0}", url);
+ LOG.log(Level.INFO, "Unable to create/locate J2EE InstanceProperties for {0}", url);
}
}
@@ -137,7 +139,7 @@ public class JavaEEServerModuleFactory implements GlassfishModuleFactory {
}
});
} else {
- Logger.getLogger("glassfish-javaee").log(Level.WARNING, "commonModule is NULL");
+ LOG.log(Level.WARNING, "commonModule is NULL");
}
return (ip != null) ? new JavaEEServerModule(instanceLookup, ip) : null;
@@ -188,10 +190,10 @@ public class JavaEEServerModuleFactory implements GlassfishModuleFactory {
if (j2eeDoc != null) {
docList.add(ServerUtilities.fileToUrl(j2eeDoc));
} else {
- Logger.getLogger("glassfish-javaee").log(Level.WARNING, "Warning: Java EE documentation not found when registering EclipseLink library.");
+ LOG.log(Level.WARNING, "Warning: Java EE documentation not found when registering EclipseLink library.");
}
} catch (MalformedURLException ex) {
- Logger.getLogger("glassfish-javaee").log(Level.WARNING, ex.getLocalizedMessage(), ex);
+ LOG.log(Level.WARNING, ex.getLocalizedMessage(), ex);
return false;
}
String name = ECLIPSE_LINK_LIB;
@@ -224,7 +226,7 @@ public class JavaEEServerModuleFactory implements GlassfishModuleFactory {
try {
libraryList.add(ServerUtilities.fileToUrl(f));
} catch (MalformedURLException ex) {
- Logger.getLogger("glassfish-javaee").log(Level.WARNING, ex.getLocalizedMessage(), ex);
+ LOG.log(Level.WARNING, ex.getLocalizedMessage(), ex);
return false;
}
}
@@ -245,6 +247,8 @@ public class JavaEEServerModuleFactory implements GlassfishModuleFactory {
private static final String JAVA_EE_5_LIB = "Java-EE-GlassFish-v3-Prelude"; // NOI18N
private static final String JAVA_EE_JAVADOC = "javaee-doc-api.jar"; // NOI18N
+ private static final String JAKARTA_EE_8_JAVADOC = "jakartaee8-doc-api.jar"; // NOI18N
+ private static final String JAKARTA_EE_9_JAVADOC = "jakartaee9-doc-api.jar"; // NOI18N
private static boolean ensureGlassFishApiSupport(GlassFishServer server) {
String installRoot = server.getServerRoot();
@@ -256,18 +260,30 @@ public class JavaEEServerModuleFactory implements GlassfishModuleFactory {
if (f != null && f.exists()) {
name = JAVA_EE_6_LIB;
}
-
- File j2eeDoc = InstalledFileLocator.getDefault().locate(
+
+ File j2eeDoc;
+ if (GlassFishVersion.ge(server.getVersion(), GlassFishVersion.GF_6)) {
+ j2eeDoc = InstalledFileLocator.getDefault().locate(
+ "docs/" + JAKARTA_EE_9_JAVADOC,
+ Hk2LibraryProvider.JAVAEE_DOC_CODE_BASE, false);
+ } else if (GlassFishVersion.ge(server.getVersion(), GlassFishVersion.GF_5_1_0)) {
+ j2eeDoc = InstalledFileLocator.getDefault().locate(
+ "docs/" + JAKARTA_EE_8_JAVADOC,
+ Hk2LibraryProvider.JAVAEE_DOC_CODE_BASE, false);
+ } else {
+ j2eeDoc = InstalledFileLocator.getDefault().locate(
"docs/" + JAVA_EE_JAVADOC,
Hk2LibraryProvider.JAVAEE_DOC_CODE_BASE, false);
+ }
+
if (j2eeDoc != null) {
try {
docList.add(ServerUtilities.fileToUrl(j2eeDoc));
} catch (MalformedURLException ex) {
- Logger.getLogger("glassfish-javaee").log(Level.INFO, "Problem while registering Java EE API library JavaDoc."); // NOI18N
+ LOG.log(Level.INFO, "Problem while registering Java EE API library JavaDoc."); // NOI18N
}
} else {
- Logger.getLogger("glassfish-javaee").log(Level.INFO, "Java EE documentation not found when registering Java EE API library."); // NOI18N
+ LOG.log(Level.INFO, "Java EE documentation not found when registering Java EE API library."); // NOI18N
}
// additional jar for glassfish-samples support
@@ -276,7 +292,7 @@ public class JavaEEServerModuleFactory implements GlassfishModuleFactory {
try {
libraryList.add(ServerUtilities.fileToUrl(f));
} catch (MalformedURLException ex) {
- Logger.getLogger("glassfish-javaee").log(Level.INFO, "Problem while registering web-core into GlassFish API library."); // NOI18N
+ LOG.log(Level.INFO, "Problem while registering web-core into GlassFish API library."); // NOI18N
}
}
@@ -322,11 +338,11 @@ public class JavaEEServerModuleFactory implements GlassfishModuleFactory {
libPath = libPath.substring(5);
}
if (!new File(libPath.replace("!/", "")).exists()) {
- Logger.getLogger("glassfish-javaee").log(Level.FINE, "libPath does not exist. Updating {0}", name);
+ LOG.log(Level.FINE, "libPath does not exist. Updating {0}", name);
try {
lmgr.removeLibrary(lib);
} catch (IOException ex) {
- Logger.getLogger("glassfish-javaee").log(Level.INFO, ex.getLocalizedMessage(), ex);
+ LOG.log(Level.INFO, ex.getLocalizedMessage(), ex);
} catch (IllegalArgumentException ex) {
// Already removed somehow, ignore.
}
@@ -343,7 +359,7 @@ public class JavaEEServerModuleFactory implements GlassfishModuleFactory {
try {
lmgr.removeLibrary(lib);
} catch (IOException ex) {
- Logger.getLogger("glassfish-javaee").log(Level.INFO, ex.getLocalizedMessage(), ex);
+ LOG.log(Level.INFO, ex.getLocalizedMessage(), ex);
} catch (IllegalArgumentException ex) {
// Already removed somehow, ignore.
}
@@ -360,11 +376,11 @@ public class JavaEEServerModuleFactory implements GlassfishModuleFactory {
libPath = libPath.substring(5);
}
if (!new File(libPath.replace("!/", "")).exists()) {
- Logger.getLogger("glassfish-javaee").log(Level.FINE, "libPath does not exist. Updating {0}", name);
+ LOG.log(Level.FINE, "libPath does not exist. Updating {0}", name);
try {
lmgr.removeLibrary(lib);
} catch (IOException ex) {
- Logger.getLogger("glassfish-javaee").log(Level.INFO, ex.getLocalizedMessage(), ex);
+ LOG.log(Level.INFO, ex.getLocalizedMessage(), ex);
} catch (IllegalArgumentException ex) {
// Already removed somehow, ignore.
}
@@ -381,7 +397,7 @@ public class JavaEEServerModuleFactory implements GlassfishModuleFactory {
try {
lmgr.removeLibrary(lib);
} catch (IOException ex) {
- Logger.getLogger("glassfish-javaee").log(Level.INFO, ex.getLocalizedMessage(), ex);
+ LOG.log(Level.INFO, ex.getLocalizedMessage(), ex);
} catch (IllegalArgumentException ex) {
// Already removed somehow, ignore.
}
@@ -402,22 +418,22 @@ public class JavaEEServerModuleFactory implements GlassfishModuleFactory {
LibraryTypeProvider ltp = LibrariesSupport.getLibraryTypeProvider(libType);
if (null != ltp) {
lib = lmgr.createLibrary(libType, name, displayName, description, contents);
- Logger.getLogger("glassfish-javaee").log(Level.FINE, "Created library {0}", name);
+ LOG.log(Level.FINE, "Created library {0}", name);
} else {
lmgr.addPropertyChangeListener(new InitializeLibrary(lmgr, libType, name, contents, displayName, description));
- Logger.getLogger("glassfish-javaee").log(Level.FINE, "schedule to create library {0}", name);
+ LOG.log(Level.FINE, "schedule to create library {0}", name);
}
} catch (IOException ex) {
// Someone must have created the library in a parallel thread, try again otherwise fail.
lib = lmgr.getLibrary(name);
if (lib == null) {
- Logger.getLogger("glassfish-javaee").log(Level.INFO, ex.getLocalizedMessage(), ex);
+ LOG.log(Level.INFO, ex.getLocalizedMessage(), ex);
}
} catch (IllegalArgumentException ex) {
// Someone must have created the library in a parallel thread, try again otherwise fail.
lib = lmgr.getLibrary(name);
if (lib == null) {
- Logger.getLogger("glassfish-javaee").log(Level.INFO, ex.getLocalizedMessage(), ex);
+ LOG.log(Level.INFO, ex.getLocalizedMessage(), ex);
}
}
}
@@ -454,14 +470,14 @@ public class JavaEEServerModuleFactory implements GlassfishModuleFactory {
LibraryTypeProvider ltp = LibrariesSupport.getLibraryTypeProvider(libType);
if (null != ltp) {
lmgr.createLibrary(libType, name, displayName, description, content);
- Logger.getLogger("glassfish-javaee").log(Level.FINE, "Created library {0}", name);
+ LOG.log(Level.FINE, "Created library {0}", name);
removeFromListenerList(pcl);
}
} catch (IOException ex) {
- Logger.getLogger("glassfish-javaee").log(Level.INFO,
+ LOG.log(Level.INFO,
ex.getLocalizedMessage(), ex);
} catch (IllegalArgumentException iae) {
- Logger.getLogger("glassfish-javaee").log(Level.INFO,
+ LOG.log(Level.INFO,
iae.getLocalizedMessage(), iae);
}
} else {
diff --git a/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/RunTimeDDCatalog.java b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/RunTimeDDCatalog.java
index 8ae1ccb409..88794e4336 100644
--- a/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/RunTimeDDCatalog.java
+++ b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/RunTimeDDCatalog.java
@@ -132,36 +132,62 @@ public class RunTimeDDCatalog extends GrammarQueryManager implements CatalogRead
private static final String SchemaToURLMap[] = {
"SCHEMA:http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd" , "ejb-jar_2_1",
-
+ "SCHEMA:http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd" , "ejb-jar_3_0",
+ "SCHEMA:http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd" , "ejb-jar_3_1",
+ "SCHEMA:http://xmlns.jcp.org/xml/ns/javaee/ejb-jar_3_2.xsd" , "ejb-jar_3_2",
+ "SCHEMA:https://jakarta.ee/xml/ns/jakartaee/ejb-jar_4_0.xsd" , "ejb-jar_4_0",
"SCHEMA:http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd" , "application-client_1_4",
"SCHEMA:http://java.sun.com/xml/ns/j2ee/application_1_4.xsd" , "application_1_4",
+ "SCHEMA:http://java.sun.com/xml/ns/javaee/application-client_5.xsd" , "application-client_5",
+ "SCHEMA:http://java.sun.com/xml/ns/javaee/application_5.xsd" , "application_5",
+ "SCHEMA:http://java.sun.com/xml/ns/javaee/application-client_6.xsd" , "application-client_6",
+ "SCHEMA:http://java.sun.com/xml/ns/javaee/application_6.xsd" , "application_6",
+ "SCHEMA:http://xmlns.jcp.org/xml/ns/javaee/application-client_7.xsd" , "application-client_7",
+ "SCHEMA:http://xmlns.jcp.org/xml/ns/javaee/application_7.xsd" , "application_7",
+ "SCHEMA:http://xmlns.jcp.org/xml/ns/javaee/application-client_8.xsd" , "application-client_8",
+ "SCHEMA:http://xmlns.jcp.org/xml/ns/javaee/application_8.xsd" , "application_8",
+ "SCHEMA:https://jakarta.ee/xml/ns/jakartaee/application-client_9.xsd" , "application-client_9",
+ "SCHEMA:https://jakarta.ee/xml/ns/jakartaee/application_9.xsd" , "application_9",
"SCHEMA:http://java.sun.com/xml/ns/j2ee/jax-rpc-ri-config.xsd" , "jax-rpc-ri-config",
"SCHEMA:http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd" , "connector_1_5",
+ "SCHEMA:http://java.sun.com/xml/ns/javaee/connector_1_6.xsd" , "connector_1_6",
+ "SCHEMA:http://xmlns.jcp.org/xml/ns/javaee/connector_1_7.xsd" , "connector_1_7",
+ "SCHEMA:https://jakarta.ee/xml/ns/jakartaee/connector_2_0.xsd" , "connector_2_0",
///"SCHEMA:http://java.sun.com/xml/ns/j2ee/jsp_2_0.xsd" , "jsp_2_0.xsd",
///"SCHEMA:http://java.sun.com/xml/ns/j2ee/datatypes.dtd" , "datatypes",
///"SCHEMA:http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" , "web-app_2_4",
///"SCHEMA:http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" , "web-jsptaglibrary_2_0",
///"SCHEMA:http://java.sun.com/xml/ns/j2ee/j2ee_1_4.xsd" , "j2ee_1_4",
- "SCHEMA:http://java.sun.com/xml/ns/j2ee/j2ee_jaxrpc_mapping_1_1.xsd" , "j2ee_jaxrpc_mapping_1_1",
+ "SCHEMA:http://java.sun.com/xml/ns/j2ee/j2ee_jaxrpc_mapping_1_1.xsd" , "j2ee_jaxrpc_mapping_1_1",
"SCHEMA:http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd" ,"j2ee_web_services_1_1",
- "SCHEMA:http://java.sun.com/xml/ns/j2ee/j2ee_web_services_client_1_1.xsd" ,"j2ee_web_services_client_1_1",
- "SCHEMA:http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd" , "ejb-jar_3_0",
- "SCHEMA:http://java.sun.com/xml/ns/javaee/application-client_5.xsd" , "application-client_5",
- "SCHEMA:http://java.sun.com/xml/ns/javaee/application_5.xsd" , "application_5",
- "SCHEMA:http://java.sun.com/xml/ns/persistence/orm_1_0.xsd" , "orm_1_0",
- "SCHEMA:http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd" , "persistence_1_0",
- "SCHEMA:http://java.sun.com/xml/ns/javaee/javaee_web_services_1_2.xsd" ,"javaee_web_services_1_2",
- "SCHEMA:http://java.sun.com/xml/ns/javaee/javaee_web_services_client_1_2.xsd" ,"javaee_web_services_client_1_2",
-
+ "SCHEMA:http://java.sun.com/xml/ns/j2ee/j2ee_web_services_client_1_1.xsd" ,"j2ee_web_services_client_1_1",
+ "SCHEMA:http://java.sun.com/xml/ns/javaee/javaee_web_services_1_2.xsd" ,"javaee_web_services_1_2",
+ "SCHEMA:http://java.sun.com/xml/ns/javaee/javaee_web_services_client_1_2.xsd" ,"javaee_web_services_client_1_2",
+ "SCHEMA:http://java.sun.com/xml/ns/javaee/javaee_web_services_1_3.xsd" ,"javaee_web_services_1_3",
+ "SCHEMA:http://java.sun.com/xml/ns/javaee/javaee_web_services_client_1_3.xsd" ,"javaee_web_services_client_1_3",
+ "SCHEMA:http://xmlns.jcp.org/xml/ns/javaee/javaee_web_services_1_4.xsd" ,"javaee_web_services_1_4",
+ "SCHEMA:http://xmlns.jcp.org/xml/ns/javaee/javaee_web_services_client_1_4.xsd" ,"javaee_web_services_client_1_4",
+ "SCHEMA:https://jakarta.ee/xml/ns/jakartaee/jakartaee_web_services_2_0.xsd" ,"jakartaee_web_services_2_0",
+ "SCHEMA:https://jakarta.ee/xml/ns/jakartaee/jakartaee_web_services_client_2_0.xsd" ,"jakartaee_web_services_client_2_0",
+ "SCHEMA:http://java.sun.com/xml/ns/persistence/orm_1_0.xsd" , "orm_1_0",
+ "SCHEMA:http://java.sun.com/xml/ns/persistence/orm_2_0.xsd" , "orm_2_0",
+ "SCHEMA:http://xmlns.jcp.org/xml/ns/persistence/orm_2_1.xsd" , "orm_2_1",
+ "SCHEMA:http://xmlns.jcp.org/xml/ns/persistence/orm_2_2.xsd" , "orm_2_2",
+ "SCHEMA:https://jakarta.ee/xml/ns/persistence/orm/orm_3_0.xsd" , "orm_3_0",
+ "SCHEMA:http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd" , "persistence_1_0",
+ "SCHEMA:http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd" , "persistence_2_0",
+ "SCHEMA:http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd" , "persistence_2_1",
+ "SCHEMA:http://xmlns.jcp.org/xml/ns/persistence/persistence_2_2.xsd" , "persistence_2_2",
+ "SCHEMA:https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd" , "persistence_3_0",
};
private static final String JavaEE6SchemaToURLMap[] = {
- "SCHEMA:http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd" , "ejb-jar_3_1",
- "SCHEMA:http://java.sun.com/xml/ns/j2ee/jsp_2_2.xsd" , "jsp_2_2",
- "SCHEMA:http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" , "web-app_3_0",
- "SCHEMA:http://java.sun.com/xml/ns/javaee/web-common_3_0.xsd" , "web-common_3_0",
- "SCHEMA:http://java.sun.com/xml/ns/javaee/web-fragment_3_0.xsd" , "web-fragment_3_0",
+ "SCHEMA:http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd" , "ejb-jar_3_1",
+ "SCHEMA:http://java.sun.com/xml/ns/j2ee/jsp_2_2.xsd" , "jsp_2_2",
+ "SCHEMA:http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" , "web-app_3_0",
+ "SCHEMA:http://java.sun.com/xml/ns/javaee/web-common_3_0.xsd" , "web-common_3_0",
+ "SCHEMA:http://java.sun.com/xml/ns/javaee/web-fragment_3_0.xsd" , "web-fragment_3_0",
"SCHEMA:http://xmlns.oracle.com/weblogic/weblogic-application-client/1.0/weblogic-application-client.xsd", "weblogic-application-client",
"SCHEMA:http://xmlns.oracle.com/weblogic/weblogic-application/1.0/weblogic-application.xsd", "weblogic-application",
@@ -174,7 +200,7 @@ public class RunTimeDDCatalog extends GrammarQueryManager implements CatalogRead
"SCHEMA:http://xmlns.oracle.com/weblogic/jdbc-data-source/1.0/jdbc-data-source.xsd", "jdbc-data-source",
};
- private static Map<ServerInstanceProvider, RunTimeDDCatalog> ddCatalogMap = new HashMap<ServerInstanceProvider, RunTimeDDCatalog>();
+ private static Map<ServerInstanceProvider, RunTimeDDCatalog> ddCatalogMap = new HashMap<>();
// private static RunTimeDDCatalog preludeDDCatalog;
private static RunTimeDDCatalog javaEE6DDCatalog;
@@ -226,7 +252,7 @@ public class RunTimeDDCatalog extends GrammarQueryManager implements CatalogRead
return null;
}
- List<String> list = new ArrayList<String>();
+ List<String> list = new ArrayList<>();
for (int i=0;i<TypeToURLMap.length;i = i+2){
list.add(TypeToURLMap[i]);
}
@@ -342,7 +368,7 @@ public class RunTimeDDCatalog extends GrammarQueryManager implements CatalogRead
}
- private List<CatalogListener> catalogListeners = new ArrayList<CatalogListener>(1);
+ private List<CatalogListener> catalogListeners = new ArrayList<>(1);
/**
* Optional operation allowing to listen at catalog for changes.
@@ -412,6 +438,8 @@ public class RunTimeDDCatalog extends GrammarQueryManager implements CatalogRead
public static final String J2EE_NS = "http://java.sun.com/xml/ns/j2ee"; // NOI18N
public static final String JAVAEE_NS = "http://java.sun.com/xml/ns/javaee"; // NOI18N
+ public static final String NEW_JAVAEE_NS = "http://xmlns.jcp.org/xml/ns/javaee"; // NOI18N
+ public static final String JAKARTAEE_NS = "https://jakarta.ee/xml/ns/jakartaee"; // NOI18N
public static final String RI_CONFIG_NS = "http://java.sun.com/xml/ns/jax-rpc/ri/config"; // NOI18N
public static final String IBM_J2EE_NS = "http://www.ibm.com/webservices/xsd"; // NOI18N
@@ -428,6 +456,18 @@ public class RunTimeDDCatalog extends GrammarQueryManager implements CatalogRead
private static final String EJBJAR_3_0 = JAVAEE_NS+"/"+EJBJAR_3_0_XSD; // NOI18N
public static final String EJBJAR_3_0_ID = "SCHEMA:"+EJBJAR_3_0; // NOI18N
+ private static final String EJBJAR_3_1_XSD="ejb-jar_3_1.xsd"; // NOI18N
+ private static final String EJBJAR_3_1 = JAVAEE_NS+"/"+EJBJAR_3_1_XSD; // NOI18N
+ public static final String EJBJAR_3_1_ID = "SCHEMA:"+EJBJAR_3_1; // NOI18N
+
+ private static final String EJBJAR_3_2_XSD="ejb-jar_3_2.xsd"; // NOI18N
+ private static final String EJBJAR_3_2 = NEW_JAVAEE_NS+"/"+EJBJAR_3_2_XSD; // NOI18N
+ public static final String EJBJAR_3_2_ID = "SCHEMA:"+EJBJAR_3_2; // NOI18N
+
+ private static final String EJBJAR_4_0_XSD="ejb-jar_4_0.xsd"; // NOI18N
+ private static final String EJBJAR_4_0 = JAKARTAEE_NS+"/"+EJBJAR_4_0_XSD; // NOI18N
+ public static final String EJBJAR_4_0_ID = "SCHEMA:"+EJBJAR_4_0; // NOI18N
+
private static final String APP_TAG="application"; //NOI18N
private static final String APP_1_4_XSD="application_1_4.xsd"; // NOI18N
private static final String APP_1_4= J2EE_NS+"/"+APP_1_4_XSD; // NOI18N
@@ -437,6 +477,21 @@ public class RunTimeDDCatalog extends GrammarQueryManager implements CatalogRead
private static final String APP_5= JAVAEE_NS+"/"+APP_5_XSD; // NOI18N
public static final String APP_5_ID = "SCHEMA:"+APP_5; // NOI18N
+ private static final String APP_6_XSD="application_6.xsd"; // NOI18N
+ private static final String APP_6= JAVAEE_NS+"/"+APP_6_XSD; // NOI18N
+ public static final String APP_6_ID = "SCHEMA:"+APP_6; // NOI18N
+
+ private static final String APP_7_XSD="application_7.xsd"; // NOI18N
+ private static final String APP_7= NEW_JAVAEE_NS+"/"+APP_7_XSD; // NOI18N
+ public static final String APP_7_ID = "SCHEMA:"+APP_7; // NOI18N
+
+ private static final String APP_8_XSD="application_8.xsd"; // NOI18N
+ private static final String APP_8= NEW_JAVAEE_NS+"/"+APP_8_XSD; // NOI18N
+ public static final String APP_8_ID = "SCHEMA:"+APP_8; // NOI18N
+
+ private static final String APP_9_XSD="application_9.xsd"; // NOI18N
+ private static final String APP_9= JAKARTAEE_NS+"/"+APP_9_XSD; // NOI18N
+ public static final String APP_9_ID = "SCHEMA:"+APP_9; // NOI18N
private static final String APPCLIENT_TAG="application-client"; //NOI18N
private static final String APPCLIENT_1_4_XSD="application-client_1_4.xsd"; // NOI18N
@@ -447,6 +502,21 @@ public class RunTimeDDCatalog extends GrammarQueryManager implements CatalogRead
private static final String APPCLIENT_5= JAVAEE_NS+"/"+APPCLIENT_5_XSD; // NOI18N
public static final String APPCLIENT_5_ID = "SCHEMA:"+APPCLIENT_5; // NOI18N
+ private static final String APPCLIENT_6_XSD="application-client_6.xsd"; // NOI18N
+ private static final String APPCLIENT_6= JAVAEE_NS+"/"+APPCLIENT_6_XSD; // NOI18N
+ public static final String APPCLIENT_6_ID = "SCHEMA:"+APPCLIENT_6; // NOI18N
+
+ private static final String APPCLIENT_7_XSD="application-client_7.xsd"; // NOI18N
+ private static final String APPCLIENT_7= NEW_JAVAEE_NS+"/"+APPCLIENT_7_XSD; // NOI18N
+ public static final String APPCLIENT_7_ID = "SCHEMA:"+APPCLIENT_7; // NOI18N
+
+ private static final String APPCLIENT_8_XSD="application-client_8.xsd"; // NOI18N
+ private static final String APPCLIENT_8= NEW_JAVAEE_NS+"/"+APPCLIENT_8_XSD; // NOI18N
+ public static final String APPCLIENT_8_ID = "SCHEMA:"+APPCLIENT_8; // NOI18N
+
+ private static final String APPCLIENT_9_XSD="application-client_9.xsd"; // NOI18N
+ private static final String APPCLIENT_9= JAKARTAEE_NS+"/"+APPCLIENT_9_XSD; // NOI18N
+ public static final String APPCLIENT_9_ID = "SCHEMA:"+APPCLIENT_9; // NOI18N
private static final String WEBSERVICES_TAG="webservices"; //NOI18N
private static final String WEBSERVICES_1_1_XSD="j2ee_web_services_1_1.xsd"; // NOI18N
@@ -460,10 +530,34 @@ public class RunTimeDDCatalog extends GrammarQueryManager implements CatalogRead
private static final String WEBSERVICES_1_2_XSD="javaee_web_services_1_2.xsd"; // NOI18N
private static final String WEBSERVICES_1_2= JAVAEE_NS+"/"+WEBSERVICES_1_2_XSD; // NOI18N
public static final String WEBSERVICES_1_2_ID = "SCHEMA:"+WEBSERVICES_1_2; // NOI18N
+
+ private static final String WEBSERVICES_1_3_XSD="javaee_web_services_1_3.xsd"; // NOI18N
+ private static final String WEBSERVICES_1_3= JAVAEE_NS+"/"+WEBSERVICES_1_3_XSD; // NOI18N
+ public static final String WEBSERVICES_1_3_ID = "SCHEMA:"+WEBSERVICES_1_3; // NOI18N
+
+ private static final String WEBSERVICES_1_4_XSD="javaee_web_services_1_4.xsd"; // NOI18N
+ private static final String WEBSERVICES_1_4= NEW_JAVAEE_NS+"/"+WEBSERVICES_1_4_XSD; // NOI18N
+ public static final String WEBSERVICES_1_4_ID = "SCHEMA:"+WEBSERVICES_1_4; // NOI18N
+
+ private static final String WEBSERVICES_2_0_XSD="jakartaee_web_services_2_0.xsd"; // NOI18N
+ private static final String WEBSERVICES_2_0= JAKARTAEE_NS+"/"+WEBSERVICES_2_0_XSD; // NOI18N
+ public static final String WEBSERVICES_2_0_ID = "SCHEMA:"+WEBSERVICES_2_0; // NOI18N
private static final String WEBSERVICES_CLIENT_1_2_XSD="javaee_web_services_client_1_2.xsd"; // NOI18N
private static final String WEBSERVICES_CLIENT_1_2= JAVAEE_NS+"/"+WEBSERVICES_CLIENT_1_2_XSD; // NOI18N
public static final String WEBSERVICES_CLIENT_1_2_ID = "SCHEMA:"+WEBSERVICES_CLIENT_1_2; // NOI18N
+
+ private static final String WEBSERVICES_CLIENT_1_3_XSD="javaee_web_services_client_1_3.xsd"; // NOI18N
+ private static final String WEBSERVICES_CLIENT_1_3= JAVAEE_NS+"/"+WEBSERVICES_CLIENT_1_3_XSD; // NOI18N
+ public static final String WEBSERVICES_CLIENT_1_3_ID = "SCHEMA:"+WEBSERVICES_CLIENT_1_3; // NOI18N
+
+ private static final String WEBSERVICES_CLIENT_1_4_XSD="javaee_web_services_client_1_4.xsd"; // NOI18N
+ private static final String WEBSERVICES_CLIENT_1_4= NEW_JAVAEE_NS+"/"+WEBSERVICES_CLIENT_1_4_XSD; // NOI18N
+ public static final String WEBSERVICES_CLIENT_1_4_ID = "SCHEMA:"+WEBSERVICES_CLIENT_1_4; // NOI18N
+
+ private static final String WEBSERVICES_CLIENT_2_0_XSD="jakartaee_web_services_client_2_0.xsd"; // NOI18N
+ private static final String WEBSERVICES_CLIENT_2_0= JAKARTAEE_NS+"/"+WEBSERVICES_CLIENT_2_0_XSD; // NOI18N
+ public static final String WEBSERVICES_CLIENT_2_0_ID = "SCHEMA:"+WEBSERVICES_CLIENT_2_0; // NOI18N
private static final String WEBAPP_TAG="web-app"; //NOI18N
private static final String WEBAPP_2_5_XSD="web-app_2_5.xsd"; // NOI18N
@@ -471,24 +565,104 @@ public class RunTimeDDCatalog extends GrammarQueryManager implements CatalogRead
public static final String WEBAPP_2_5_ID = "SCHEMA:"+WEBAPP_2_5; // NOI18N
private static final String WEBAPP_3_0_XSD="web-app_3_0.xsd"; // NOI18N
-
- private static final String WEBFRAGMENT_3_0_XSD="web-fragment_3_0.xsd"; // NOI18N
-
+ private static final String WEBAPP_3_0 = JAVAEE_NS+"/"+WEBAPP_3_0_XSD; // NOI18N
+ public static final String WEBAPP_3_0_ID = "SCHEMA:"+WEBAPP_3_0; // NOI18N
+
private static final String WEBCOMMON_3_0_XSD="web-common_3_0.xsd"; // NOI18N
+ private static final String WEBCOMMON_3_0 = JAVAEE_NS+"/"+WEBCOMMON_3_0_XSD; // NOI18N
+ public static final String WEBCOMMON_3_0_ID = "SCHEMA:"+WEBCOMMON_3_0; // NOI18N
+
+ private static final String WEBFRAGMENT_3_0_XSD="web-fragment_3_0.xsd"; // NOI18N
+ private static final String WEBFRAGMENT_3_0 = JAVAEE_NS+"/"+WEBFRAGMENT_3_0_XSD; // NOI18N
+ public static final String WEBFRAGMENT_3_0_ID = "SCHEMA:"+WEBFRAGMENT_3_0; // NOI18N
+
+ private static final String WEBAPP_3_1_XSD="web-app_3_1.xsd"; // NOI18N
+ private static final String WEBAPP_3_1 = NEW_JAVAEE_NS+"/"+WEBAPP_3_1_XSD; // NOI18N
+ public static final String WEBAPP_3_1_ID = "SCHEMA:"+WEBAPP_3_1; // NOI18N
+
+ private static final String WEBCOMMON_3_1_XSD="web-common_3_1.xsd"; // NOI18N
+ private static final String WEBCOMMON_3_1 = NEW_JAVAEE_NS+"/"+WEBCOMMON_3_1_XSD; // NOI18N
+ public static final String WEBCOMMON_3_1_ID = "SCHEMA:"+WEBCOMMON_3_1; // NOI18N
+
+ private static final String WEBFRAGMENT_3_1_XSD="web-fragment_3_1.xsd"; // NOI18N
+ private static final String WEBFRAGMENT_3_1 = NEW_JAVAEE_NS+"/"+WEBFRAGMENT_3_1_XSD; // NOI18N
+ public static final String WEBFRAGMENT_3_1_ID = "SCHEMA:"+WEBFRAGMENT_3_1; // NOI18N
+
+ private static final String WEBAPP_4_0_XSD="web-app_4_0.xsd"; // NOI18N
+ private static final String WEBAPP_4_0 = NEW_JAVAEE_NS+"/"+WEBAPP_4_0_XSD; // NOI18N
+ public static final String WEBAPP_4_0_ID = "SCHEMA:"+WEBAPP_4_0; // NOI18N
+
+ private static final String WEBCOMMON_4_0_XSD="web-common_4_0.xsd"; // NOI18N
+ private static final String WEBCOMMON_4_0 = NEW_JAVAEE_NS+"/"+WEBCOMMON_4_0_XSD; // NOI18N
+ public static final String WEBCOMMON_4_0_ID = "SCHEMA:"+WEBCOMMON_4_0; // NOI18N
+
+ private static final String WEBFRAGMENT_4_0_XSD="web-fragment_4_0.xsd"; // NOI18N
+ private static final String WEBFRAGMENT_4_0 = NEW_JAVAEE_NS+"/"+WEBFRAGMENT_4_0_XSD; // NOI18N
+ public static final String WEBFRAGMENT_4_0_ID = "SCHEMA:"+WEBFRAGMENT_4_0; // NOI18N
+
+ private static final String WEBAPP_5_0_XSD="web-app_5_0.xsd"; // NOI18N
+ private static final String WEBAPP_5_0 = JAKARTAEE_NS+"/"+WEBAPP_5_0_XSD; // NOI18N
+ public static final String WEBAPP_5_0_ID = "SCHEMA:"+WEBAPP_5_0; // NOI18N
+
+ private static final String WEBCOMMON_5_0_XSD="web-common_5_0.xsd"; // NOI18N
+ private static final String WEBCOMMON_5_0 = JAKARTAEE_NS+"/"+WEBCOMMON_5_0_XSD; // NOI18N
+ public static final String WEBCOMMON_5_0_ID = "SCHEMA:"+WEBCOMMON_5_0; // NOI18N
+
+ private static final String WEBFRAGMENT_5_0_XSD="web-fragment_5_0.xsd"; // NOI18N
+ private static final String WEBFRAGMENT_5_0 = JAKARTAEE_NS+"/"+WEBFRAGMENT_5_0_XSD; // NOI18N
+ public static final String WEBFRAGMENT_5_0_ID = "SCHEMA:"+WEBFRAGMENT_5_0; // NOI18N
public static final String PERSISTENCE_NS = "http://java.sun.com/xml/ns/persistence"; // NOI18N
+ public static final String NEW_PERSISTENCE_NS = "http://xmlns.jcp.org/xml/ns/persistence"; // NOI18N
+ public static final String JAKARTA_PERSISTENCE_NS = "https://jakarta.ee/xml/ns/persistence"; // NOI18N
+
private static final String PERSISTENCE_TAG="persistence"; //NOI18N
+
private static final String PERSISTENCE_XSD="persistence_1_0.xsd"; // NOI18N
private static final String PERSISTENCE = PERSISTENCE_NS+"/"+PERSISTENCE_XSD; // NOI18N
public static final String PERSISTENCE_ID = "SCHEMA:"+PERSISTENCE; // NOI18N
+ private static final String PERSISTENCE_2_0_XSD="persistence_2_0.xsd"; // NOI18N
+ private static final String PERSISTENCE_2_0 = PERSISTENCE_NS+"/"+PERSISTENCE_2_0_XSD; // NOI18N
+ public static final String PERSISTENCE_2_0_ID = "SCHEMA:"+PERSISTENCE_2_0; // NOI18N
+
+ private static final String PERSISTENCE_2_1_XSD="persistence_2_1.xsd"; // NOI18N
+ private static final String PERSISTENCE_2_1 = NEW_PERSISTENCE_NS+"/"+PERSISTENCE_2_1_XSD; // NOI18N
+ public static final String PERSISTENCE_2_1_ID = "SCHEMA:"+PERSISTENCE_2_1; // NOI18N
+
+ private static final String PERSISTENCE_2_2_XSD="persistence_2_2.xsd"; // NOI18N
+ private static final String PERSISTENCE_2_2 = NEW_PERSISTENCE_NS+"/"+PERSISTENCE_2_2_XSD; // NOI18N
+ public static final String PERSISTENCE_2_2_ID = "SCHEMA:"+PERSISTENCE_2_2; // NOI18N
+
+ private static final String PERSISTENCE_3_0_XSD="persistence_3_0.xsd"; // NOI18N
+ private static final String PERSISTENCE_3_0 = JAKARTA_PERSISTENCE_NS+"/"+PERSISTENCE_3_0_XSD; // NOI18N
+ public static final String PERSISTENCE_3_0_ID = "SCHEMA:"+PERSISTENCE_3_0; // NOI18N
+
public static final String PERSISTENCEORM_NS = "http://java.sun.com/xml/ns/persistence/orm"; // NOI18N
+ public static final String NEW_PERSISTENCEORM_NS = "http://xmlns.jcp.org/xml/ns/persistence/orm"; // NOI18N
+ public static final String JAKARTA_PERSISTENCEORM_NS = "https://jakarta.ee/xml/ns/persistence/orm"; // NOI18N
+
private static final String PERSISTENCEORM_TAG="entity-mappings"; //NOI18N
+
private static final String PERSISTENCEORM_XSD="orm_1_0.xsd"; // NOI18N
private static final String PERSISTENCEORM = PERSISTENCE_NS+"/"+PERSISTENCEORM_XSD; // NOI18N yes not ORM NS!!!
public static final String PERSISTENCEORM_ID = "SCHEMA:"+PERSISTENCEORM; // NOI18N
-
+ private static final String PERSISTENCEORM_2_0_XSD="orm_2_0.xsd"; // NOI18N
+ private static final String PERSISTENCEORM_2_0 = PERSISTENCE_NS+"/"+PERSISTENCEORM_2_0_XSD; // NOI18N yes not ORM NS!!!
+ public static final String PERSISTENCEORM_2_0_ID = "SCHEMA:"+PERSISTENCEORM_2_0; // NOI18N
+
+ private static final String PERSISTENCEORM_2_1_XSD="orm_2_1.xsd"; // NOI18N
+ private static final String PERSISTENCEORM_2_1 = NEW_PERSISTENCEORM_NS+"/"+PERSISTENCEORM_2_1_XSD; // NOI18N yes not ORM NS!!!
+ public static final String PERSISTENCEORM_2_1_ID = "SCHEMA:"+PERSISTENCEORM_2_1; // NOI18N
+
+ private static final String PERSISTENCEORM_2_2_XSD="orm_2_2.xsd"; // NOI18N
+ private static final String PERSISTENCEORM_2_2 = NEW_PERSISTENCEORM_NS+"/"+PERSISTENCEORM_2_2_XSD; // NOI18N yes not ORM NS!!!
+ public static final String PERSISTENCEORM_2_2_ID = "SCHEMA:"+PERSISTENCEORM_2_2; // NOI18N
+
+ private static final String PERSISTENCEORM_3_0_XSD="orm_3_0.xsd"; // NOI18N
+ private static final String PERSISTENCEORM_3_0 = JAKARTA_PERSISTENCEORM_NS+"/"+PERSISTENCEORM_3_0_XSD; // NOI18N yes not ORM NS!!!
+ public static final String PERSISTENCEORM_3_0_ID = "SCHEMA:"+PERSISTENCEORM_3_0; // NOI18N
public String getFullURLFromSystemId(String systemId){
@@ -526,87 +700,146 @@ public class RunTimeDDCatalog extends GrammarQueryManager implements CatalogRead
SCHEMASLOCATION= file.toURI().toURL().toExternalForm();
}catch(Exception e){
Logger.getLogger("glassfish-javaee").log(Level.INFO, file.getAbsolutePath(), e); // NOI18N
- }
-
-
- }
- if (systemId!=null && systemId.endsWith(EJBJAR_2_1_XSD)) {
- return new org.xml.sax.InputSource(SCHEMASLOCATION+EJBJAR_2_1_XSD);
- }
- else if (systemId!=null && systemId.endsWith(EJBJAR_3_0_XSD)) {
- return new org.xml.sax.InputSource(SCHEMASLOCATION+EJBJAR_3_0_XSD);
- }
- else if (systemId!=null && systemId.endsWith(APP_1_4_XSD)) {
- return new org.xml.sax.InputSource(SCHEMASLOCATION+APP_1_4_XSD);
- }
- else if (systemId!=null && systemId.endsWith(APPCLIENT_1_4_XSD)) {
- return new org.xml.sax.InputSource(SCHEMASLOCATION+APPCLIENT_1_4_XSD);
- }
- else if (systemId!=null && systemId.endsWith(WEBAPP_2_5_XSD)) {
- return new org.xml.sax.InputSource(SCHEMASLOCATION+WEBAPP_2_5_XSD);
- }
- else if (systemId!=null && systemId.endsWith(WEBAPP_3_0_XSD)) {
- return new org.xml.sax.InputSource(SCHEMASLOCATION+WEBAPP_3_0_XSD);
+ }
}
- else if (systemId!=null && systemId.endsWith(WEBFRAGMENT_3_0_XSD)) {
- return new org.xml.sax.InputSource(SCHEMASLOCATION+WEBFRAGMENT_3_0_XSD);
- }
- else if (systemId!=null && systemId.endsWith(WEBCOMMON_3_0_XSD)) {
- return new org.xml.sax.InputSource(SCHEMASLOCATION+WEBCOMMON_3_0_XSD);
- }
- else if (systemId!=null && systemId.endsWith(APP_5_XSD)) {
- return new org.xml.sax.InputSource(SCHEMASLOCATION+APP_5_XSD);
- }
- else if (systemId!=null && systemId.endsWith(APPCLIENT_5_XSD)) {
- return new org.xml.sax.InputSource(SCHEMASLOCATION+APPCLIENT_5_XSD);
- }
- else if (systemId!=null && systemId.endsWith(PERSISTENCEORM_XSD)) {
- return new org.xml.sax.InputSource(SCHEMASLOCATION+PERSISTENCEORM_XSD);
- }
- else if (systemId!=null && systemId.endsWith(PERSISTENCE_XSD)) {
- return new org.xml.sax.InputSource(SCHEMASLOCATION+PERSISTENCE_XSD);
- }
- else if (systemId!=null && systemId.endsWith(WEBSERVICES_1_1_XSD)) {
- return new org.xml.sax.InputSource(SCHEMASLOCATION+WEBSERVICES_1_1_XSD);
- }
- else if (systemId!=null && systemId.endsWith(WEBSERVICES_1_2_XSD)) {
- return new org.xml.sax.InputSource(SCHEMASLOCATION+WEBSERVICES_1_2_XSD);
- } else if (XML_XSD.equals(systemId)) {
- return new org.xml.sax.InputSource(new java.io.StringReader(XML_XSD_DEF));
- }
- else if (systemId!=null && systemId.endsWith(WEBSERVICES_CLIENT_1_1_XSD)) {
- return new org.xml.sax.InputSource(SCHEMASLOCATION+WEBSERVICES_CLIENT_1_1_XSD);
- }
- else if (systemId!=null && systemId.endsWith(WEBSERVICES_CLIENT_1_2_XSD)) {
- return new org.xml.sax.InputSource(SCHEMASLOCATION+WEBSERVICES_CLIENT_1_2_XSD);
- } else if (XML_XSD.equals(systemId)) {
- return new org.xml.sax.InputSource(new java.io.StringReader(XML_XSD_DEF));
- } else if (systemId != null && systemId.endsWith("weblogic-web-app.xsd")) { //NOI18N
- return new org.xml.sax.InputSource(SCHEMASLOCATION+"weblogic-web-app.xsd"); //NOI18N
- } else if (systemId != null && systemId.endsWith("weblogic-ejb-jar.xsd")) { //NOI18N
- return new org.xml.sax.InputSource(SCHEMASLOCATION+"weblogic-ejb-jar.xsd"); //NOI18N
- } else if (systemId != null && systemId.endsWith("weblogic-application.xsd")) { //NOI18N
- return new org.xml.sax.InputSource(SCHEMASLOCATION+"weblogic-application.xsd"); //NOI18N
- } else if (systemId != null && systemId.endsWith("weblogic-application-client.xsd")) { //NOI18N
- return new org.xml.sax.InputSource(SCHEMASLOCATION+"weblogic-application-client.xsd"); //NOI18N
- } else if (systemId != null && systemId.endsWith("weblogic-connector.xsd")) { //NOI18N
- return new org.xml.sax.InputSource(SCHEMASLOCATION+"weblogic-connector.xsd"); //NOI18N
- } else if (systemId != null && systemId.endsWith("weblogic-javaee.xsd")) { //NOI18N
- return new org.xml.sax.InputSource(SCHEMASLOCATION+"weblogic-javaee.xsd"); //NOI18N
- } else if (systemId != null && systemId.endsWith("weblogic-jms.xsd")) { //NOI18N
- return new org.xml.sax.InputSource(SCHEMASLOCATION+"weblogic-jms.xsd"); //NOI18N
- } else if (systemId != null && systemId.endsWith("weblogic-webservices.xsd")) { //NOI18N
- return new org.xml.sax.InputSource(SCHEMASLOCATION+"weblogic-webservices.xsd"); //NOI18N
- } else if (systemId != null && systemId.endsWith("jdbc-data-source.xsd")) { //NOI18N
- return new org.xml.sax.InputSource(SCHEMASLOCATION+"jdbc-data-source.xsd"); //NOI18N
- }
- else {
- return null;
+
+ if (systemId != null) {
+ // ejb
+ if ( systemId.endsWith(EJBJAR_2_1_XSD)) {
+ return new org.xml.sax.InputSource(SCHEMASLOCATION+EJBJAR_2_1_XSD);
+ } else if ( systemId.endsWith(EJBJAR_3_0_XSD)) {
+ return new org.xml.sax.InputSource(SCHEMASLOCATION+EJBJAR_3_0_XSD);
+ } else if ( systemId.endsWith(EJBJAR_3_1_XSD)) {
+ return new org.xml.sax.InputSource(SCHEMASLOCATION+EJBJAR_3_1_XSD);
+ } else if ( systemId.endsWith(EJBJAR_3_2_XSD)) {
+ return new org.xml.sax.InputSource(SCHEMASLOCATION+EJBJAR_3_2_XSD);
+ } else if ( systemId.endsWith(EJBJAR_4_0_XSD)) {
+ return new org.xml.sax.InputSource(SCHEMASLOCATION+EJBJAR_4_0_XSD);
+ }
+ // application & application-client
+ else if ( systemId.endsWith(APP_1_4_XSD)) {
+ return new org.xml.sax.InputSource(SCHEMASLOCATION+APP_1_4_XSD);
+ } else if ( systemId.endsWith(APPCLIENT_1_4_XSD)) {
+ return new org.xml.sax.InputSource(SCHEMASLOCATION+APPCLIENT_1_4_XSD);
+ } else if ( systemId.endsWith(APP_5_XSD)) {
+ return new org.xml.sax.InputSource(SCHEMASLOCATION+APP_5_XSD);
+ } else if ( systemId.endsWith(APPCLIENT_5_XSD)) {
+ return new org.xml.sax.InputSource(SCHEMASLOCATION+APPCLIENT_5_XSD);
+ } else if ( systemId.endsWith(APP_6_XSD)) {
+ return new org.xml.sax.InputSource(SCHEMASLOCATION+APP_6_XSD);
+ } else if ( systemId.endsWith(APPCLIENT_6_XSD)) {
+ return new org.xml.sax.InputSource(SCHEMASLOCATION+APPCLIENT_6_XSD);
+ } else if ( systemId.endsWith(APP_7_XSD)) {
+ return new org.xml.sax.InputSource(SCHEMASLOCATION+APP_7_XSD);
+ } else if ( systemId.endsWith(APPCLIENT_7_XSD)) {
+ return new org.xml.sax.InputSource(SCHEMASLOCATION+APPCLIENT_7_XSD);
+ } else if ( systemId.endsWith(APP_8_XSD)) {
+ return new org.xml.sax.InputSource(SCHEMASLOCATION+APP_8_XSD);
+ } else if ( systemId.endsWith(APPCLIENT_8_XSD)) {
+ return new org.xml.sax.InputSource(SCHEMASLOCATION+APPCLIENT_8_XSD);
+ } else if ( systemId.endsWith(APP_9_XSD)) {
+ return new org.xml.sax.InputSource(SCHEMASLOCATION+APP_9_XSD);
+ } else if ( systemId.endsWith(APPCLIENT_9_XSD)) {
+ return new org.xml.sax.InputSource(SCHEMASLOCATION+APPCLIENT_9_XSD);
+ }
+ //web-app, web-common & web-fragment
+ else if ( systemId.endsWith(WEBAPP_2_5_XSD)) {
+ return new org.xml.sax.InputSource(SCHEMASLOCATION+WEBAPP_2_5_XSD);
+ } else if ( systemId.endsWith(WEBAPP_3_0_XSD)) {
+ return new org.xml.sax.InputSource(SCHEMASLOCATION+WEBAPP_3_0_XSD);
+ } else if ( systemId.endsWith(WEBFRAGMENT_3_0_XSD)) {
+ return new org.xml.sax.InputSource(SCHEMASLOCATION+WEBFRAGMENT_3_0_XSD);
+ } else if ( systemId.endsWith(WEBCOMMON_3_0_XSD)) {
+ return new org.xml.sax.InputSource(SCHEMASLOCATION+WEBCOMMON_3_0_XSD);
+ } else if ( systemId.endsWith(WEBAPP_3_1_XSD)) {
+ return new org.xml.sax.InputSource(SCHEMASLOCATION+WEBAPP_3_1_XSD);
+ } else if ( systemId.endsWith(WEBFRAGMENT_3_1_XSD)) {
+ return new org.xml.sax.InputSource(SCHEMASLOCATION+WEBFRAGMENT_3_1_XSD);
+ } else if ( systemId.endsWith(WEBCOMMON_3_1_XSD)) {
+ return new org.xml.sax.InputSource(SCHEMASLOCATION+WEBCOMMON_3_1_XSD);
+ } else if ( systemId.endsWith(WEBAPP_4_0_XSD)) {
+ return new org.xml.sax.InputSource(SCHEMASLOCATION+WEBAPP_4_0_XSD);
+ } else if ( systemId.endsWith(WEBFRAGMENT_4_0_XSD)) {
+ return new org.xml.sax.InputSource(SCHEMASLOCATION+WEBFRAGMENT_4_0_XSD);
+ } else if ( systemId.endsWith(WEBCOMMON_4_0_XSD)) {
+ return new org.xml.sax.InputSource(SCHEMASLOCATION+WEBCOMMON_4_0_XSD);
+ } else if ( systemId.endsWith(WEBAPP_5_0_XSD)) {
+ return new org.xml.sax.InputSource(SCHEMASLOCATION+WEBAPP_5_0_XSD);
+ } else if ( systemId.endsWith(WEBFRAGMENT_5_0_XSD)) {
+ return new org.xml.sax.InputSource(SCHEMASLOCATION+WEBFRAGMENT_5_0_XSD);
+ } else if ( systemId.endsWith(WEBCOMMON_5_0_XSD)) {
+ return new org.xml.sax.InputSource(SCHEMASLOCATION+WEBCOMMON_5_0_XSD);
+ }
+ //persistence & orm
+ else if ( systemId.endsWith(PERSISTENCEORM_XSD)) {
+ return new org.xml.sax.InputSource(SCHEMASLOCATION+PERSISTENCEORM_XSD);
+ } else if ( systemId.endsWith(PERSISTENCE_XSD)) {
+ return new org.xml.sax.InputSource(SCHEMASLOCATION+PERSISTENCE_XSD);
+ } else if ( systemId.endsWith(PERSISTENCEORM_2_0_XSD)) {
+ return new org.xml.sax.InputSource(SCHEMASLOCATION+PERSISTENCEORM_2_0_XSD);
+ } else if ( systemId.endsWith(PERSISTENCE_2_0_XSD)) {
+ return new org.xml.sax.InputSource(SCHEMASLOCATION+PERSISTENCE_2_0_XSD);
+ } else if ( systemId.endsWith(PERSISTENCEORM_2_1_XSD)) {
+ return new org.xml.sax.InputSource(SCHEMASLOCATION+PERSISTENCEORM_2_1_XSD);
+ } else if ( systemId.endsWith(PERSISTENCE_2_1_XSD)) {
+ return new org.xml.sax.InputSource(SCHEMASLOCATION+PERSISTENCE_2_1_XSD);
+ } else if ( systemId.endsWith(PERSISTENCEORM_2_2_XSD)) {
+ return new org.xml.sax.InputSource(SCHEMASLOCATION+PERSISTENCEORM_2_2_XSD);
+ } else if ( systemId.endsWith(PERSISTENCE_2_2_XSD)) {
+ return new org.xml.sax.InputSource(SCHEMASLOCATION+PERSISTENCE_2_2_XSD);
+ } else if ( systemId.endsWith(PERSISTENCEORM_3_0_XSD)) {
+ return new org.xml.sax.InputSource(SCHEMASLOCATION+PERSISTENCEORM_3_0_XSD);
+ } else if ( systemId.endsWith(PERSISTENCE_3_0_XSD)) {
+ return new org.xml.sax.InputSource(SCHEMASLOCATION+PERSISTENCE_3_0_XSD);
+ }
+ //webservice & webservice-client
+ else if ( systemId.endsWith(WEBSERVICES_1_1_XSD)) {
+ return new org.xml.sax.InputSource(SCHEMASLOCATION+WEBSERVICES_1_1_XSD);
+ } else if ( systemId.endsWith(WEBSERVICES_1_2_XSD)) {
+ return new org.xml.sax.InputSource(SCHEMASLOCATION+WEBSERVICES_1_2_XSD);
+ } else if ( systemId.endsWith(WEBSERVICES_1_3_XSD)) {
+ return new org.xml.sax.InputSource(SCHEMASLOCATION+WEBSERVICES_1_3_XSD);
+ } else if ( systemId.endsWith(WEBSERVICES_1_4_XSD)) {
+ return new org.xml.sax.InputSource(SCHEMASLOCATION+WEBSERVICES_1_4_XSD);
+ } else if ( systemId.endsWith(WEBSERVICES_2_0_XSD)) {
+ return new org.xml.sax.InputSource(SCHEMASLOCATION+WEBSERVICES_2_0_XSD);
+ } else if ( systemId.endsWith(WEBSERVICES_CLIENT_1_1_XSD)) {
+ return new org.xml.sax.InputSource(SCHEMASLOCATION+WEBSERVICES_CLIENT_1_1_XSD);
+ } else if ( systemId.endsWith(WEBSERVICES_CLIENT_1_2_XSD)) {
+ return new org.xml.sax.InputSource(SCHEMASLOCATION+WEBSERVICES_CLIENT_1_2_XSD);
+ } else if ( systemId.endsWith(WEBSERVICES_CLIENT_1_3_XSD)) {
+ return new org.xml.sax.InputSource(SCHEMASLOCATION+WEBSERVICES_CLIENT_1_3_XSD);
+ } else if ( systemId.endsWith(WEBSERVICES_CLIENT_1_4_XSD)) {
+ return new org.xml.sax.InputSource(SCHEMASLOCATION+WEBSERVICES_CLIENT_1_4_XSD);
+ } else if ( systemId.endsWith(WEBSERVICES_CLIENT_2_0_XSD)) {
+ return new org.xml.sax.InputSource(SCHEMASLOCATION+WEBSERVICES_CLIENT_2_0_XSD);
+ }
+ // weblogic
+ else if ( systemId.endsWith("weblogic-web-app.xsd")) { //NOI18N
+ return new org.xml.sax.InputSource(SCHEMASLOCATION+"weblogic-web-app.xsd"); //NOI18N
+ } else if ( systemId.endsWith("weblogic-ejb-jar.xsd")) { //NOI18N
+ return new org.xml.sax.InputSource(SCHEMASLOCATION+"weblogic-ejb-jar.xsd"); //NOI18N
+ } else if ( systemId.endsWith("weblogic-application.xsd")) { //NOI18N
+ return new org.xml.sax.InputSource(SCHEMASLOCATION+"weblogic-application.xsd"); //NOI18N
+ } else if ( systemId.endsWith("weblogic-application-client.xsd")) { //NOI18N
+ return new org.xml.sax.InputSource(SCHEMASLOCATION+"weblogic-application-client.xsd"); //NOI18N
+ } else if ( systemId.endsWith("weblogic-connector.xsd")) { //NOI18N
+ return new org.xml.sax.InputSource(SCHEMASLOCATION+"weblogic-connector.xsd"); //NOI18N
+ } else if ( systemId.endsWith("weblogic-javaee.xsd")) { //NOI18N
+ return new org.xml.sax.InputSource(SCHEMASLOCATION+"weblogic-javaee.xsd"); //NOI18N
+ } else if ( systemId.endsWith("weblogic-jms.xsd")) { //NOI18N
+ return new org.xml.sax.InputSource(SCHEMASLOCATION+"weblogic-jms.xsd"); //NOI18N
+ } else if ( systemId.endsWith("weblogic-webservices.xsd")) { //NOI18N
+ return new org.xml.sax.InputSource(SCHEMASLOCATION+"weblogic-webservices.xsd"); //NOI18N
+ } else if ( systemId.endsWith("jdbc-data-source.xsd")) { //NOI18N
+ return new org.xml.sax.InputSource(SCHEMASLOCATION+"jdbc-data-source.xsd"); //NOI18N
+ } else if (XML_XSD.equals(systemId)) {
+ return new org.xml.sax.InputSource(new java.io.StringReader(XML_XSD_DEF));
+ }
}
+ return null;
}
-
-
@Override
public Enumeration enabled(GrammarEnvironment ctx) {
if (ctx.getFileObject() == null) return null;
@@ -618,98 +851,16 @@ public class RunTimeDDCatalog extends GrammarQueryManager implements CatalogRead
} else if (next.getNodeType() == Node.ELEMENT_NODE) {
Element element = (Element) next;
String tag = element.getTagName();
- if (EJB_JAR_TAG.equals(tag)) { // NOI18N
- String xmlns = element.getAttribute(XMLNS_ATTR);
- if (xmlns!=null && J2EE_NS.equals(xmlns)) {
- Vector<Node> v = new Vector<Node>();
- v.add(next);
- return v.elements();
- // return org.openide.util.Enumerations.singleton(next);
- }
- else if (xmlns!=null && JAVAEE_NS.equals(xmlns)) {
- Vector<Node> v = new Vector<Node>();
- v.add(next);
- return v.elements();
- // return org.openide.util.Enumerations.singleton(next);
- }
- }
-
- if (APP_TAG.equals(tag)) { // NOI18N
- String xmlns = element.getAttribute(XMLNS_ATTR);
- if (xmlns!=null && J2EE_NS.equals(xmlns)) {
- Vector<Node> v = new Vector<Node>();
- v.add(next);
- return v.elements();
- // return org.openide.util.Enumerations.singleton(next);
- }
- else if (xmlns!=null && JAVAEE_NS.equals(xmlns)) {
- Vector<Node> v = new Vector<Node>();
- v.add(next);
- return v.elements();
- // return org.openide.util.Enumerations.singleton(next);
- }
- }
- if (WEBAPP_TAG.equals(tag)) { // NOI18N
- String xmlns = element.getAttribute(XMLNS_ATTR);
- if (xmlns!=null && JAVAEE_NS.equals(xmlns)) {
- Vector<Node> v = new Vector<Node>();
- v.add(next);
- return v.elements();
- // return org.openide.util.Enumerations.singleton(next);
- }
-
- }
- if (APPCLIENT_TAG.equals(tag)) { // NOI18N
- String xmlns = element.getAttribute(XMLNS_ATTR);
- if (xmlns!=null && J2EE_NS.equals(xmlns)) {
- Vector<Node> v = new Vector<Node>();
- v.add(next);
- return v.elements();
- // return org.openide.util.Enumerations.singleton(next);
- }
- else if (xmlns!=null && JAVAEE_NS.equals(xmlns)) {
- Vector<Node> v = new Vector<Node>();
- v.add(next);
- return v.elements();
- // return org.openide.util.Enumerations.singleton(next);
- }
- }
- if (PERSISTENCEORM_TAG.equals(tag)) { // NOI18N
- String xmlns = element.getAttribute(XMLNS_ATTR);
- if (xmlns!=null && PERSISTENCEORM_NS.equals(xmlns)) {
- Vector<Node> v = new Vector<Node>();
- v.add(next);
- return v.elements();
- // return org.openide.util.Enumerations.singleton(next);
- }
-
- }
-
- if (PERSISTENCE_TAG.equals(tag)) { // NOI18N
- String xmlns = element.getAttribute(XMLNS_ATTR);
- if (xmlns!=null && PERSISTENCE_NS.equals(xmlns)) {
- Vector<Node> v = new Vector<Node>();
- v.add(next);
- return v.elements();
- // return org.openide.util.Enumerations.singleton(next);
- }
-
- }
-
- if (WEBSERVICES_TAG.equals(tag)) { // NOI18N
- String xmlns = element.getAttribute(XMLNS_ATTR);
- if (xmlns!=null && J2EE_NS.equals(xmlns)) {
- Vector<Node> v = new Vector<Node>();
- v.add(next);
- return v.elements();
- // return org.openide.util.Enumerations.singleton(next);
- } else if (xmlns!=null && JAVAEE_NS.equals(xmlns)) {
- Vector<Node> v = new Vector<Node>();
- v.add(next);
- return v.elements();
- // return org.openide.util.Enumerations.singleton(next);
- }
- else if (xmlns!=null && IBM_J2EE_NS.equals(xmlns)) {
+ String xmlns = element.getAttribute(XMLNS_ATTR);
+ if ( xmlns != null && ( EJB_JAR_TAG.equals(tag) || APP_TAG.equals(tag)
+ || WEBAPP_TAG.equals(tag) || APPCLIENT_TAG.equals(tag)
+ || PERSISTENCEORM_TAG.equals(tag) || PERSISTENCE_TAG.equals(tag)
+ || WEBSERVICES_TAG.equals(tag) ) ) { // NOI18N
+
+ if ( J2EE_NS.equals(xmlns)
+ || JAVAEE_NS.equals(xmlns)
+ || NEW_JAVAEE_NS.equals(xmlns)
+ || JAKARTAEE_NS.equals(xmlns) ) { // NOI18N
Vector<Node> v = new Vector<Node>();
v.add(next);
return v.elements();
@@ -718,7 +869,6 @@ public class RunTimeDDCatalog extends GrammarQueryManager implements CatalogRead
}
}
}
-
return null;
}
@@ -743,47 +893,138 @@ public class RunTimeDDCatalog extends GrammarQueryManager implements CatalogRead
if (resolver != null) {
try {
-
if (ctx.getFileObject() == null) {
return null;
}
InputSource inputSource = null;
String mimeType = ctx.getFileObject().getMIMEType();
- if (mimeType==null){
+ if (mimeType == null){
return null;
}
- if (mimeType.equals("text/x-dd-ejbjar3.0")){// NOI18N
- inputSource = resolver.resolveEntity(EJBJAR_3_0_ID, "");
- } else if (mimeType.equals("text/x-dd-ejbjar2.1")) {// NOI18N
- inputSource = resolver.resolveEntity(EJBJAR_2_1_ID, "");
- } else if (mimeType.equals("text/x-dd-application5.0")) {// NOI18N
- inputSource = resolver.resolveEntity(APP_5_ID, "");
- }else if (mimeType.equals("text/x-dd-application1.4")) {// NOI18N
- inputSource = resolver.resolveEntity(APP_1_4_ID, "");
- }else if (mimeType.equals("text/x-dd-client5.0")) {// NOI18N
- inputSource = resolver.resolveEntity(APPCLIENT_5_ID, "");
- }else if (mimeType.equals("text/x-dd-client1.4")) {// NOI18N
- inputSource = resolver.resolveEntity(APPCLIENT_1_4_ID, "");
- }else if (mimeType.equals("text/x-persistence1.0")) {// NOI18N
- inputSource = resolver.resolveEntity(PERSISTENCE_ID, "");
- }else if (mimeType.equals("text/x-orm1.0")) {// NOI18N
- inputSource = resolver.resolveEntity(PERSISTENCEORM_ID, "");
+ switch (mimeType) {
+ case "text/x-dd-ejbjar4.0": // NOI18N
+ inputSource = resolver.resolveEntity(EJBJAR_4_0_ID, "");
+ break;
+ case "text/x-dd-ejbjar3.2": // NOI18N
+ inputSource = resolver.resolveEntity(EJBJAR_3_2_ID, "");
+ break;
+ case "text/x-dd-ejbjar3.1": // NOI18N
+ inputSource = resolver.resolveEntity(EJBJAR_3_1_ID, "");
+ break;
+ case "text/x-dd-ejbjar3.0": // NOI18N
+ inputSource = resolver.resolveEntity(EJBJAR_3_0_ID, "");
+ break;
+ case "text/x-dd-ejbjar2.1": // NOI18N
+ inputSource = resolver.resolveEntity(EJBJAR_2_1_ID, "");
+ break;
+ case "text/x-dd-application9.0": // NOI18N
+ inputSource = resolver.resolveEntity(APP_9_ID, "");
+ break;
+ case "text/x-dd-application8.0": // NOI18N
+ inputSource = resolver.resolveEntity(APP_8_ID, "");
+ break;
+ case "text/x-dd-application7.0": // NOI18N
+ inputSource = resolver.resolveEntity(APP_7_ID, "");
+ break;
+ case "text/x-dd-application6.0": // NOI18N
+ inputSource = resolver.resolveEntity(APP_6_ID, "");
+ break;
+ case "text/x-dd-application5.0": // NOI18N
+ inputSource = resolver.resolveEntity(APP_5_ID, "");
+ break;
+ case "text/x-dd-application1.4": // NOI18N
+ inputSource = resolver.resolveEntity(APP_1_4_ID, "");
+ break;
+ case "text/x-dd-client9.0": // NOI18N
+ inputSource = resolver.resolveEntity(APPCLIENT_9_ID, "");
+ break;
+ case "text/x-dd-client8.0": // NOI18N
+ inputSource = resolver.resolveEntity(APPCLIENT_8_ID, "");
+ break;
+ case "text/x-dd-client7.0": // NOI18N
+ inputSource = resolver.resolveEntity(APPCLIENT_7_ID, "");
+ break;
+ case "text/x-dd-client6.0": // NOI18N
+ inputSource = resolver.resolveEntity(APPCLIENT_6_ID, "");
+ break;
+ case "text/x-dd-client5.0": // NOI18N
+ inputSource = resolver.resolveEntity(APPCLIENT_5_ID, "");
+ break;
+ case "text/x-dd-client1.4": // NOI18N
+ inputSource = resolver.resolveEntity(APPCLIENT_1_4_ID, "");
+ break;
+ case "text/x-dd-servlet5.0": // NOI18N
+ inputSource = resolver.resolveEntity(WEBAPP_5_0_ID, "");
+ break;
+ case "text/x-dd-servlet4.0": // NOI18N
+ inputSource = resolver.resolveEntity(WEBAPP_4_0_ID, "");
+ break;
+ case "text/x-dd-servlet3.1": // NOI18N
+ inputSource = resolver.resolveEntity(WEBAPP_3_1_ID, "");
+ break;
+ case "text/x-dd-servlet3.0": // NOI18N
+ inputSource = resolver.resolveEntity(WEBAPP_3_0_ID, "");
+ break;
+ case "text/x-dd-servlet2.5": // NOI18N
+ inputSource = resolver.resolveEntity(WEBAPP_2_5_ID, "");
+ break;
+ case "text/x-dd-servlet-fragment5.0": // NOI18N
+ inputSource = resolver.resolveEntity(WEBFRAGMENT_5_0_ID, "");
+ break;
+ case "text/x-dd-servlet-fragment4.0": // NOI18N
+ inputSource = resolver.resolveEntity(WEBFRAGMENT_4_0_ID, "");
+ break;
+ case "text/x-dd-servlet-fragment3.1": // NOI18N
+ inputSource = resolver.resolveEntity(WEBFRAGMENT_3_1_ID, "");
+ break;
+ case "text/x-dd-servlet-fragment3.0": // NOI18N
+ inputSource = resolver.resolveEntity(WEBFRAGMENT_3_0_ID, "");
+ break;
+ case "text/x-persistence3.0": // NOI18N
+ inputSource = resolver.resolveEntity(PERSISTENCE_3_0_ID, "");
+ break;
+ case "text/x-persistence2.2": // NOI18N
+ inputSource = resolver.resolveEntity(PERSISTENCE_2_2_ID, "");
+ break;
+ case "text/x-persistence2.1": // NOI18N
+ inputSource = resolver.resolveEntity(PERSISTENCE_2_1_ID, "");
+ break;
+ case "text/x-persistence2.0": // NOI18N
+ inputSource = resolver.resolveEntity(PERSISTENCE_2_0_ID, "");
+ break;
+ case "text/x-persistence1.0": // NOI18N
+ inputSource = resolver.resolveEntity(PERSISTENCE_ID, "");
+ break;
+ case "text/x-orm3.0": // NOI18N
+ inputSource = resolver.resolveEntity(PERSISTENCEORM_3_0_ID, "");
+ break;
+ case "text/x-orm2.2": // NOI18N
+ inputSource = resolver.resolveEntity(PERSISTENCEORM_2_2_ID, "");
+ break;
+ case "text/x-orm2.1": // NOI18N
+ inputSource = resolver.resolveEntity(PERSISTENCEORM_2_1_ID, "");
+ break;
+ case "text/x-orm2.0": // NOI18N
+ inputSource = resolver.resolveEntity(PERSISTENCEORM_2_0_ID, "");
+ break;
+ case "text/x-orm1.0": // NOI18N
+ inputSource = resolver.resolveEntity(PERSISTENCEORM_ID, "");
+ break;
+ default:
+ break;
}
- if (inputSource!=null) {
+ if (inputSource != null) {
return DTDUtil.parseDTD(true, inputSource);
}
-
if (is.getSystemId().endsWith("webservices.xml") ) { // NOI18N
// System.out.println("webservices tag");
inputSource = resolver.resolveEntity(WEBSERVICES_1_1_ID, "");
if (inputSource!=null) {
return DTDUtil.parseDTD(true, inputSource);
}
-
-
}
} catch(SAXException e) {
diff --git a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV5_1_0.xml b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV5_1_0.xml
index cc9fad3130..cfb81fe246 100644
--- a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV5_1_0.xml
+++ b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV5_1_0.xml
@@ -53,6 +53,7 @@
<include name="jakarta\..+\.jar"/>
<include name="bean-validator.jar"/>
<include name="cdi-api.jar"/>
+ <include name="javax.batch-api.jar"/>
<include name="jaxb-osgi.jar"/>
<include name="webservices-osgi.jar"/>
<include name="weld-osgi-bundle.jar"/>
@@ -65,7 +66,7 @@
</fileset>
</classpath>
<javadocs>
- <lookup path="docs/javaee-doc-api.jar"/>
+ <lookup path="docs/jakartaee8-doc-api.jar"/>
</javadocs>
<sources>
</sources>
diff --git a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV6.xml b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV6.xml
index 99beb41746..abcd3cb501 100644
--- a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV6.xml
+++ b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV6.xml
@@ -53,7 +53,7 @@
</fileset>
</classpath>
<javadocs>
- <lookup path="docs/javaee-doc-api.jar"/>
+ <lookup path="docs/jakartaee9-doc-api.jar"/>
</javadocs>
<sources>
</sources>
diff --git a/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/api/AppClientProjectGenerator.java b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/api/AppClientProjectGenerator.java
index 64866d135e..3e2205b3cf 100644
--- a/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/api/AppClientProjectGenerator.java
+++ b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/api/AppClientProjectGenerator.java
@@ -804,15 +804,11 @@ public class AppClientProjectGenerator {
private static void createManifest(FileObject dir, String path) throws IOException {
if (dir.getFileObject(path) == null) {
FileObject manifest = FileUtil.createData(dir, path);
- FileLock lock = manifest.lock();
- try {
- try (OutputStream os = manifest.getOutputStream(lock); PrintWriter pw = new PrintWriter(os, true)) {
- pw.println("Manifest-Version: 1.0"); // NOI18N
- pw.println("X-COMMENT: Main-Class will be added automatically by build"); // NOI18N
- pw.println(); // safest to end in \n\n due to JRE parsing bug
- }
- } finally {
- lock.releaseLock();
+ try (FileLock lock = manifest.lock();
+ OutputStream os = manifest.getOutputStream(lock); PrintWriter pw = new PrintWriter(os, true)) {
+ pw.println("Manifest-Version: 1.0"); // NOI18N
+ pw.println("X-COMMENT: Main-Class will be added automatically by build"); // NOI18N
+ pw.println(); // safest to end in \n\n due to JRE parsing bug
}
}
}
diff --git a/enterprise/j2ee.common/licenseinfo.xml b/enterprise/j2ee.common/licenseinfo.xml
index 4f20738fec..c54aa0cc9e 100644
--- a/enterprise/j2ee.common/licenseinfo.xml
+++ b/enterprise/j2ee.common/licenseinfo.xml
@@ -26,23 +26,33 @@
<file>src/org/netbeans/modules/j2ee/common/dd/resources/beans-1.0.xml</file>
<file>src/org/netbeans/modules/j2ee/common/dd/resources/beans-1.1.xml</file>
<file>src/org/netbeans/modules/j2ee/common/dd/resources/beans-2.0.xml</file>
+ <file>src/org/netbeans/modules/j2ee/common/dd/resources/beans-3.0.xml</file>
<file>src/org/netbeans/modules/j2ee/common/dd/resources/constraint.xml</file>
+ <file>src/org/netbeans/modules/j2ee/common/dd/resources/constraint-1.1.xml</file>
+ <file>src/org/netbeans/modules/j2ee/common/dd/resources/constraint-2.0.xml</file>
+ <file>src/org/netbeans/modules/j2ee/common/dd/resources/constraint-3.0.xml</file>
<file>src/org/netbeans/modules/j2ee/common/dd/resources/ear-1.3.xml</file>
<file>src/org/netbeans/modules/j2ee/common/dd/resources/ear-1.4.xml</file>
<file>src/org/netbeans/modules/j2ee/common/dd/resources/ear-5.xml</file>
<file>src/org/netbeans/modules/j2ee/common/dd/resources/ear-6.xml</file>
<file>src/org/netbeans/modules/j2ee/common/dd/resources/ear-7.xml</file>
<file>src/org/netbeans/modules/j2ee/common/dd/resources/ear-8.xml</file>
+ <file>src/org/netbeans/modules/j2ee/common/dd/resources/ear-9.xml</file>
<file>src/org/netbeans/modules/j2ee/common/dd/resources/validation.xml</file>
+ <file>src/org/netbeans/modules/j2ee/common/dd/resources/validation-1.1.xml</file>
+ <file>src/org/netbeans/modules/j2ee/common/dd/resources/validation-2.0.xml</file>
+ <file>src/org/netbeans/modules/j2ee/common/dd/resources/validation-3.0.xml</file>
<file>src/org/netbeans/modules/j2ee/common/dd/resources/web-2.3.xml</file>
<file>src/org/netbeans/modules/j2ee/common/dd/resources/web-2.4.xml</file>
<file>src/org/netbeans/modules/j2ee/common/dd/resources/web-2.5.xml</file>
<file>src/org/netbeans/modules/j2ee/common/dd/resources/web-3.0.xml</file>
<file>src/org/netbeans/modules/j2ee/common/dd/resources/web-3.1.xml</file>
<file>src/org/netbeans/modules/j2ee/common/dd/resources/web-4.0.xml</file>
+ <file>src/org/netbeans/modules/j2ee/common/dd/resources/web-5.0.xml</file>
<file>src/org/netbeans/modules/j2ee/common/dd/resources/web-fragment-3.0.xml</file>
<file>src/org/netbeans/modules/j2ee/common/dd/resources/web-fragment-3.1.xml</file>
<file>src/org/netbeans/modules/j2ee/common/dd/resources/web-fragment-4.0.xml</file>
+ <file>src/org/netbeans/modules/j2ee/common/dd/resources/web-fragment-5.0.xml</file>
<file>test/unit/src/templates/Class.template</file>
<file>test/unit/src/templates/Interface.template</file>
<license ref="Apache-2.0-ASF" />
diff --git a/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/J2eeProjectCapabilities.java b/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/J2eeProjectCapabilities.java
index 0dc01528ec..e5d9a73637 100644
--- a/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/J2eeProjectCapabilities.java
+++ b/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/J2eeProjectCapabilities.java
@@ -96,41 +96,42 @@ public final class J2eeProjectCapabilities {
public boolean isEjb30Supported() {
J2eeModule.Type moduleType = provider.getJ2eeModule().getType();
boolean eeOk = ejbJarProfile != null && (ejbJarProfile.equals(Profile.JAVA_EE_5) ||
- ejbJarProfile.equals(Profile.JAVA_EE_6_FULL) || ejbJarProfile.equals(Profile.JAVA_EE_7_FULL) || ejbJarProfile.equals(Profile.JAVA_EE_8_FULL) || ejbJarProfile.equals(Profile.JAKARTA_EE_8_FULL) || ejbJarProfile.equals(Profile.JAKARTA_EE_9_FULL));
+ ejbJarProfile.equals(Profile.JAVA_EE_6_FULL) || ejbJarProfile.equals(Profile.JAVA_EE_7_FULL) || ejbJarProfile.equals(Profile.JAVA_EE_8_FULL) || ejbJarProfile.equals(Profile.JAKARTA_EE_8_FULL));
return J2eeModule.Type.EJB.equals(moduleType) && eeOk;
}
/**
* EJB 3.1 functionality is supported in EjbJar and Web project which is targeting
* full Java EE 6 platform.
+ * @return {@code true} if the project is targeting full Java EE 6 or newer platform
*/
public boolean isEjb31Supported() {
J2eeModule.Type moduleType = provider.getJ2eeModule().getType();
- boolean ee6or7 = ejbJarProfile != null && (ejbJarProfile.equals(Profile.JAVA_EE_6_FULL) || ejbJarProfile.equals(Profile.JAVA_EE_7_FULL) || ejbJarProfile.equals(Profile.JAVA_EE_8_FULL) || ejbJarProfile.equals(Profile.JAKARTA_EE_8_FULL) || ejbJarProfile.equals(Profile.JAKARTA_EE_9_FULL));
+ boolean ee6or7 = ejbJarProfile != null && (ejbJarProfile.equals(Profile.JAVA_EE_6_FULL) || ejbJarProfile.equals(Profile.JAVA_EE_7_FULL) || ejbJarProfile.equals(Profile.JAVA_EE_8_FULL) || ejbJarProfile.equals(Profile.JAKARTA_EE_8_FULL));
return ee6or7 && (J2eeModule.Type.EJB.equals(moduleType) ||
J2eeModule.Type.WAR.equals(moduleType));
}
/**
* EJB 3.1 Lite functionality is supported in Web project targeting Java EE 6
- * web profile and wherever full EJB 3.1 is supported.
+ * web profile or newer and wherever full EJB 3.1 is supported.
*/
public boolean isEjb31LiteSupported() {
J2eeModule.Type moduleType = provider.getJ2eeModule().getType();
- boolean ee6or7Web = ejbJarProfile != null && (ejbJarProfile.equals(Profile.JAVA_EE_6_WEB) || ejbJarProfile.equals(Profile.JAVA_EE_7_WEB) || ejbJarProfile.equals(Profile.JAVA_EE_8_WEB) || ejbJarProfile.equals(Profile.JAKARTA_EE_8_WEB) || ejbJarProfile.equals(Profile.JAKARTA_EE_9_WEB));
+ boolean ee6or7Web = ejbJarProfile != null && (ejbJarProfile.equals(Profile.JAVA_EE_6_WEB) || ejbJarProfile.equals(Profile.JAVA_EE_7_WEB) || ejbJarProfile.equals(Profile.JAVA_EE_8_WEB) || ejbJarProfile.equals(Profile.JAKARTA_EE_8_WEB));
return isEjb31Supported() || (J2eeModule.Type.WAR.equals(moduleType) && ee6or7Web);
}
/**
* EJB 3.2 functionality is supported in EjbJar and Web project which is targeting
- * full Java EE 7 platform.
+ * full Java EE or newer platform.
*
- * @return {@code true} if the project is targeting full Java EE 7 platform
+ * @return {@code true} if the project is targeting full Java EE 7 or newer platform
* @since 1.76
*/
public boolean isEjb32Supported() {
J2eeModule.Type moduleType = provider.getJ2eeModule().getType();
- boolean ee7 = ejbJarProfile != null && (ejbJarProfile.equals(Profile.JAVA_EE_7_FULL) || ejbJarProfile.equals(Profile.JAVA_EE_8_FULL) || ejbJarProfile.equals(Profile.JAKARTA_EE_8_FULL) || ejbJarProfile.equals(Profile.JAKARTA_EE_9_FULL));
+ boolean ee7 = ejbJarProfile != null && (ejbJarProfile.equals(Profile.JAVA_EE_7_FULL) || ejbJarProfile.equals(Profile.JAVA_EE_8_FULL) || ejbJarProfile.equals(Profile.JAKARTA_EE_8_FULL));
return ee7 && (J2eeModule.Type.EJB.equals(moduleType) || J2eeModule.Type.WAR.equals(moduleType));
}
@@ -138,15 +139,41 @@ public final class J2eeProjectCapabilities {
* EJB 3.2 Lite functionality is supported in Web project targeting Java EE 7
* web profile and wherever full EJB 3.2 is supported.
*
- * @return {@code true} if the project is targeting full or web profile Java EE 7 platform
+ * @return {@code true} if the project is targeting full or web profile Java EE 7 or newer platform
* @since 1.76
*/
public boolean isEjb32LiteSupported() {
J2eeModule.Type moduleType = provider.getJ2eeModule().getType();
- boolean ee7Web = ejbJarProfile != null && (ejbJarProfile.equals(Profile.JAVA_EE_7_WEB) || ejbJarProfile.equals(Profile.JAVA_EE_8_WEB) || ejbJarProfile.equals(Profile.JAKARTA_EE_8_WEB) || ejbJarProfile.equals(Profile.JAKARTA_EE_9_WEB));
+ boolean ee7Web = ejbJarProfile != null && (ejbJarProfile.equals(Profile.JAVA_EE_7_WEB) || ejbJarProfile.equals(Profile.JAVA_EE_8_WEB) || ejbJarProfile.equals(Profile.JAKARTA_EE_8_WEB));
return isEjb32Supported() || (J2eeModule.Type.WAR.equals(moduleType) && ee7Web);
}
+ /**
+ * EJB 4.0 functionality is supported in EjbJar and Web project which is targeting
+ * full Jakarta EE 9/9.1 platform.
+ *
+ * @return {@code true} if the project is targeting full Jakarta EE 9/9.1 or newer platform
+ * @since 1.76
+ */
+ public boolean isEjb40Supported() {
+ J2eeModule.Type moduleType = provider.getJ2eeModule().getType();
+ boolean ee9 = ejbJarProfile != null && (ejbJarProfile.equals(Profile.JAKARTA_EE_9_FULL) || ejbJarProfile.equals(Profile.JAKARTA_EE_9_1_FULL));
+ return ee9 && (J2eeModule.Type.EJB.equals(moduleType) || J2eeModule.Type.WAR.equals(moduleType));
+ }
+
+ /**
+ * EJB 4.0 Lite functionality is supported in Web project targeting Jakarta EE 9/9.1
+ * web profile and wherever full EJB 4.0 is supported.
+ *
+ * @return {@code true} if the project is targeting full or web profile Jakarta EE 9/9.1 or newer platform
+ * @since 1.76
+ */
+ public boolean isEjb40LiteSupported() {
+ J2eeModule.Type moduleType = provider.getJ2eeModule().getType();
+ boolean ee9Web = ejbJarProfile != null && (ejbJarProfile.equals(Profile.JAKARTA_EE_9_WEB) || ejbJarProfile.equals(Profile.JAKARTA_EE_9_1_WEB));
+ return isEjb40Supported() || (J2eeModule.Type.WAR.equals(moduleType) && ee9Web);
+ }
+
/**
* Is CDI 1.0 supported in this project?
* @return {@code true} if the project targets EE6 profile, {@code false} otherwise
@@ -188,6 +215,21 @@ public final class J2eeProjectCapabilities {
Profile.JAKARTA_EE_8_WEB.equals(webProfile) ||
Profile.JAKARTA_EE_8_FULL.equals(carProfile);
}
+
+ /**
+ * Is CDI 3.0 supported in this project?
+ * @return {@code true} if the project targets Jakarta EE 9/9.1 profile,
+ * {@code false} otherwise
+ * @since 1.113
+ */
+ public boolean isCdi30Supported() {
+ return Profile.JAKARTA_EE_9_FULL.equals(ejbJarProfile) ||
+ Profile.JAKARTA_EE_9_WEB.equals(webProfile) ||
+ Profile.JAKARTA_EE_9_FULL.equals(carProfile) ||
+ Profile.JAKARTA_EE_9_1_FULL.equals(ejbJarProfile) ||
+ Profile.JAKARTA_EE_9_1_WEB.equals(webProfile) ||
+ Profile.JAKARTA_EE_9_1_FULL.equals(carProfile);
+ }
/**
* Returns <code>true</code> if the server used by project supports EJB lite.
diff --git a/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/DDHelper.java b/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/DDHelper.java
index d050e06eb8..92e6e1c649 100644
--- a/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/DDHelper.java
+++ b/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/DDHelper.java
@@ -47,7 +47,7 @@ public class DDHelper {
/**
* Creates web.xml deployment descriptor.
- * @param j2eeProfile Java EE profile to specify which version of web.xml should be created
+ * @param j2eeProfile Java EE/Jakarta EE profile to specify which version of web.xml should be created
* @param dir Directory where web.xml should be created
* @return web.xml file as FileObject
* @throws java.io.IOException
@@ -58,7 +58,7 @@ public class DDHelper {
/**
* Creates web.xml deployment descriptor.
- * @param j2eeProfile Java EE profile to specify which version of web.xml should be created
+ * @param j2eeProfile Java EE/Jakarta EE profile to specify which version of web.xml should be created
* @param webXmlRequired true if web.xml should be created also for profiles where it is not required
* @param dir Directory where web.xml should be created
* @return web.xml file as FileObject
@@ -66,13 +66,11 @@ public class DDHelper {
*/
public static FileObject createWebXml(Profile j2eeProfile, boolean webXmlRequired, FileObject dir) throws IOException {
String template = null;
- if ((Profile.JAKARTA_EE_9_1_FULL == j2eeProfile || Profile.JAKARTA_EE_9_1_WEB == j2eeProfile) && webXmlRequired) {
- template = "web-4.0.xml"; //NOI18N
- } else if ((Profile.JAKARTA_EE_9_FULL == j2eeProfile || Profile.JAKARTA_EE_9_WEB == j2eeProfile) && webXmlRequired) {
- template = "web-4.0.xml"; //NOI18N
- } else if ((Profile.JAKARTA_EE_8_FULL == j2eeProfile || Profile.JAKARTA_EE_8_WEB == j2eeProfile) && webXmlRequired) {
- template = "web-4.0.xml"; //NOI18N
- } else if ((Profile.JAVA_EE_8_FULL == j2eeProfile || Profile.JAVA_EE_8_WEB == j2eeProfile) && webXmlRequired) {
+ if ((Profile.JAKARTA_EE_9_1_FULL == j2eeProfile || Profile.JAKARTA_EE_9_1_WEB == j2eeProfile ||
+ Profile.JAKARTA_EE_9_FULL == j2eeProfile || Profile.JAKARTA_EE_9_WEB == j2eeProfile) && webXmlRequired) {
+ template = "web-5.0.xml"; //NOI18N
+ } else if ((Profile.JAKARTA_EE_8_FULL == j2eeProfile || Profile.JAKARTA_EE_8_WEB == j2eeProfile ||
+ Profile.JAVA_EE_8_FULL == j2eeProfile || Profile.JAVA_EE_8_WEB == j2eeProfile) && webXmlRequired) {
template = "web-4.0.xml"; //NOI18N
} else if ((Profile.JAVA_EE_7_FULL == j2eeProfile || Profile.JAVA_EE_7_WEB == j2eeProfile) && webXmlRequired) {
template = "web-3.1.xml"; //NOI18N
@@ -98,20 +96,18 @@ public class DDHelper {
/**
* Creates web-fragment.xml deployment descriptor.
- * @param j2eeProfile Java EE profile to specify which version of web-fragment.xml should be created
+ * @param j2eeProfile Java EE/Jakarta EE profile to specify which version of web-fragment.xml should be created
* @param dir Directory where web-fragment.xml should be created
* @return web-fragment.xml file as FileObject
* @throws java.io.IOException
*/
public static FileObject createWebFragmentXml(Profile j2eeProfile, FileObject dir) throws IOException {
String template = null;
- if (Profile.JAKARTA_EE_9_1_FULL == j2eeProfile || Profile.JAKARTA_EE_9_1_WEB == j2eeProfile) {
- template = "web-fragment-4.0.xml"; //NOI18N
- } else if (Profile.JAKARTA_EE_9_FULL == j2eeProfile || Profile.JAKARTA_EE_9_WEB == j2eeProfile) {
- template = "web-fragment-4.0.xml"; //NOI18N
- } else if (Profile.JAKARTA_EE_8_FULL == j2eeProfile || Profile.JAKARTA_EE_8_WEB == j2eeProfile) {
- template = "web-fragment-4.0.xml"; //NOI18N
- } else if (Profile.JAVA_EE_8_FULL == j2eeProfile || Profile.JAVA_EE_8_WEB == j2eeProfile) {
+ if (Profile.JAKARTA_EE_9_1_FULL == j2eeProfile || Profile.JAKARTA_EE_9_1_WEB == j2eeProfile ||
+ Profile.JAKARTA_EE_9_FULL == j2eeProfile || Profile.JAKARTA_EE_9_WEB == j2eeProfile) {
+ template = "web-fragment-5.0.xml"; //NOI18N
+ } else if (Profile.JAKARTA_EE_8_FULL == j2eeProfile || Profile.JAKARTA_EE_8_WEB == j2eeProfile ||
+ Profile.JAVA_EE_8_FULL == j2eeProfile || Profile.JAVA_EE_8_WEB == j2eeProfile) {
template = "web-fragment-4.0.xml"; //NOI18N
} else if (Profile.JAVA_EE_7_FULL == j2eeProfile || Profile.JAVA_EE_7_WEB == j2eeProfile) {
template = "web-fragment-3.1.xml"; //NOI18N
@@ -131,7 +127,7 @@ public class DDHelper {
/**
* Creates beans.xml deployment descriptor.
- * @param j2eeProfile Java EE profile to specify which version of beans.xml should be created
+ * @param j2eeProfile Java EE/Jakarta EE profile to specify which version of beans.xml should be created
* @param dir Directory where beans.xml should be created
* @return beans.xml file as FileObject
* @throws java.io.IOException
@@ -143,7 +139,7 @@ public class DDHelper {
/**
* Creates beans.xml deployment descriptor.
- * @param j2eeProfile Java EE profile to specify which version of beans.xml should be created
+ * @param j2eeProfile Java EE/Jakarta EE profile to specify which version of beans.xml should be created
* @param dir Directory where beans.xml should be created
* @param name name of configuration file to create; should be always "beans" for now
* @return beans.xml file as FileObject
@@ -151,10 +147,12 @@ public class DDHelper {
* @since 1.49
*/
public static FileObject createBeansXml(Profile j2eeProfile, FileObject dir, String name) throws IOException {
- String template = null;
- if (Profile.JAKARTA_EE_8_FULL == j2eeProfile || Profile.JAKARTA_EE_8_WEB == j2eeProfile) {
- template = "beans-2.0.xml"; //NOI18N
- } else if (Profile.JAVA_EE_8_FULL == j2eeProfile || Profile.JAVA_EE_8_WEB == j2eeProfile) {
+ String template = null;
+ if (Profile.JAKARTA_EE_9_1_FULL == j2eeProfile || Profile.JAKARTA_EE_9_1_WEB == j2eeProfile ||
+ Profile.JAKARTA_EE_9_FULL == j2eeProfile || Profile.JAKARTA_EE_9_WEB == j2eeProfile) {
+ template = "beans-3.0.xml"; //NOI18N
+ } else if (Profile.JAKARTA_EE_8_FULL == j2eeProfile || Profile.JAKARTA_EE_8_WEB == j2eeProfile ||
+ Profile.JAVA_EE_8_FULL == j2eeProfile || Profile.JAVA_EE_8_WEB == j2eeProfile) {
template = "beans-2.0.xml"; //NOI18N
} else if (Profile.JAVA_EE_7_FULL == j2eeProfile || Profile.JAVA_EE_7_WEB == j2eeProfile) {
template = "beans-1.1.xml"; //NOI18N
@@ -162,10 +160,6 @@ public class DDHelper {
template = "beans-1.0.xml"; //NOI18N
}
- if (Profile.JAKARTA_EE_9_FULL == j2eeProfile || Profile.JAKARTA_EE_9_WEB == j2eeProfile) {
- template = "beans-2.0.xml"; //NOI18N
- }
-
if (template == null)
return null;
@@ -179,7 +173,7 @@ public class DDHelper {
/**
* Created validation.xml deployment descriptor
- * @param j2eeProfile Java EE profile
+ * @param j2eeProfile Java EE/Jakarta EE profile
* @param dir Directory where validation.xml should be created
* @return validation.xml file as FileObject
* @throws IOException
@@ -191,7 +185,7 @@ public class DDHelper {
/**
* Created validation.xml deployment descriptor
- * @param j2eeProfile Java EE profile
+ * @param j2eeProfile Java EE/Jakarta EE profile
* @param dir Directory where validation.xml should be created
* @param name name of configuration file to create;
* @return validation.xml file as FileObject
@@ -200,12 +194,16 @@ public class DDHelper {
*/
public static FileObject createValidationXml(Profile j2eeProfile, FileObject dir, String name) throws IOException {
String template = null;
- if (Profile.JAVA_EE_6_FULL == j2eeProfile || Profile.JAVA_EE_6_WEB == j2eeProfile ||
- Profile.JAVA_EE_7_FULL == j2eeProfile || Profile.JAVA_EE_7_WEB == j2eeProfile ||
- Profile.JAVA_EE_8_FULL == j2eeProfile || Profile.JAVA_EE_8_WEB == j2eeProfile ||
- Profile.JAKARTA_EE_8_FULL == j2eeProfile || Profile.JAKARTA_EE_8_WEB == j2eeProfile ||
- Profile.JAKARTA_EE_9_FULL == j2eeProfile || Profile.JAKARTA_EE_9_WEB == j2eeProfile) {
+ if (Profile.JAVA_EE_6_FULL == j2eeProfile || Profile.JAVA_EE_6_WEB == j2eeProfile) {
template = "validation.xml"; //NOI18N
+ } else if (Profile.JAVA_EE_7_FULL == j2eeProfile || Profile.JAVA_EE_7_WEB == j2eeProfile) {
+ template = "validation-1.1.xml"; //NOI18N
+ } else if (Profile.JAVA_EE_8_FULL == j2eeProfile || Profile.JAVA_EE_8_WEB == j2eeProfile ||
+ Profile.JAKARTA_EE_8_FULL == j2eeProfile || Profile.JAKARTA_EE_8_WEB == j2eeProfile) {
+ template = "validation-2.0.xml"; //NOI18N
+ } else if (Profile.JAKARTA_EE_9_FULL == j2eeProfile || Profile.JAKARTA_EE_9_WEB == j2eeProfile ||
+ Profile.JAKARTA_EE_9_1_FULL == j2eeProfile || Profile.JAKARTA_EE_9_1_WEB == j2eeProfile) {
+ template = "validation-3.0.xml"; //NOI18N
}
if (template == null)
return null;
@@ -220,7 +218,7 @@ public class DDHelper {
/**
* Created Constraint declaration deployment descriptor
- * @param j2eeProfile Java EE profile
+ * @param j2eeProfile Java EE/Jakarta EE profile
* @param dir Directory where constraint.xml should be created
* @return validation.xml file as FileObject
* @throws IOException
@@ -232,7 +230,7 @@ public class DDHelper {
/**
* Created Constraint declaration deployment descriptor
- * @param j2eeProfile Java EE profile
+ * @param j2eeProfile Java EE/Jakarta EE profile
* @param dir Directory where constraint.xml should be created
* @param name name of configuration file to create;
* @return validation.xml file as FileObject
@@ -241,12 +239,16 @@ public class DDHelper {
*/
public static FileObject createConstraintXml(Profile j2eeProfile, FileObject dir, String name) throws IOException {
String template = null;
- if (Profile.JAVA_EE_6_FULL == j2eeProfile || Profile.JAVA_EE_6_WEB == j2eeProfile ||
- Profile.JAVA_EE_7_FULL == j2eeProfile || Profile.JAVA_EE_7_WEB == j2eeProfile ||
- Profile.JAVA_EE_8_FULL == j2eeProfile || Profile.JAVA_EE_8_WEB == j2eeProfile ||
- Profile.JAKARTA_EE_8_FULL == j2eeProfile || Profile.JAKARTA_EE_8_WEB == j2eeProfile ||
- Profile.JAKARTA_EE_9_FULL == j2eeProfile || Profile.JAKARTA_EE_9_WEB == j2eeProfile) {
+ if (Profile.JAVA_EE_6_FULL == j2eeProfile || Profile.JAVA_EE_6_WEB == j2eeProfile) {
template = "constraint.xml"; //NOI18N
+ } else if (Profile.JAVA_EE_7_FULL == j2eeProfile || Profile.JAVA_EE_7_WEB == j2eeProfile) {
+ template = "constraint-1.1.xml"; //NOI18N
+ } else if (Profile.JAVA_EE_8_FULL == j2eeProfile || Profile.JAVA_EE_8_WEB == j2eeProfile ||
+ Profile.JAKARTA_EE_8_FULL == j2eeProfile || Profile.JAKARTA_EE_8_WEB == j2eeProfile) {
+ template = "constraint-2.0.xml"; //NOI18N
+ } else if (Profile.JAKARTA_EE_9_FULL == j2eeProfile || Profile.JAKARTA_EE_9_WEB == j2eeProfile ||
+ Profile.JAKARTA_EE_9_1_FULL == j2eeProfile || Profile.JAKARTA_EE_9_1_WEB == j2eeProfile) {
+ template = "constraint-3.0.xml"; //NOI18N
}
if (template == null)
return null;
@@ -274,9 +276,10 @@ public class DDHelper {
public static FileObject createApplicationXml(final Profile profile, final FileObject dir,
boolean forceCreation) throws IOException {
String template = null;
- if (profile != null && profile.equals(Profile.JAKARTA_EE_8_FULL) && forceCreation) {
- template = "ear-8.xml"; // NOI18N
- } else if (profile != null && profile.equals(Profile.JAVA_EE_8_FULL) && forceCreation) {
+
+ if (profile != null && (profile.equals(Profile.JAKARTA_EE_9_FULL) || profile.equals(Profile.JAKARTA_EE_9_1_FULL)) && forceCreation) {
+ template = "ear-9.xml"; // NOI18N
+ } else if (profile != null && (profile.equals(Profile.JAKARTA_EE_8_FULL) || profile.equals(Profile.JAVA_EE_8_FULL)) && forceCreation) {
template = "ear-8.xml"; // NOI18N
} else if (profile != null && profile.equals(Profile.JAVA_EE_7_FULL) && forceCreation) {
template = "ear-7.xml"; // NOI18N
@@ -316,10 +319,7 @@ public class DDHelper {
}
}
Ear ear = Ear.getEar(project.getProjectDirectory());
- if (ear != null && Profile.J2EE_14.equals(ear.getJ2eeProfile())) {
- return true;
- }
- return false;
+ return ear != null && Profile.J2EE_14.equals(ear.getJ2eeProfile());
}
// -------------------------------------------------------------------------
@@ -354,11 +354,9 @@ public class DDHelper {
FileObject xml = FileUtil.createData(toDir, toFile);
String content = readResource(DDHelper.class.getResourceAsStream(fromFile));
if (content != null) {
- FileLock lock = xml.lock();
- try (BufferedWriter bw = new BufferedWriter(new OutputStreamWriter(xml.getOutputStream(lock)))) {
+ try (FileLock lock = xml.lock();
+ BufferedWriter bw = new BufferedWriter(new OutputStreamWriter(xml.getOutputStream(lock)))) {
bw.write(content);
- } finally {
- lock.releaseLock();
}
}
result = xml;
diff --git a/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/beans-3.0.xml b/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/beans-3.0.xml
new file mode 100644
index 0000000000..a46dbc679a
--- /dev/null
+++ b/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/beans-3.0.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans 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/beans_3_0.xsd"
+ bean-discovery-mode="annotated"
+ version="3.0">
+</beans>
\ No newline at end of file
diff --git a/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/constraint-1.1.xml b/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/constraint-1.1.xml
new file mode 100644
index 0000000000..5f10b3837e
--- /dev/null
+++ b/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/constraint-1.1.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<constraint-mappings
+ xmlns="http://jboss.org/xml/ns/javax/validation/mapping"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://jboss.org/xml/ns/javax/validation/mapping
+ http://jboss.org/xml/ns/javax/validation/mapping/validation-mapping-1.1.xsd">
+
+</constraint-mappings>
diff --git a/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/constraint-2.0.xml b/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/constraint-2.0.xml
new file mode 100644
index 0000000000..5a225b4a77
--- /dev/null
+++ b/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/constraint-2.0.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<constraint-mappings
+ xmlns="http://xmlns.jcp.org/xml/ns/validation/mapping"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/validation/mapping
+ http://xmlns.jcp.org/xml/ns/validation/mapping/validation-mapping-2.0.xsd"
+ version="2.0">
+
+</constraint-mappings>
diff --git a/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/constraint-3.0.xml b/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/constraint-3.0.xml
new file mode 100644
index 0000000000..e07f0eb56a
--- /dev/null
+++ b/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/constraint-3.0.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<constraint-mappings
+ xmlns="https://jakarta.ee/xml/ns/validation/mapping"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="https://jakarta.ee/xml/ns/validation/mapping
+ https://jakarta.ee/xml/ns/validation/validation-mapping-3.0.xsd"
+ version="3.0">
+
+</constraint-mappings>
diff --git a/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/constraint.xml b/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/constraint.xml
index 2f3193b8d1..36620a30f7 100644
--- a/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/constraint.xml
+++ b/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/constraint.xml
@@ -1,7 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<constraint-mappings xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://jboss.org/xml/ns/javax/validation/mapping http://jboss.org/xml/ns/javax/validation/mapping/validation-mapping-1.0.xsd"
- xmlns="http://jboss.org/xml/ns/javax/validation/mapping">
+<constraint-mappings
+ xmlns="http://jboss.org/xml/ns/javax/validation/mapping"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://jboss.org/xml/ns/javax/validation/mapping
+ http://jboss.org/xml/ns/javax/validation/mapping/validation-mapping-1.0.xsd">
</constraint-mappings>
diff --git a/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/ear-9.xml b/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/ear-9.xml
new file mode 100644
index 0000000000..b9acd22181
--- /dev/null
+++ b/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/ear-9.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application xmlns="https://jakarta.ee/xml/ns/jakartaee"
+ version="9"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/application_9.xsd">
+
+</application>
diff --git a/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/validation-1.1.xml b/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/validation-1.1.xml
new file mode 100644
index 0000000000..6e14f1a1a6
--- /dev/null
+++ b/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/validation-1.1.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<validation-config
+ xmlns="http://jboss.org/xml/ns/javax/validation/configuration"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://jboss.org/xml/ns/javax/validation/configuration
+ http://jboss.org/xml/ns/javax/validation/configuration/validation-configuration-1.1.xsd">
+
+</validation-config>
diff --git a/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/validation-2.0.xml b/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/validation-2.0.xml
new file mode 100644
index 0000000000..13bdcfe34d
--- /dev/null
+++ b/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/validation-2.0.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<validation-config
+ xmlns="http://xmlns.jcp.org/xml/ns/validation/configuration"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/validation/configuration
+ http://xmlns.jcp.org/xml/ns/validation/configuration/validation-configuration-2.0.xsd"
+ version="2.0">
+
+</validation-config>
diff --git a/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/validation-3.0.xml b/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/validation-3.0.xml
new file mode 100644
index 0000000000..cc5e22a3ad
--- /dev/null
+++ b/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/validation-3.0.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<validation-config
+ xmlns="https://jakarta.ee/xml/ns/validation/configuration"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="https://jakarta.ee/xml/ns/validation/configuration
+ https://jakarta.ee/xml/ns/validation/validation-configuration-3.0.xsd"
+ version="3.0">
+
+</validation-config>
diff --git a/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/validation.xml b/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/validation.xml
index 268d575125..fd1377165d 100644
--- a/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/validation.xml
+++ b/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/validation.xml
@@ -1,7 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<validation-config xmlns="http://jboss.org/xml/ns/javax/validation/configuration"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://jboss.org/xml/ns/javax/validation/configuration http://jboss.org/xml/ns/javax/validation/configuration/validation-configuration-1.0.xsd">
+<validation-config
+ xmlns="http://jboss.org/xml/ns/javax/validation/configuration"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://jboss.org/xml/ns/javax/validation/configuration
+ http://jboss.org/xml/ns/javax/validation/configuration/validation-configuration-1.0.xsd">
</validation-config>
diff --git a/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/web-5.0.xml b/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/web-5.0.xml
new file mode 100644
index 0000000000..4d3d29983f
--- /dev/null
+++ b/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/web-5.0.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app 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-app_5_0.xsd"
+ version="5.0">
+
+</web-app>
diff --git a/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/web-fragment-5.0.xml b/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/web-fragment-5.0.xml
new file mode 100644
index 0000000000..3d2be357a6
--- /dev/null
+++ b/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/dd/resources/web-fragment-5.0.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-fragment 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"
+ version="5.0">
+
+</web-fragment>
diff --git a/enterprise/j2ee.common/test/unit/src/org/netbeans/modules/j2ee/common/J2eeProjectCapabilitiesTest.java b/enterprise/j2ee.common/test/unit/src/org/netbeans/modules/j2ee/common/J2eeProjectCapabilitiesTest.java
index f833d10d95..625948959d 100644
--- a/enterprise/j2ee.common/test/unit/src/org/netbeans/modules/j2ee/common/J2eeProjectCapabilitiesTest.java
+++ b/enterprise/j2ee.common/test/unit/src/org/netbeans/modules/j2ee/common/J2eeProjectCapabilitiesTest.java
@@ -50,6 +50,7 @@ public class J2eeProjectCapabilitiesTest extends NbTestCase {
}
public void testIsEjbSupported() throws Exception {
+
Project p = createProject(Profile.JAVA_EE_5, Type.EJB);
J2eeProjectCapabilities cap = J2eeProjectCapabilities.forProject(p);
assertTrue(cap.isEjb30Supported());
@@ -57,6 +58,8 @@ public class J2eeProjectCapabilitiesTest extends NbTestCase {
assertFalse(cap.isEjb31LiteSupported());
assertFalse(cap.isEjb32Supported());
assertFalse(cap.isEjb32LiteSupported());
+ assertFalse(cap.isEjb40Supported());
+ assertFalse(cap.isEjb40LiteSupported());
p = createProject(Profile.JAVA_EE_6_FULL, Type.EJB);
cap = J2eeProjectCapabilities.forProject(p);
@@ -65,30 +68,118 @@ public class J2eeProjectCapabilitiesTest extends NbTestCase {
assertTrue(cap.isEjb31LiteSupported());
assertFalse(cap.isEjb32Supported());
assertFalse(cap.isEjb32LiteSupported());
+ assertFalse(cap.isEjb40Supported());
+ assertFalse(cap.isEjb40LiteSupported());
p = createProject(Profile.JAVA_EE_6_WEB, Type.EJB);
cap = J2eeProjectCapabilities.forProject(p);
assertFalse(cap.isEjb30Supported());
assertFalse(cap.isEjb31Supported());
- assertFalse(cap.isEjb31LiteSupported());
+ assertTrue(cap.isEjb31LiteSupported());
assertFalse(cap.isEjb32Supported());
assertFalse(cap.isEjb32LiteSupported());
+ assertFalse(cap.isEjb40Supported());
+ assertFalse(cap.isEjb40LiteSupported());
+
+ p = createProject(Profile.JAVA_EE_7_FULL, Type.EJB);
+ cap = J2eeProjectCapabilities.forProject(p);
+ assertTrue(cap.isEjb30Supported());
+ assertTrue(cap.isEjb31Supported());
+ assertTrue(cap.isEjb31LiteSupported());
+ assertTrue(cap.isEjb32Supported());
+ assertTrue(cap.isEjb32LiteSupported());
+ assertFalse(cap.isEjb40Supported());
+ assertFalse(cap.isEjb40LiteSupported());
- p = createProject(Profile.JAVA_EE_6_WEB, Type.WAR);
+ p = createProject(Profile.JAVA_EE_7_WEB, Type.EJB);
cap = J2eeProjectCapabilities.forProject(p);
assertFalse(cap.isEjb30Supported());
assertFalse(cap.isEjb31Supported());
assertTrue(cap.isEjb31LiteSupported());
assertFalse(cap.isEjb32Supported());
- assertFalse(cap.isEjb32LiteSupported());
+ assertTrue(cap.isEjb32LiteSupported());
+ assertFalse(cap.isEjb40Supported());
+ assertFalse(cap.isEjb40LiteSupported());
+
+ p = createProject(Profile.JAVA_EE_8_FULL, Type.EJB);
+ cap = J2eeProjectCapabilities.forProject(p);
+ assertTrue(cap.isEjb30Supported());
+ assertTrue(cap.isEjb31Supported());
+ assertTrue(cap.isEjb31LiteSupported());
+ assertTrue(cap.isEjb32Supported());
+ assertTrue(cap.isEjb32LiteSupported());
+ assertFalse(cap.isEjb40Supported());
+ assertFalse(cap.isEjb40LiteSupported());
- p = createProject(Profile.JAVA_EE_6_FULL, Type.WAR);
+ p = createProject(Profile.JAVA_EE_8_WEB, Type.EJB);
cap = J2eeProjectCapabilities.forProject(p);
assertFalse(cap.isEjb30Supported());
+ assertFalse(cap.isEjb31Supported());
+ assertTrue(cap.isEjb31LiteSupported());
+ assertFalse(cap.isEjb32Supported());
+ assertTrue(cap.isEjb32LiteSupported());
+ assertFalse(cap.isEjb40Supported());
+ assertFalse(cap.isEjb40LiteSupported());
+
+ p = createProject(Profile.JAKARTA_EE_8_FULL, Type.EJB);
+ cap = J2eeProjectCapabilities.forProject(p);
+ assertTrue(cap.isEjb30Supported());
assertTrue(cap.isEjb31Supported());
assertTrue(cap.isEjb31LiteSupported());
+ assertTrue(cap.isEjb32Supported());
+ assertTrue(cap.isEjb32LiteSupported());
+ assertFalse(cap.isEjb40Supported());
+ assertFalse(cap.isEjb40LiteSupported());
+
+ p = createProject(Profile.JAKARTA_EE_8_WEB, Type.EJB);
+ cap = J2eeProjectCapabilities.forProject(p);
+ assertFalse(cap.isEjb30Supported());
+ assertFalse(cap.isEjb31Supported());
+ assertTrue(cap.isEjb31LiteSupported());
+ assertFalse(cap.isEjb32Supported());
+ assertTrue(cap.isEjb32LiteSupported());
+ assertFalse(cap.isEjb40Supported());
+ assertFalse(cap.isEjb40LiteSupported());
+
+ p = createProject(Profile.JAKARTA_EE_9_FULL, Type.EJB);
+ cap = J2eeProjectCapabilities.forProject(p);
+ assertFalse(cap.isEjb30Supported());
+ assertFalse(cap.isEjb31Supported());
+ assertFalse(cap.isEjb31LiteSupported());
assertFalse(cap.isEjb32Supported());
assertFalse(cap.isEjb32LiteSupported());
+ assertTrue(cap.isEjb40Supported());
+ assertTrue(cap.isEjb40LiteSupported());
+
+ p = createProject(Profile.JAKARTA_EE_9_WEB, Type.EJB);
+ cap = J2eeProjectCapabilities.forProject(p);
+ assertFalse(cap.isEjb30Supported());
+ assertFalse(cap.isEjb31Supported());
+ assertFalse(cap.isEjb31LiteSupported());
+ assertFalse(cap.isEjb32Supported());
+ assertFalse(cap.isEjb32LiteSupported());
+ assertFalse(cap.isEjb40Supported());
+ assertTrue(cap.isEjb40LiteSupported());
+
+ p = createProject(Profile.JAKARTA_EE_9_1_FULL, Type.EJB);
+ cap = J2eeProjectCapabilities.forProject(p);
+ assertFalse(cap.isEjb30Supported());
+ assertFalse(cap.isEjb31Supported());
+ assertFalse(cap.isEjb31LiteSupported());
+ assertFalse(cap.isEjb32Supported());
+ assertFalse(cap.isEjb32LiteSupported());
+ assertTrue(cap.isEjb40Supported());
+ assertTrue(cap.isEjb40LiteSupported());
+
+ p = createProject(Profile.JAKARTA_EE_9_1_WEB, Type.EJB);
+ cap = J2eeProjectCapabilities.forProject(p);
+ assertFalse(cap.isEjb30Supported());
+ assertFalse(cap.isEjb31Supported());
+ assertFalse(cap.isEjb31LiteSupported());
+ assertFalse(cap.isEjb32Supported());
+ assertFalse(cap.isEjb32LiteSupported());
+ assertFalse(cap.isEjb40Supported());
+ assertTrue(cap.isEjb40LiteSupported());
p = createProject(Profile.JAVA_EE_5, Type.WAR);
cap = J2eeProjectCapabilities.forProject(p);
@@ -97,86 +188,129 @@ public class J2eeProjectCapabilitiesTest extends NbTestCase {
assertFalse(cap.isEjb31LiteSupported());
assertFalse(cap.isEjb32Supported());
assertFalse(cap.isEjb32LiteSupported());
+ assertFalse(cap.isEjb40Supported());
+ assertFalse(cap.isEjb40LiteSupported());
+
+ p = createProject(Profile.JAVA_EE_6_WEB, Type.WAR);
+ cap = J2eeProjectCapabilities.forProject(p);
+ assertFalse(cap.isEjb30Supported());
+ assertFalse(cap.isEjb31Supported());
+ assertTrue(cap.isEjb31LiteSupported());
+ assertFalse(cap.isEjb32Supported());
+ assertFalse(cap.isEjb32LiteSupported());
+ assertFalse(cap.isEjb40Supported());
+ assertFalse(cap.isEjb40LiteSupported());
- p = createProject(Profile.JAVA_EE_7_FULL, Type.WAR);
+ p = createProject(Profile.JAVA_EE_6_FULL, Type.WAR);
cap = J2eeProjectCapabilities.forProject(p);
assertFalse(cap.isEjb30Supported());
assertTrue(cap.isEjb31Supported());
assertTrue(cap.isEjb31LiteSupported());
- assertTrue(cap.isEjb32Supported());
- assertTrue(cap.isEjb32LiteSupported());
+ assertFalse(cap.isEjb32Supported());
+ assertFalse(cap.isEjb32LiteSupported());
+ assertFalse(cap.isEjb40Supported());
+ assertFalse(cap.isEjb40LiteSupported());
- p = createProject(Profile.JAVA_EE_8_FULL, Type.WAR);
+ p = createProject(Profile.JAVA_EE_7_FULL, Type.WAR);
cap = J2eeProjectCapabilities.forProject(p);
assertFalse(cap.isEjb30Supported());
assertTrue(cap.isEjb31Supported());
assertTrue(cap.isEjb31LiteSupported());
assertTrue(cap.isEjb32Supported());
assertTrue(cap.isEjb32LiteSupported());
-
- p = createProject(Profile.JAKARTA_EE_9_FULL, Type.WAR);
+ assertFalse(cap.isEjb40Supported());
+ assertFalse(cap.isEjb40LiteSupported());
+
+ p = createProject(Profile.JAVA_EE_7_WEB, Type.WAR);
cap = J2eeProjectCapabilities.forProject(p);
assertFalse(cap.isEjb30Supported());
- assertTrue(cap.isEjb31Supported());
+ assertFalse(cap.isEjb31Supported());
assertTrue(cap.isEjb31LiteSupported());
- assertTrue(cap.isEjb32Supported());
+ assertFalse(cap.isEjb32Supported());
assertTrue(cap.isEjb32LiteSupported());
+ assertFalse(cap.isEjb40Supported());
+ assertFalse(cap.isEjb40LiteSupported());
- p = createProject(Profile.JAKARTA_EE_8_FULL, Type.WAR);
+ p = createProject(Profile.JAVA_EE_8_FULL, Type.WAR);
cap = J2eeProjectCapabilities.forProject(p);
assertFalse(cap.isEjb30Supported());
assertTrue(cap.isEjb31Supported());
assertTrue(cap.isEjb31LiteSupported());
assertTrue(cap.isEjb32Supported());
assertTrue(cap.isEjb32LiteSupported());
+ assertFalse(cap.isEjb40Supported());
+ assertFalse(cap.isEjb40LiteSupported());
+
+ p = createProject(Profile.JAVA_EE_8_WEB, Type.WAR);
+ cap = J2eeProjectCapabilities.forProject(p);
+ assertFalse(cap.isEjb30Supported());
+ assertFalse(cap.isEjb31Supported());
+ assertTrue(cap.isEjb31LiteSupported());
+ assertFalse(cap.isEjb32Supported());
+ assertTrue(cap.isEjb32LiteSupported());
+ assertFalse(cap.isEjb40Supported());
+ assertFalse(cap.isEjb40LiteSupported());
- p = createProject(Profile.JAVA_EE_7_FULL, Type.EJB);
+ p = createProject(Profile.JAKARTA_EE_8_FULL, Type.WAR);
cap = J2eeProjectCapabilities.forProject(p);
- assertTrue(cap.isEjb30Supported());
+ assertFalse(cap.isEjb30Supported());
assertTrue(cap.isEjb31Supported());
assertTrue(cap.isEjb31LiteSupported());
assertTrue(cap.isEjb32Supported());
assertTrue(cap.isEjb32LiteSupported());
+ assertFalse(cap.isEjb40Supported());
+ assertFalse(cap.isEjb40LiteSupported());
- p = createProject(Profile.JAVA_EE_7_WEB, Type.EJB);
+ p = createProject(Profile.JAKARTA_EE_8_WEB, Type.WAR);
cap = J2eeProjectCapabilities.forProject(p);
assertFalse(cap.isEjb30Supported());
assertFalse(cap.isEjb31Supported());
- assertFalse(cap.isEjb31LiteSupported());
+ assertTrue(cap.isEjb31LiteSupported());
assertFalse(cap.isEjb32Supported());
- assertFalse(cap.isEjb32LiteSupported());
-
- p = createProject(Profile.JAVA_EE_7_WEB, Type.WAR);
+ assertTrue(cap.isEjb32LiteSupported());
+ assertFalse(cap.isEjb40Supported());
+ assertFalse(cap.isEjb40LiteSupported());
+
+ p = createProject(Profile.JAKARTA_EE_9_FULL, Type.WAR);
cap = J2eeProjectCapabilities.forProject(p);
assertFalse(cap.isEjb30Supported());
assertFalse(cap.isEjb31Supported());
- assertTrue(cap.isEjb31LiteSupported());
+ assertFalse(cap.isEjb31LiteSupported());
assertFalse(cap.isEjb32Supported());
- assertTrue(cap.isEjb32LiteSupported());
+ assertFalse(cap.isEjb32LiteSupported());
+ assertTrue(cap.isEjb40Supported());
+ assertTrue(cap.isEjb40LiteSupported());
- p = createProject(Profile.JAVA_EE_8_WEB, Type.WAR);
+ p = createProject(Profile.JAKARTA_EE_9_WEB, Type.WAR);
cap = J2eeProjectCapabilities.forProject(p);
assertFalse(cap.isEjb30Supported());
assertFalse(cap.isEjb31Supported());
- assertTrue(cap.isEjb31LiteSupported());
+ assertFalse(cap.isEjb31LiteSupported());
assertFalse(cap.isEjb32Supported());
- assertTrue(cap.isEjb32LiteSupported());
-
- p = createProject(Profile.JAKARTA_EE_8_WEB, Type.WAR);
+ assertFalse(cap.isEjb32LiteSupported());
+ assertFalse(cap.isEjb40Supported());
+ assertTrue(cap.isEjb40LiteSupported());
+
+ p = createProject(Profile.JAKARTA_EE_9_1_FULL, Type.WAR);
cap = J2eeProjectCapabilities.forProject(p);
assertFalse(cap.isEjb30Supported());
assertFalse(cap.isEjb31Supported());
- assertTrue(cap.isEjb31LiteSupported());
+ assertFalse(cap.isEjb31LiteSupported());
assertFalse(cap.isEjb32Supported());
- assertTrue(cap.isEjb32LiteSupported());
+ assertFalse(cap.isEjb32LiteSupported());
+ assertTrue(cap.isEjb40Supported());
+ assertTrue(cap.isEjb40LiteSupported());
- p = createProject(Profile.JAKARTA_EE_9_WEB, Type.WAR);
+ p = createProject(Profile.JAKARTA_EE_9_1_WEB, Type.WAR);
cap = J2eeProjectCapabilities.forProject(p);
assertFalse(cap.isEjb30Supported());
assertFalse(cap.isEjb31Supported());
- assertTrue(cap.isEjb31LiteSupported());
+ assertFalse(cap.isEjb31LiteSupported());
assertFalse(cap.isEjb32Supported());
- assertTrue(cap.isEjb32LiteSupported());
+ assertFalse(cap.isEjb32LiteSupported());
+ assertFalse(cap.isEjb40Supported());
+ assertTrue(cap.isEjb40LiteSupported());
+
}
private Project createProject(final Profile profile, final Type type) throws IOException {
diff --git a/enterprise/j2ee.core/test/unit/src/org/netbeans/api/j2ee/core/ProfileTest.java b/enterprise/j2ee.core/test/unit/src/org/netbeans/api/j2ee/core/ProfileTest.java
index b1f2bd091c..1db6efd770 100644
--- a/enterprise/j2ee.core/test/unit/src/org/netbeans/api/j2ee/core/ProfileTest.java
+++ b/enterprise/j2ee.core/test/unit/src/org/netbeans/api/j2ee/core/ProfileTest.java
@@ -55,6 +55,10 @@ public class ProfileTest extends NbTestCase {
assertEquals(Profile.JAKARTA_EE_9_FULL, Profile.fromPropertiesString("JAKARTA_EE_9_FULL"));
assertEquals(Profile.JAKARTA_EE_9_WEB, Profile.fromPropertiesString("9.0-web"));
assertEquals(Profile.JAKARTA_EE_9_WEB, Profile.fromPropertiesString("JAKARTA_EE_9_WEB"));
+ assertEquals(Profile.JAKARTA_EE_9_1_FULL, Profile.fromPropertiesString("9.1"));
+ assertEquals(Profile.JAKARTA_EE_9_1_FULL, Profile.fromPropertiesString("JAKARTA_EE_9_1_FULL"));
+ assertEquals(Profile.JAKARTA_EE_9_1_WEB, Profile.fromPropertiesString("9.1-web"));
+ assertEquals(Profile.JAKARTA_EE_9_1_WEB, Profile.fromPropertiesString("JAKARTA_EE_9_1_WEB"));
assertNull(Profile.fromPropertiesString("something"));
}
@@ -67,6 +71,14 @@ public class ProfileTest extends NbTestCase {
assertTrue(Profile.JAVA_EE_6_WEB.isAtLeast(Profile.JAVA_EE_5));
assertTrue(Profile.JAVA_EE_7_FULL.isAtLeast(Profile.JAVA_EE_5));
assertTrue(Profile.JAVA_EE_7_WEB.isAtLeast(Profile.JAVA_EE_5));
+ assertTrue(Profile.JAVA_EE_8_FULL.isAtLeast(Profile.JAVA_EE_5));
+ assertTrue(Profile.JAVA_EE_8_WEB.isAtLeast(Profile.JAVA_EE_5));
+ assertTrue(Profile.JAKARTA_EE_8_FULL.isAtLeast(Profile.JAVA_EE_5));
+ assertTrue(Profile.JAKARTA_EE_8_WEB.isAtLeast(Profile.JAVA_EE_5));
+ assertTrue(Profile.JAKARTA_EE_9_FULL.isAtLeast(Profile.JAVA_EE_5));
+ assertTrue(Profile.JAKARTA_EE_9_WEB.isAtLeast(Profile.JAVA_EE_5));
+ assertTrue(Profile.JAKARTA_EE_9_1_FULL.isAtLeast(Profile.JAVA_EE_5));
+ assertTrue(Profile.JAKARTA_EE_9_1_WEB.isAtLeast(Profile.JAVA_EE_5));
}
public void testIsHigherJavaEEVersionJavaEE6full() {
@@ -78,6 +90,14 @@ public class ProfileTest extends NbTestCase {
assertTrue(Profile.JAVA_EE_6_FULL.isAtLeast(Profile.JAVA_EE_6_WEB));
assertTrue(Profile.JAVA_EE_7_WEB.isAtLeast(Profile.JAVA_EE_6_WEB));
assertTrue(Profile.JAVA_EE_7_FULL.isAtLeast(Profile.JAVA_EE_6_WEB));
+ assertTrue(Profile.JAVA_EE_8_FULL.isAtLeast(Profile.JAVA_EE_6_WEB));
+ assertTrue(Profile.JAVA_EE_8_WEB.isAtLeast(Profile.JAVA_EE_6_WEB));
+ assertTrue(Profile.JAKARTA_EE_8_FULL.isAtLeast(Profile.JAVA_EE_6_WEB));
+ assertTrue(Profile.JAKARTA_EE_8_WEB.isAtLeast(Profile.JAVA_EE_6_WEB));
+ assertTrue(Profile.JAKARTA_EE_9_FULL.isAtLeast(Profile.JAVA_EE_6_WEB));
+ assertTrue(Profile.JAKARTA_EE_9_WEB.isAtLeast(Profile.JAVA_EE_6_WEB));
+ assertTrue(Profile.JAKARTA_EE_9_1_FULL.isAtLeast(Profile.JAVA_EE_6_WEB));
+ assertTrue(Profile.JAKARTA_EE_9_1_WEB.isAtLeast(Profile.JAVA_EE_6_WEB));
}
public void testIsHigherJavaEEVersionJavaEE7full() {
@@ -89,6 +109,14 @@ public class ProfileTest extends NbTestCase {
assertFalse(Profile.JAVA_EE_6_FULL.isAtLeast(Profile.JAVA_EE_7_WEB));
assertTrue(Profile.JAVA_EE_7_WEB.isAtLeast(Profile.JAVA_EE_7_WEB));
assertTrue(Profile.JAVA_EE_7_FULL.isAtLeast(Profile.JAVA_EE_7_WEB));
+ assertTrue(Profile.JAVA_EE_8_FULL.isAtLeast(Profile.JAVA_EE_7_WEB));
+ assertTrue(Profile.JAVA_EE_8_WEB.isAtLeast(Profile.JAVA_EE_7_WEB));
+ assertTrue(Profile.JAKARTA_EE_8_FULL.isAtLeast(Profile.JAVA_EE_7_WEB));
+ assertTrue(Profile.JAKARTA_EE_8_WEB.isAtLeast(Profile.JAVA_EE_7_WEB));
+ assertTrue(Profile.JAKARTA_EE_9_FULL.isAtLeast(Profile.JAVA_EE_7_WEB));
+ assertTrue(Profile.JAKARTA_EE_9_WEB.isAtLeast(Profile.JAVA_EE_7_WEB));
+ assertTrue(Profile.JAKARTA_EE_9_1_FULL.isAtLeast(Profile.JAVA_EE_7_WEB));
+ assertTrue(Profile.JAKARTA_EE_9_1_WEB.isAtLeast(Profile.JAVA_EE_7_WEB));
}
public void testIsHigherJavaEEVersionJavaEE8full() {
@@ -102,6 +130,12 @@ public class ProfileTest extends NbTestCase {
assertFalse(Profile.JAVA_EE_7_FULL.isAtLeast(Profile.JAVA_EE_8_WEB));
assertTrue(Profile.JAVA_EE_8_WEB.isAtLeast(Profile.JAVA_EE_8_WEB));
assertTrue(Profile.JAVA_EE_8_FULL.isAtLeast(Profile.JAVA_EE_8_WEB));
+ assertTrue(Profile.JAKARTA_EE_8_WEB.isAtLeast(Profile.JAVA_EE_8_WEB));
+ assertTrue(Profile.JAKARTA_EE_8_FULL.isAtLeast(Profile.JAVA_EE_8_WEB));
+ assertTrue(Profile.JAKARTA_EE_9_FULL.isAtLeast(Profile.JAVA_EE_8_WEB));
+ assertTrue(Profile.JAKARTA_EE_9_WEB.isAtLeast(Profile.JAVA_EE_8_WEB));
+ assertTrue(Profile.JAKARTA_EE_9_1_FULL.isAtLeast(Profile.JAVA_EE_8_WEB));
+ assertTrue(Profile.JAKARTA_EE_9_1_WEB.isAtLeast(Profile.JAVA_EE_8_WEB));
}
public void testIsHigherJavaEEVersionJakartaEE8full() {
@@ -117,6 +151,10 @@ public class ProfileTest extends NbTestCase {
assertFalse(Profile.JAVA_EE_8_FULL.isAtLeast(Profile.JAKARTA_EE_8_WEB));
assertTrue(Profile.JAKARTA_EE_8_WEB.isAtLeast(Profile.JAKARTA_EE_8_WEB));
assertTrue(Profile.JAKARTA_EE_8_FULL.isAtLeast(Profile.JAKARTA_EE_8_WEB));
+ assertTrue(Profile.JAKARTA_EE_9_FULL.isAtLeast(Profile.JAKARTA_EE_8_WEB));
+ assertTrue(Profile.JAKARTA_EE_9_WEB.isAtLeast(Profile.JAKARTA_EE_8_WEB));
+ assertTrue(Profile.JAKARTA_EE_9_1_FULL.isAtLeast(Profile.JAKARTA_EE_8_WEB));
+ assertTrue(Profile.JAKARTA_EE_9_1_WEB.isAtLeast(Profile.JAKARTA_EE_8_WEB));
}
public void testIsHigherJavaEEVersionJakartaEE9full() {
@@ -134,6 +172,27 @@ public class ProfileTest extends NbTestCase {
assertFalse(Profile.JAKARTA_EE_8_FULL.isAtLeast(Profile.JAKARTA_EE_9_WEB));
assertTrue(Profile.JAKARTA_EE_9_WEB.isAtLeast(Profile.JAKARTA_EE_9_WEB));
assertTrue(Profile.JAKARTA_EE_9_FULL.isAtLeast(Profile.JAKARTA_EE_9_WEB));
+ assertTrue(Profile.JAKARTA_EE_9_1_WEB.isAtLeast(Profile.JAKARTA_EE_9_WEB));
+ assertTrue(Profile.JAKARTA_EE_9_1_FULL.isAtLeast(Profile.JAKARTA_EE_9_WEB));
+ }
+
+ public void testIsHigherJavaEEVersionJakartaEE91full() {
+ assertFalse(Profile.J2EE_13.isAtLeast(Profile.JAKARTA_EE_9_1_WEB));
+ assertFalse(Profile.J2EE_14.isAtLeast(Profile.JAKARTA_EE_9_1_WEB));
+ assertFalse(Profile.JAVA_EE_5.isAtLeast(Profile.JAKARTA_EE_9_1_WEB));
+
+ assertFalse(Profile.JAVA_EE_6_WEB.isAtLeast(Profile.JAKARTA_EE_9_1_WEB));
+ assertFalse(Profile.JAVA_EE_6_FULL.isAtLeast(Profile.JAKARTA_EE_9_1_WEB));
+ assertFalse(Profile.JAVA_EE_7_WEB.isAtLeast(Profile.JAKARTA_EE_9_1_WEB));
+ assertFalse(Profile.JAVA_EE_7_FULL.isAtLeast(Profile.JAKARTA_EE_9_1_WEB));
+ assertFalse(Profile.JAVA_EE_8_WEB.isAtLeast(Profile.JAKARTA_EE_9_1_WEB));
+ assertFalse(Profile.JAVA_EE_8_FULL.isAtLeast(Profile.JAKARTA_EE_9_1_WEB));
+ assertFalse(Profile.JAKARTA_EE_8_WEB.isAtLeast(Profile.JAKARTA_EE_9_1_WEB));
+ assertFalse(Profile.JAKARTA_EE_8_FULL.isAtLeast(Profile.JAKARTA_EE_9_1_WEB));
+ assertFalse(Profile.JAKARTA_EE_9_WEB.isAtLeast(Profile.JAKARTA_EE_9_1_WEB));
+ assertFalse(Profile.JAKARTA_EE_9_FULL.isAtLeast(Profile.JAKARTA_EE_9_1_WEB));
+ assertTrue(Profile.JAKARTA_EE_9_1_WEB.isAtLeast(Profile.JAKARTA_EE_9_1_WEB));
+ assertTrue(Profile.JAKARTA_EE_9_1_FULL.isAtLeast(Profile.JAKARTA_EE_9_1_WEB));
}
}
diff --git a/enterprise/j2ee.dd/.gitignore b/enterprise/j2ee.dd/.gitignore
index 0223612f06..053e4ca208 100644
--- a/enterprise/j2ee.dd/.gitignore
+++ b/enterprise/j2ee.dd/.gitignore
@@ -4,15 +4,18 @@ src/org/netbeans/modules/j2ee/dd/impl/application/model_5/*
src/org/netbeans/modules/j2ee/dd/impl/application/model_6/*
src/org/netbeans/modules/j2ee/dd/impl/application/model_7/*
src/org/netbeans/modules/j2ee/dd/impl/application/model_8/*
+src/org/netbeans/modules/j2ee/dd/impl/application/model_9/*
src/org/netbeans/modules/j2ee/dd/impl/client/model_1_4/*
src/org/netbeans/modules/j2ee/dd/impl/client/model_5_0/*
src/org/netbeans/modules/j2ee/dd/impl/client/model_6_0/*
src/org/netbeans/modules/j2ee/dd/impl/client/model_7_0/*
src/org/netbeans/modules/j2ee/dd/impl/client/model_8_0/*
+src/org/netbeans/modules/j2ee/dd/impl/client/model_9_0/*
src/org/netbeans/modules/j2ee/dd/impl/ejb/model_2_1/*
src/org/netbeans/modules/j2ee/dd/impl/ejb/model_3_0/*
src/org/netbeans/modules/j2ee/dd/impl/ejb/model_3_1/*
src/org/netbeans/modules/j2ee/dd/impl/ejb/model_3_2/*
+src/org/netbeans/modules/j2ee/dd/impl/ejb/model_4_0/*
src/org/netbeans/modules/j2ee/dd/impl/web/model_2_4/*
src/org/netbeans/modules/j2ee/dd/impl/web/model_2_5/*
src/org/netbeans/modules/j2ee/dd/impl/web/model_3_0/*
@@ -20,4 +23,6 @@ src/org/netbeans/modules/j2ee/dd/impl/web/model_3_0_frag/*
src/org/netbeans/modules/j2ee/dd/impl/web/model_3_1/*
src/org/netbeans/modules/j2ee/dd/impl/web/model_3_1_frag/*
src/org/netbeans/modules/j2ee/dd/impl/web/model_4_0/*
-src/org/netbeans/modules/j2ee/dd/impl/web/model_4_0_frag/*
\ No newline at end of file
+src/org/netbeans/modules/j2ee/dd/impl/web/model_4_0_frag/*
+src/org/netbeans/modules/j2ee/dd/impl/web/model_5_0/*
+src/org/netbeans/modules/j2ee/dd/impl/web/model_5_0_frag/*
\ No newline at end of file
diff --git a/enterprise/j2ee.dd/build.xml b/enterprise/j2ee.dd/build.xml
index 58138bf91d..457295048f 100644
--- a/enterprise/j2ee.dd/build.xml
+++ b/enterprise/j2ee.dd/build.xml
@@ -29,24 +29,29 @@
<property name="s2b_root_web_3_0" location="src/org/netbeans/modules/j2ee/dd/impl/web/model_3_0"/>
<property name="s2b_root_web_3_1" location="src/org/netbeans/modules/j2ee/dd/impl/web/model_3_1"/>
<property name="s2b_root_web_4_0" location="src/org/netbeans/modules/j2ee/dd/impl/web/model_4_0"/>
+ <property name="s2b_root_web_5_0" location="src/org/netbeans/modules/j2ee/dd/impl/web/model_5_0"/>
<property name="s2b_root_web_3_0_frag" location="src/org/netbeans/modules/j2ee/dd/impl/web/model_3_0_frag"/>
<property name="s2b_root_web_3_1_frag" location="src/org/netbeans/modules/j2ee/dd/impl/web/model_3_1_frag"/>
<property name="s2b_root_web_4_0_frag" location="src/org/netbeans/modules/j2ee/dd/impl/web/model_4_0_frag"/>
+ <property name="s2b_root_web_5_0_frag" location="src/org/netbeans/modules/j2ee/dd/impl/web/model_5_0_frag"/>
<property name="s2b_root_2_1" location="src/org/netbeans/modules/j2ee/dd/impl/ejb/model_2_1"/>
<property name="s2b_root_3_0" location="src/org/netbeans/modules/j2ee/dd/impl/ejb/model_3_0"/>
<property name="s2b_root_3_1" location="src/org/netbeans/modules/j2ee/dd/impl/ejb/model_3_1"/>
<property name="s2b_root_3_2" location="src/org/netbeans/modules/j2ee/dd/impl/ejb/model_3_2"/>
+ <property name="s2b_root_4_0" location="src/org/netbeans/modules/j2ee/dd/impl/ejb/model_4_0"/>
<property name="s2b_root_app_1_4" location="src/org/netbeans/modules/j2ee/dd/impl/application/model_1_4"/>
<property name="s2b_root_app_5" location="src/org/netbeans/modules/j2ee/dd/impl/application/model_5"/>
<property name="s2b_root_app_6" location="src/org/netbeans/modules/j2ee/dd/impl/application/model_6"/>
<property name="s2b_root_app_7" location="src/org/netbeans/modules/j2ee/dd/impl/application/model_7"/>
<property name="s2b_root_app_8" location="src/org/netbeans/modules/j2ee/dd/impl/application/model_8"/>
+ <property name="s2b_root_app_9" location="src/org/netbeans/modules/j2ee/dd/impl/application/model_9"/>
<property name="s2b_res_root" location="src/org/netbeans/modules/j2ee/dd/impl/resources"/>
<property name="s2b_root_client_1_4" location="src/org/netbeans/modules/j2ee/dd/impl/client/model_1_4"/>
<property name="s2b_root_client_5_0" location="src/org/netbeans/modules/j2ee/dd/impl/client/model_5_0"/>
<property name="s2b_root_client_6_0" location="src/org/netbeans/modules/j2ee/dd/impl/client/model_6_0"/>
<property name="s2b_root_client_7_0" location="src/org/netbeans/modules/j2ee/dd/impl/client/model_7_0"/>
<property name="s2b_root_client_8_0" location="src/org/netbeans/modules/j2ee/dd/impl/client/model_8_0"/>
+ <property name="s2b_root_client_9_0" location="src/org/netbeans/modules/j2ee/dd/impl/client/model_9_0"/>
<property name="j2ee.dd.resources.dir" value="src/org/netbeans/modules/j2ee/dd/impl/"/>
@@ -150,6 +155,28 @@
rootDir="src"
java5="true"/>
<echo file="${s2b_root_web_4_0_frag}/package-info.java">@org.netbeans.api.annotations.common.SuppressWarnings("NM_SAME_SIMPLE_NAME_AS_INTERFACE") // justification="Generated implementation classes"${line.separator}package org.netbeans.modules.j2ee.dd.impl.web.model_4_0_frag;</echo>
+ <schema2beans schema="${s2b_res_root}/web-app_5_0.xsd"
+ mddFile="${s2b_res_root}/web-app_5_0.mdd"
+ package="org.netbeans.modules.j2ee.dd.impl.web.model_5_0"
+ schemaType="xmlschema"
+ useInterfaces="true"
+ validate="true"
+ attrProp="true"
+ removeUnreferencedNodes="true"
+ rootDir="src"
+ java5="true"/>
+ <echo file="${s2b_root_web_5_0}/package-info.java">@org.netbeans.api.annotations.common.SuppressWarnings("NM_SAME_SIMPLE_NAME_AS_INTERFACE") // justification="Generated implementation classes"${line.separator}package org.netbeans.modules.j2ee.dd.impl.web.model_5_0;</echo>
+ <schema2beans schema="${s2b_res_root}/web-fragment_5_0.xsd"
+ mddFile="${s2b_res_root}/web-fragment_5_0.mdd"
+ package="org.netbeans.modules.j2ee.dd.impl.web.model_5_0_frag"
+ schemaType="xmlschema"
+ useInterfaces="true"
+ validate="true"
+ attrProp="true"
+ removeUnreferencedNodes="true"
+ rootDir="src"
+ java5="true"/>
+ <echo file="${s2b_root_web_5_0_frag}/package-info.java">@org.netbeans.api.annotations.common.SuppressWarnings("NM_SAME_SIMPLE_NAME_AS_INTERFACE") // justification="Generated implementation classes"${line.separator}package org.netbeans.modules.j2ee.dd.impl.web.model_5_0_frag;</echo>
<replace file="${s2b_root_web_2_4}/WebApp.java" summary="true">
<replacetoken>org.netbeans.modules.j2ee.dd.api.web.ServletMapping25</replacetoken>
@@ -338,6 +365,97 @@
<replacevalue>public void setServletNames(java.lang.String[] value) {</replacevalue>
</replace>
+ <replace file="${s2b_root_web_4_0_frag}/WebFragment.java" summary="true">
+ <replacetoken>org.netbeans.modules.j2ee.dd.api.web.ServletMapping25</replacetoken>
+ <replacevalue>org.netbeans.modules.j2ee.dd.api.web.ServletMapping</replacevalue>
+ </replace>
+
+ <replace file="${s2b_root_web_4_0_frag}/ServletMapping.java" summary="true">
+ <replacetoken>public java.lang.String[] getUrlPattern() {</replacetoken>
+ <replacevalue>public java.lang.String[] getUrlPatterns() {</replacevalue>
+ </replace>
+ <replace file="${s2b_root_web_4_0_frag}/ServletMapping.java" summary="true">
+ <replacetoken>public void setUrlPattern(java.lang.String[] value) {</replacetoken>
+ <replacevalue>public void setUrlPatterns(java.lang.String[] value) {</replacevalue>
+ </replace>
+
+ <replace file="${s2b_root_web_4_0_frag}/FilterMapping.java" summary="true">
+ <replacetoken>public java.lang.String[] getUrlPattern() {</replacetoken>
+ <replacevalue>public java.lang.String[] getUrlPatterns() {</replacevalue>
+ </replace>
+ <replace file="${s2b_root_web_4_0_frag}/FilterMapping.java" summary="true">
+ <replacetoken>public void setUrlPattern(java.lang.String[] value) {</replacetoken>
+ <replacevalue>public void setUrlPatterns(java.lang.String[] value) {</replacevalue>
+ </replace>
+ <replace file="${s2b_root_web_4_0_frag}/FilterMapping.java" summary="true">
+ <replacetoken>public java.lang.String[] getServletName() {</replacetoken>
+ <replacevalue>public java.lang.String[] getServletNames() {</replacevalue>
+ </replace>
+ <replace file="${s2b_root_web_4_0_frag}/FilterMapping.java" summary="true">
+ <replacetoken>public void setServletName(java.lang.String[] value) {</replacetoken>
+ <replacevalue>public void setServletNames(java.lang.String[] value) {</replacevalue>
+ </replace>
+
+ <replace file="${s2b_root_web_5_0}/ServletMapping.java" summary="true">
+ <replacetoken>public java.lang.String[] getUrlPattern() {</replacetoken>
+ <replacevalue>public java.lang.String[] getUrlPatterns() {</replacevalue>
+ </replace>
+ <replace file="${s2b_root_web_5_0}/ServletMapping.java" summary="true">
+ <replacetoken>public void setUrlPattern(java.lang.String[] value) {</replacetoken>
+ <replacevalue>public void setUrlPatterns(java.lang.String[] value) {</replacevalue>
+ </replace>
+ <replace file="${s2b_root_web_5_0}/WebApp.java" summary="true">
+ <replacetoken>org.netbeans.modules.j2ee.dd.api.web.ServletMapping25</replacetoken>
+ <replacevalue>org.netbeans.modules.j2ee.dd.api.web.ServletMapping</replacevalue>
+ </replace>
+
+ <replace file="${s2b_root_web_5_0}/FilterMapping.java" summary="true">
+ <replacetoken>public java.lang.String[] getUrlPattern() {</replacetoken>
+ <replacevalue>public java.lang.String[] getUrlPatterns() {</replacevalue>
+ </replace>
+ <replace file="${s2b_root_web_5_0}/FilterMapping.java" summary="true">
+ <replacetoken>public void setUrlPattern(java.lang.String[] value) {</replacetoken>
+ <replacevalue>public void setUrlPatterns(java.lang.String[] value) {</replacevalue>
+ </replace>
+ <replace file="${s2b_root_web_5_0}/FilterMapping.java" summary="true">
+ <replacetoken>public java.lang.String[] getServletName() {</replacetoken>
+ <replacevalue>public java.lang.String[] getServletNames() {</replacevalue>
+ </replace>
+ <replace file="${s2b_root_web_5_0}/FilterMapping.java" summary="true">
+ <replacetoken>public void setServletName(java.lang.String[] value) {</replacetoken>
+ <replacevalue>public void setServletNames(java.lang.String[] value) {</replacevalue>
+ </replace>
+
+ <replace file="${s2b_root_web_5_0_frag}/WebFragment.java" summary="true">
+ <replacetoken>org.netbeans.modules.j2ee.dd.api.web.ServletMapping25</replacetoken>
+ <replacevalue>org.netbeans.modules.j2ee.dd.api.web.ServletMapping</replacevalue>
+ </replace>
+
+ <replace file="${s2b_root_web_5_0_frag}/ServletMapping.java" summary="true">
+ <replacetoken>public java.lang.String[] getUrlPattern() {</replacetoken>
+ <replacevalue>public java.lang.String[] getUrlPatterns() {</replacevalue>
+ </replace>
+ <replace file="${s2b_root_web_5_0_frag}/ServletMapping.java" summary="true">
+ <replacetoken>public void setUrlPattern(java.lang.String[] value) {</replacetoken>
+ <replacevalue>public void setUrlPatterns(java.lang.String[] value) {</replacevalue>
+ </replace>
+
+ <replace file="${s2b_root_web_5_0_frag}/FilterMapping.java" summary="true">
+ <replacetoken>public java.lang.String[] getUrlPattern() {</replacetoken>
+ <replacevalue>public java.lang.String[] getUrlPatterns() {</replacevalue>
+ </replace>
+ <replace file="${s2b_root_web_5_0_frag}/FilterMapping.java" summary="true">
+ <replacetoken>public void setUrlPattern(java.lang.String[] value) {</replacetoken>
+ <replacevalue>public void setUrlPatterns(java.lang.String[] value) {</replacevalue>
+ </replace>
+ <replace file="${s2b_root_web_5_0_frag}/FilterMapping.java" summary="true">
+ <replacetoken>public java.lang.String[] getServletName() {</replacetoken>
+ <replacevalue>public java.lang.String[] getServletNames() {</replacevalue>
+ </replace>
+ <replace file="${s2b_root_web_5_0_frag}/FilterMapping.java" summary="true">
+ <replacetoken>public void setServletName(java.lang.String[] value) {</replacetoken>
+ <replacevalue>public void setServletNames(java.lang.String[] value) {</replacevalue>
+ </replace>
<replace file="${s2b_root_web_3_0}/WebApp.java" summary="true"><replacetoken>setDescription(null);</replacetoken><replacevalue></replacevalue></replace>
<replace file="${s2b_root_web_3_0}/WebApp.java" summary="true"><replacetoken>setDisplayName(null);</replacetoken><replacevalue></replacevalue></replace>
@@ -504,6 +622,104 @@
<replace file="${s2b_root_web_4_0}/WebApp.java" summary="true"><replacetoken>setLocaleEncodingMappingList(null);</replacetoken><replacevalue></replacevalue></replace>
<replace file="${s2b_root_web_4_0}/WebApp.java" summary="true"><replacetoken>setDistributable(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_4_0_frag}/WebFragment.java" summary="true"><replacetoken>setDescription(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_4_0_frag}/WebFragment.java" summary="true"><replacetoken>setDisplayName(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_4_0_frag}/WebFragment.java" summary="true"><replacetoken>setIcon(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_4_0_frag}/WebFragment.java" summary="true"><replacetoken>setName(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_4_0_frag}/WebFragment.java" summary="true"><replacetoken>setContextParam(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_4_0_frag}/WebFragment.java" summary="true"><replacetoken>setFilter(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_4_0_frag}/WebFragment.java" summary="true"><replacetoken>setFilterMapping(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_4_0_frag}/WebFragment.java" summary="true"><replacetoken>setListener(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_4_0_frag}/WebFragment.java" summary="true"><replacetoken>setServlet(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_4_0_frag}/WebFragment.java" summary="true"><replacetoken>setServletMapping(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_4_0_frag}/WebFragment.java" summary="true"><replacetoken>setSessionConfig(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_4_0_frag}/WebFragment.java" summary="true"><replacetoken>setMimeMapping(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_4_0_frag}/WebFragment.java" summary="true"><replacetoken>setWelcomeFileList(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_4_0_frag}/WebFragment.java" summary="true"><replacetoken>setErrorPage(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_4_0_frag}/WebFragment.java" summary="true"><replacetoken>setJspConfig(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_4_0_frag}/WebFragment.java" summary="true"><replacetoken>setSecurityConstraint(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_4_0_frag}/WebFragment.java" summary="true"><replacetoken>setLoginConfig(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_4_0_frag}/WebFragment.java" summary="true"><replacetoken>setSecurityRole(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_4_0_frag}/WebFragment.java" summary="true"><replacetoken>setEnvEntry(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_4_0_frag}/WebFragment.java" summary="true"><replacetoken>setEjbRef(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_4_0_frag}/WebFragment.java" summary="true"><replacetoken>setEjbLocalRef(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_4_0_frag}/WebFragment.java" summary="true"><replacetoken>setServiceRef(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_4_0_frag}/WebFragment.java" summary="true"><replacetoken>setResourceRef(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_4_0_frag}/WebFragment.java" summary="true"><replacetoken>setResourceEnvRef(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_4_0_frag}/WebFragment.java" summary="true"><replacetoken>setMessageDestinationRef(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_4_0_frag}/WebFragment.java" summary="true"><replacetoken>setPersistenceContextRef(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_4_0_frag}/WebFragment.java" summary="true"><replacetoken>setPersistenceUnitRef(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_4_0_frag}/WebFragment.java" summary="true"><replacetoken>setPostConstruct(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_4_0_frag}/WebFragment.java" summary="true"><replacetoken>setPreDestroy(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_4_0_frag}/WebFragment.java" summary="true"><replacetoken>setMessageDestination(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_4_0_frag}/WebFragment.java" summary="true"><replacetoken>setLocaleEncodingMappingList(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_4_0_frag}/WebFragment.java" summary="true"><replacetoken>setDistributable(null);</replacetoken><replacevalue></replacevalue></replace>
+
+ <replace file="${s2b_root_web_5_0}/WebApp.java" summary="true"><replacetoken>setDescription(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_5_0}/WebApp.java" summary="true"><replacetoken>setDisplayName(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_5_0}/WebApp.java" summary="true"><replacetoken>setIcon(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_5_0}/WebApp.java" summary="true"><replacetoken>setName(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_5_0}/WebApp.java" summary="true"><replacetoken>setContextParam(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_5_0}/WebApp.java" summary="true"><replacetoken>setFilter(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_5_0}/WebApp.java" summary="true"><replacetoken>setFilterMapping(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_5_0}/WebApp.java" summary="true"><replacetoken>setListener(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_5_0}/WebApp.java" summary="true"><replacetoken>setServlet(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_5_0}/WebApp.java" summary="true"><replacetoken>setServletMapping(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_5_0}/WebApp.java" summary="true"><replacetoken>setSessionConfig(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_5_0}/WebApp.java" summary="true"><replacetoken>setMimeMapping(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_5_0}/WebApp.java" summary="true"><replacetoken>setWelcomeFileList(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_5_0}/WebApp.java" summary="true"><replacetoken>setErrorPage(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_5_0}/WebApp.java" summary="true"><replacetoken>setJspConfig(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_5_0}/WebApp.java" summary="true"><replacetoken>setSecurityConstraint(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_5_0}/WebApp.java" summary="true"><replacetoken>setLoginConfig(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_5_0}/WebApp.java" summary="true"><replacetoken>setSecurityRole(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_5_0}/WebApp.java" summary="true"><replacetoken>setEnvEntry(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_5_0}/WebApp.java" summary="true"><replacetoken>setEjbRef(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_5_0}/WebApp.java" summary="true"><replacetoken>setEjbLocalRef(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_5_0}/WebApp.java" summary="true"><replacetoken>setServiceRef(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_5_0}/WebApp.java" summary="true"><replacetoken>setResourceRef(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_5_0}/WebApp.java" summary="true"><replacetoken>setResourceEnvRef(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_5_0}/WebApp.java" summary="true"><replacetoken>setMessageDestinationRef(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_5_0}/WebApp.java" summary="true"><replacetoken>setPersistenceContextRef(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_5_0}/WebApp.java" summary="true"><replacetoken>setPersistenceUnitRef(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_5_0}/WebApp.java" summary="true"><replacetoken>setPostConstruct(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_5_0}/WebApp.java" summary="true"><replacetoken>setPreDestroy(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_5_0}/WebApp.java" summary="true"><replacetoken>setMessageDestination(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_5_0}/WebApp.java" summary="true"><replacetoken>setLocaleEncodingMappingList(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_5_0}/WebApp.java" summary="true"><replacetoken>setDistributable(null);</replacetoken><replacevalue></replacevalue></replace>
+
+ <replace file="${s2b_root_web_5_0_frag}/WebFragment.java" summary="true"><replacetoken>setDescription(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_5_0_frag}/WebFragment.java" summary="true"><replacetoken>setDisplayName(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_5_0_frag}/WebFragment.java" summary="true"><replacetoken>setIcon(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_5_0_frag}/WebFragment.java" summary="true"><replacetoken>setName(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_5_0_frag}/WebFragment.java" summary="true"><replacetoken>setContextParam(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_5_0_frag}/WebFragment.java" summary="true"><replacetoken>setFilter(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_5_0_frag}/WebFragment.java" summary="true"><replacetoken>setFilterMapping(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_5_0_frag}/WebFragment.java" summary="true"><replacetoken>setListener(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_5_0_frag}/WebFragment.java" summary="true"><replacetoken>setServlet(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_5_0_frag}/WebFragment.java" summary="true"><replacetoken>setServletMapping(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_5_0_frag}/WebFragment.java" summary="true"><replacetoken>setSessionConfig(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_5_0_frag}/WebFragment.java" summary="true"><replacetoken>setMimeMapping(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_5_0_frag}/WebFragment.java" summary="true"><replacetoken>setWelcomeFileList(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_5_0_frag}/WebFragment.java" summary="true"><replacetoken>setErrorPage(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_5_0_frag}/WebFragment.java" summary="true"><replacetoken>setJspConfig(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_5_0_frag}/WebFragment.java" summary="true"><replacetoken>setSecurityConstraint(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_5_0_frag}/WebFragment.java" summary="true"><replacetoken>setLoginConfig(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_5_0_frag}/WebFragment.java" summary="true"><replacetoken>setSecurityRole(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_5_0_frag}/WebFragment.java" summary="true"><replacetoken>setEnvEntry(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_5_0_frag}/WebFragment.java" summary="true"><replacetoken>setEjbRef(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_5_0_frag}/WebFragment.java" summary="true"><replacetoken>setEjbLocalRef(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_5_0_frag}/WebFragment.java" summary="true"><replacetoken>setServiceRef(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_5_0_frag}/WebFragment.java" summary="true"><replacetoken>setResourceRef(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_5_0_frag}/WebFragment.java" summary="true"><replacetoken>setResourceEnvRef(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_5_0_frag}/WebFragment.java" summary="true"><replacetoken>setMessageDestinationRef(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_5_0_frag}/WebFragment.java" summary="true"><replacetoken>setPersistenceContextRef(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_5_0_frag}/WebFragment.java" summary="true"><replacetoken>setPersistenceUnitRef(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_5_0_frag}/WebFragment.java" summary="true"><replacetoken>setPostConstruct(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_5_0_frag}/WebFragment.java" summary="true"><replacetoken>setPreDestroy(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_5_0_frag}/WebFragment.java" summary="true"><replacetoken>setMessageDestination(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_5_0_frag}/WebFragment.java" summary="true"><replacetoken>setLocaleEncodingMappingList(null);</replacetoken><replacevalue></replacevalue></replace>
+ <replace file="${s2b_root_web_5_0_frag}/WebFragment.java" summary="true"><replacetoken>setDistributable(null);</replacetoken><replacevalue></replacevalue></replace>
<schema2beans schema="${s2b_res_root}/ejb-jar_2_1.xsd"
mddFile="${s2b_res_root}/ejb-jar_2_1.mdd"
@@ -549,6 +765,18 @@
rootDir="src"
java5="true"/>
<echo file="${s2b_root_3_2}/package-info.java">@org.netbeans.api.annotations.common.SuppressWarnings("NM_SAME_SIMPLE_NAME_AS_INTERFACE") // justification="Generated implementation classes"${line.separator}package org.netbeans.modules.j2ee.dd.impl.ejb.model_3_2;</echo>
+ <schema2beans schema="${s2b_res_root}/ejb-jar_4_0.xsd"
+ mddFile="${s2b_res_root}/ejb-jar_4_0.mdd"
+ package="org.netbeans.modules.j2ee.dd.impl.ejb.model_4_0"
+ schemaType="xmlschema"
+ useInterfaces="true"
+ validate="true"
+ attrProp="true"
+ removeUnreferencedNodes="true"
+ rootDir="src"
+ java5="true"/>
+ <echo file="${s2b_root_4_0}/package-info.java">@org.netbeans.api.annotations.common.SuppressWarnings("NM_SAME_SIMPLE_NAME_AS_INTERFACE") // justification="Generated implementation classes"${line.separator}package org.netbeans.modules.j2ee.dd.impl.ejb.model_4_0;</echo>
+
<replace file="${s2b_root_3_1}/EjbJar.java" summary="true">
<replacetoken>public java.lang.String getVersion() {</replacetoken>
<replacevalue>public java.lang.String getVersionString() {</replacevalue>
@@ -597,6 +825,39 @@
<replacetoken>return (EjbRelationshipRole[])this.getValues(EJB_RELATIONSHIP_ROLE)</replacetoken>
<replacevalue>return (EjbRelationshipRole)this.getValue(EJB_RELATIONSHIP_ROLE, 0)</replacevalue>
</replace>
+ <replace file="${s2b_root_4_0}/EjbJar.java" summary="true">
+ <replacetoken>public java.lang.String getVersion() {</replacetoken>
+ <replacevalue>public java.lang.String getVersionString() {</replacevalue>
+ </replace>
+ <replace file="${s2b_root_4_0}/EjbJar.java" summary="true">
+ <replacetoken>public void setVersion(java.lang.String value) {</replacetoken>
+ <replacevalue>public void setVersionString(java.lang.String value) {</replacevalue>
+ </replace>
+ <replace file="${s2b_root_4_0}/EjbJar.java" summary="true">
+ <replacetoken>(getVersion()</replacetoken>
+ <replacevalue>(getVersionString()</replacevalue>
+ </replace>
+ <replace file="${s2b_root_4_0}/EjbJar.java" summary="true">
+ <replacetoken>setVersion("4.0");</replacetoken>
+ <replacevalue>setVersionString("4.0");</replacevalue>
+ </replace>
+ <replace file="${s2b_root_4_0}/EjbRelation.java" summary="true">
+ <replacetoken>setEjbRelationshipRole(org.netbeans.modules.j2ee.dd.api.ejb.EjbRelationshipRole[] value)</replacetoken>
+ <replacevalue>setEjbRelationshipRole(org.netbeans.modules.j2ee.dd.api.ejb.EjbRelationshipRole value)</replacevalue>
+ </replace>
+ <replace file="${s2b_root_4_0}/EjbRelation.java" summary="true">
+ <replacetoken>this.setValue(EJB_RELATIONSHIP_ROLE, value);</replacetoken>
+ <replacevalue>this.setValue(EJB_RELATIONSHIP_ROLE, 0, value);</replacevalue>
+ </replace>
+ <replace file="${s2b_root_4_0}/EjbRelation.java" summary="true">
+ <replacetoken>org.netbeans.modules.j2ee.dd.api.ejb.EjbRelationshipRole[] getEjbRelationshipRole()</replacetoken>
+ <replacevalue>org.netbeans.modules.j2ee.dd.api.ejb.EjbRelationshipRole getEjbRelationshipRole()</replacevalue>
+ </replace>
+ <replace file="${s2b_root_4_0}/EjbRelation.java" summary="true">
+ <replacetoken>return (EjbRelationshipRole[])this.getValues(EJB_RELATIONSHIP_ROLE)</replacetoken>
+ <replacevalue>return (EjbRelationshipRole)this.getValue(EJB_RELATIONSHIP_ROLE, 0)</replacevalue>
+ </replace>
+
<schema2beans schema="${s2b_res_root}/application_1_4.xsd"
mddFile="${s2b_res_root}/application_1_4.mdd"
package="org.netbeans.modules.j2ee.dd.impl.application.model_1_4"
@@ -652,7 +913,18 @@
rootDir="src"
java5="true"/>
<echo file="${s2b_root_app_8}/package-info.java">@org.netbeans.api.annotations.common.SuppressWarnings("NM_SAME_SIMPLE_NAME_AS_INTERFACE") // justification="Generated implementation classes"${line.separator}package org.netbeans.modules.j2ee.dd.impl.application.model_8;</echo>
-
+ <schema2beans schema="${s2b_res_root}/application_9.xsd"
+ mddFile="${s2b_res_root}/application_9.mdd"
+ package="org.netbeans.modules.j2ee.dd.impl.application.model_9"
+ schemaType="xmlschema"
+ useInterfaces="true"
+ validate="true"
+ attrProp="true"
+ removeUnreferencedNodes="true"
+ rootDir="src"
+ java5="true"/>
+ <echo file="${s2b_root_app_9}/package-info.java">@org.netbeans.api.annotations.common.SuppressWarnings("NM_SAME_SIMPLE_NAME_AS_INTERFACE") // justification="Generated implementation classes"${line.separator}package org.netbeans.modules.j2ee.dd.impl.application.model_9;</echo>
+
<replace file="${s2b_root_app_6}/Application.java" summary="true">
<replacetoken>public java.lang.String getVersion() {</replacetoken>
<replacevalue>public java.lang.String getVersionString() {</replacevalue>
@@ -701,6 +973,22 @@
<replacetoken>setVersion("8");</replacetoken>
<replacevalue>setVersionString("8");</replacevalue>
</replace>
+ <replace file="${s2b_root_app_9}/Application.java" summary="true">
+ <replacetoken>public java.lang.String getVersion() {</replacetoken>
+ <replacevalue>public java.lang.String getVersionString() {</replacevalue>
+ </replace>
+ <replace file="${s2b_root_app_9}/Application.java" summary="true">
+ <replacetoken>public void setVersion(java.lang.String value) {</replacetoken>
+ <replacevalue>public void setVersionString(java.lang.String value) {</replacevalue>
+ </replace>
+ <replace file="${s2b_root_app_9}/Application.java" summary="true">
+ <replacetoken>(getVersion()</replacetoken>
+ <replacevalue>(getVersionString()</replacevalue>
+ </replace>
+ <replace file="${s2b_root_app_9}/Application.java" summary="true">
+ <replacetoken>setVersion("9");</replacetoken>
+ <replacevalue>setVersionString("9");</replacevalue>
+ </replace>
<schema2beans schema="${s2b_res_root}/application-client_1_4.xsd"
mddFile="${s2b_res_root}/application-client_1_4.mdd"
@@ -757,6 +1045,18 @@
rootDir="src"
java5="true"/>
<echo file="${s2b_root_client_8_0}/package-info.java">@org.netbeans.api.annotations.common.SuppressWarnings("NM_SAME_SIMPLE_NAME_AS_INTERFACE") // justification="Generated implementation classes"${line.separator}package org.netbeans.modules.j2ee.dd.impl.client.model_8_0;</echo>
+ <schema2beans schema="${s2b_res_root}/application-client_9.xsd"
+ mddFile="${s2b_res_root}/application-client_9.mdd"
+ package="org.netbeans.modules.j2ee.dd.impl.client.model_9_0"
+ schemaType="xmlschema"
+ useInterfaces="true"
+ validate="true"
+ attrProp="true"
+ removeUnreferencedNodes="true"
+ rootDir="src"
+ java5="true"/>
+ <echo file="${s2b_root_client_9_0}/package-info.java">@org.netbeans.api.annotations.common.SuppressWarnings("NM_SAME_SIMPLE_NAME_AS_INTERFACE") // justification="Generated implementation classes"${line.separator}package org.netbeans.modules.j2ee.dd.impl.client.model_9_0;</echo>
+
<replace file="${s2b_root_client_6_0}/ApplicationClient.java" summary="true">
<replacetoken>public java.lang.String getVersion() {</replacetoken>
<replacevalue>public java.lang.String getVersionString() {</replacevalue>
@@ -805,6 +1105,22 @@
<replacetoken>setVersion("8");</replacetoken>
<replacevalue>setVersionString("8");</replacevalue>
</replace>
+ <replace file="${s2b_root_client_9_0}/ApplicationClient.java" summary="true">
+ <replacetoken>public java.lang.String getVersion() {</replacetoken>
+ <replacevalue>public java.lang.String getVersionString() {</replacevalue>
+ </replace>
+ <replace file="${s2b_root_client_9_0}/ApplicationClient.java" summary="true">
+ <replacetoken>public void setVersion(java.lang.String value) {</replacetoken>
+ <replacevalue>public void setVersionString(java.lang.String value) {</replacevalue>
+ </replace>
+ <replace file="${s2b_root_client_9_0}/ApplicationClient.java" summary="true">
+ <replacetoken>(getVersion()</replacetoken>
+ <replacevalue>(getVersionString()</replacevalue>
+ </replace>
+ <replace file="${s2b_root_client_9_0}/ApplicationClient.java" summary="true">
+ <replacetoken>setVersion("9");</replacetoken>
+ <replacevalue>setVersionString("9");</replacevalue>
+ </replace>
</target>
<target name="compile" depends="dd2beansgen,projectized-common.compile"/>
@@ -820,20 +1136,27 @@
<mkdir dir="${s2b_root_web_3_1_frag}"/>
<mkdir dir="${s2b_root_web_4_0}"/>
<mkdir dir="${s2b_root_web_4_0_frag}"/>
+ <mkdir dir="${s2b_root_web_5_0}"/>
+ <mkdir dir="${s2b_root_web_5_0_frag}"/>
<mkdir dir="${s2b_root_2_1}"/>
<mkdir dir="${s2b_root_3_0}"/>
<mkdir dir="${s2b_root_3_1}"/>
<mkdir dir="${s2b_root_3_2}"/>
+ <mkdir dir="${s2b_root_4_0}"/>
<mkdir dir="${s2b_root_app_1_4}"/>
<mkdir dir="${s2b_root_app_5}"/>
<mkdir dir="${s2b_root_app_6}"/>
<mkdir dir="${s2b_root_app_7}"/>
<mkdir dir="${s2b_root_app_8}"/>
+ <mkdir dir="${s2b_root_app_9}"/>
<mkdir dir="${s2b_root_client_1_4}"/>
<mkdir dir="${s2b_root_client_5_0}"/>
<mkdir dir="${s2b_root_client_6_0}"/>
<mkdir dir="${s2b_root_client_7_0}"/>
<mkdir dir="${s2b_root_client_8_0}"/>
+ <mkdir dir="${s2b_root_client_9_0}"/>
+
+ <!--web & web-fragment-->
<delete>
<fileset dir="${s2b_root_web_2_4}">
<include name="*.java"/>
@@ -882,6 +1205,19 @@
</fileset>
</delete>
<delete dir="${s2b_root_web_4_0_frag}"/>
+ <delete>
+ <fileset dir="${s2b_root_web_5_0}">
+ <include name="*.java"/>
+ </fileset>
+ </delete>
+ <delete dir="${s2b_root_web_5_0}"/>
+ <delete>
+ <fileset dir="${s2b_root_web_5_0_frag}">
+ <include name="*.java"/>
+ </fileset>
+ </delete>
+ <delete dir="${s2b_root_web_5_0_frag}"/>
+ <!--ejb-jar-->
<delete>
<fileset dir="${s2b_root_2_1}">
<include name="*.java"/>
@@ -906,6 +1242,13 @@
</fileset>
</delete>
<delete dir="${s2b_root_3_2}"/>
+ <delete>
+ <fileset dir="${s2b_root_4_0}">
+ <include name="*.java"/>
+ </fileset>
+ </delete>
+ <delete dir="${s2b_root_4_0}"/>
+ <!--application-->
<delete>
<fileset dir="${s2b_root_app_1_4}">
<include name="*.java"/>
@@ -936,6 +1279,13 @@
</fileset>
</delete>
<delete dir="${s2b_root_app_8}"/>
+ <delete>
+ <fileset dir="${s2b_root_app_9}">
+ <include name="*.java"/>
+ </fileset>
+ </delete>
+ <delete dir="${s2b_root_app_9}"/>
+ <!--application-client-->
<delete>
<fileset dir="${s2b_root_client_1_4}">
<include name="*.java"/>
@@ -966,6 +1316,12 @@
</fileset>
</delete>
<delete dir="${s2b_root_client_8_0}"/>
+ <delete>
+ <fileset dir="${s2b_root_client_9_0}">
+ <include name="*.java"/>
+ </fileset>
+ </delete>
+ <delete dir="${s2b_root_client_9_0}"/>
</target>
<target name="javadoc" depends="init-javadoc, projectized.javadoc"/>
diff --git a/enterprise/j2ee.dd/licenseinfo.xml b/enterprise/j2ee.dd/licenseinfo.xml
index 8c684bf6b9..55e180f583 100755
--- a/enterprise/j2ee.dd/licenseinfo.xml
+++ b/enterprise/j2ee.dd/licenseinfo.xml
@@ -111,4 +111,30 @@
<license ref="W3C2" />
<comment type="CATEGORY_B" />
</fileset>
+ <fileset>
+ <file>src/org/netbeans/modules/j2ee/dd/impl/resources/bindingschema_3_0.xsd</file>
+ <license ref="EDL-1.0" />
+ <comment type="CATEGORY_B" />
+ </fileset>
+ <fileset>
+ <file>src/org/netbeans/modules/j2ee/dd/impl/resources/application_9.mdd</file>
+ <file>src/org/netbeans/modules/j2ee/dd/impl/resources/application_9.xsd</file>
+ <file>src/org/netbeans/modules/j2ee/dd/impl/resources/application-client_9.mdd</file>
+ <file>src/org/netbeans/modules/j2ee/dd/impl/resources/application-client_9.xsd</file>
+ <file>src/org/netbeans/modules/j2ee/dd/impl/resources/connector_2_0.xsd</file>
+ <file>src/org/netbeans/modules/j2ee/dd/impl/resources/ejb-jar_4_0.mdd</file>
+ <file>src/org/netbeans/modules/j2ee/dd/impl/resources/ejb-jar_4_0.xsd</file>
+ <file>src/org/netbeans/modules/j2ee/dd/impl/resources/jakartaee_9.xsd</file>
+ <file>src/org/netbeans/modules/j2ee/dd/impl/resources/jakartaee_web_services_2_0.xsd</file>
+ <file>src/org/netbeans/modules/j2ee/dd/impl/resources/jakartaee_web_services_client_2_0.xsd</file>
+ <file>src/org/netbeans/modules/j2ee/dd/impl/resources/jsp_3_0.xsd</file>
+ <file>src/org/netbeans/modules/j2ee/dd/impl/resources/permissions_9.xsd</file>
+ <file>src/org/netbeans/modules/j2ee/dd/impl/resources/web-app_5_0.mdd</file>
+ <file>src/org/netbeans/modules/j2ee/dd/impl/resources/web-app_5_0.xsd</file>
+ <file>src/org/netbeans/modules/j2ee/dd/impl/resources/web-common_5_0.xsd</file>
+ <file>src/org/netbeans/modules/j2ee/dd/impl/resources/web-fragment_5_0.mdd</file>
+ <file>src/org/netbeans/modules/j2ee/dd/impl/resources/web-fragment_5_0.xsd</file>
+ <license ref="EPL-v20" />
+ <comment type="CATEGORY_B" />
+ </fileset>
</licenseinfo>
diff --git a/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/application/Application.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/application/Application.java
index 3cbcd70ed1..80bac056a5 100644
--- a/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/application/Application.java
+++ b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/application/Application.java
@@ -43,10 +43,15 @@ public interface Application extends org.netbeans.modules.j2ee.dd.api.common.Roo
*/
public static final String VERSION_7 = "7"; //NOI18N
/**
- * application.xml DD version for JavaEE8
+ * application.xml DD version for JavaEE8/JakartaEE8
* @since 2
*/
public static final String VERSION_8 = "8"; //NOI18N
+ /**
+ * application.xml DD version for JakartaEE9/JakartaEE9.1
+ * @since 2
+ */
+ public static final String VERSION_9 = "9"; //NOI18N
public static final int STATE_VALID=0;
public static final int STATE_INVALID_PARSABLE=1;
public static final int STATE_INVALID_UNPARSABLE=2;
diff --git a/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/application/DDProvider.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/application/DDProvider.java
index 211065a6d1..2593b0d23b 100644
--- a/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/application/DDProvider.java
+++ b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/application/DDProvider.java
@@ -235,15 +235,17 @@ public final class DDProvider {
Application jar = null;
String version = parse.getVersion();
if (Application.VERSION_1_4.equals(version)) {
- return new org.netbeans.modules.j2ee.dd.impl.application.model_1_4.Application(parse.getDocument(), Common.USE_DEFAULT_VALUES);
+ return new org.netbeans.modules.j2ee.dd.impl.application.model_1_4.Application(parse.getDocument(), Common.USE_DEFAULT_VALUES);
} else if (Application.VERSION_5.equals(version)) {
- return new org.netbeans.modules.j2ee.dd.impl.application.model_5.Application(parse.getDocument(), Common.USE_DEFAULT_VALUES);
+ return new org.netbeans.modules.j2ee.dd.impl.application.model_5.Application(parse.getDocument(), Common.USE_DEFAULT_VALUES);
} else if (Application.VERSION_6.equals(version)) {
- return new org.netbeans.modules.j2ee.dd.impl.application.model_6.Application(parse.getDocument(), Common.USE_DEFAULT_VALUES);
+ return new org.netbeans.modules.j2ee.dd.impl.application.model_6.Application(parse.getDocument(), Common.USE_DEFAULT_VALUES);
} else if (Application.VERSION_7.equals(version)) {
- return new org.netbeans.modules.j2ee.dd.impl.application.model_7.Application(parse.getDocument(), Common.USE_DEFAULT_VALUES);
+ return new org.netbeans.modules.j2ee.dd.impl.application.model_7.Application(parse.getDocument(), Common.USE_DEFAULT_VALUES);
} else if (Application.VERSION_8.equals(version)) {
- return new org.netbeans.modules.j2ee.dd.impl.application.model_8.Application(parse.getDocument(), Common.USE_DEFAULT_VALUES);
+ return new org.netbeans.modules.j2ee.dd.impl.application.model_8.Application(parse.getDocument(), Common.USE_DEFAULT_VALUES);
+ } else if (Application.VERSION_9.equals(version)) {
+ return new org.netbeans.modules.j2ee.dd.impl.application.model_9.Application(parse.getDocument(), Common.USE_DEFAULT_VALUES);
}
return jar;
}
@@ -268,6 +270,8 @@ public final class DDProvider {
return new InputSource("nbres:/org/netbeans/modules/javaee/dd/impl/resources/application_7.xsd"); //NOI18N
} else if ("http://xmlns.jcp.org/xml/ns/javaee/application_8.xsd".equals(systemId)) {
return new InputSource("nbres:/org/netbeans/modules/javaee/dd/impl/resources/application_8.xsd"); //NOI18N
+ } else if ("https://jakarta.ee/xml/ns/jakartaee/application_9.xsd".equals(systemId)) {
+ return new InputSource("nbres:/org/netbeans/modules/javaee/dd/impl/resources/application_9.xsd"); //NOI18N
} else {
// use the default behaviour
return null;
@@ -384,7 +388,9 @@ public final class DDProvider {
Node vNode = attrs.getNamedItem("version");//NOI18N
if(vNode != null) {
String versionValue = vNode.getNodeValue();
- if (Application.VERSION_8.equals(versionValue)) {
+ if (Application.VERSION_9.equals(versionValue)) {
+ version = Application.VERSION_9;
+ } else if (Application.VERSION_8.equals(versionValue)) {
version = Application.VERSION_8;
} else if (Application.VERSION_7.equals(versionValue)) {
version = Application.VERSION_7;
diff --git a/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/DDProvider.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/DDProvider.java
index dc754859f6..f67ba80f59 100644
--- a/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/DDProvider.java
+++ b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/ejb/DDProvider.java
@@ -60,6 +60,7 @@ public final class DDProvider {
private static final String EJB_30_DOCTYPE = "http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd"; //NOI18N
private static final String EJB_31_DOCTYPE = "http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd"; //NOI18N
private static final String EJB_32_DOCTYPE = "http://xmlns.jcp.org/xml/ns/javaee/ejb-jar_3_2.xsd"; //NOI18N
+ private static final String EJB_40_DOCTYPE = "https://jakarta.ee/xml/ns/jakartaee/ejb-jar_4_0.xsd"; //NOI18N
private static final DDProvider ddProvider = new DDProvider();
private final Map<Object, EjbJarProxy> ddMap;
@@ -196,7 +197,9 @@ public final class DDProvider {
}
private static EjbJar createEjbJar(String version, Document document) {
- if (EjbJar.VERSION_3_2.equals(version)) {
+ if (EjbJar.VERSION_4_0.equals(version)) {
+ return new org.netbeans.modules.j2ee.dd.impl.ejb.model_4_0.EjbJar(document, Common.USE_DEFAULT_VALUES);
+ } else if (EjbJar.VERSION_3_2.equals(version)) {
return new org.netbeans.modules.j2ee.dd.impl.ejb.model_3_2.EjbJar(document, Common.USE_DEFAULT_VALUES);
} else if (EjbJar.VERSION_3_1.equals(version)) {
return new org.netbeans.modules.j2ee.dd.impl.ejb.model_3_1.EjbJar(document, Common.USE_DEFAULT_VALUES);
@@ -227,7 +230,9 @@ public final class DDProvider {
}
}
if (id != null) {
- if(EJB_32_DOCTYPE.equals(id)) {
+ if(EJB_40_DOCTYPE.equals(id)) {
+ return EjbJar.VERSION_4_0;
+ } else if(EJB_32_DOCTYPE.equals(id)) {
return EjbJar.VERSION_3_2;
} else if (EJB_31_DOCTYPE.equals(id)) {
return EjbJar.VERSION_3_1;
@@ -272,7 +277,9 @@ public final class DDProvider {
@Override
public InputSource resolveEntity(String publicId, String systemId) {
String resource;
- if (EJB_32_DOCTYPE.equals(systemId)) {
+ if (EJB_40_DOCTYPE.equals(systemId)) {
+ resource = "/org/netbeans/modules/j2ee/dd/impl/resources/ejb-jar_4_0.xsd"; //NOI18N
+ } else if (EJB_32_DOCTYPE.equals(systemId)) {
resource = "/org/netbeans/modules/j2ee/dd/impl/resources/ejb-jar_3_2.xsd"; //NOI18N
} else if (EJB_31_DOCTYPE.equals(systemId)) {
resource = "/org/netbeans/modules/j2ee/dd/impl/resources/ejb-jar_3_1.xsd"; //NOI18N
diff --git a/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/WebApp.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/WebApp.java
index d8079bb187..b31cff55a1 100644
--- a/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/WebApp.java
+++ b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/WebApp.java
@@ -51,7 +51,15 @@ public interface WebApp extends org.netbeans.modules.j2ee.dd.api.common.RootInte
* @since 1.29
*/
static final String VERSION_3_1 = "3.1"; //NOI18N
+ /**
+ * web.xml, web-fragment.xml DD version for JavaEE8/JakartaEE8
+ * @since 1.29
+ */
static final String VERSION_4_0 = "4.0"; //NOI18N
+ /**
+ * web.xml, web-fragment.xml DD version for JakartaEE9/JakartaEE91
+ * @since 1.29
+ */
static final String VERSION_5_0 = "5.0"; //NOI18N
static final int STATE_VALID = 0;
static final int STATE_INVALID_PARSABLE = 1;
@@ -252,7 +260,7 @@ public interface WebApp extends org.netbeans.modules.j2ee.dd.api.common.RootInte
void setName(String[] value) throws VersionNotSupportedException;
String[] getName() throws VersionNotSupportedException;
- AbsoluteOrdering newAbsoluteOrdering() throws VersionNotSupportedException;
+ AbsoluteOrdering newAbsoluteOrdering() throws VersionNotSupportedException;
void setAbsoluteOrdering(AbsoluteOrdering[] value) throws VersionNotSupportedException;
AbsoluteOrdering[] getAbsoluteOrdering() throws VersionNotSupportedException;
}
diff --git a/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/WebFragment.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/WebFragment.java
index 73984437fb..6e7f9e2452 100644
--- a/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/WebFragment.java
+++ b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/WebFragment.java
@@ -36,8 +36,8 @@ public interface WebFragment extends org.netbeans.modules.j2ee.dd.api.common.Roo
// Methods specific for WebFragment
- RelativeOrdering newRelativeOrdering();
- RelativeOrdering[] getOrdering();
- void setOrdering(RelativeOrdering[] value);
+ RelativeOrdering newRelativeOrdering();
+ RelativeOrdering[] getOrdering();
+ void setOrdering(RelativeOrdering[] value);
}
diff --git a/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/WebFragmentProvider.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/WebFragmentProvider.java
index fd3aa67835..30194cea4a 100644
--- a/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/WebFragmentProvider.java
+++ b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/web/WebFragmentProvider.java
@@ -79,13 +79,15 @@ public final class WebFragmentProvider {
private WebFragment createWebFragment(FileObject fo, String version) throws IOException, SAXException {
try {
-// TODO
-// if (WebFragment.VERSION_4_0.equals(version)) {
-// try (InputStream inputStream = fo.getInputStream()) {
-// return org.netbeans.modules.j2ee.dd.impl.web.model_4_0_frag.WebFragment.createGraph(inputStream);
-// }
-// }
- if (WebFragment.VERSION_3_1.equals(version)) {
+ if (WebFragment.VERSION_5_0.equals(version)) {
+ try (InputStream inputStream = fo.getInputStream()) {
+ return org.netbeans.modules.j2ee.dd.impl.web.model_5_0_frag.WebFragment.createGraph(inputStream);
+ }
+ } else if (WebFragment.VERSION_4_0.equals(version)) {
+ try (InputStream inputStream = fo.getInputStream()) {
+ return org.netbeans.modules.j2ee.dd.impl.web.model_4_0_frag.WebFragment.createGraph(inputStream);
+ }
+ } else if (WebFragment.VERSION_3_1.equals(version)) {
try (InputStream inputStream = fo.getInputStream()) {
return org.netbeans.modules.j2ee.dd.impl.web.model_3_1_frag.WebFragment.createGraph(inputStream);
}
diff --git a/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/application/ApplicationProxy.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/application/ApplicationProxy.java
index b11aa5c0ee..228dfdf71b 100644
--- a/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/application/ApplicationProxy.java
+++ b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/application/ApplicationProxy.java
@@ -392,20 +392,10 @@ public class ApplicationProxy implements Application {
public void write(org.openide.filesystems.FileObject fo) throws java.io.IOException {
if (app != null) {
- try {
- org.openide.filesystems.FileLock lock = fo.lock();
- try {
- java.io.OutputStream os = fo.getOutputStream(lock);
- try {
- writing=true;
- write(os);
- } finally {
- os.close();
- }
- }
- finally {
- lock.releaseLock();
- }
+ try (org.openide.filesystems.FileLock lock = fo.lock();
+ java.io.OutputStream os = fo.getOutputStream(lock)) {
+ writing=true;
+ write(os);
} catch (org.openide.filesystems.FileAlreadyLockedException ex) {
// trying to use OutputProvider for writing changes
org.openide.loaders.DataObject dobj = org.openide.loaders.DataObject.find(fo);
diff --git a/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/client/AppClientProxy.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/client/AppClientProxy.java
index ddbf567dbf..81beefdf70 100644
--- a/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/client/AppClientProxy.java
+++ b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/client/AppClientProxy.java
@@ -357,19 +357,10 @@ public class AppClientProxy implements AppClient {
public void write(FileObject fo) throws java.io.IOException {
if (app != null) {
- try {
- org.openide.filesystems.FileLock lock = fo.lock();
- try {
- java.io.OutputStream os = fo.getOutputStream(lock);
- try {
- writing=true;
- write(os);
- } finally {
- os.close();
- }
- } finally {
- lock.releaseLock();
- }
+ try (org.openide.filesystems.FileLock lock = fo.lock();
+ java.io.OutputStream os = fo.getOutputStream(lock)) {
+ writing=true;
+ write(os);
} catch (FileAlreadyLockedException ex) {
// trying to use OutputProvider for writing changes
org.openide.loaders.DataObject dobj = org.openide.loaders.DataObject.find(fo);
diff --git a/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/DDUtils.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/DDUtils.java
index e20bf1952f..63e057c27e 100644
--- a/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/DDUtils.java
+++ b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/DDUtils.java
@@ -121,6 +121,8 @@ public class DDUtils {
return org.netbeans.modules.j2ee.dd.impl.web.model_3_1.WebApp.createGraph(is);
} else if (WebApp.VERSION_4_0.equals(version)) {
return org.netbeans.modules.j2ee.dd.impl.web.model_4_0.WebApp.createGraph(is);
+ } else if (WebApp.VERSION_5_0.equals(version)) {
+ return org.netbeans.modules.j2ee.dd.impl.web.model_5_0.WebApp.createGraph(is);
} else {
return null;
}
@@ -147,6 +149,8 @@ public class DDUtils {
return org.netbeans.modules.j2ee.dd.impl.client.model_7_0.ApplicationClient.createGraph(is);
} else if (AppClient.VERSION_8_0.equals(version)) {
return org.netbeans.modules.j2ee.dd.impl.client.model_8_0.ApplicationClient.createGraph(is);
+ } else if (AppClient.VERSION_9_0.equals(version)) {
+ return org.netbeans.modules.j2ee.dd.impl.client.model_9_0.ApplicationClient.createGraph(is);
}
} catch (RuntimeException ex) {
throw new SAXException(ex);
diff --git a/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/EnclosingBean.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/EnclosingBean.java
index b1e6f2d37e..7daf863bcb 100644
--- a/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/EnclosingBean.java
+++ b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/EnclosingBean.java
@@ -79,16 +79,9 @@ public abstract class EnclosingBean extends BaseBean implements CommonDDBean, Cr
*/
public void write(org.openide.filesystems.FileObject fo) throws java.io.IOException {
// TODO: need to be implemented with Dialog opened when the file object is locked
- FileLock lock = fo.lock();
- try {
- OutputStream os = fo.getOutputStream(lock);
- try {
- write(os);
- } finally {
- os.close();
- }
- } finally {
- lock.releaseLock();
+ try (FileLock lock = fo.lock();
+ OutputStream os = fo.getOutputStream(lock)) {
+ write(os);
}
}
@@ -97,10 +90,10 @@ public abstract class EnclosingBean extends BaseBean implements CommonDDBean, Cr
Object keyValue = null;
if (propertyNames!=null)
for (int i=0;i<propertyNames.length;i++) {
- if (keyProperty.equals(propertyNames[i])) {
- keyValue=propertyValues[i];
- break;
- }
+ if (keyProperty.equals(propertyNames[i])) {
+ keyValue=propertyValues[i];
+ break;
+ }
}
if (keyValue!=null && keyValue instanceof String) {
if (findBeanByName(beanName, keyProperty,(String)keyValue)!=null) {
diff --git a/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/ParseUtils.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/ParseUtils.java
index 1e6ac02e7b..ce8897fee8 100644
--- a/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/ParseUtils.java
+++ b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/ParseUtils.java
@@ -130,7 +130,7 @@ public class ParseUtils {
throws org.xml.sax.SAXException, java.io.IOException {
// additional logging for #127276
if (LOGGER.isLoggable(Level.FINE)) {
- LOGGER.log(Level.FINE, "Parsing with ddResolver: " + ddResolver);
+ LOGGER.log(Level.FINE, "Parsing with ddResolver: {0}", ddResolver);
}
ErrorHandler errorHandler = new ErrorHandler();
try {
diff --git a/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/EjbJarProxy.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/EjbJarProxy.java
index 973cc61392..b273a568b5 100644
--- a/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/EjbJarProxy.java
+++ b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/EjbJarProxy.java
@@ -436,14 +436,10 @@ public class EjbJarProxy implements EjbJar {
if (dataObject instanceof DDProviderDataObject) {
((DDProviderDataObject) dataObject).writeModel(ejbJar);
} else {
- FileLock lock = fo.lock();
- try {
- try (OutputStream os = fo.getOutputStream(lock)) {
- writing = true;
- write(os);
- }
- } finally {
- lock.releaseLock();
+ try (FileLock lock = fo.lock();
+ OutputStream os = fo.getOutputStream(lock)) {
+ writing = true;
+ write(os);
}
}
}
@@ -457,7 +453,11 @@ public class EjbJarProxy implements EjbJar {
else {
EjbJar clonedEjbJar=(EjbJar)ejbJar.clone();
proxy = new EjbJarProxy(clonedEjbJar,version);
- if (EjbJar.VERSION_3_2.equals(version)) {
+ if (EjbJar.VERSION_4_0.equals(version)) {
+ ((org.netbeans.modules.j2ee.dd.impl.ejb.model_4_0.EjbJar)clonedEjbJar)._setSchemaLocation
+ ("https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/ejb-jar_4_0.xsd");
+ clonedEjbJar.setVersion(new java.math.BigDecimal(EjbJar.VERSION_3_2));
+ } else if (EjbJar.VERSION_3_2.equals(version)) {
((org.netbeans.modules.j2ee.dd.impl.ejb.model_3_2.EjbJar)clonedEjbJar)._setSchemaLocation
("http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/ejb-jar_3_2.xsd");
clonedEjbJar.setVersion(new java.math.BigDecimal(EjbJar.VERSION_3_2));
diff --git a/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/resources/application-client_9.mdd b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/resources/application-client_9.mdd
new file mode 100644
index 0000000000..69657a26ba
--- /dev/null
+++ b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/resources/application-client_9.mdd
@@ -0,0 +1,385 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<!--
+Copyright (c) 2009, 2020 Oracle and/or its affiliates. All rights reserved.
+
+This program and the accompanying materials are made available under the
+terms of the Eclipse Public License v. 2.0, which is available at
+http://www.eclipse.org/legal/epl-2.0.
+
+This Source Code may also be made available under the following Secondary
+Licenses when the conditions for such availability set forth in the
+Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+version 2 with the GNU Classpath Exception, which is available at
+https://www.gnu.org/software/classpath/license.html.
+
+SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+-->
+<metaDD>
+ <meta-element>
+ <dtd-name>application-client</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>ApplicationClient</bean-name>
+ <implements>org.netbeans.modules.j2ee.dd.api.client.AppClient</implements>
+ <extends>org.netbeans.modules.j2ee.dd.impl.common.ComponentBeanMultiple</extends>
+ <user-code>
+ public org.xml.sax.SAXParseException getError() {
+ return null;
+ }
+ public int getStatus() {
+ return STATE_VALID;
+ }
+ public void setVersion(java.math.BigDecimal value) {
+ setAttributeValue(VERSION, value.toString());
+ }
+ public java.math.BigDecimal getVersion() {
+ return new java.math.BigDecimal(getAttributeValue(VERSION));
+ }
+ </user-code>
+ </meta-element>
+ <meta-element>
+ <dtd-name>env-entryType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>EnvEntry</bean-name>
+ <extends>org.netbeans.modules.j2ee.dd.impl.common.DescriptionBeanMultiple</extends>
+ <implements>
+ org.netbeans.modules.j2ee.dd.api.common.EnvEntry, org.netbeans.modules.j2ee.dd.impl.common.KeyBean
+ </implements>
+ <user-code>
+ public String getKeyProperty() { return "EnvEntryName"; }
+ </user-code>
+ </meta-element>
+ <meta-element>
+ <dtd-name>ejb-refType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>EjbRef</bean-name>
+ <extends>org.netbeans.modules.j2ee.dd.impl.common.DescriptionBeanMultiple</extends>
+ <implements>
+ org.netbeans.modules.j2ee.dd.api.common.EjbRef, org.netbeans.modules.j2ee.dd.impl.common.KeyBean
+ </implements>
+ <user-code>
+ public String getKeyProperty() { return "EjbRefName"; }
+ </user-code>
+ </meta-element>
+ <meta-element>
+ <dtd-name>resource-refType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>ResourceRef</bean-name>
+ <extends>org.netbeans.modules.j2ee.dd.impl.common.DescriptionBeanMultiple</extends>
+ <implements>
+ org.netbeans.modules.j2ee.dd.api.common.ResourceRef, org.netbeans.modules.j2ee.dd.impl.common.KeyBean
+ </implements>
+ <user-code>
+ public String getKeyProperty() { return "ResRefName"; }
+ </user-code>
+ </meta-element>
+ <meta-element>
+ <dtd-name>resource-env-refType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>ResourceEnvRef</bean-name>
+ <extends>org.netbeans.modules.j2ee.dd.impl.common.DescriptionBeanMultiple</extends>
+ <implements>
+ org.netbeans.modules.j2ee.dd.api.common.ResourceEnvRef, org.netbeans.modules.j2ee.dd.impl.common.KeyBean
+ </implements>
+ <user-code>
+ public String getKeyProperty() { return "ResourceEnvRefName"; }
+ </user-code>
+ </meta-element>
+ <meta-element>
+ <dtd-name>message-destination-refType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>MessageDestinationRef</bean-name>
+ <extends>org.netbeans.modules.j2ee.dd.impl.common.DescriptionBeanMultiple</extends>
+ <implements>
+ org.netbeans.modules.j2ee.dd.api.common.MessageDestinationRef, org.netbeans.modules.j2ee.dd.impl.common.KeyBean
+ </implements>
+ <user-code>
+ public String getKeyProperty() { return "MessageDestinationRefName"; }
+ </user-code>
+ </meta-element>
+ <meta-element>
+ <dtd-name>persistence-context-refType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>PersistenceContextRefType</bean-name>
+ </meta-element>
+ <meta-element>
+ <dtd-name>persistence-unit-refType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>PersistenceUnitRefType</bean-name>
+ </meta-element>
+ <meta-element>
+ <dtd-name>lifecycle-callbackType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>LifecycleCallbackType</bean-name>
+ </meta-element>
+ <meta-element>
+ <dtd-name>fully-qualified-classType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>FullyQualifiedClass</bean-name>
+ <wrapper-class>java.lang.String</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>message-destinationType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>MessageDestination</bean-name>
+ <extends>org.netbeans.modules.j2ee.dd.impl.common.ComponentBeanMultiple</extends>
+ <implements>
+ org.netbeans.modules.j2ee.dd.api.common.MessageDestination, org.netbeans.modules.j2ee.dd.impl.common.KeyBean
+ </implements>
+ <user-code>
+ public String getKeyProperty() { return "MessageDestinationName"; }
+ </user-code>
+ </meta-element>
+ <meta-element>
+ <dtd-name>string</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>String</bean-name>
+ <wrapper-class>java.lang.String</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>xsdStringType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>XsdStringType</bean-name>
+ <wrapper-class>java.lang.String</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>descriptionType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>DescriptionType</bean-name>
+ <wrapper-class>java.lang.String</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>display-nameType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>DisplayNameType</bean-name>
+ <wrapper-class>java.lang.String</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>iconType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>Icon</bean-name>
+ <extends>org.netbeans.modules.j2ee.dd.impl.common.EnclosingBean</extends>
+ <implements>
+ org.netbeans.modules.j2ee.dd.api.common.Icon
+ </implements>
+ </meta-element>
+ <meta-element>
+ <dtd-name>pathType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>PathType</bean-name>
+ <wrapper-class>java.lang.String</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>java-identifierType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>JavaIdentifierType</bean-name>
+ <wrapper-class>java.lang.String</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>jndi-nameType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>JndiNameType</bean-name>
+ <wrapper-class>java.lang.String</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>injection-targetType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>InjectionTarget</bean-name>
+ <implements>org.netbeans.modules.j2ee.dd.api.common.InjectionTarget</implements>
+ <extends>org.netbeans.modules.j2ee.dd.impl.common.EnclosingBean</extends>
+ </meta-element>
+ <meta-element>
+ <dtd-name>persistence-context-typeType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>PersistenceContextTypeType</bean-name>
+ <wrapper-class>java.lang.String</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>message-destination-typeType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>MessageDestinationTypeType</bean-name>
+ <wrapper-class>java.lang.String</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>message-destination-usageType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>MessageDestinationUsageType</bean-name>
+ <wrapper-class>java.lang.String</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>message-destination-linkType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>MessageDestinationLinkType</bean-name>
+ <wrapper-class>java.lang.String</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>res-authType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>ResAuthType</bean-name>
+ <wrapper-class>java.lang.String</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>res-sharing-scopeType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>ResSharingScopeType</bean-name>
+ <wrapper-class>java.lang.String</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>service-refType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>ServiceRef</bean-name>
+ <comparator-class>org.netbeans.modules.j2ee.dd.impl.common.Comparator</comparator-class>
+ <extends>org.netbeans.modules.j2ee.dd.impl.common.ComponentBeanMultiple</extends>
+ <implements>
+ org.netbeans.modules.j2ee.dd.api.common.ServiceRef, org.netbeans.modules.j2ee.dd.impl.common.KeyBean
+ </implements>
+ <user-code>
+ public String getKeyProperty() { return "ServiceRefName"; }
+ </user-code>
+ </meta-element>
+ <meta-element>
+ <dtd-name>xsdAnyURIType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>XsdAnyURIType</bean-name>
+ <wrapper-class>java.net.URI</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>xsdQNameType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>XsdQNameType</bean-name>
+ <wrapper-class>java.lang.String</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>port-component-refType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>PortComponentRef</bean-name>
+ <extends>org.netbeans.modules.j2ee.dd.impl.common.EnclosingBean</extends>
+ <implements>
+ org.netbeans.modules.j2ee.dd.api.common.PortComponentRef
+ </implements>
+ </meta-element>
+ <meta-element>
+ <dtd-name>service-ref_handlerType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>ServiceRefHandler</bean-name>
+ <comparator-class>org.netbeans.modules.j2ee.dd.impl.common.Comparator</comparator-class>
+ <extends>org.netbeans.modules.j2ee.dd.impl.common.ComponentBeanMultiple</extends>
+ <implements>
+ org.netbeans.modules.j2ee.dd.api.common.ServiceRefHandler, org.netbeans.modules.j2ee.dd.impl.common.KeyBean
+ </implements>
+ <user-code>
+ public String getKeyProperty() { return "HandlerName"; }
+ </user-code>
+ </meta-element>
+ <meta-element>
+ <dtd-name>service-ref_handler-chainsType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>ServiceRefHandlerChains</bean-name>
+ <implements>org.netbeans.modules.j2ee.dd.api.common.ServiceRefHandlerChains</implements>
+ </meta-element>
+ <meta-element>
+ <dtd-name>service-ref_handler-chainType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>ServiceRefHandlerChainType</bean-name>
+ <implements>org.netbeans.modules.j2ee.dd.api.common.ServiceRefHandlerChain</implements>
+ </meta-element>
+ <meta-element>
+ <dtd-name>service-ref_qname-pattern</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>ServiceRefQnamePattern</bean-name>
+ <wrapper-class>java.lang.String</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>service-ref_protocol-bindingListType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>ServiceRefProtocolBindingListType</bean-name>
+ <wrapper-class>String</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>param-valueType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>InitParam</bean-name>
+ <extends>org.netbeans.modules.j2ee.dd.impl.common.DescriptionBeanMultiple</extends>
+ <implements>
+ org.netbeans.modules.j2ee.dd.api.common.InitParam, org.netbeans.modules.j2ee.dd.impl.common.KeyBean
+ </implements>
+ <user-code>
+ public String getKeyProperty() { return "ParamName"; }
+ </user-code>
+ </meta-element>
+ <meta-element>
+ <dtd-name>true-falseType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>TrueFalseType</bean-name>
+ <wrapper-class>boolean</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>ejb-ref-nameType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>EjbRefNameType</bean-name>
+ <wrapper-class>java.lang.String</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>ejb-ref-typeType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>EjbRefTypeType</bean-name>
+ <wrapper-class>java.lang.String</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>homeType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>HomeType</bean-name>
+ <wrapper-class>java.lang.String</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>remoteType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>RemoteType</bean-name>
+ <wrapper-class>java.lang.String</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>ejb-linkType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>EjbLinkType</bean-name>
+ <wrapper-class>java.lang.String</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>env-entry-type-valuesType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>EnvEntryTypeValuesType</bean-name>
+ <wrapper-class>java.lang.String</wrapper-class>
+ </meta-element>
+
+ <!-- changes added for EE6: -->
+
+ <meta-element>
+ <dtd-name>handlerType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>ServiceRefHandler</bean-name>
+ <comparator-class>org.netbeans.modules.j2ee.dd.impl.common.Comparator</comparator-class>
+ <extends>org.netbeans.modules.j2ee.dd.impl.common.ComponentBeanMultiple</extends>
+ <implements>
+ org.netbeans.modules.j2ee.dd.api.common.ServiceRefHandler, org.netbeans.modules.j2ee.dd.impl.common.KeyBean
+ </implements>
+ <user-code>
+ public String getKeyProperty() { return "HandlerName"; }
+ </user-code>
+ </meta-element>
+ <meta-element>
+ <dtd-name>handler-chainsType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>ServiceRefHandlerChains</bean-name>
+ <implements>org.netbeans.modules.j2ee.dd.api.common.ServiceRefHandlerChains</implements>
+ </meta-element>
+ <meta-element>
+ <dtd-name>handler-chainType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>ServiceRefHandlerChainType</bean-name>
+ <implements>org.netbeans.modules.j2ee.dd.api.common.ServiceRefHandlerChain</implements>
+ </meta-element>
+ <meta-element>
+ <dtd-name>dewey-versionType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>version</bean-name>
+ <wrapper-class>java.math.BigDecimal</wrapper-class>
+ </meta-element>
+</metaDD>
diff --git a/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/resources/application-client_9.xsd b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/resources/application-client_9.xsd
new file mode 100644
index 0000000000..a4df45bd0d
--- /dev/null
+++ b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/resources/application-client_9.xsd
@@ -0,0 +1,307 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
+ targetNamespace="https://jakarta.ee/xml/ns/jakartaee"
+ xmlns:jakartaee="https://jakarta.ee/xml/ns/jakartaee"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ elementFormDefault="qualified"
+ attributeFormDefault="unqualified"
+ version="9">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ Copyright (c) 2009, 2020 Oracle and/or its affiliates. All rights reserved.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v. 2.0, which is available at
+ http://www.eclipse.org/legal/epl-2.0.
+
+ This Source Code may also be made available under the following Secondary
+ Licenses when the conditions for such availability set forth in the
+ Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ version 2 with the GNU Classpath Exception, which is available at
+ https://www.gnu.org/software/classpath/license.html.
+
+ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+ </xsd:documentation>
+ </xsd:annotation>
+
+ <xsd:annotation>
+ <xsd:documentation>
+ <![CDATA[
+ This is the XML Schema for the application client 9
+ deployment descriptor. The deployment descriptor must
+ be named "META-INF/application-client.xml" in the
+ application client's jar file. All application client
+ deployment descriptors must indicate the application
+ client schema by using the Jakarta EE namespace:
+
+ https://jakarta.ee/xml/ns/jakartaee
+
+ and indicate the version of the schema by
+ using the version element as shown below:
+
+ <application-client 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/application-client_9.xsd"
+ version="9">
+ ...
+ </application-client>
+
+ The instance documents may indicate the published version of
+ the schema using the xsi:schemaLocation attribute for Jakarta EE
+ namespace with the following location:
+
+ https://jakarta.ee/xml/ns/jakartaee/application-client_9.xsd
+
+ ]]>
+ </xsd:documentation>
+ </xsd:annotation>
+
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The following conventions apply to all Jakarta EE
+ deployment descriptor elements unless indicated otherwise.
+
+ - In elements that specify a pathname to a file within the
+ same JAR file, relative filenames (i.e., those not
+ starting with "/") are considered relative to the root of
+ the JAR file's namespace. Absolute filenames (i.e., those
+ starting with "/") also specify names in the root of the
+ JAR file's namespace. In general, relative names are
+ preferred. The exception is .war files where absolute
+ names are preferred for consistency with the Servlet API.
+
+ </xsd:documentation>
+ </xsd:annotation>
+
+ <xsd:include schemaLocation="jakartaee_9.xsd"/>
+
+
+<!-- **************************************************** -->
+
+ <xsd:element name="application-client"
+ type="jakartaee:application-clientType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The application-client element is the root element of an
+ application client deployment descriptor. The application
+ client deployment descriptor describes the enterprise bean
+ components and external resources referenced by the
+ application client.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:unique name="env-entry-name-uniqueness">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The env-entry-name element contains the name of an
+ application client's environment entry. The name is a JNDI
+ name relative to the java:comp/env context. The name must
+ be unique within an application client.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:selector xpath="jakartaee:env-entry"/>
+ <xsd:field xpath="jakartaee:env-entry-name"/>
+ </xsd:unique>
+ <xsd:unique name="ejb-ref-name-uniqueness">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The ejb-ref-name element contains the name of an enterprise bean
+ reference. The enterprise bean reference is an entry
+ in the application client's environment and is relative to the
+ java:comp/env context. The name must be unique within the
+ application client.
+
+ It is recommended that name is prefixed with "ejb/".
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:selector xpath="jakartaee:ejb-ref"/>
+ <xsd:field xpath="jakartaee:ejb-ref-name"/>
+ </xsd:unique>
+ <xsd:unique name="res-ref-name-uniqueness">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The res-ref-name element specifies the name of a
+ resource manager connection factory reference.The name
+ is a JNDI name relative to the java:comp/env context.
+ The name must be unique within an application client.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:selector xpath="jakartaee:resource-ref"/>
+ <xsd:field xpath="jakartaee:res-ref-name"/>
+ </xsd:unique>
+ <xsd:unique name="resource-env-ref-uniqueness">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The resource-env-ref-name element specifies the name of
+ a resource environment reference; its value is the
+ environment entry name used in the application client
+ code. The name is a JNDI name relative to the
+ java:comp/env context and must be unique within an
+ application client.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:selector xpath="jakartaee:resource-env-ref"/>
+ <xsd:field xpath="jakartaee:resource-env-ref-name"/>
+ </xsd:unique>
+ <xsd:unique name="message-destination-ref-uniqueness">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The message-destination-ref-name element specifies the
+ name of a message destination reference; its value is
+ the message destination reference name used in the
+ application client code. The name is a JNDI name
+ relative to the java:comp/env context and must be unique
+ within an application client.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:selector xpath="jakartaee:message-destination-ref"/>
+ <xsd:field xpath="jakartaee:message-destination-ref-name"/>
+ </xsd:unique>
+ </xsd:element>
+
+
+<!-- **************************************************** -->
+
+ <xsd:complexType name="application-clientType">
+ <xsd:sequence>
+ <xsd:element name="module-name"
+ type="jakartaee:string"
+ minOccurs="0"/>
+ <xsd:group ref="jakartaee:descriptionGroup"/>
+ <xsd:element name="env-entry"
+ type="jakartaee:env-entryType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="ejb-ref"
+ type="jakartaee:ejb-refType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:group ref="jakartaee:service-refGroup"/>
+ <xsd:element name="resource-ref"
+ type="jakartaee:resource-refType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="resource-env-ref"
+ type="jakartaee:resource-env-refType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="message-destination-ref"
+ type="jakartaee:message-destination-refType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="persistence-unit-ref"
+ type="jakartaee:persistence-unit-refType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="post-construct"
+ type="jakartaee:lifecycle-callbackType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="pre-destroy"
+ type="jakartaee:lifecycle-callbackType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="callback-handler"
+ type="jakartaee:fully-qualified-classType"
+ minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The callback-handler element names a class provided by
+ the application. The class must have a no args
+ constructor and must implement the
+ jakarta.security.auth.callback.CallbackHandler
+ interface. The class will be instantiated by the
+ application client container and used by the container
+ to collect authentication information from the user.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="message-destination"
+ type="jakartaee:message-destinationType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="data-source"
+ type="jakartaee:data-sourceType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="jms-connection-factory"
+ type="jakartaee:jms-connection-factoryType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="jms-destination"
+ type="jakartaee:jms-destinationType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="mail-session"
+ type="jakartaee:mail-sessionType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="connection-factory"
+ type="jakartaee:connection-factory-resourceType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="administered-object"
+ type="jakartaee:administered-objectType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ </xsd:sequence>
+ <xsd:attribute name="version"
+ type="jakartaee:dewey-versionType"
+ fixed="9"
+ use="required">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The required value for the version is 9.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
+ <xsd:attribute name="metadata-complete"
+ type="xsd:boolean">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The metadata-complete attribute defines whether this
+ deployment descriptor and other related deployment
+ descriptors for this module (e.g., web service
+ descriptors) are complete, or whether the class
+ files available to this module and packaged with
+ this application should be examined for annotations
+ that specify deployment information.
+
+ If metadata-complete is set to "true", the deployment
+ tool must ignore any annotations that specify deployment
+ information, which might be present in the class files
+ of the application.
+
+ If metadata-complete is not specified or is set to
+ "false", the deployment tool must examine the class
+ files of the application for annotations, as
+ specified by the specifications.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
+ <xsd:attribute name="id"
+ type="xsd:ID"/>
+ </xsd:complexType>
+
+</xsd:schema>
diff --git a/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/resources/application_9.mdd b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/resources/application_9.mdd
new file mode 100644
index 0000000000..2ab0ff71c8
--- /dev/null
+++ b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/resources/application_9.mdd
@@ -0,0 +1,111 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<!--
+Copyright (c) 2009, 2020 Oracle and/or its affiliates. All rights reserved.
+
+This program and the accompanying materials are made available under the
+terms of the Eclipse Public License v. 2.0, which is available at
+http://www.eclipse.org/legal/epl-2.0.
+
+This Source Code may also be made available under the following Secondary
+Licenses when the conditions for such availability set forth in the
+Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+version 2 with the GNU Classpath Exception, which is available at
+https://www.gnu.org/software/classpath/license.html.
+
+SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+-->
+<metaDD>
+ <meta-element>
+ <dtd-name>application</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>Application</bean-name>
+ <implements>org.netbeans.modules.j2ee.dd.api.application.Application</implements>
+ <extends>org.netbeans.modules.j2ee.dd.impl.common.ComponentBeanMultiple</extends>
+ <user-code>
+ public org.xml.sax.SAXParseException getError() {
+ return null;
+ }
+ public int getStatus() {
+ return STATE_VALID;
+ }
+ public void setVersion(java.math.BigDecimal value) {
+ setAttributeValue(VERSION, value.toString());
+ }
+ public java.math.BigDecimal getVersion() {
+ return new java.math.BigDecimal(getAttributeValue(VERSION));
+ }
+ </user-code>
+ </meta-element>
+ <meta-element>
+ <dtd-name>moduleType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>Module</bean-name>
+ <implements>org.netbeans.modules.j2ee.dd.api.application.Module</implements>
+ <extends>org.netbeans.modules.j2ee.dd.impl.common.EnclosingBean</extends>
+ </meta-element>
+ <meta-element>
+ <dtd-name>security-roleType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>SecurityRole</bean-name>
+ <implements>org.netbeans.modules.j2ee.dd.api.common.SecurityRole</implements>
+ <extends>org.netbeans.modules.j2ee.dd.impl.common.DescriptionBeanMultiple</extends>
+ </meta-element>
+ <meta-element>
+ <dtd-name>pathType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>Path</bean-name>
+ <wrapper-class>java.lang.String</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>descriptionType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>Description</bean-name>
+ <wrapper-class>java.lang.String</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>xsdStringType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>XsdString</bean-name>
+ <wrapper-class>java.lang.String</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>role-nameType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>RoleName</bean-name>
+ <wrapper-class>java.lang.String</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>webType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>Web</bean-name>
+ <implements>org.netbeans.modules.j2ee.dd.api.application.Web</implements>
+ <extends>org.netbeans.modules.j2ee.dd.impl.common.EnclosingBean</extends>
+ <user-code>
+ public String getWebUriId() throws org.netbeans.modules.j2ee.dd.api.common.VersionNotSupportedException {
+ throw new org.netbeans.modules.j2ee.dd.api.common.VersionNotSupportedException(org.netbeans.modules.j2ee.dd.api.application.Application.VERSION_9);
+ }
+ public void setWebUriId(String value) throws org.netbeans.modules.j2ee.dd.api.common.VersionNotSupportedException {
+ throw new org.netbeans.modules.j2ee.dd.api.common.VersionNotSupportedException(org.netbeans.modules.j2ee.dd.api.application.Application.VERSION_9);
+ }
+ </user-code>
+ </meta-element>
+ <meta-element>
+ <dtd-name>string</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>String</bean-name>
+ <wrapper-class>java.lang.String</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>display-nameType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>DisplayName</bean-name>
+ <wrapper-class>java.lang.String</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>iconType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>Icon</bean-name>
+ <implements>org.netbeans.modules.j2ee.dd.api.common.Icon</implements>
+ <extends>org.netbeans.modules.j2ee.dd.impl.common.EnclosingBean</extends>
+ </meta-element>
+</metaDD>
diff --git a/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/resources/application_9.xsd b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/resources/application_9.xsd
new file mode 100644
index 0000000000..1e038a278f
--- /dev/null
+++ b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/resources/application_9.xsd
@@ -0,0 +1,390 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
+ targetNamespace="https://jakarta.ee/xml/ns/jakartaee"
+ xmlns:jakartaee="https://jakarta.ee/xml/ns/jakartaee"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ elementFormDefault="qualified"
+ attributeFormDefault="unqualified"
+ version="9">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ Copyright (c) 2009, 2020 Oracle and/or its affiliates. All rights reserved.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v. 2.0, which is available at
+ http://www.eclipse.org/legal/epl-2.0.
+
+ This Source Code may also be made available under the following Secondary
+ Licenses when the conditions for such availability set forth in the
+ Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ version 2 with the GNU Classpath Exception, which is available at
+ https://www.gnu.org/software/classpath/license.html.
+
+ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+ </xsd:documentation>
+ </xsd:annotation>
+
+ <xsd:annotation>
+ <xsd:documentation>
+ <![CDATA[
+ This is the XML Schema for the application 9 deployment
+ descriptor. The deployment descriptor must be named
+ "META-INF/application.xml" in the application's ear file.
+ All application deployment descriptors must indicate
+ the application schema by using the Jakarta EE namespace:
+
+ https://jakarta.ee/xml/ns/jakartaee
+
+ and indicate the version of the schema by
+ using the version element as shown below:
+
+ <application 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/application_9.xsd"
+ version="9">
+ ...
+ </application>
+
+ The instance documents may indicate the published version of
+ the schema using the xsi:schemaLocation attribute for Jakarta EE
+ namespace with the following location:
+
+ https://jakarta.ee/xml/ns/jakartaee/application_9.xsd
+
+ ]]>
+ </xsd:documentation>
+ </xsd:annotation>
+
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The following conventions apply to all Jakarta EE
+ deployment descriptor elements unless indicated otherwise.
+
+ - In elements that specify a pathname to a file within the
+ same JAR file, relative filenames (i.e., those not
+ starting with "/") are considered relative to the root of
+ the JAR file's namespace. Absolute filenames (i.e., those
+ starting with "/") also specify names in the root of the
+ JAR file's namespace. In general, relative names are
+ preferred. The exception is .war files where absolute
+ names are preferred for consistency with the Servlet API.
+
+ </xsd:documentation>
+ </xsd:annotation>
+
+ <xsd:include schemaLocation="jakartaee_9.xsd"/>
+
+
+<!-- **************************************************** -->
+
+ <xsd:element name="application"
+ type="jakartaee:applicationType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The application element is the root element of a Jakarta EE
+ application deployment descriptor.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:unique name="context-root-uniqueness">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The context-root element content must be unique
+ in the ear.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:selector xpath="jakartaee:module/jakartaee:web"/>
+ <xsd:field xpath="jakartaee:context-root"/>
+ </xsd:unique>
+ <xsd:unique name="security-role-uniqueness">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The security-role-name element content
+ must be unique in the ear.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:selector xpath="jakartaee:security-role"/>
+ <xsd:field xpath="jakartaee:role-name"/>
+ </xsd:unique>
+ </xsd:element>
+
+
+<!-- **************************************************** -->
+
+ <xsd:complexType name="applicationType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The applicationType defines the structure of the
+ application.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:sequence>
+ <xsd:element name="application-name"
+ type="jakartaee:string"
+ minOccurs="0"/>
+ <xsd:group ref="jakartaee:descriptionGroup"/>
+ <xsd:element name="initialize-in-order"
+ type="jakartaee:generic-booleanType"
+ minOccurs="0"
+ maxOccurs="1">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ If initialize-in-order is true, modules must be initialized
+ in the order they're listed in this deployment descriptor,
+ with the exception of application client modules, which can
+ be initialized in any order.
+ If initialize-in-order is not set or set to false, the order
+ of initialization is unspecified and may be product-dependent.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="module"
+ type="jakartaee:moduleType"
+ maxOccurs="unbounded">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The application deployment descriptor must have one
+ module element for each Jakarta EE module in the
+ application package. A module element is defined
+ by moduleType definition.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="security-role"
+ type="jakartaee:security-roleType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="library-directory"
+ type="jakartaee:pathType"
+ minOccurs="0"
+ maxOccurs="1">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The library-directory element specifies the pathname
+ of a directory within the application package, relative
+ to the top level of the application package. All files
+ named "*.jar" in this directory must be made available
+ in the class path of all components included in this
+ application package. If this element isn't specified,
+ the directory named "lib" is searched. An empty element
+ may be used to disable searching.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="env-entry"
+ type="jakartaee:env-entryType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="ejb-ref"
+ type="jakartaee:ejb-refType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="ejb-local-ref"
+ type="jakartaee:ejb-local-refType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:group ref="jakartaee:service-refGroup"/>
+ <xsd:element name="resource-ref"
+ type="jakartaee:resource-refType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="resource-env-ref"
+ type="jakartaee:resource-env-refType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="message-destination-ref"
+ type="jakartaee:message-destination-refType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="persistence-context-ref"
+ type="jakartaee:persistence-context-refType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="persistence-unit-ref"
+ type="jakartaee:persistence-unit-refType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="message-destination"
+ type="jakartaee:message-destinationType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="data-source"
+ type="jakartaee:data-sourceType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="jms-connection-factory"
+ type="jakartaee:jms-connection-factoryType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="jms-destination"
+ type="jakartaee:jms-destinationType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="mail-session"
+ type="jakartaee:mail-sessionType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="connection-factory"
+ type="jakartaee:connection-factory-resourceType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="administered-object"
+ type="jakartaee:administered-objectType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ </xsd:sequence>
+ <xsd:attribute name="version"
+ type="jakartaee:dewey-versionType"
+ fixed="9"
+ use="required">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The required value for the version is 9.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
+ <xsd:attribute name="id"
+ type="xsd:ID"/>
+ </xsd:complexType>
+
+
+<!-- **************************************************** -->
+
+ <xsd:complexType name="moduleType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The moduleType defines a single Jakarta EE module and contains a
+ connector, ejb, java, or web element, which indicates the
+ module type and contains a path to the module file, and an
+ optional alt-dd element, which specifies an optional URI to
+ the post-assembly version of the deployment descriptor.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:sequence>
+ <xsd:choice>
+ <xsd:element name="connector"
+ type="jakartaee:pathType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The connector element specifies the URI of a
+ resource adapter archive file, relative to the
+ top level of the application package.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="ejb"
+ type="jakartaee:pathType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The ejb element specifies the URI of an ejb-jar,
+ relative to the top level of the application
+ package.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="java"
+ type="jakartaee:pathType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The java element specifies the URI of a java
+ application client module, relative to the top
+ level of the application package.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="web"
+ type="jakartaee:webType"/>
+ </xsd:choice>
+ <xsd:element name="alt-dd"
+ type="jakartaee:pathType"
+ minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The alt-dd element specifies an optional URI to the
+ post-assembly version of the deployment descriptor
+ file for a particular Jakarta EE module. The URI must
+ specify the full pathname of the deployment
+ descriptor file relative to the application's root
+ directory. If alt-dd is not specified, the deployer
+ must read the deployment descriptor from the default
+ location and file name required by the respective
+ component specification.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ </xsd:sequence>
+ <xsd:attribute name="id"
+ type="xsd:ID"/>
+ </xsd:complexType>
+
+
+<!-- **************************************************** -->
+
+ <xsd:complexType name="webType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The webType defines the web-uri and context-root of
+ a web application module.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:sequence>
+ <xsd:element name="web-uri"
+ type="jakartaee:pathType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The web-uri element specifies the URI of a web
+ application file, relative to the top level of the
+ application package.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="context-root"
+ type="jakartaee:string">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The context-root element specifies the context root
+ of a web application.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ </xsd:sequence>
+ <xsd:attribute name="id"
+ type="xsd:ID"/>
+ </xsd:complexType>
+
+</xsd:schema>
diff --git a/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/resources/batchXML_2_0.xsd b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/resources/batchXML_2_0.xsd
new file mode 100644
index 0000000000..7d1d0a720b
--- /dev/null
+++ b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/resources/batchXML_2_0.xsd
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2012, 2020 International Business Machines Corp. and others
+
+ See the NOTICE file distributed with this work for additional information
+ regarding copyright ownership. Licensed under the Apache License,
+ Version 2.0 (the "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ SPDX-License-Identifier: Apache-2.0
+ -->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ elementFormDefault="qualified"
+ targetNamespace="https://jakarta.ee/xml/ns/jakartaee"
+ xmlns:jbatch="https://jakarta.ee/xml/ns/jakartaee" version="2.0">
+
+ <xs:element name="batch-artifacts"
+ type="jbatch:BatchArtifacts" />
+
+ <xs:complexType name="BatchArtifacts">
+ <xs:sequence>
+ <xs:element name="ref" type="jbatch:BatchArtifactRef"
+ minOccurs="0" maxOccurs="unbounded" />
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="BatchArtifactRef">
+ <xs:attribute name="id" use="required" type="xs:string" />
+ <xs:attribute name="class" use="required"
+ type="xs:string" />
+ </xs:complexType>
+
+</xs:schema>
diff --git a/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/resources/beans_3_0.xsd b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/resources/beans_3_0.xsd
new file mode 100644
index 0000000000..ead38085ec
--- /dev/null
+++ b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/resources/beans_3_0.xsd
@@ -0,0 +1,366 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+~ JBoss, Home of Professional Open Source
+~ Copyright 2020, Red Hat, Inc., and individual contributors
+~ by the @authors tag. See the copyright.txt in the distribution for a
+~ full listing of individual contributors.
+~
+~ Licensed under the Apache License, Version 2.0 (the "License");
+~ you may not use this file except in compliance with the License.
+~ You may obtain a copy of the License at
+~ http://www.apache.org/licenses/LICENSE-2.0
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" BASIS,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+-->
+
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ xmlns:jakartaee="https://jakarta.ee/xml/ns/jakartaee"
+ elementFormDefault="qualified"
+ targetNamespace="https://jakarta.ee/xml/ns/jakartaee"
+ version="3.0">
+
+ <xs:annotation>
+ <xs:documentation>
+ <![CDATA[[
+ Jakarta Contexts and Dependency Injection (CDI) defines
+ a set of complementary services that help improve the structure
+ of application code. beans.xml is used to enable CDI services
+ for the current bean archive as well as to enable named
+ interceptors, decorators and alternatives for the current bean
+ archive.
+
+
+ This is the XML Schema for the beans.xml deployment
+ descriptor for CDI 3.0. The deployment descriptor must be named
+ "META-INF/beans.xml" or "WEB-INF/beans.xml" in a war file.
+ All application deployment descriptors may indicate
+ the application schema by using the Java EE namespace:
+
+ https://jakarta.ee/xml/ns/jakartaee
+
+ and may indicate the version of the schema by
+ using the version element as shown below:
+
+ <beans 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/beans_3_0.xsd"
+ version="3.0">
+ ...
+ </beans>
+
+ The deployment descriptor may indicate the published version of
+ the schema using the xsi:schemaLocation attribute for the Java EE
+ namespace with the following location:
+
+ https://jakarta.ee/xml/ns/jakartaee/beans_3_0.xsd
+
+ ]]>
+ </xs:documentation>
+ </xs:annotation>
+
+ <xs:element name="beans">
+ <xs:annotation>
+ <xs:documentation>
+ Bean classes of enabled beans must be
+ deployed in bean archives. A library jar, EJB jar,
+ application client jar or rar archive is a bean archive if
+ it has a file named beans.xml in the META-INF directory. The
+ WEB-INF/classes directory of a war is a bean archive if
+ there is a file named beans.xml in the WEB-INF directory of
+ the war. A directory in the JVM classpath is a bean archive
+ if it has a file named beans.xml in the META-INF directory.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:all >
+ <xs:element ref="jakartaee:interceptors" minOccurs="0"/>
+ <xs:element ref="jakartaee:decorators" minOccurs="0" />
+ <xs:element ref="jakartaee:alternatives" minOccurs="0" />
+ <xs:element ref="jakartaee:scan" minOccurs="0" />
+ <xs:element ref="jakartaee:trim" minOccurs="0"/>
+ </xs:all>
+ <xs:attribute name="version" default="3.0">
+ <xs:annotation>
+ <xs:documentation>
+ The version of CDI this beans.xml is for. If the version is "3.0" (or
+ later), then the attribute bean-discovery-mode must be added.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:simpleType>
+ <xs:restriction base="xs:token">
+ <xs:pattern value="\.?[0-9]+(\.[0-9]+)*"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ <xs:attribute name="bean-discovery-mode" use="required">
+ <xs:annotation>
+ <xs:documentation>
+ It is strongly recommended you use "annotated".
+
+ If the bean discovery mode is "all", then all types in this
+ archive will be considered. If the bean discovery mode is
+ "annotated", then only those types with bean defining annotations will be
+ considered. If the bean discovery mode is "none", then no
+ types will be considered.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="annotated">
+ <xs:annotation>
+ <xs:documentation>
+ Only those types with bean defining annotations will be
+ considered.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="all">
+ <xs:annotation>
+ <xs:documentation>
+ All types in this archive will be considered.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ <xs:enumeration value="none">
+ <xs:annotation>
+ <xs:documentation>
+ This archive will be ignored.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:enumeration>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="scan">
+ <xs:annotation>
+ <xs:documentation>
+ <![CDATA[The <scan> element allows exclusion of classes and packages from consideration. Various filters may be applied, and may be conditionally activated.]]>
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence maxOccurs="unbounded" minOccurs="0">
+ <xs:element name="exclude">
+ <xs:annotation>
+ <xs:documentation>
+ <![CDATA[The exclude filter allows exclusion of classes and packages through the use of Ant-style glob matches. For example, <exclude name="com.acme.**"> would exclude all classes and subpackages of com.acme.]]>
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:choice maxOccurs="unbounded" minOccurs="0">
+ <xs:element name="if-class-available">
+ <xs:annotation>
+ <xs:documentation>
+ <![CDATA[Activates the filter only if the class specified can be loaded.]]>
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:attribute name="name" type="xs:string" use="required">
+ <xs:annotation>
+ <xs:documentation>
+ <![CDATA[If the named class can be loaded then, then the filter will be activated.]]>
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="if-class-not-available">
+ <xs:annotation>
+ <xs:documentation>
+ <![CDATA[Activates the filter only if the class specified cannot be loaded.]]>
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:attribute name="name" type="xs:string" use="required">
+ <xs:annotation>
+ <xs:documentation>
+ <![CDATA[If the named class cannot be loaded then, then the filter will be activated.]]>
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="if-system-property">
+ <xs:annotation>
+ <xs:documentation>
+ <![CDATA[If both name and value are specified, then the named system property must be set, and have the specified value for the filter to be activated. If only the name is specified, then the named system property must be set for the filter to be activated.]]>
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:attribute name="name" type="xs:string" use="required">
+ <xs:annotation>
+ <xs:documentation>
+ <![CDATA[The name of the system property that must be set for the filter to be active.]]>
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="value" type="xs:string" use="optional">
+ <xs:annotation>
+ <xs:documentation>
+ <![CDATA[Optional. The value that the system property must have for the filter to be active.]]>
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:complexType>
+ </xs:element>
+ </xs:choice>
+ <xs:attribute name="name" use="required">
+ <xs:annotation>
+ <xs:documentation>
+ <![CDATA[The name of the class or package to exclude. Ant-style glob matches are supported. For example, <exclude name="com.acme.**"> would exclude all classes and subpackages of com.acme.]]>
+ </xs:documentation>
+ </xs:annotation>
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:pattern value="([a-zA-Z_$][a-zA-Z\d_$]*\.)*([a-zA-Z_$][a-zA-Z\d_$]*|\*|\*\*)"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="interceptors">
+ <xs:annotation>
+ <xs:documentation>
+ By default, a bean archive has no enabled
+ interceptors bound via interceptor bindings. An interceptor
+ must be explicitly enabled by listing its class under the
+ <interceptors> element of the beans.xml file of the
+ bean archive. The order of the interceptor declarations
+ determines the interceptor ordering. Interceptors which
+ occur earlier in the list are called first. If the same
+ class is listed twice under the <interceptors>
+ element, the container automatically detects the problem and
+ treats it as a deployment problem.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="class" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>
+ Each child <class> element
+ must specify the name of an interceptor class. If
+ there is no class with the specified name, or if
+ the class with the specified name is not an
+ interceptor class, the container automatically
+ detects the problem and treats it as a deployment
+ problem.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:choice>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="decorators">
+ <xs:annotation>
+ <xs:documentation>
+ By default, a bean archive has no enabled
+ decorators. A decorator must be explicitly enabled by
+ listing its bean class under the <decorators> element
+ of the beans.xml file of the bean archive. The order of the
+ decorator declarations determines the decorator ordering.
+ Decorators which occur earlier in the list are called first.
+ If the same class is listed twice under the
+ <decorators> element, the container automatically
+ detects the problem and treats it as a deployment problem.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="class" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>
+ Each child <class> element
+ must specify the name of a decorator class. If
+ there is no class with the specified name, or if
+ the class with the specified name is not a
+ decorator class, the container automatically
+ detects the problem and treats it as a deployment
+ problem.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:choice>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="alternatives">
+ <xs:annotation>
+ <xs:documentation>
+ An alternative is a bean that must be
+ explicitly declared in the beans.xml file if it should be
+ available for lookup, injection or EL resolution. By
+ default, a bean archive has no selected alternatives. An
+ alternative must be explicitly declared using the
+ <alternatives> element of the beans.xml file of the
+ bean archive. The <alternatives> element contains a
+ list of bean classes and stereotypes. An alternative is
+ selected for the bean archive if either: the alternative is
+ a managed bean or session bean and the bean class of the
+ bean is listed, or the alternative is a producer method,
+ field or resource, and the bean class that declares the
+ method or field is listed, or any @Alternative stereotype of
+ the alternative is listed.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="class" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>
+ Each child <class> element
+ must specify the name of an alternative bean class.
+ If there is no class with the specified name, or if
+ the class with the specified name is not an
+ alternative bean class, the container automatically
+ detects the problem and treats it as a deployment
+ problem. If the same class is listed twice under
+ the <alternatives> element, the container
+ automatically detects the problem and treats it as
+ a deployment problem.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+
+ <xs:element name="stereotype" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>
+ Each child <stereotype>
+ element must specify the name of an @Alternative
+ stereotype annotation. If there is no annotation
+ with the specified name, or the annotation is not
+ an @Alternative stereotype, the container
+ automatically detects the problem and treats it as
+ a deployment problem. If the same stereotype is
+ listed twice under the <alternatives>
+ element, the container automatically detects the
+ problem and treats it as a deployment problem.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:choice>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="trim" type="xs:string" fixed="">
+ <xs:annotation>
+ <xs:documentation>
+ If an explicit bean archive contains the <trim/< element in its beans.xml file, types that don’t have
+ either a bean defining annotation (as defined in Bean defining annotations) or any scope annotation,
+ are removed from the set of discovered types.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+
+</xs:schema>
diff --git a/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/resources/bindingschema_3_0.xsd b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/resources/bindingschema_3_0.xsd
new file mode 100644
index 0000000000..52dd50041e
--- /dev/null
+++ b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/resources/bindingschema_3_0.xsd
@@ -0,0 +1,482 @@
+<?xml version = "1.0" encoding = "UTF-8"?>
+<!--
+
+ Copyright (c) 2020 Oracle and/or its affiliates. All rights reserved.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Distribution License v. 1.0, which is available at
+ http://www.eclipse.org/org/documents/edl-v10.php.
+
+ SPDX-License-Identifier: BSD-3-Clause
+
+-->
+
+<xs:schema
+ targetNamespace = "https://jakarta.ee/xml/ns/jaxb"
+ xmlns:jaxb = "https://jakarta.ee/xml/ns/jaxb"
+ xmlns:xs = "http://www.w3.org/2001/XMLSchema"
+ elementFormDefault = "qualified"
+ attributeFormDefault = "unqualified">
+ <xs:annotation>
+ <xs:documentation>
+ This is the XML Schema for the Jakarta XML Binding binding
+ customization descriptor.
+ All binding customization descriptors must indicate
+ the descriptor schema by using the Jakarta XML Binding namespace:
+
+ https://jakarta.ee/xml/ns/jaxb
+
+ and by indicating the version of the schema by
+ using the version element as shown below:
+
+ <bindings xmlns="https://jakarta.ee/xml/ns/jaxb"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="https://jakarta.ee/xml/ns/jaxb
+ https://jakarta.ee/xml/ns/jaxb/bindingschema_3_0.xsd"
+ version="3.0">
+ ...
+ </bindings>
+
+ The instance documents may indicate the published version of
+ the schema using the xsi:schemaLocation attribute for Jakarta XML Binding
+ namespace with the following location:
+
+ https://jakarta.ee/xml/ns/jaxb/bindingschema_3_0.xsd
+ </xs:documentation>
+ </xs:annotation>
+ <xs:group name = "declaration">
+ <xs:annotation>
+ <xs:documentation>
+ Model group that represents a binding declaration. Each new binding
+ declaration added to the jaxb namespace that is not restricted to
+ globalBindings should be added as a child element to this model group.
+ </xs:documentation>
+ </xs:annotation>
+ <!-- each new binding declaration, not restricted to
+ globalBindings, should be added here -->
+ <xs:choice>
+ <xs:element ref = "jaxb:globalBindings"/>
+ <xs:element ref = "jaxb:schemaBindings"/>
+ <xs:element ref = "jaxb:class"/>
+ <xs:element ref = "jaxb:property"/>
+ <xs:element ref = "jaxb:typesafeEnumClass"/>
+ <xs:element ref = "jaxb:typesafeEnumMember"/>
+ <xs:element ref = "jaxb:javaType"/>
+ <xs:element ref = "jaxb:dom"/>
+ <xs:element ref = "jaxb:inlineBinaryData"/>
+ <xs:any namespace = "##other" processContents = "lax"/>
+ </xs:choice>
+ </xs:group>
+ <xs:attribute name = "version" type="xs:token" >
+ <xs:annotation>
+ <xs:documentation>
+ Used to specify the version of the binding schema on the schema element for
+ inline annotations or jaxb:bindings for external binding.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attributeGroup name = "propertyAttributes">
+ <xs:annotation><xs:documentation>
+ Attributes used for property customization. The attribute group can be
+ referenced either from the globalBindings declaration or from the
+ property declaration. The following defaults are defined by the JAXB
+ specification in global scope only. Thus they apply when the
+ propertyAttributes group is referenced from the globalBindings declaration
+ but not when referenced from the property declaration.
+ collectionType a class that implements java.util.List.
+ fixedAttributeAsConstantProperty false
+ enableFailFastCheck false
+ generateIsSetMethod false
+ optionalProperty wrapper
+ generateElementProperty false
+ attachmentRef default
+ </xs:documentation></xs:annotation>
+ <xs:attribute name = "collectionType" type="jaxb:referenceCollectionType"/>
+ <xs:attribute name = "fixedAttributeAsConstantProperty" type = "xs:boolean"/>
+ <xs:attribute name = "enableFailFastCheck" type = "xs:boolean"/>
+ <xs:attribute name = "generateIsSetMethod" type = "xs:boolean"/>
+ <xs:attribute name = "optionalProperty">
+ <xs:simpleType>
+ <xs:restriction base="xs:NCName">
+ <xs:enumeration value="wrapper"/>
+ <xs:enumeration value="primitive"/>
+ <xs:enumeration value="isSet"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ <xs:attribute name = "generateElementProperty" type="xs:boolean"/>
+ <xs:attribute name = "attachmentRef">
+ <xs:simpleType>
+ <xs:restriction base="xs:NCName">
+ <xs:enumeration value="resolve"/>
+ <xs:enumeration value="doNotResolve"/>
+ <xs:enumeration value="default"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ </xs:attributeGroup>
+ <xs:attributeGroup name = "XMLNameToJavaIdMappingDefaults">
+ <xs:annotation>
+ <xs:documentation>Customize XMLNames to Java id mapping
+ </xs:documentation>
+ </xs:annotation>
+ <xs:attribute name = "underscoreBinding" default = "asWordSeparator" type = "jaxb:underscoreBindingType"/>
+ </xs:attributeGroup>
+ <xs:attributeGroup name = "typesafeEnumClassDefaults">
+ <xs:attribute name = "typesafeEnumMemberName" default = "skipGeneration" type = "jaxb:typesafeEnumMemberNameType"/>
+ <xs:attribute name = "typesafeEnumBase" default = "xs:string" type = "jaxb:typesafeEnumBaseType"/>
+ <xs:attribute name = "typesafeEnumMaxMembers" type="xs:int" default="256"/>
+ </xs:attributeGroup>
+ <xs:element name = "globalBindings">
+ <xs:annotation>
+ <xs:documentation>Customization values defined in global scope.</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence minOccurs = "0">
+ <xs:element ref = "jaxb:javaType" minOccurs = "0" maxOccurs = "unbounded"/>
+ <xs:element ref = "jaxb:serializable" minOccurs = "0"/>
+ <xs:any namespace = "##other" processContents = "lax">
+ <xs:annotation>
+ <xs:documentation>allows extension binding declarations to be specified.</xs:documentation>
+ </xs:annotation>
+ </xs:any>
+ </xs:sequence>
+ <xs:attributeGroup ref = "jaxb:XMLNameToJavaIdMappingDefaults"/>
+ <xs:attributeGroup ref = "jaxb:typesafeEnumClassDefaults"/>
+ <xs:attributeGroup ref = "jaxb:propertyAttributes"/>
+ <xs:attribute name="generateValueClass" type="xs:boolean"
+ default= "true"/>
+ <xs:attribute name="generateElementClass" type="xs:boolean"
+ default= "false"/>
+ <xs:attribute name="mapSimpleTypeDef" type="xs:boolean"
+ default= "false"/>
+ <xs:attribute name="localScoping" default= "nested">
+ <xs:simpleType>
+ <xs:restriction base="xs:NCName">
+ <xs:enumeration value="nested"/>
+ <xs:enumeration value="toplevel"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ <xs:attribute name = "enableJavaNamingConventions" default = "true" type = "xs:boolean"/>
+ <!-- Removed from JAXB 2.0
+ <xs:attribute name = "bindingStyle" default = "elementBinding" type = "jaxb:bindingStyleType"/>
+ -->
+ <xs:attribute name = "choiceContentProperty" default = "false" type = "xs:boolean"/>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name = "schemaBindings">
+ <xs:annotation>
+ <xs:documentation>Customization values with schema scope</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:all>
+ <xs:element name = "package" type = "jaxb:packageType" minOccurs = "0"/>
+ <xs:element name = "nameXmlTransform" type = "jaxb:nameXmlTransformType" minOccurs = "0"/>
+ </xs:all>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name = "class">
+ <xs:annotation>
+ <xs:documentation>Customize interface and implementation class.</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name = "javadoc" type = "xs:string" minOccurs = "0"/>
+ </xs:sequence>
+ <xs:attribute name = "name" type = "jaxb:javaIdentifierType">
+ <xs:annotation>
+ <xs:documentation>Java class name without package prefix.</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name = "implClass" type = "jaxb:javaIdentifierType">
+ <xs:annotation>
+ <xs:documentation>Implementation class name including package prefix.</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="generateValueClass" type="xs:boolean">
+ <xs:annotation>
+ <xs:documentation>Default value derived from [jaxb:globalBindings]@generateValueClass.</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name = "property">
+ <xs:annotation>
+ <xs:documentation>Customize property.</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:all>
+ <xs:element name = "javadoc" type = "xs:string" minOccurs="0"/>
+ <xs:element name = "baseType" type="jaxb:propertyBaseType" minOccurs="0"/>
+ </xs:all>
+ <xs:attribute name = "name" type = "jaxb:javaIdentifierType"/>
+ <xs:attributeGroup ref = "jaxb:propertyAttributes"/>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name = "javaType">
+ <xs:annotation>
+ <xs:documentation>Data type conversions; overriding builtins</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:attribute name = "name" use = "required" type = "jaxb:javaIdentifierType">
+ <xs:annotation>
+ <xs:documentation>name of the java type to which xml type is to be bound.</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name = "xmlType" type = "xs:QName">
+ <xs:annotation>
+ <xs:documentation> xml type to which java datatype has to be bound.Must be present when javaType is scoped to globalBindings</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name = "parseMethod" type = "jaxb:javaIdentifierType"/>
+ <xs:attribute name = "printMethod" type = "jaxb:javaIdentifierType"/>
+ <xs:attribute name = "hasNsContext" default = "false" type = "xs:boolean" >
+ <xs:annotation>
+ <xs:documentation>
+ If true, the parsMethod and printMethod must reference a method
+ signtature that has a second parameter of type NamespaceContext.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name = "typesafeEnumClass">
+ <xs:annotation>
+ <xs:documentation> Bind to a type safe enumeration class.</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name = "javadoc" type = "xs:string" minOccurs = "0"/>
+ <xs:element ref = "jaxb:typesafeEnumMember" minOccurs = "0" maxOccurs = "unbounded"/>
+ </xs:sequence>
+ <xs:attribute name = "name" type = "jaxb:javaIdentifierType"/>
+ <xs:attribute name = "map" type = "xs:boolean" default = "true"/>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name = "typesafeEnumMember">
+ <xs:annotation>
+ <xs:documentation> Enumeration member name in a type safe enumeration class.</xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name = "javadoc" type = "xs:string" minOccurs = "0"/>
+ </xs:sequence>
+ <xs:attribute name = "value" type="xs:anySimpleType"/>
+ <xs:attribute name = "name" use = "required" type = "jaxb:javaIdentifierType"/>
+ </xs:complexType>
+ </xs:element>
+
+ <!-- TYPE DEFINITIONS -->
+
+ <xs:complexType name = "propertyBaseType">
+ <xs:all>
+ <xs:element ref = "jaxb:javaType" minOccurs = "0"/>
+ </xs:all>
+ <xs:attribute name = "name" type = "jaxb:javaIdentifierType">
+ <xs:annotation>
+ <xs:documentation>
+ The name attribute for [baseType] enables more precise control over the actual base type for a JAXB property. This customization enables specifying a more general base type than the property's default base type. The name attribute value must be a fully qualified Java class name. Additionally, this Java class must be a super interface/class of the default Java base type for the property. When the default base type is a primitive type, consider the default Java base type to be th [...]
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:complexType>
+
+ <!-- Removed in JAXB 2.0. modelGroupBinding no longer exists.
+ <xs:simpleType name = "bindingStyleType">
+ <xs:annotation><xs:documentation>Allows selection of a binding algorithm</xs:documentation></xs:annotation>
+ <xs:restriction base = "xs:string">
+ <xs:enumeration value = "elementBinding"/>
+ <xs:enumeration value = "modelGroupBinding"/>
+ </xs:restriction>
+ </xs:simpleType>
+ -->
+
+ <xs:complexType name = "packageType">
+ <xs:sequence>
+ <xs:element name = "javadoc" type = "xs:string" minOccurs = "0"/>
+ </xs:sequence>
+ <xs:attribute name = "name" type = "jaxb:javaIdentifierType"/>
+ </xs:complexType>
+ <xs:simpleType name = "underscoreBindingType">
+ <xs:annotation>
+ <xs:documentation>Treate underscore in XML Name to Java identifier mapping.</xs:documentation>
+ </xs:annotation>
+ <xs:restriction base = "xs:string">
+ <xs:enumeration value = "asWordSeparator"/>
+ <xs:enumeration value = "asCharInWord"/>
+ </xs:restriction>
+ </xs:simpleType>
+ <xs:simpleType name = "typesafeEnumBaseType">
+ <xs:annotation>
+ <xs:documentation>
+ XML types or types derived from them which have enumeration facet(s)
+ which are be mapped to typesafeEnumClass by default.
+ The following types cannot be specified in this list:
+ "xsd:QName", "xsd:base64Binary", "xsd:hexBinary",
+ "xsd:date", "xsd:time", "xsd:dateTime", "xsd:duration",
+ "xsd:gDay", "xsd:gMonth", "xsd:Year", "xsd:gMonthDay", "xsd:YearMonth"
+ </xs:documentation>
+ </xs:annotation>
+ <xs:list itemType = "xs:QName"/>
+ </xs:simpleType>
+ <xs:simpleType name = "typesafeEnumMemberNameType">
+ <xs:annotation>
+ <xs:documentation>Used to customize how to handle name collisions.</xs:documentation>
+ </xs:annotation>
+ <xs:restriction base = "xs:string">
+ <xs:enumeration value = "generateName"/>
+ <xs:enumeration value = "generateError"/>
+ <xs:enumeration value = "skipGeneration"/>
+ </xs:restriction>
+ </xs:simpleType>
+ <xs:simpleType name = "javaIdentifierType">
+ <xs:annotation>
+ <xs:documentation>Placeholder type to indicate Legal Java identifier.</xs:documentation>
+ </xs:annotation>
+ <xs:list itemType = "xs:NCName"/>
+ </xs:simpleType>
+ <xs:complexType name = "nameXmlTransformRule">
+ <xs:annotation>
+ <xs:documentation>Rule to transform an Xml name into another Xml name</xs:documentation>
+ </xs:annotation>
+ <xs:attribute name = "prefix" type = "xs:string">
+ <xs:annotation>
+ <xs:documentation>prepend the string to QName.</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name = "suffix" type = "xs:string">
+ <xs:annotation>
+ <xs:documentation>Append the string to QName.</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:complexType>
+ <xs:complexType name = "nameXmlTransformType">
+ <xs:annotation>
+ <xs:documentation>Allows transforming an xml name into another xml name. Use case UDDI 2.0 schema.</xs:documentation>
+ </xs:annotation>
+ <xs:all>
+ <xs:element name = "typeName" type = "jaxb:nameXmlTransformRule" minOccurs = "0">
+ <xs:annotation>
+ <xs:documentation>Mapping rule for type definitions.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name = "elementName" type = "jaxb:nameXmlTransformRule" minOccurs = "0">
+ <xs:annotation>
+ <xs:documentation>Mapping rule for elements</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name = "modelGroupName" type = "jaxb:nameXmlTransformRule" minOccurs = "0">
+ <xs:annotation>
+ <xs:documentation>Mapping rule for model group</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name = "anonymousTypeName" type = "jaxb:nameXmlTransformRule" minOccurs = "0">
+ <xs:annotation>
+ <xs:documentation>Mapping rule for class names generated for an anonymous type.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:all>
+ </xs:complexType>
+ <xs:attribute name = "extensionBindingPrefixes">
+ <xs:annotation>
+ <xs:documentation>
+ A binding compiler only processes this attribute when it occurs on an
+ an instance of xs:schema element. The value of this attribute is a
+ whitespace-separated list of namespace prefixes. The namespace bound
+ to each of the prefixes is designated as a customization declaration
+ namespace.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:simpleType>
+ <xs:list itemType = "xs:normalizedString"/>
+ </xs:simpleType>
+ </xs:attribute>
+ <xs:element name = "bindings">
+ <xs:annotation>
+ <xs:documentation>
+ Binding declaration(s) for a remote schema.
+ If attribute node is set, the binding declaraions
+ are associated with part of the remote schema
+ designated by schemaLocation attribute. The node
+ attribute identifies the node in the remote schema
+ to associate the binding declaration(s) with.
+ </xs:documentation>
+ </xs:annotation>
+ <!-- a <bindings> element can contain arbitrary number of binding declarations or nested <bindings> elements -->
+ <xs:complexType>
+ <xs:sequence>
+ <xs:choice minOccurs = "0" maxOccurs = "unbounded">
+ <xs:group ref = "jaxb:declaration"/>
+ <xs:element ref = "jaxb:bindings"/>
+ </xs:choice>
+ </xs:sequence>
+ <xs:attribute name = "schemaLocation" type = "xs:anyURI">
+ <xs:annotation>
+ <xs:documentation>
+ Location of the remote schema to associate binding declarations with.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name = "node" type = "xs:string">
+ <xs:annotation>
+ <xs:documentation>
+ The value of the string is an XPATH 1.0 compliant string that
+ resolves to a node in a remote schema to associate
+ binding declarations with. The remote schema is specified
+ by the schemaLocation attribute occuring in the current
+ element or in a parent of this element.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name = "version" type = "xs:token">
+ <xs:annotation>
+ <xs:documentation>
+ Used to indicate the version of binding declarations. Only valid on root level bindings element.
+ Either this or "jaxb:version" attribute but not both may be specified.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute ref = "jaxb:version">
+ <xs:annotation>
+ <xs:documentation>
+ Used to indicate the version of binding declarations. Only valid on root level bindings element.
+ Either this attribute or "version" attribute but not both may be specified.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:complexType>
+ </xs:element>
+ <xs:simpleType name="referenceCollectionType">
+ <xs:union>
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="indexed"/>
+ </xs:restriction>
+ </xs:simpleType>
+ <xs:simpleType>
+ <xs:restriction base="jaxb:javaIdentifierType"/>
+ </xs:simpleType>
+ </xs:union>
+ </xs:simpleType>
+ <xs:element name="dom">
+ <xs:complexType>
+ <xs:attribute name = "type" type="xs:NCName" default="w3c">
+ <xs:annotation>
+ <xs:documentation>Specify DOM API to bind to JAXB property to.</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="inlineBinaryData">
+ <xs:annotation>
+ <xs:documentation>Disable MTOM/XOP encoding for this binary data. Annotation can be placed on a type defintion that derives from a W3C XSD binary data type or on an element that has a type that is or derives from a W3C XSD binary data type.</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name = "serializable">
+ <xs:complexType>
+ <xs:attribute name="uid" type="xs:long" default="1"/>
+ </xs:complexType>
+ </xs:element>
+</xs:schema>
+
diff --git a/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/resources/connector_2_0.xsd b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/resources/connector_2_0.xsd
new file mode 100644
index 0000000000..37cb82c26a
--- /dev/null
+++ b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/resources/connector_2_0.xsd
@@ -0,0 +1,1165 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
+ targetNamespace="https://jakarta.ee/xml/ns/jakartaee"
+ xmlns:jakartaee="https://jakarta.ee/xml/ns/jakartaee"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ elementFormDefault="qualified"
+ attributeFormDefault="unqualified"
+ version="2.0">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ Copyright (c) 2009, 2020 Oracle and/or its affiliates. All rights reserved.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v. 2.0, which is available at
+ http://www.eclipse.org/legal/epl-2.0.
+
+ This Source Code may also be made available under the following Secondary
+ Licenses when the conditions for such availability set forth in the
+ Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ version 2 with the GNU Classpath Exception, which is available at
+ https://www.gnu.org/software/classpath/license.html.
+
+ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+ </xsd:documentation>
+ </xsd:annotation>
+
+ <xsd:annotation>
+ <xsd:documentation>
+ <![CDATA[
+ This is the XML Schema for the Connectors 2.0 deployment
+ descriptor. The deployment descriptor must be named
+ "META-INF/ra.xml" in the connector's rar file. All connector
+ deployment descriptors must indicate the connector resource
+ adapter schema by using the Jakarta EE namespace:
+
+ https://jakarta.ee/xml/ns/jakartaee
+
+ and by indicating the version of the schema by
+ using the version element as shown below:
+
+ <connector 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/connector_2_0.xsd"
+ version="2.0">
+ ...
+ </connector>
+
+ The instance documents may indicate the published version of
+ the schema using the xsi:schemaLocation attribute for Jakarta EE
+ namespace with the following location:
+
+ https://jakarta.ee/xml/ns/jakartaee/connector_2_0.xsd
+
+ ]]>
+ </xsd:documentation>
+ </xsd:annotation>
+
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The following conventions apply to all Jakarta EE
+ deployment descriptor elements unless indicated otherwise.
+
+ - In elements that specify a pathname to a file within the
+ same JAR file, relative filenames (i.e., those not
+ starting with "/") are considered relative to the root of
+ the JAR file's namespace. Absolute filenames (i.e., those
+ starting with "/") also specify names in the root of the
+ JAR file's namespace. In general, relative names are
+ preferred. The exception is .war files where absolute
+ names are preferred for consistency with the Servlet API.
+
+ </xsd:documentation>
+ </xsd:annotation>
+
+ <xsd:include schemaLocation="jakartaee_9.xsd"/>
+
+
+<!-- **************************************************** -->
+
+ <xsd:element name="connector"
+ type="jakartaee:connectorType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The connector element is the root element of the deployment
+ descriptor for the resource adapter. This element includes
+ general information - vendor name, resource adapter version,
+ icon - about the resource adapter module. It also includes
+ information specific to the implementation of the resource
+ adapter library as specified through the element
+ resourceadapter.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+
+<!-- **************************************************** -->
+
+ <xsd:complexType name="activationspecType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The activationspecType specifies an activation
+ specification. The information includes fully qualified
+ Java class name of an activation specification and a set of
+ required configuration property names.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:sequence>
+ <xsd:element name="activationspec-class"
+ type="jakartaee:fully-qualified-classType">
+ <xsd:annotation>
+ <xsd:documentation>
+ <![CDATA[
+ The element activationspec-class specifies the fully
+ qualified Java class name of the activation
+ specification class. This class must implement the
+ jakarta.resource.spi.ActivationSpec interface. The
+ implementation of this class is required to be a
+ JavaBean.
+
+ Example:
+ <activationspec-class>com.wombat.ActivationSpecImpl
+ </activationspec-class>
+
+ ]]>
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="required-config-property"
+ type="jakartaee:required-config-propertyType"
+ minOccurs="0"
+ maxOccurs="unbounded">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The required-config-property element is deprecated since
+ Connectors 1.6 specification. The resource adapter
+ implementation is recommended to use the @NotNull
+ Bean Validation annotation or its XML validation
+ descriptor equivalent to indicate that a configuration
+ property is required to be specified by the deployer.
+ See the Jakarta Connectors specification for more information.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="config-property"
+ type="jakartaee:config-propertyType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ </xsd:sequence>
+ <xsd:attribute name="id"
+ type="xsd:ID"/>
+ </xsd:complexType>
+
+
+<!-- **************************************************** -->
+
+ <xsd:complexType name="adminobjectType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The adminobjectType specifies information about an
+ administered object. Administered objects are specific to a
+ messaging style or message provider. This contains
+ information on the Java type of the interface implemented by
+ an administered object, its Java class name and its
+ configuration properties.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:sequence>
+ <xsd:element name="adminobject-interface"
+ type="jakartaee:fully-qualified-classType">
+ <xsd:annotation>
+ <xsd:documentation>
+ <![CDATA[
+ The element adminobject-interface specifies the
+ fully qualified name of the Java type of the
+ interface implemented by an administered object.
+
+ Example:
+ <adminobject-interface>jakarta.jms.Destination
+ </adminobject-interface>
+
+ ]]>
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="adminobject-class"
+ type="jakartaee:fully-qualified-classType">
+ <xsd:annotation>
+ <xsd:documentation>
+ <![CDATA[
+ The element adminobject-class specifies the fully
+ qualified Java class name of an administered object.
+
+ Example:
+ <adminobject-class>com.wombat.DestinationImpl
+ </adminobject-class>
+
+ ]]>
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="config-property"
+ type="jakartaee:config-propertyType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ </xsd:sequence>
+ <xsd:attribute name="id"
+ type="xsd:ID"/>
+ </xsd:complexType>
+
+
+<!-- **************************************************** -->
+
+ <xsd:complexType name="authentication-mechanismType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The authentication-mechanismType specifies an authentication
+ mechanism supported by the resource adapter. Note that this
+ support is for the resource adapter and not for the
+ underlying EIS instance. The optional description specifies
+ any resource adapter specific requirement for the support of
+ security contract and authentication mechanism.
+
+ Note that BasicPassword mechanism type should support the
+ jakarta.resource.spi.security.PasswordCredential interface.
+ The Kerbv5 mechanism type should support the
+ org.ietf.jgss.GSSCredential interface or the deprecated
+ jakarta.resource.spi.security.GenericCredential interface.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:sequence>
+ <xsd:element name="description"
+ type="jakartaee:descriptionType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="authentication-mechanism-type"
+ type="jakartaee:xsdStringType">
+ <xsd:annotation>
+ <xsd:documentation>
+ <![CDATA[
+ The element authentication-mechanism-type specifies
+ type of an authentication mechanism.
+
+ The example values are:
+
+ <authentication-mechanism-type>BasicPassword
+ </authentication-mechanism-type>
+
+ <authentication-mechanism-type>Kerbv5
+ </authentication-mechanism-type>
+
+ Any additional security mechanisms are outside the
+ scope of the Jakarta Connectors architecture specification.
+
+ ]]>
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="credential-interface"
+ type="jakartaee:credential-interfaceType"/>
+ </xsd:sequence>
+ <xsd:attribute name="id"
+ type="xsd:ID"/>
+ </xsd:complexType>
+
+
+<!-- **************************************************** -->
+
+ <xsd:complexType name="config-property-nameType">
+ <xsd:annotation>
+ <xsd:documentation>
+ <![CDATA[
+ The config-property-nameType contains the name of a
+ configuration property.
+
+ The connector architecture defines a set of well-defined
+ properties all of type java.lang.String. These are as
+ follows.
+
+ ServerName
+ PortNumber
+ UserName
+ Password
+ ConnectionURL
+
+ A resource adapter provider can extend this property set to
+ include properties specific to the resource adapter and its
+ underlying EIS.
+
+ Possible values include
+ ServerName
+ PortNumber
+ UserName
+ Password
+ ConnectionURL
+
+ Example: <config-property-name>ServerName</config-property-name>
+
+ ]]>
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:simpleContent>
+ <xsd:restriction base="jakartaee:xsdStringType"/>
+ </xsd:simpleContent>
+ </xsd:complexType>
+
+
+<!-- **************************************************** -->
+
+ <xsd:complexType name="config-property-typeType">
+ <xsd:annotation>
+ <xsd:documentation>
+ <![CDATA[
+ The config-property-typeType contains the fully
+ qualified Java type of a configuration property.
+
+ The following are the legal values:
+ java.lang.Boolean, java.lang.String, java.lang.Integer,
+ java.lang.Double, java.lang.Byte, java.lang.Short,
+ java.lang.Long, java.lang.Float, java.lang.Character
+
+ Used in: config-property
+
+ Example:
+ <config-property-type>java.lang.String</config-property-type>
+
+ ]]>
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:simpleContent>
+ <xsd:restriction base="jakartaee:string">
+ <xsd:enumeration value="java.lang.Boolean"/>
+ <xsd:enumeration value="java.lang.String"/>
+ <xsd:enumeration value="java.lang.Integer"/>
+ <xsd:enumeration value="java.lang.Double"/>
+ <xsd:enumeration value="java.lang.Byte"/>
+ <xsd:enumeration value="java.lang.Short"/>
+ <xsd:enumeration value="java.lang.Long"/>
+ <xsd:enumeration value="java.lang.Float"/>
+ <xsd:enumeration value="java.lang.Character"/>
+ </xsd:restriction>
+ </xsd:simpleContent>
+ </xsd:complexType>
+
+
+<!-- **************************************************** -->
+
+ <xsd:complexType name="config-propertyType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The config-propertyType contains a declaration of a single
+ configuration property that may be used for providing
+ configuration information.
+
+ The declaration consists of an optional description, name,
+ type and an optional value of the configuration property. If
+ the resource adapter provider does not specify a value than
+ the deployer is responsible for providing a valid value for
+ a configuration property.
+
+ Any bounds or well-defined values of properties should be
+ described in the description element.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:sequence>
+ <xsd:element name="description"
+ type="jakartaee:descriptionType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="config-property-name"
+ type="jakartaee:config-property-nameType"/>
+ <xsd:element name="config-property-type"
+ type="jakartaee:config-property-typeType"/>
+ <xsd:element name="config-property-value"
+ type="jakartaee:xsdStringType"
+ minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ <![CDATA[
+ The element config-property-value contains the value
+ of a configuration entry. Note, it is possible for a
+ resource adapter deployer to override this
+ configuration information during deployment.
+
+ Example:
+ <config-property-value>WombatServer</config-property-value>
+
+ ]]>
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="config-property-ignore"
+ type="jakartaee:true-falseType"
+ minOccurs="0"
+ maxOccurs="1">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The element config-property-ignore is used to specify
+ whether the configuration tools must ignore considering the
+ configuration property during auto-discovery of
+ Configuration properties. See the Jakarta Connectors specification for
+ more details. If unspecified, the container must not ignore
+ the configuration property during auto-discovery.
+ This element must be one of the following, "true" or "false".
+
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="config-property-supports-dynamic-updates"
+ type="jakartaee:true-falseType"
+ minOccurs="0"
+ maxOccurs="1">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The element config-property-supports-dynamic-updates is used to specify
+ whether the configuration property allows its value to be updated, by
+ application server's configuration tools, during the lifetime of
+ the JavaBean instance. See the Jakarta Connectors specification for
+ more details. If unspecified, the container must not dynamically
+ reconfigure the property.
+ This element must be one of the following, "true" or "false".
+
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="config-property-confidential"
+ type="jakartaee:true-falseType"
+ minOccurs="0"
+ maxOccurs="1">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The element config-property-confidential is used to specify
+ whether the configuration property is confidential and
+ recommends application server's configuration tools to use special
+ visual aids for editing them. See the Jakarta Connectors specification for
+ more details. If unspecified, the container must not treat the
+ property as confidential.
+ This element must be one of the following, "true" or "false".
+
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ </xsd:sequence>
+ <xsd:attribute name="id"
+ type="xsd:ID"/>
+ </xsd:complexType>
+
+
+<!-- **************************************************** -->
+
+ <xsd:complexType name="connection-definitionType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The connection-definitionType defines a set of connection
+ interfaces and classes pertaining to a particular connection
+ type. This also includes configurable properties for
+ ManagedConnectionFactory instances that may be produced out
+ of this set.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:sequence>
+ <xsd:element name="managedconnectionfactory-class"
+ type="jakartaee:fully-qualified-classType">
+ <xsd:annotation>
+ <xsd:documentation>
+ <![CDATA[
+ The element managedconnectionfactory-class specifies
+ the fully qualified name of the Java class that
+ implements the
+ jakarta.resource.spi.ManagedConnectionFactory interface.
+ This Java class is provided as part of resource
+ adapter's implementation of connector architecture
+ specified contracts. The implementation of this
+ class is required to be a JavaBean.
+
+ Example:
+ <managedconnectionfactory-class>
+ com.wombat.ManagedConnectionFactoryImpl
+ </managedconnectionfactory-class>
+
+ ]]>
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="config-property"
+ type="jakartaee:config-propertyType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="connectionfactory-interface"
+ type="jakartaee:fully-qualified-classType">
+ <xsd:annotation>
+ <xsd:documentation>
+ <![CDATA[
+ The element connectionfactory-interface specifies
+ the fully qualified name of the ConnectionFactory
+ interface supported by the resource adapter.
+
+ Example:
+ <connectionfactory-interface>com.wombat.ConnectionFactory
+ </connectionfactory-interface>
+
+ OR
+
+ <connectionfactory-interface>jakarta.resource.cci.ConnectionFactory
+ </connectionfactory-interface>
+
+ ]]>
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="connectionfactory-impl-class"
+ type="jakartaee:fully-qualified-classType">
+ <xsd:annotation>
+ <xsd:documentation>
+ <![CDATA[
+ The element connectionfactory-impl-class specifies
+ the fully qualified name of the ConnectionFactory
+ class that implements resource adapter
+ specific ConnectionFactory interface.
+
+ Example:
+
+ <connectionfactory-impl-class>com.wombat.ConnectionFactoryImpl
+ </connectionfactory-impl-class>
+
+ ]]>
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="connection-interface"
+ type="jakartaee:fully-qualified-classType">
+ <xsd:annotation>
+ <xsd:documentation>
+ <![CDATA[
+ The connection-interface element specifies the fully
+ qualified name of the Connection interface supported
+ by the resource adapter.
+
+ Example:
+
+ <connection-interface>jakarta.resource.cci.Connection
+ </connection-interface>
+
+ ]]>
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="connection-impl-class"
+ type="jakartaee:fully-qualified-classType">
+ <xsd:annotation>
+ <xsd:documentation>
+ <![CDATA[
+ The connection-impl-classType specifies the fully
+ qualified name of the Connection class that
+ implements resource adapter specific Connection
+ interface. It is used by the connection-impl-class
+ elements.
+
+ Example:
+
+ <connection-impl-class>com.wombat.ConnectionImpl
+ </connection-impl-class>
+
+ ]]>
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ </xsd:sequence>
+ <xsd:attribute name="id"
+ type="xsd:ID"/>
+ </xsd:complexType>
+
+
+<!-- **************************************************** -->
+
+ <xsd:complexType name="connectorType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The connectorType defines a resource adapter.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:sequence>
+ <xsd:element name="module-name"
+ type="jakartaee:string"
+ minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The element module-name specifies the name of the
+ resource adapter.
+
+ If there is no module-name specified, the module-name
+ is determined as defined in Section EE.8.1.1 and EE.8.1.2
+ of the Java Platform, Enterprise Edition (Jakarta EE)
+ Specification, version 6.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:group ref="jakartaee:descriptionGroup"/>
+ <xsd:element name="vendor-name"
+ type="jakartaee:xsdStringType"
+ minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The element vendor-name specifies the name of
+ resource adapter provider vendor.
+
+ If there is no vendor-name specified, the application
+ server must consider the default "" (empty string) as
+ the name of the resource adapter provider vendor.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="eis-type"
+ type="jakartaee:xsdStringType"
+ minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The element eis-type contains information about the
+ type of the EIS. For example, the type of an EIS can
+ be product name of EIS independent of any version
+ info.
+
+ This helps in identifying EIS instances that can be
+ used with this resource adapter.
+
+ If there is no eis-type specified, the application
+ server must consider the default "" (empty string) as
+ the type of the EIS.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="resourceadapter-version"
+ type="jakartaee:xsdStringType"
+ minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The element resourceadapter-version specifies a string-based version
+ of the resource adapter from the resource adapter
+ provider.
+
+ If there is no resourceadapter-version specified, the application
+ server must consider the default "" (empty string) as
+ the version of the resource adapter.
+
+
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="license"
+ type="jakartaee:licenseType"
+ minOccurs="0"/>
+ <xsd:element name="resourceadapter"
+ type="jakartaee:resourceadapterType"/>
+ <xsd:element name="required-work-context"
+ type="jakartaee:fully-qualified-classType"
+ minOccurs="0"
+ maxOccurs="unbounded">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The element required-work-context specifies a fully qualified class
+ name that implements WorkContext interface, that the resource adapter
+ requires the application server to support.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ </xsd:sequence>
+ <xsd:attribute name="version"
+ type="jakartaee:dewey-versionType"
+ fixed="2.0"
+ use="required">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The version indicates the version of the schema to be used by the
+ deployment tool. This element doesn't have a default, and the resource adapter
+ developer/deployer is required to specify it. The element allows the deployment
+ tool to choose which schema to validate the descriptor against.
+
+
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
+ <xsd:attribute name="metadata-complete"
+ type="xsd:boolean">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The metadata-complete attribute defines whether the deployment
+ descriptor for the resource adapter module is complete, or whether
+ the class files available to the module and packaged with the resource
+ adapter should be examined for annotations that specify deployment
+ information.
+
+ If metadata-complete is set to "true", the deployment tool of the
+ application server must ignore any annotations that specify deployment
+ information, which might be present in the class files of the
+ application.If metadata-complete is not specified or is set to "false",
+ the deployment tool must examine the class files of the application for
+ annotations, as specified by this specification. If the
+ deployment descriptor is not included or is included but not marked
+ metadata-complete, the deployment tool will process annotations.
+
+ Application servers must assume that metadata-complete is true for
+ resource adapter modules with deployment descriptor version
+ lower than 1.6.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
+ <xsd:attribute name="id"
+ type="xsd:ID"/>
+ </xsd:complexType>
+
+
+<!-- **************************************************** -->
+
+ <xsd:complexType name="credential-interfaceType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The credential-interfaceType specifies the
+ interface that the resource adapter implementation
+ supports for the representation of the
+ credentials. This element(s) that use this type,
+ i.e. credential-interface, should be used by
+ application server to find out the Credential
+ interface it should use as part of the security
+ contract.
+
+ The possible values are:
+
+ jakarta.resource.spi.security.PasswordCredential
+ org.ietf.jgss.GSSCredential
+ jakarta.resource.spi.security.GenericCredential
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:simpleContent>
+ <xsd:restriction base="jakartaee:fully-qualified-classType">
+ <xsd:enumeration value="jakarta.resource.spi.security.PasswordCredential"/>
+ <xsd:enumeration value="org.ietf.jgss.GSSCredential"/>
+ <xsd:enumeration value="jakarta.resource.spi.security.GenericCredential"/>
+ </xsd:restriction>
+ </xsd:simpleContent>
+ </xsd:complexType>
+
+
+<!-- **************************************************** -->
+
+ <xsd:complexType name="inbound-resourceadapterType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The inbound-resourceadapterType specifies information
+ about an inbound resource adapter. This contains information
+ specific to the implementation of the resource adapter
+ library as specified through the messageadapter element.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:sequence>
+ <xsd:element name="messageadapter"
+ type="jakartaee:messageadapterType"
+ minOccurs="0">
+ <xsd:unique name="messagelistener-type-uniqueness">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The messagelistener-type element content must be
+ unique in the messageadapter. Several messagelisteners
+ can not use the same messagelistener-type.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:selector xpath="jakartaee:messagelistener"/>
+ <xsd:field xpath="jakartaee:messagelistener-type"/>
+ </xsd:unique>
+ </xsd:element>
+ </xsd:sequence>
+ <xsd:attribute name="id"
+ type="xsd:ID"/>
+ </xsd:complexType>
+
+
+<!-- **************************************************** -->
+
+ <xsd:complexType name="licenseType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The licenseType specifies licensing requirements for the
+ resource adapter module. This type specifies whether a
+ license is required to deploy and use this resource adapter,
+ and an optional description of the licensing terms
+ (examples: duration of license, number of connection
+ restrictions). It is used by the license element.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:sequence>
+ <xsd:element name="description"
+ type="jakartaee:descriptionType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="license-required"
+ type="jakartaee:true-falseType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The element license-required specifies whether a
+ license is required to deploy and use the
+ resource adapter. This element must be one of
+ the following, "true" or "false".
+
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ </xsd:sequence>
+ <xsd:attribute name="id"
+ type="xsd:ID"/>
+ </xsd:complexType>
+
+
+<!-- **************************************************** -->
+
+ <xsd:complexType name="messageadapterType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The messageadapterType specifies information about the
+ messaging capabilities of the resource adapter. This
+ contains information specific to the implementation of the
+ resource adapter library as specified through the
+ messagelistener element.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:sequence>
+ <xsd:element name="messagelistener"
+ type="jakartaee:messagelistenerType"
+ maxOccurs="unbounded"/>
+ </xsd:sequence>
+ <xsd:attribute name="id"
+ type="xsd:ID"/>
+ </xsd:complexType>
+
+
+<!-- **************************************************** -->
+
+ <xsd:complexType name="messagelistenerType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The messagelistenerType specifies information about a
+ specific message listener supported by the messaging
+ resource adapter. It contains information on the Java type
+ of the message listener interface and an activation
+ specification.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:sequence>
+ <xsd:element name="messagelistener-type"
+ type="jakartaee:fully-qualified-classType">
+ <xsd:annotation>
+ <xsd:documentation>
+ <![CDATA[
+ The element messagelistener-type specifies the fully
+ qualified name of the Java type of a message
+ listener interface.
+
+ Example:
+
+ <messagelistener-type>jakarta.jms.MessageListener
+ </messagelistener-type>
+
+ ]]>
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="activationspec"
+ type="jakartaee:activationspecType"/>
+ </xsd:sequence>
+ <xsd:attribute name="id"
+ type="xsd:ID"/>
+ </xsd:complexType>
+
+
+<!-- **************************************************** -->
+
+ <xsd:complexType name="outbound-resourceadapterType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The outbound-resourceadapterType specifies information about
+ an outbound resource adapter. The information includes fully
+ qualified names of classes/interfaces required as part of
+ the connector architecture specified contracts for
+ connection management, level of transaction support
+ provided, one or more authentication mechanisms supported
+ and additional required security permissions.
+
+ If any of the outbound resource adapter elements (transaction-support,
+ authentication-mechanism, reauthentication-support) is specified through
+ this element or metadata annotations, and no connection-definition is
+ specified as part of this element or through annotations, the
+ application server must consider this an error and fail deployment.
+
+ If there is no authentication-mechanism specified as part of
+ this element or metadata annotations, then the resource adapter does
+ not support any standard security authentication mechanisms as
+ part of security contract. The application server ignores the security
+ part of the system contracts in this case.
+
+ If there is no transaction-support specified as part of this element
+ or metadata annotation, then the application server must consider that
+ the resource adapter does not support either the resource manager local
+ or Jakarta Transactions transactions and must consider the transaction support as
+ NoTransaction. Note that resource adapters may specify the level of
+ transaction support to be used at runtime for a ManagedConnectionFactory
+ through the TransactionSupport interface.
+
+ If there is no reauthentication-support specified as part of
+ this element or metadata annotation, then the application server must consider
+ that the resource adapter does not support re-authentication of
+ ManagedConnections.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:sequence>
+ <xsd:element name="connection-definition"
+ type="jakartaee:connection-definitionType"
+ maxOccurs="unbounded"
+ minOccurs="0"/>
+ <xsd:element name="transaction-support"
+ type="jakartaee:transaction-supportType"
+ minOccurs="0"/>
+ <xsd:element name="authentication-mechanism"
+ type="jakartaee:authentication-mechanismType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="reauthentication-support"
+ type="jakartaee:true-falseType"
+ minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The element reauthentication-support specifies
+ whether the resource adapter implementation supports
+ re-authentication of existing Managed- Connection
+ instance. Note that this information is for the
+ resource adapter implementation and not for the
+ underlying EIS instance. This element must have
+ either a "true" or "false" value.
+
+
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ </xsd:sequence>
+ <xsd:attribute name="id"
+ type="xsd:ID"/>
+ </xsd:complexType>
+
+
+<!-- **************************************************** -->
+
+ <xsd:complexType name="required-config-propertyType">
+ <xsd:annotation>
+ <xsd:documentation>
+ <![CDATA[
+ The required-config-propertyType contains a declaration
+ of a single configuration property used for specifying a
+ required configuration property name. It is used
+ by required-config-property elements.
+
+ Usage of this type is deprecated from Connectors 1.6 specification.
+ Refer to required-config-property element for more information.
+
+ Example:
+
+ <required-config-property>
+ <config-property-name>Destination</config-property-name>
+ </required-config-property>
+
+ ]]>
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:sequence>
+ <xsd:element name="description"
+ type="jakartaee:descriptionType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="config-property-name"
+ type="jakartaee:config-property-nameType"/>
+ </xsd:sequence>
+ <xsd:attribute name="id"
+ type="xsd:ID"/>
+ </xsd:complexType>
+
+
+<!-- **************************************************** -->
+
+ <xsd:complexType name="resourceadapterType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The resourceadapterType specifies information about the
+ resource adapter. The information includes fully qualified
+ resource adapter Java class name, configuration properties,
+ information specific to the implementation of the resource
+ adapter library as specified through the
+ outbound-resourceadapter and inbound-resourceadapter
+ elements, and an optional set of administered objects.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:sequence>
+ <xsd:element name="resourceadapter-class"
+ type="jakartaee:fully-qualified-classType"
+ minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The element resourceadapter-class specifies the
+ fully qualified name of a Java class that implements
+ the jakarta.resource.spi.ResourceAdapter
+ interface. This Java class is provided as part of
+ resource adapter's implementation of connector
+ architecture specified contracts. The implementation
+ of this class is required to be a JavaBean.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="config-property"
+ type="jakartaee:config-propertyType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="outbound-resourceadapter"
+ type="jakartaee:outbound-resourceadapterType"
+ minOccurs="0">
+ <xsd:unique name="connectionfactory-interface-uniqueness">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The connectionfactory-interface element content
+ must be unique in the outbound-resourceadapter.
+ Multiple connection-definitions can not use the
+ same connectionfactory-type.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:selector xpath="jakartaee:connection-definition"/>
+ <xsd:field xpath="jakartaee:connectionfactory-interface"/>
+ </xsd:unique>
+ </xsd:element>
+ <xsd:element name="inbound-resourceadapter"
+ type="jakartaee:inbound-resourceadapterType"
+ minOccurs="0"/>
+ <xsd:element name="adminobject"
+ type="jakartaee:adminobjectType"
+ minOccurs="0"
+ maxOccurs="unbounded">
+ <xsd:unique name="adminobject-type-uniqueness">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The adminobject-interface and adminobject-class element content must be
+ unique in the resourceadapterType. Several admin objects
+ can not use the same adminobject-interface and adminobject-class.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:selector xpath="jakartaee:adminobject"/>
+ <xsd:field xpath="jakartaee:adminobject-interface"/>
+ <xsd:field xpath="jakartaee:adminobject-class"/>
+ </xsd:unique>
+ </xsd:element>
+ <xsd:element name="security-permission"
+ type="jakartaee:security-permissionType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ </xsd:sequence>
+ <xsd:attribute name="id"
+ type="xsd:ID"/>
+ </xsd:complexType>
+
+
+<!-- **************************************************** -->
+
+ <xsd:complexType name="security-permissionType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The security-permissionType specifies a security
+ permission that is required by the resource adapter code.
+
+ The security permission listed in the deployment descriptor
+ are ones that are different from those required by the
+ default permission set as specified in the connector
+ specification. The optional description can mention specific
+ reason that resource adapter requires a given security
+ permission.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:sequence>
+ <xsd:element name="description"
+ type="jakartaee:descriptionType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="security-permission-spec"
+ type="jakartaee:xsdStringType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The element security-permission-spec specifies a security
+ permission based on the Security policy file
+ syntax. Refer to the following URL for Sun's
+ implementation of the security permission
+ specification:
+
+ http://docs.oracle.com/javase/6/docs/technotes/guides/security/PolicyFiles.html
+
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ </xsd:sequence>
+ <xsd:attribute name="id"
+ type="xsd:ID"/>
+ </xsd:complexType>
+
+</xsd:schema>
diff --git a/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/resources/ejb-jar_4_0.mdd b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/resources/ejb-jar_4_0.mdd
new file mode 100644
index 0000000000..26db9bafc2
--- /dev/null
+++ b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/resources/ejb-jar_4_0.mdd
@@ -0,0 +1,732 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<!--
+Copyright (c) 2009, 2020 Oracle and/or its affiliates. All rights reserved.
+
+This program and the accompanying materials are made available under the
+terms of the Eclipse Public License v. 2.0, which is available at
+http://www.eclipse.org/legal/epl-2.0.
+
+This Source Code may also be made available under the following Secondary
+Licenses when the conditions for such availability set forth in the
+Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+version 2 with the GNU Classpath Exception, which is available at
+https://www.gnu.org/software/classpath/license.html.
+
+SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+-->
+<metaDD>
+ <meta-element>
+ <dtd-name>ejb-jar</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>EjbJar</bean-name>
+ <extends>org.netbeans.modules.j2ee.dd.impl.common.ComponentBeanMultiple</extends>
+ <comparator-class>org.netbeans.modules.j2ee.dd.impl.common.Comparator</comparator-class>
+ <implements>org.netbeans.modules.j2ee.dd.api.ejb.EjbJar</implements>
+ <user-code>
+ public org.xml.sax.SAXParseException getError() {
+ return null;
+ }
+ public int getStatus() {
+ return STATE_VALID;
+ }
+ public String getSingleEjbClientJar() {
+ return getEjbClientJar();
+ }
+ public org.netbeans.modules.j2ee.dd.api.ejb.AssemblyDescriptor getSingleAssemblyDescriptor() {
+ return getAssemblyDescriptor();
+ }
+ public org.netbeans.modules.j2ee.dd.api.ejb.Relationships getSingleRelationships() {
+ return getRelationships();
+ }
+ public void setVersion(java.math.BigDecimal value) {
+ setAttributeValue(VERSION, value.toString());
+ }
+ public java.math.BigDecimal getVersion() {
+ return new java.math.BigDecimal(getAttributeValue(VERSION));
+ }
+ public Object clone() {
+ org.netbeans.modules.j2ee.dd.api.ejb.EjbJar ejbJar =
+ (org.netbeans.modules.j2ee.dd.api.ejb.EjbJar) super.clone();
+ ejbJar.setVersion( getVersion());
+ return ejbJar;
+ }
+ </user-code>
+ </meta-element>
+ <meta-element>
+ <dtd-name>enterprise-beansType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>EnterpriseBeans</bean-name>
+ <comparator-class>org.netbeans.modules.j2ee.dd.impl.common.Comparator</comparator-class>
+ <implements>org.netbeans.modules.j2ee.dd.api.ejb.EnterpriseBeans</implements>
+ <extends>org.netbeans.modules.j2ee.dd.impl.common.GetAllEjbs</extends>
+ </meta-element>
+ <meta-element>
+ <dtd-name>interceptorsType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>Interceptors</bean-name>
+ <implements>org.netbeans.modules.j2ee.dd.api.ejb.Interceptors</implements>
+ </meta-element>
+ <meta-element>
+ <dtd-name>relationshipsType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>Relationships</bean-name>
+ <implements>org.netbeans.modules.j2ee.dd.api.ejb.Relationships</implements>
+ <extends>org.netbeans.modules.j2ee.dd.impl.common.DescriptionBeanMultiple</extends>
+ </meta-element>
+ <meta-element>
+ <dtd-name>assembly-descriptorType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>AssemblyDescriptor</bean-name>
+ <implements>org.netbeans.modules.j2ee.dd.api.ejb.AssemblyDescriptor</implements>
+ <extends>org.netbeans.modules.j2ee.dd.impl.common.EnclosingBean</extends>
+ </meta-element>
+ <meta-element>
+ <dtd-name>pathType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>Path</bean-name>
+ <wrapper-class>java.lang.String</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>security-roleType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>SecurityRole</bean-name>
+ <implements>org.netbeans.modules.j2ee.dd.api.common.SecurityRole</implements>
+ <extends>org.netbeans.modules.j2ee.dd.impl.common.DescriptionBeanMultiple</extends> e
+ </meta-element>
+ <meta-element>
+ <dtd-name>method-permissionType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>MethodPermission</bean-name>
+ <implements>org.netbeans.modules.j2ee.dd.api.ejb.MethodPermission</implements>
+ <extends>org.netbeans.modules.j2ee.dd.impl.common.DescriptionBeanMultiple</extends>
+ </meta-element>
+ <meta-element>
+ <dtd-name>container-transactionType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>ContainerTransaction</bean-name>
+ <implements>org.netbeans.modules.j2ee.dd.api.ejb.ContainerTransaction</implements>
+ <extends>org.netbeans.modules.j2ee.dd.impl.common.DescriptionBeanMultiple</extends>
+ </meta-element>
+ <meta-element>
+ <dtd-name>interceptor-bindingType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>InterceptorBinding</bean-name>
+ <implements>org.netbeans.modules.j2ee.dd.api.ejb.InterceptorBinding</implements>
+ <extends>org.netbeans.modules.j2ee.dd.impl.common.DescriptionBeanMultiple</extends>
+ </meta-element>
+ <meta-element>
+ <dtd-name>message-destinationType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>MessageDestination</bean-name>
+ <implements>org.netbeans.modules.j2ee.dd.api.common.MessageDestination</implements>
+ <extends>org.netbeans.modules.j2ee.dd.impl.common.ComponentBeanMultiple</extends>
+ </meta-element>
+ <meta-element>
+ <dtd-name>exclude-listType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>ExcludeList</bean-name>
+ <implements>org.netbeans.modules.j2ee.dd.api.ejb.ExcludeList</implements>
+ <extends>org.netbeans.modules.j2ee.dd.impl.common.DescriptionBeanMultiple</extends>
+ </meta-element>
+ <meta-element>
+ <dtd-name>application-exceptionType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>ApplicationException</bean-name>
+ <implements>org.netbeans.modules.j2ee.dd.api.ejb.ApplicationException</implements>
+ </meta-element>
+ <meta-element>
+ <dtd-name>fully-qualified-classType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>FullyQualifiedClass</bean-name>
+ <wrapper-class>java.lang.String</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>true-falseType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>TrueFalse</bean-name>
+ <wrapper-class>boolean</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>descriptionType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>Description</bean-name>
+ <wrapper-class>java.lang.String</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>xsdStringType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>XsdString</bean-name>
+ <wrapper-class>java.lang.String</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>methodType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>Method</bean-name>
+ <implements>org.netbeans.modules.j2ee.dd.api.ejb.Method</implements>
+ <extends>org.netbeans.modules.j2ee.dd.impl.common.DescriptionBeanMultiple</extends>
+ </meta-element>
+ <meta-element>
+ <dtd-name>ejb-nameType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>EjbName</bean-name>
+ <wrapper-class>java.lang.String</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>method-intfType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>MethodIntf</bean-name>
+ <wrapper-class>java.lang.String</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>method-nameType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>MethodName</bean-name>
+ <wrapper-class>java.lang.String</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>method-paramsType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>MethodParams</bean-name>
+ <implements>org.netbeans.modules.j2ee.dd.api.ejb.MethodParams</implements>
+ <extends>org.netbeans.modules.j2ee.dd.impl.common.EnclosingBean</extends>
+ </meta-element>
+ <meta-element>
+ <dtd-name>java-typeType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>JavaType</bean-name>
+ <wrapper-class>java.lang.String</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>string</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>String</bean-name>
+ <wrapper-class>java.lang.String</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>display-nameType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>DisplayName</bean-name>
+ <wrapper-class>java.lang.String</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>iconType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>Icon</bean-name>
+ <implements>org.netbeans.modules.j2ee.dd.api.common.Icon</implements>
+ <extends>org.netbeans.modules.j2ee.dd.impl.common.EnclosingBean</extends>
+ </meta-element>
+ <meta-element>
+ <dtd-name>named-methodType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>NamedMethod</bean-name>
+ <implements>org.netbeans.modules.j2ee.dd.api.ejb.NamedMethod</implements>
+ </meta-element>
+ <meta-element>
+ <dtd-name>interceptor-orderType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>InterceptorOrder</bean-name>
+ <implements>org.netbeans.modules.j2ee.dd.api.ejb.InterceptorOrder</implements>
+ </meta-element>
+ <meta-element>
+ <dtd-name>trans-attributeType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>TransAttribute</bean-name>
+ <wrapper-class>java.lang.String</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>role-nameType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>RoleName</bean-name>
+ <wrapper-class>java.lang.String</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>emptyType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>Empty</bean-name>
+ <wrapper-class>boolean</wrapper-class>
+ <can-be-empty/>
+ </meta-element>
+ <meta-element>
+ <dtd-name>ejb-relationType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>EjbRelation</bean-name>
+ <implements>org.netbeans.modules.j2ee.dd.api.ejb.EjbRelation</implements>
+ <extends>org.netbeans.modules.j2ee.dd.impl.common.DescriptionBeanMultiple</extends>
+ <user-code>
+ @Override
+ public void setEjbRelationshipRole2(org.netbeans.modules.j2ee.dd.api.ejb.EjbRelationshipRole value) {
+ this.setValue(EJB_RELATIONSHIP_ROLE, 1, value);
+ }
+
+ @Override
+ public org.netbeans.modules.j2ee.dd.api.ejb.EjbRelationshipRole getEjbRelationshipRole2() {
+ return (EjbRelationshipRole)this.getValue(EJB_RELATIONSHIP_ROLE, 1);
+ }
+ </user-code>
+ </meta-element>
+ <meta-element>
+ <dtd-name>ejb-relationship-roleType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>EjbRelationshipRole</bean-name>
+ <implements>org.netbeans.modules.j2ee.dd.api.ejb.EjbRelationshipRole</implements>
+ <extends>org.netbeans.modules.j2ee.dd.impl.common.DescriptionBeanMultiple</extends>
+ </meta-element>
+ <meta-element>
+ <dtd-name>multiplicityType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>Multiplicity</bean-name>
+ <wrapper-class>java.lang.String</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>relationship-role-sourceType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>RelationshipRoleSource</bean-name>
+ <implements>org.netbeans.modules.j2ee.dd.api.ejb.RelationshipRoleSource</implements>
+ <extends>org.netbeans.modules.j2ee.dd.impl.common.DescriptionBeanMultiple</extends>
+ </meta-element>
+ <meta-element>
+ <dtd-name>cmr-fieldType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>CmrField</bean-name>
+ <implements>org.netbeans.modules.j2ee.dd.api.ejb.CmrField</implements>
+ <extends>org.netbeans.modules.j2ee.dd.impl.common.DescriptionBeanMultiple</extends>
+ </meta-element>
+ <meta-element>
+ <dtd-name>cmr-field-typeType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>CmrFieldType</bean-name>
+ <wrapper-class>java.lang.String</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>interceptorType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>Interceptor</bean-name>
+ <implements>org.netbeans.modules.j2ee.dd.api.ejb.Interceptor</implements>
+ </meta-element>
+ <meta-element>
+ <dtd-name>around-invokeType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>AroundInvoke</bean-name>
+ <implements>org.netbeans.modules.j2ee.dd.api.ejb.AroundInvoke</implements>
+ </meta-element>
+ <meta-element>
+ <dtd-name>lifecycle-callbackType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>LifecycleCallback</bean-name>
+ <implements>org.netbeans.modules.j2ee.dd.api.ejb.LifecycleCallback</implements>
+ </meta-element>
+ <meta-element>
+ <dtd-name>java-identifierType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>JavaIdentifier</bean-name>
+ <wrapper-class>java.lang.String</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>env-entryType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>EnvEntry</bean-name>
+ <implements>org.netbeans.modules.j2ee.dd.api.common.EnvEntry</implements>
+ <extends>org.netbeans.modules.j2ee.dd.impl.common.DescriptionBeanMultiple</extends>
+ </meta-element>
+ <meta-element>
+ <dtd-name>ejb-refType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>EjbRef</bean-name>
+ <implements>org.netbeans.modules.j2ee.dd.api.common.EjbRef</implements>
+ <extends>org.netbeans.modules.j2ee.dd.impl.common.DescriptionBeanMultiple</extends>
+ </meta-element>
+ <meta-element>
+ <dtd-name>ejb-local-refType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>EjbLocalRef</bean-name>
+ <implements>org.netbeans.modules.j2ee.dd.api.common.EjbLocalRef</implements>
+ <extends>org.netbeans.modules.j2ee.dd.impl.common.DescriptionBeanMultiple</extends>
+ </meta-element>
+ <meta-element>
+ <dtd-name>resource-refType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>ResourceRef</bean-name>
+ <implements>org.netbeans.modules.j2ee.dd.api.common.ResourceRef</implements>
+ <extends>org.netbeans.modules.j2ee.dd.impl.common.DescriptionBeanMultiple</extends>
+ </meta-element>
+ <meta-element>
+ <dtd-name>resource-env-refType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>ResourceEnvRef</bean-name>
+ <implements>org.netbeans.modules.j2ee.dd.api.common.ResourceEnvRef</implements>
+ <extends>org.netbeans.modules.j2ee.dd.impl.common.DescriptionBeanMultiple</extends>
+ </meta-element>
+ <meta-element>
+ <dtd-name>message-destination-refType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>MessageDestinationRef</bean-name>
+ <implements>org.netbeans.modules.j2ee.dd.api.common.MessageDestinationRef</implements>
+ <extends>org.netbeans.modules.j2ee.dd.impl.common.DescriptionBeanMultiple</extends>
+ </meta-element>
+ <meta-element>
+ <dtd-name>persistence-context-refType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>PersistenceContextRef</bean-name>
+ <implements>org.netbeans.modules.j2ee.dd.api.ejb.PersistenceContextRef</implements>
+ </meta-element>
+ <meta-element>
+ <dtd-name>persistence-unit-refType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>PersistenceUnitRef</bean-name>
+ <implements>org.netbeans.modules.j2ee.dd.api.ejb.PersistenceUnitRef</implements>
+ </meta-element>
+ <meta-element>
+ <dtd-name>jndi-nameType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>JndiName</bean-name>
+ <wrapper-class>java.lang.String</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>injection-targetType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>InjectionTarget</bean-name>
+ <extends>org.netbeans.modules.j2ee.dd.impl.common.EnclosingBean</extends>
+ <implements>org.netbeans.modules.j2ee.dd.api.common.InjectionTarget</implements>
+ </meta-element>
+ <meta-element>
+ <dtd-name>persistence-context-typeType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>PersistenceContextType</bean-name>
+ <wrapper-class>java.lang.String</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>propertyType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>Property</bean-name>
+ <implements>org.netbeans.modules.j2ee.dd.api.ejb.Property</implements>
+ </meta-element>
+ <meta-element>
+ <dtd-name>message-destination-typeType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>MessageDestinationType</bean-name>
+ <wrapper-class>java.lang.String</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>message-destination-usageType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>MessageDestinationUsage</bean-name>
+ <wrapper-class>java.lang.String</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>message-destination-linkType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>MessageDestinationLink</bean-name>
+ <wrapper-class>java.lang.String</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>res-authType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>ResAuth</bean-name>
+ <wrapper-class>java.lang.String</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>res-sharing-scopeType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>ResSharingScope</bean-name>
+ <wrapper-class>java.lang.String</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>service-refType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>ServiceRef</bean-name>
+ <implements>org.netbeans.modules.j2ee.dd.api.common.ServiceRef</implements>
+ <extends>org.netbeans.modules.j2ee.dd.impl.common.ComponentBeanMultiple</extends>
+ </meta-element>
+ <meta-element>
+ <dtd-name>xsdAnyURIType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>XsdAnyURI</bean-name>
+ <wrapper-class>java.net.URI</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>xsdQNameType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>XsdQName</bean-name>
+ <wrapper-class>java.lang.String</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>port-component-refType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>PortComponentRef</bean-name>
+ <implements>org.netbeans.modules.j2ee.dd.api.common.PortComponentRef</implements>
+ <extends>org.netbeans.modules.j2ee.dd.impl.common.EnclosingBean</extends>
+ </meta-element>
+ <meta-element>
+ <dtd-name>service-ref_handlerType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>ServiceRefHandler</bean-name>
+ <implements>org.netbeans.modules.j2ee.dd.api.common.ServiceRefHandler</implements>
+ <extends>org.netbeans.modules.j2ee.dd.impl.common.ComponentBeanMultiple</extends>
+ </meta-element>
+ <meta-element>
+ <dtd-name>service-ref_handler-chainsType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>ServiceRefHandlerChains</bean-name>
+ <implements>org.netbeans.modules.j2ee.dd.api.common.ServiceRefHandlerChains</implements>
+ </meta-element>
+ <meta-element>
+ <dtd-name>service-ref_handler-chainType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>ServiceRefHandlerChain</bean-name>
+ <implements>org.netbeans.modules.j2ee.dd.api.common.ServiceRefHandlerChain</implements>
+ </meta-element>
+ <meta-element>
+ <dtd-name>service-ref_qname-pattern</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>ServiceRefQnamePattern</bean-name>
+ <wrapper-class>java.lang.String</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>service-ref_protocol-bindingListType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>ServiceRefProtocolBindingList</bean-name>
+ <wrapper-class>String</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>param-valueType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>InitParam</bean-name>
+ <implements>org.netbeans.modules.j2ee.dd.api.common.InitParam</implements>
+ <extends>org.netbeans.modules.j2ee.dd.impl.common.DescriptionBeanMultiple</extends>
+ </meta-element>
+ <meta-element>
+ <dtd-name>ejb-ref-nameType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>EjbRefName</bean-name>
+ <wrapper-class>java.lang.String</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>ejb-ref-typeType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>EjbRefType</bean-name>
+ <wrapper-class>java.lang.String</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>local-homeType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>LocalHome</bean-name>
+ <wrapper-class>java.lang.String</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>localType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>Local</bean-name>
+ <wrapper-class>java.lang.String</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>ejb-linkType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>EjbLink</bean-name>
+ <wrapper-class>java.lang.String</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>homeType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>Home</bean-name>
+ <wrapper-class>java.lang.String</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>remoteType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>Remote</bean-name>
+ <wrapper-class>java.lang.String</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>env-entry-type-valuesType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>EnvEntryTypeValues</bean-name>
+ <wrapper-class>java.lang.String</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>session-beanType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>SessionBean</bean-name>
+ <comparator-class>org.netbeans.modules.j2ee.dd.impl.common.Comparator</comparator-class>
+ <implements>org.netbeans.modules.j2ee.dd.api.ejb.Session,org.netbeans.modules.j2ee.dd.impl.common.KeyBean</implements>
+ <extends>org.netbeans.modules.j2ee.dd.impl.common.ComponentBeanMultiple</extends>
+ <user-code>
+ public String getKeyProperty() {
+ return "EjbName";
+ }
+ public org.netbeans.modules.j2ee.dd.api.ejb.EjbJar getRoot() {
+ return (org.netbeans.modules.j2ee.dd.api.ejb.EjbJar) _getRoot();
+ }
+ </user-code>
+ </meta-element>
+ <meta-element>
+ <dtd-name>entity-beanType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>EntityBean</bean-name>
+ <comparator-class>org.netbeans.modules.j2ee.dd.impl.common.Comparator</comparator-class>
+ <implements>org.netbeans.modules.j2ee.dd.api.ejb.Entity,org.netbeans.modules.j2ee.dd.impl.common.KeyBean</implements>
+ <extends>org.netbeans.modules.j2ee.dd.impl.common.ComponentBeanMultiple</extends>
+ <user-code>
+ public String getKeyProperty() {
+ return "EjbName";
+ }
+ public org.netbeans.modules.j2ee.dd.api.ejb.EjbJar getRoot() {
+ return (org.netbeans.modules.j2ee.dd.api.ejb.EjbJar) _getRoot();
+ }
+ </user-code>
+ </meta-element>
+ <meta-element>
+ <dtd-name>message-driven-beanType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>MessageDrivenBean</bean-name>
+ <comparator-class>org.netbeans.modules.j2ee.dd.impl.common.Comparator</comparator-class>
+ <implements>org.netbeans.modules.j2ee.dd.api.ejb.MessageDriven,org.netbeans.modules.j2ee.dd.impl.common.KeyBean</implements>
+ <extends>org.netbeans.modules.j2ee.dd.impl.common.ComponentBeanMultiple</extends>
+ <user-code>
+ public org.netbeans.modules.j2ee.dd.api.ejb.EjbJar getRoot() {
+ return (org.netbeans.modules.j2ee.dd.api.ejb.EjbJar) _getRoot();
+ }
+ // not needed for with 3.1
+ public String getKeyProperty() {
+ return "EjbName";
+ }
+ </user-code>
+ </meta-element>
+ <meta-element>
+ <dtd-name>ejb-classType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>EjbClass</bean-name>
+ <wrapper-class>java.lang.String</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>transaction-typeType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>TransactionType</bean-name>
+ <wrapper-class>java.lang.String</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>activation-configType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>ActivationConfig</bean-name>
+ <implements>org.netbeans.modules.j2ee.dd.api.ejb.ActivationConfig</implements>
+ <extends>org.netbeans.modules.j2ee.dd.impl.common.DescriptionBeanMultiple</extends>
+ </meta-element>
+ <meta-element>
+ <dtd-name>security-identityType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>SecurityIdentity</bean-name>
+ <implements>org.netbeans.modules.j2ee.dd.api.ejb.SecurityIdentity</implements>
+ <extends>org.netbeans.modules.j2ee.dd.impl.common.DescriptionBeanMultiple</extends>
+ </meta-element>
+ <meta-element>
+ <dtd-name>run-asType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>RunAs</bean-name>
+ <implements>org.netbeans.modules.j2ee.dd.api.common.RunAs</implements>
+ <extends>org.netbeans.modules.j2ee.dd.impl.common.DescriptionBeanMultiple</extends>
+ </meta-element>
+ <meta-element>
+ <dtd-name>activation-config-propertyType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>ActivationConfigProperty</bean-name>
+ <implements>org.netbeans.modules.j2ee.dd.api.ejb.ActivationConfigProperty</implements>
+ <extends>org.netbeans.modules.j2ee.dd.impl.common.DescriptionBeanMultiple</extends>
+ </meta-element>
+ <meta-element>
+ <dtd-name>persistence-typeType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>PersistenceType</bean-name>
+ <wrapper-class>java.lang.String</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>cmp-versionType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>CmpVersion</bean-name>
+ <wrapper-class>java.lang.String</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>cmp-fieldType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>CmpField</bean-name>
+ <implements>org.netbeans.modules.j2ee.dd.api.ejb.CmpField</implements>
+ <extends>org.netbeans.modules.j2ee.dd.impl.common.DescriptionBeanMultiple</extends>
+ </meta-element>
+ <meta-element>
+ <dtd-name>security-role-refType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>SecurityRoleRef</bean-name>
+ <implements>org.netbeans.modules.j2ee.dd.api.common.SecurityRoleRef</implements>
+ <extends>org.netbeans.modules.j2ee.dd.impl.common.DescriptionBeanMultiple</extends>
+ </meta-element>
+ <meta-element>
+ <dtd-name>queryType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>Query</bean-name>
+ <implements>org.netbeans.modules.j2ee.dd.api.ejb.Query</implements>
+ <extends>org.netbeans.modules.j2ee.dd.impl.common.DescriptionBeanSingle</extends>
+ </meta-element>
+ <meta-element>
+ <dtd-name>query-methodType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>QueryMethod</bean-name>
+ <implements>org.netbeans.modules.j2ee.dd.api.ejb.QueryMethod</implements>
+ <extends>org.netbeans.modules.j2ee.dd.impl.common.EnclosingBean</extends>
+ </meta-element>
+ <meta-element>
+ <dtd-name>result-type-mappingType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>ResultTypeMapping</bean-name>
+ <wrapper-class>java.lang.String</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>session-typeType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>SessionType</bean-name>
+ <wrapper-class>java.lang.String</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>init-methodType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>InitMethod</bean-name>
+ <implements>org.netbeans.modules.j2ee.dd.api.ejb.InitMethod</implements>
+ </meta-element>
+ <meta-element>
+ <dtd-name>remove-methodType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>RemoveMethod</bean-name>
+ <implements>org.netbeans.modules.j2ee.dd.api.ejb.RemoveMethod</implements>
+ </meta-element>
+
+ <!-- changes added for EE6: -->
+
+ <meta-element>
+ <dtd-name>handlerType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>ServiceRefHandler</bean-name>
+ <comparator-class>org.netbeans.modules.j2ee.dd.impl.common.Comparator</comparator-class>
+ <extends>org.netbeans.modules.j2ee.dd.impl.common.ComponentBeanMultiple</extends>
+ <implements>
+ org.netbeans.modules.j2ee.dd.api.common.ServiceRefHandler, org.netbeans.modules.j2ee.dd.impl.common.KeyBean
+ </implements>
+ <user-code>
+ public String getKeyProperty() { return "HandlerName"; }
+ </user-code>
+ </meta-element>
+ <meta-element>
+ <dtd-name>handler-chainsType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>ServiceRefHandlerChains</bean-name>
+ <implements>org.netbeans.modules.j2ee.dd.api.common.ServiceRefHandlerChains</implements>
+ </meta-element>
+ <meta-element>
+ <dtd-name>handler-chainType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>ServiceRefHandlerChainType</bean-name>
+ <implements>org.netbeans.modules.j2ee.dd.api.common.ServiceRefHandlerChain</implements>
+ </meta-element>
+ <meta-element>
+ <dtd-name>dewey-versionType</dtd-name>
+ <namespace>https://jakarta.ee/xml/ns/jakartaee</namespace>
+ <bean-name>version</bean-name>
+ <wrapper-class>java.math.BigDecimal</wrapper-class>
+ </meta-element>
+</metaDD>
diff --git a/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/resources/ejb-jar_4_0.xsd b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/resources/ejb-jar_4_0.xsd
new file mode 100644
index 0000000000..e779c4b8be
--- /dev/null
+++ b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/resources/ejb-jar_4_0.xsd
@@ -0,0 +1,3351 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
+ targetNamespace="https://jakarta.ee/xml/ns/jakartaee"
+ xmlns:jakartaee="https://jakarta.ee/xml/ns/jakartaee"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ elementFormDefault="qualified"
+ attributeFormDefault="unqualified"
+ version="4.0">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ Copyright (c) 2009, 2021 Oracle and/or its affiliates. All rights reserved.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v. 2.0, which is available at
+ http://www.eclipse.org/legal/epl-2.0.
+
+ This Source Code may also be made available under the following Secondary
+ Licenses when the conditions for such availability set forth in the
+ Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ version 2 with the GNU Classpath Exception, which is available at
+ https://www.gnu.org/software/classpath/license.html.
+
+ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+ </xsd:documentation>
+ </xsd:annotation>
+
+ <xsd:annotation>
+ <xsd:documentation>
+ <![CDATA[
+ This is the XML Schema for the Enterprise Beans 4.0 deployment descriptor.
+
+ All Enterprise Beans deployment descriptors must indicate
+ the schema by using the Jakarta EE namespace:
+
+ https://jakarta.ee/xml/ns/jakartaee
+
+ and by indicating the version of the schema by
+ using the version element as shown below:
+
+ <ejb-jar 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/ejb-jar_4_0.xsd"
+ version="4.0">
+ ...
+ </ejb-jar>
+
+ The instance documents may indicate the published version of
+ the schema using the xsi:schemaLocation attribute for the
+ Jakarta EE namespace with the following location:
+
+ https://jakarta.ee/xml/ns/jakartaee/ejb-jar_4_0.xsd
+
+ ]]>
+ </xsd:documentation>
+ </xsd:annotation>
+
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The following conventions apply to all Jakarta EE
+ deployment descriptor elements unless indicated otherwise.
+
+ - In elements that specify a pathname to a file within the
+ same JAR file, relative filenames (i.e., those not
+ starting with "/") are considered relative to the root of
+ the JAR file's namespace. Absolute filenames (i.e., those
+ starting with "/") also specify names in the root of the
+ JAR file's namespace. In general, relative names are
+ preferred. The exception is .war files where absolute
+ names are preferred for consistency with the Servlet API.
+
+ </xsd:documentation>
+ </xsd:annotation>
+
+ <xsd:include schemaLocation="jakartaee_9.xsd"/>
+
+
+<!-- **************************************************** -->
+
+ <xsd:element name="ejb-jar"
+ type="jakartaee:ejb-jarType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ This is the root of the ejb-jar deployment descriptor.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:key name="ejb-name-key">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The ejb-name element contains the name of an enterprise
+ bean. The name must be unique within the ejb-jar file or
+ .war file.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:selector xpath="jakartaee:enterprise-beans/*"/>
+ <xsd:field xpath="jakartaee:ejb-name"/>
+ </xsd:key>
+ <xsd:keyref name="ejb-name-references"
+ refer="jakartaee:ejb-name-key">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The keyref indicates the references from
+ relationship-role-source must be to a specific ejb-name
+ defined within the scope of enterprise-beans element.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:selector xpath=".//jakartaee:ejb-relationship-role/jakartaee:relationship-role-source"/>
+ <xsd:field xpath="jakartaee:ejb-name"/>
+ </xsd:keyref>
+ <xsd:key name="role-name-key">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ A role-name-key is specified to allow the references
+ from the security-role-refs.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:selector xpath="jakartaee:assembly-descriptor/jakartaee:security-role"/>
+ <xsd:field xpath="jakartaee:role-name"/>
+ </xsd:key>
+ <xsd:keyref name="role-name-references"
+ refer="jakartaee:role-name-key">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The keyref indicates the references from
+ security-role-ref to a specified role-name.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:selector xpath="jakartaee:enterprise-beans/*/jakartaee:security-role-ref"/>
+ <xsd:field xpath="jakartaee:role-link"/>
+ </xsd:keyref>
+ </xsd:element>
+
+
+<!-- **************************************************** -->
+
+ <xsd:complexType name="access-timeoutType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The access-timeoutType represents the maximum amount of
+ time (in a given time unit) that the container should wait for
+ a concurrency lock before throwing a timeout exception to the
+ client.
+
+ A timeout value of 0 means concurrent access is not permitted.
+
+ A timeout value of -1 means wait indefinitely to acquire a lock.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:sequence>
+ <xsd:element name="timeout"
+ type="jakartaee:xsdIntegerType"/>
+ <xsd:element name="unit"
+ type="jakartaee:time-unit-typeType"/>
+ </xsd:sequence>
+ <xsd:attribute name="id"
+ type="xsd:ID"/>
+ </xsd:complexType>
+
+
+<!-- **************************************************** -->
+
+ <xsd:complexType name="async-methodType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The async-methodType element specifies that a session
+ bean method has asynchronous invocation semantics.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:sequence>
+ <xsd:element name="method-name"
+ type="jakartaee:string"/>
+ <xsd:element name="method-params"
+ type="jakartaee:method-paramsType"
+ minOccurs="0"/>
+ </xsd:sequence>
+ <xsd:attribute name="id"
+ type="xsd:ID"/>
+ </xsd:complexType>
+
+
+<!-- **************************************************** -->
+
+ <xsd:complexType name="activation-configType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The activation-configType defines information about the
+ expected configuration properties of the message-driven bean
+ in its operational environment. This may include information
+ about message acknowledgement, message selector, expected
+ destination type, destination or connection factory lookup
+ string, subscription name, etc.
+
+ The configuration information is expressed in terms of
+ name/value configuration properties.
+
+ The properties that are recognized for a particular
+ message-driven bean are determined by the messaging type.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:sequence>
+ <xsd:element name="description"
+ type="jakartaee:descriptionType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="activation-config-property"
+ type="jakartaee:activation-config-propertyType"
+ maxOccurs="unbounded"/>
+ </xsd:sequence>
+ <xsd:attribute name="id"
+ type="xsd:ID"/>
+ </xsd:complexType>
+
+
+<!-- **************************************************** -->
+
+ <xsd:complexType name="activation-config-propertyType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The activation-config-propertyType contains a name/value
+ configuration property pair for a message-driven bean.
+
+ The properties that are recognized for a particular
+ message-driven bean are determined by the messaging type.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:sequence>
+ <xsd:element name="activation-config-property-name"
+ type="jakartaee:xsdStringType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The activation-config-property-name element contains
+ the name for an activation configuration property of
+ a message-driven bean.
+
+ For Jakarta Messaging message-driven beans, the following property
+ names are recognized: acknowledgeMode,
+ messageSelector, destinationType, subscriptionDurability,
+ destinationLookup, connectionFactoryLookup, subscriptionName,
+ and clientId.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="activation-config-property-value"
+ type="jakartaee:xsdStringType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The activation-config-property-value element
+ contains the value for an activation configuration
+ property of a message-driven bean.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ </xsd:sequence>
+ <xsd:attribute name="id"
+ type="xsd:ID"/>
+ </xsd:complexType>
+
+
+<!-- **************************************************** -->
+
+ <xsd:complexType name="around-invokeType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The around-invoke type specifies a method on a
+ class to be called during the around invoke portion of an
+ ejb invocation. Note that each class may have only one
+ around invoke method and that the method may not be
+ overloaded.
+
+ If the class element is missing then
+ the class defining the callback is assumed to be the
+ interceptor class or component class in scope at the
+ location in the descriptor in which the around invoke
+ definition appears.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:sequence>
+ <xsd:element name="class"
+ type="jakartaee:fully-qualified-classType"
+ minOccurs="0"/>
+ <xsd:element name="method-name"
+ type="jakartaee:java-identifierType"/>
+ </xsd:sequence>
+ </xsd:complexType>
+
+
+<!-- **************************************************** -->
+
+ <xsd:complexType name="around-timeoutType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The around-timeout type specifies a method on a
+ class to be called during the around-timeout portion of
+ a timer timeout callback. Note that each class may have
+ only one around-timeout method and that the method may not
+ be overloaded.
+
+ If the class element is missing then
+ the class defining the callback is assumed to be the
+ interceptor class or component class in scope at the
+ location in the descriptor in which the around-timeout
+ definition appears.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:sequence>
+ <xsd:element name="class"
+ type="jakartaee:fully-qualified-classType"
+ minOccurs="0"/>
+ <xsd:element name="method-name"
+ type="jakartaee:java-identifierType"/>
+ </xsd:sequence>
+ </xsd:complexType>
+
+
+<!-- **************************************************** -->
+
+ <xsd:complexType name="assembly-descriptorType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The assembly-descriptorType defines
+ application-assembly information.
+
+ The application-assembly information consists of the
+ following parts: the definition of security roles, the
+ definition of method permissions, the definition of
+ transaction attributes for enterprise beans with
+ container-managed transaction demarcation, the definition
+ of interceptor bindings, a list of
+ methods to be excluded from being invoked, and a list of
+ exception types that should be treated as application exceptions.
+
+ All the parts are optional in the sense that they are
+ omitted if the lists represented by them are empty.
+
+ Providing an assembly-descriptor in the deployment
+ descriptor is optional for the ejb-jar file or .war file producer.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:sequence>
+ <xsd:element name="security-role"
+ type="jakartaee:security-roleType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="method-permission"
+ type="jakartaee:method-permissionType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="container-transaction"
+ type="jakartaee:container-transactionType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="interceptor-binding"
+ type="jakartaee:interceptor-bindingType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="message-destination"
+ type="jakartaee:message-destinationType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="exclude-list"
+ type="jakartaee:exclude-listType"
+ minOccurs="0"/>
+ <xsd:element name="application-exception"
+ type="jakartaee:application-exceptionType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ </xsd:sequence>
+ <xsd:attribute name="id"
+ type="xsd:ID"/>
+ </xsd:complexType>
+
+
+<!-- **************************************************** -->
+
+ <xsd:complexType name="cmp-fieldType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The cmp-fieldType describes a container-managed field. The
+ cmp-fieldType contains an optional description of the field,
+ and the name of the field.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:sequence>
+ <xsd:element name="description"
+ type="jakartaee:descriptionType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="field-name"
+ type="jakartaee:java-identifierType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The field-name element specifies the name of a
+ container managed field.
+
+ The name of the cmp-field of an entity bean with
+ cmp-version 2.x must begin with a lowercase
+ letter. This field is accessed by methods whose
+ names consists of the name of the field specified by
+ field-name in which the first letter is uppercased,
+ prefixed by "get" or "set".
+
+ The name of the cmp-field of an entity bean with
+ cmp-version 1.x must denote a public field of the
+ enterprise bean class or one of its superclasses.
+
+ Support for entity beans is optional as of Enterprise Beans 3.2.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ </xsd:sequence>
+ <xsd:attribute name="id"
+ type="xsd:ID"/>
+ </xsd:complexType>
+
+
+<!-- **************************************************** -->
+
+ <xsd:complexType name="cmp-versionType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The cmp-versionType specifies the version of an entity bean
+ with container-managed persistence. It is used by
+ cmp-version elements.
+
+ The value must be one of the two following:
+
+ 1.x
+ 2.x
+
+ Support for entity beans is optional as of Enterprise Beans 3.2.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:simpleContent>
+ <xsd:restriction base="jakartaee:string">
+ <xsd:enumeration value="1.x"/>
+ <xsd:enumeration value="2.x"/>
+ </xsd:restriction>
+ </xsd:simpleContent>
+ </xsd:complexType>
+
+
+<!-- **************************************************** -->
+
+ <xsd:complexType name="cmr-fieldType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The cmr-fieldType describes the Bean Provider's view of
+ a relationship. It consists of an optional description, and
+ the name and the class type of a field in the source of a
+ role of a relationship. The cmr-field-name element
+ corresponds to the name used for the get and set accessor
+ methods for the relationship. The cmr-field-type element is
+ used only for collection-valued cmr-fields. It specifies the
+ type of the collection that is used.
+
+ Support for entity beans is optional as of Enterprise Beans 3.2.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:sequence>
+ <xsd:element name="description"
+ type="jakartaee:descriptionType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="cmr-field-name"
+ type="jakartaee:string">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The cmr-field-name element specifies the name of a
+ logical relationship field in the entity bean
+ class. The name of the cmr-field must begin with a
+ lowercase letter. This field is accessed by methods
+ whose names consist of the name of the field
+ specified by cmr-field-name in which the first
+ letter is uppercased, prefixed by "get" or "set".
+
+ Support for entity beans is optional as of Enterprise Beans 3.2.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="cmr-field-type"
+ type="jakartaee:cmr-field-typeType"
+ minOccurs="0"/>
+ </xsd:sequence>
+ <xsd:attribute name="id"
+ type="xsd:ID"/>
+ </xsd:complexType>
+
+
+<!-- **************************************************** -->
+
+ <xsd:complexType name="cmr-field-typeType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The cmr-field-type element specifies the class of a
+ collection-valued logical relationship field in the entity
+ bean class. The value of an element using cmr-field-typeType
+ must be either: java.util.Collection or java.util.Set.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:simpleContent>
+ <xsd:restriction base="jakartaee:string">
+ <xsd:enumeration value="java.util.Collection"/>
+ <xsd:enumeration value="java.util.Set"/>
+ </xsd:restriction>
+ </xsd:simpleContent>
+ </xsd:complexType>
+
+
+<!-- **************************************************** -->
+
+ <xsd:complexType name="concurrency-management-typeType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The concurrency-management-typeType specifies the way concurrency
+ is managed for a singleton or stateful session bean.
+
+ The concurrency management type must be one of the following:
+
+ Bean
+ Container
+
+ Bean managed concurrency can only be specified for a singleton bean.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:simpleContent>
+ <xsd:restriction base="jakartaee:string">
+ <xsd:enumeration value="Bean"/>
+ <xsd:enumeration value="Container"/>
+ </xsd:restriction>
+ </xsd:simpleContent>
+ </xsd:complexType>
+
+
+<!-- **************************************************** -->
+
+ <xsd:complexType name="concurrent-lock-typeType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The concurrent-lock-typeType specifies how the container must
+ manage concurrent access to a method of a Singleton bean
+ with container-managed concurrency.
+
+ The container managed concurrency lock type must be one
+ of the following :
+
+ Read
+ Write
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:simpleContent>
+ <xsd:restriction base="jakartaee:string">
+ <xsd:enumeration value="Read"/>
+ <xsd:enumeration value="Write"/>
+ </xsd:restriction>
+ </xsd:simpleContent>
+ </xsd:complexType>
+
+
+<!-- **************************************************** -->
+
+ <xsd:complexType name="concurrent-methodType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The concurrent-methodType specifies information about a method
+ of a bean with container managed concurrency.
+
+ The optional lock element specifies the kind of concurrency
+ lock asssociated with the method.
+
+ The optional access-timeout element specifies the amount of
+ time (in a given time unit) the container should wait for a
+ concurrency lock before throwing an exception to the client.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:sequence>
+ <xsd:element name="method"
+ type="jakartaee:named-methodType"/>
+ <xsd:element name="lock"
+ type="jakartaee:concurrent-lock-typeType"
+ minOccurs="0"/>
+ <xsd:element name="access-timeout"
+ type="jakartaee:access-timeoutType"
+ minOccurs="0"/>
+ </xsd:sequence>
+ <xsd:attribute name="id"
+ type="xsd:ID"/>
+ </xsd:complexType>
+
+
+<!-- **************************************************** -->
+
+ <xsd:complexType name="container-transactionType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The container-transactionType specifies how the container
+ must manage transaction scopes for the enterprise bean's
+ method invocations. It defines an optional description, a
+ list of method elements, and a transaction attribute. The
+ transaction attribute is to be applied to all the specified
+ methods.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:sequence>
+ <xsd:element name="description"
+ type="jakartaee:descriptionType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="method"
+ type="jakartaee:methodType"
+ maxOccurs="unbounded"/>
+ <xsd:element name="trans-attribute"
+ type="jakartaee:trans-attributeType"/>
+ </xsd:sequence>
+ <xsd:attribute name="id"
+ type="xsd:ID"/>
+ </xsd:complexType>
+
+
+<!-- **************************************************** -->
+
+ <xsd:complexType name="depends-onType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The depends-onType is used to express initialization
+ ordering dependencies between Singleton components.
+ The depends-onType specifies the names of one or more
+ Singleton beans in the same application as the referring
+ Singleton, each of which must be initialized before
+ the referring bean.
+
+ Each dependent bean is expressed using ejb-link syntax.
+ The order in which dependent beans are initialized at
+ runtime is not guaranteed to match the order in which
+ they are listed.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:sequence>
+ <xsd:element name="ejb-name"
+ type="jakartaee:ejb-linkType"
+ minOccurs="1"
+ maxOccurs="unbounded"/>
+ </xsd:sequence>
+ <xsd:attribute name="id"
+ type="xsd:ID"/>
+ </xsd:complexType>
+
+
+<!-- **************************************************** -->
+
+ <xsd:complexType name="ejb-classType">
+ <xsd:annotation>
+ <xsd:documentation>
+ <![CDATA[
+ The ejb-classType contains the fully-qualified name of the
+ enterprise bean's class. It is used by ejb-class elements.
+
+ Example:
+
+ <ejb-class>com.wombat.empl.EmployeeServiceBean</ejb-class>
+
+ ]]>
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:simpleContent>
+ <xsd:restriction base="jakartaee:fully-qualified-classType"/>
+ </xsd:simpleContent>
+ </xsd:complexType>
+
+
+<!-- **************************************************** -->
+
+ <xsd:complexType name="ejb-jarType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The ejb-jarType defines the root element of the Enterprise Beans
+ deployment descriptor. It contains
+
+ - an optional description of the ejb-jar file
+ - an optional display name
+ - an optional icon that contains a small and a large
+ icon file name
+ - an optional module name. Only applicable to
+ stand-alone ejb-jars or ejb-jars packaged in an ear.
+ Ignored if specified for an ejb-jar.xml within a .war file.
+ In that case, standard .war file module-name rules apply.
+ - structural information about all included
+ enterprise beans that is not specified through
+ annotations
+ - structural information about interceptor classes
+ - a descriptor for container managed relationships,
+ if any.
+ - an optional application-assembly descriptor
+ - an optional name of an ejb-client-jar file for the
+ ejb-jar.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:sequence>
+ <xsd:element name="module-name"
+ type="jakartaee:string"
+ minOccurs="0"/>
+ <xsd:group ref="jakartaee:descriptionGroup"/>
+ <xsd:element name="enterprise-beans"
+ type="jakartaee:enterprise-beansType"
+ minOccurs="0"/>
+ <xsd:element name="interceptors"
+ type="jakartaee:interceptorsType"
+ minOccurs="0"/>
+ <xsd:element name="relationships"
+ type="jakartaee:relationshipsType"
+ minOccurs="0">
+ <xsd:unique name="relationship-name-uniqueness">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The ejb-relation-name contains the name of a
+ relation. The name must be unique within
+ relationships.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:selector xpath="jakartaee:ejb-relation"/>
+ <xsd:field xpath="jakartaee:ejb-relation-name"/>
+ </xsd:unique>
+ </xsd:element>
+ <xsd:element name="assembly-descriptor"
+ type="jakartaee:assembly-descriptorType"
+ minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ Providing an assembly-descriptor in the deployment
+ descriptor is optional for the ejb-jar file or .war file
+ producer.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="ejb-client-jar"
+ type="jakartaee:pathType"
+ minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ <![CDATA[
+ The optional ejb-client-jar element specifies a JAR
+ file that contains the class files necessary for a
+ client program to access the
+ enterprise beans in the ejb-jar file.
+
+ Example:
+
+ <ejb-client-jar>employee_service_client.jar
+ </ejb-client-jar>
+
+ ]]>
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ </xsd:sequence>
+ <xsd:attribute name="version"
+ type="jakartaee:dewey-versionType"
+ fixed="4.0"
+ use="required">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The version specifies the version of the
+ Enterprise Beans specification that the instance document must
+ comply with. This information enables deployment tools
+ to validate a particular Enterprise Beans Deployment
+ Descriptor with respect to a specific version of the Enterprise Beans
+ schema.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
+ <xsd:attribute name="metadata-complete"
+ type="xsd:boolean">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The metadata-complete attribute defines whether this
+ deployment descriptor and other related deployment
+ descriptors for this module (e.g., web service
+ descriptors) are complete, or whether the class
+ files available to this module and packaged with
+ this application should be examined for annotations
+ that specify deployment information.
+
+ If metadata-complete is set to "true", the deployment
+ tool must ignore any annotations that specify deployment
+ information, which might be present in the class files
+ of the application.
+
+ If metadata-complete is not specified or is set to
+ "false", the deployment tool must examine the class
+ files of the application for annotations, as
+ specified by the specifications.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
+ <xsd:attribute name="id"
+ type="xsd:ID"/>
+ </xsd:complexType>
+
+
+<!-- **************************************************** -->
+
+ <xsd:complexType name="ejb-nameType">
+ <xsd:annotation>
+ <xsd:documentation>
+ <![CDATA[
+ The ejb-nameType specifies an enterprise bean's name. It is
+ used by ejb-name elements. This name is assigned by the
+ file producer to name the enterprise bean in the
+ ejb-jar file or .war file's deployment descriptor. The name must be
+ unique among the names of the enterprise beans in the same
+ ejb-jar file or .war file.
+
+ There is no architected relationship between the used
+ ejb-name in the deployment descriptor and the JNDI name that
+ the Deployer will assign to the enterprise bean's home.
+
+ The name for an entity bean must conform to the lexical
+ rules for an NMTOKEN.
+
+ Example:
+
+ <ejb-name>EmployeeService</ejb-name>
+
+ ]]>
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:simpleContent>
+ <xsd:restriction base="jakartaee:xsdNMTOKENType"/>
+ </xsd:simpleContent>
+ </xsd:complexType>
+
+
+<!-- **************************************************** -->
+
+ <xsd:complexType name="ejb-relationType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The ejb-relationType describes a relationship between two
+ entity beans with container-managed persistence. It is used
+ by ejb-relation elements. It contains a description; an
+ optional ejb-relation-name element; and exactly two
+ relationship role declarations, defined by the
+ ejb-relationship-role elements. The name of the
+ relationship, if specified, is unique within the ejb-jar
+ file.
+
+ Support for entity beans is optional as of Enterprise Beans 3.2.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:sequence>
+ <xsd:element name="description"
+ type="jakartaee:descriptionType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="ejb-relation-name"
+ type="jakartaee:string"
+ minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The ejb-relation-name element provides a unique name
+ within the ejb-jar file for a relationship.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="ejb-relationship-role"
+ type="jakartaee:ejb-relationship-roleType"
+ minOccurs="2"
+ maxOccurs="2"/>
+ </xsd:sequence>
+ <xsd:attribute name="id"
+ type="xsd:ID"/>
+ </xsd:complexType>
+
+
+<!-- **************************************************** -->
+
+ <xsd:complexType name="ejb-relationship-roleType">
+ <xsd:annotation>
+ <xsd:documentation>
+ <![CDATA[
+ The ejb-relationship-roleType describes a role within a
+ relationship. There are two roles in each relationship.
+
+ The ejb-relationship-roleType contains an optional
+ description; an optional name for the relationship role; a
+ specification of the multiplicity of the role; an optional
+ specification of cascade-delete functionality for the role;
+ the role source; and a declaration of the cmr-field, if any,
+ by means of which the other side of the relationship is
+ accessed from the perspective of the role source.
+
+ The multiplicity and role-source element are mandatory.
+
+ The relationship-role-source element designates an entity
+ bean by means of an ejb-name element. For bidirectional
+ relationships, both roles of a relationship must declare a
+ relationship-role-source element that specifies a cmr-field
+ in terms of which the relationship is accessed. The lack of
+ a cmr-field element in an ejb-relationship-role specifies
+ that the relationship is unidirectional in navigability and
+ the entity bean that participates in the relationship is
+ "not aware" of the relationship.
+
+ Example:
+
+ <ejb-relation>
+ <ejb-relation-name>Product-LineItem</ejb-relation-name>
+ <ejb-relationship-role>
+ <ejb-relationship-role-name>product-has-lineitems
+ </ejb-relationship-role-name>
+ <multiplicity>One</multiplicity>
+ <relationship-role-source>
+ <ejb-name>ProductEJB</ejb-name>
+ </relationship-role-source>
+ </ejb-relationship-role>
+ </ejb-relation>
+
+ Support for entity beans is optional as of Enterprise Beans 3.2.
+
+ ]]>
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:sequence>
+ <xsd:element name="description"
+ type="jakartaee:descriptionType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="ejb-relationship-role-name"
+ type="jakartaee:string"
+ minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The ejb-relationship-role-name element defines a
+ name for a role that is unique within an
+ ejb-relation. Different relationships can use the
+ same name for a role.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="multiplicity"
+ type="jakartaee:multiplicityType"/>
+ <xsd:element name="cascade-delete"
+ type="jakartaee:emptyType"
+ minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The cascade-delete element specifies that, within a
+ particular relationship, the lifetime of one or more
+ entity beans is dependent upon the lifetime of
+ another entity bean. The cascade-delete element can
+ only be specified for an ejb-relationship-role
+ element contained in an ejb-relation element in
+ which the other ejb-relationship-role
+ element specifies a multiplicity of One.
+
+ Support for entity beans is optional as of Enterprise Beans 3.2.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="relationship-role-source"
+ type="jakartaee:relationship-role-sourceType"/>
+ <xsd:element name="cmr-field"
+ type="jakartaee:cmr-fieldType"
+ minOccurs="0"/>
+ </xsd:sequence>
+ <xsd:attribute name="id"
+ type="xsd:ID"/>
+ </xsd:complexType>
+
+
+<!-- **************************************************** -->
+
+ <xsd:complexType name="enterprise-beansType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The enterprise-beansType declares one or more enterprise
+ beans. Each bean can be a session, entity or message-driven
+ bean.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="session"
+ type="jakartaee:session-beanType">
+ <xsd:unique name="session-ejb-local-ref-name-uniqueness">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The ejb-ref-name element contains the name of
+ an enterprise bean reference. The enterprise bean reference is an entry in
+ the component's environment and is relative to the
+ java:comp/env context. The name must be unique within
+ the component.
+
+ It is recommended that name be prefixed with "ejb/".
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:selector xpath="jakartaee:ejb-local-ref"/>
+ <xsd:field xpath="jakartaee:ejb-ref-name"/>
+ </xsd:unique>
+ <xsd:unique name="session-ejb-ref-name-uniqueness">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The ejb-ref-name element contains the name of an enterprise bean
+ reference. The enterprise bean reference is an entry in the
+ component's environment and is relative to the
+ java:comp/env context. The name must be unique
+ within the component.
+
+ It is recommended that name is prefixed with "ejb/".
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:selector xpath="jakartaee:ejb-ref"/>
+ <xsd:field xpath="jakartaee:ejb-ref-name"/>
+ </xsd:unique>
+ <xsd:unique name="session-resource-env-ref-uniqueness">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The resource-env-ref-name element specifies the name
+ of a resource environment reference; its value is
+ the environment entry name used in the component
+ code. The name is a JNDI name relative to the
+ java:comp/env context and must be unique within an
+ component.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:selector xpath="jakartaee:resource-env-ref"/>
+ <xsd:field xpath="jakartaee:resource-env-ref-name"/>
+ </xsd:unique>
+ <xsd:unique name="session-message-destination-ref-uniqueness">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The message-destination-ref-name element specifies the name
+ of a message destination reference; its value is
+ the message destination reference name used in the component
+ code. The name is a JNDI name relative to the
+ java:comp/env context and must be unique within an
+ component.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:selector xpath="jakartaee:message-destination-ref"/>
+ <xsd:field xpath="jakartaee:message-destination-ref-name"/>
+ </xsd:unique>
+ <xsd:unique name="session-res-ref-name-uniqueness">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The res-ref-name element specifies the name of a
+ resource manager connection factory reference. The name
+ is a JNDI name relative to the java:comp/env context.
+ The name must be unique within an component.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:selector xpath="jakartaee:resource-ref"/>
+ <xsd:field xpath="jakartaee:res-ref-name"/>
+ </xsd:unique>
+ <xsd:unique name="session-env-entry-name-uniqueness">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The env-entry-name element contains the name of a
+ component's environment entry. The name is a JNDI
+ name relative to the java:comp/env context. The
+ name must be unique within an component.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:selector xpath="jakartaee:env-entry"/>
+ <xsd:field xpath="jakartaee:env-entry-name"/>
+ </xsd:unique>
+ </xsd:element>
+ <xsd:element name="entity"
+ type="jakartaee:entity-beanType">
+ <xsd:unique name="entity-ejb-local-ref-name-uniqueness">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The ejb-ref-name element contains the name of
+ an enterprise bean reference. The enterprise bean reference is an entry in
+ the component's environment and is relative to the
+ java:comp/env context. The name must be unique within
+ the component.
+
+ It is recommended that name be prefixed with "ejb/".
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:selector xpath="jakartaee:ejb-local-ref"/>
+ <xsd:field xpath="jakartaee:ejb-ref-name"/>
+ </xsd:unique>
+ <xsd:unique name="entity-ejb-ref-name-uniqueness">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The ejb-ref-name element contains the name of an enterprise bean
+ reference. The enterprise bean reference is an entry in the
+ component's environment and is relative to the
+ java:comp/env context. The name must be unique
+ within the component.
+
+ It is recommended that name is prefixed with "ejb/".
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:selector xpath="jakartaee:ejb-ref"/>
+ <xsd:field xpath="jakartaee:ejb-ref-name"/>
+ </xsd:unique>
+ <xsd:unique name="entity-resource-env-ref-uniqueness">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The resource-env-ref-name element specifies the name
+ of a resource environment reference; its value is
+ the environment entry name used in the component
+ code. The name is a JNDI name relative to the
+ java:comp/env context and must be unique within an
+ component.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:selector xpath="jakartaee:resource-env-ref"/>
+ <xsd:field xpath="jakartaee:resource-env-ref-name"/>
+ </xsd:unique>
+ <xsd:unique name="entity-message-destination-ref-uniqueness">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The message-destination-ref-name element specifies the name
+ of a message destination reference; its value is
+ the message destination reference name used in the component
+ code. The name is a JNDI name relative to the
+ java:comp/env context and must be unique within an
+ component.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:selector xpath="jakartaee:message-destination-ref"/>
+ <xsd:field xpath="jakartaee:message-destination-ref-name"/>
+ </xsd:unique>
+ <xsd:unique name="entity-res-ref-name-uniqueness">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The res-ref-name element specifies the name of a
+ resource manager connection factory reference. The name
+ is a JNDI name relative to the java:comp/env context.
+ The name must be unique within an component.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:selector xpath="jakartaee:resource-ref"/>
+ <xsd:field xpath="jakartaee:res-ref-name"/>
+ </xsd:unique>
+ <xsd:unique name="entity-env-entry-name-uniqueness">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The env-entry-name element contains the name of a
+ component's environment entry. The name is a JNDI
+ name relative to the java:comp/env context. The
+ name must be unique within an component.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:selector xpath="jakartaee:env-entry"/>
+ <xsd:field xpath="jakartaee:env-entry-name"/>
+ </xsd:unique>
+ </xsd:element>
+ <xsd:element name="message-driven"
+ type="jakartaee:message-driven-beanType">
+ <xsd:unique name="messaged-ejb-local-ref-name-uniqueness">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The ejb-ref-name element contains the name of
+ an enterprise bean reference. The enterprise bean reference is an entry in
+ the component's environment and is relative to the
+ java:comp/env context. The name must be unique within
+ the component.
+
+ It is recommended that name be prefixed with "ejb/".
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:selector xpath="jakartaee:ejb-local-ref"/>
+ <xsd:field xpath="jakartaee:ejb-ref-name"/>
+ </xsd:unique>
+ <xsd:unique name="messaged-ejb-ref-name-uniqueness">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The ejb-ref-name element contains the name of an enterprise bean
+ reference. The enterprise bean reference is an entry in the
+ component's environment and is relative to the
+ java:comp/env context. The name must be unique
+ within the component.
+
+ It is recommended that name is prefixed with "ejb/".
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:selector xpath="jakartaee:ejb-ref"/>
+ <xsd:field xpath="jakartaee:ejb-ref-name"/>
+ </xsd:unique>
+ <xsd:unique name="messaged-resource-env-ref-uniqueness">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The resource-env-ref-name element specifies the name
+ of a resource environment reference; its value is
+ the environment entry name used in the component
+ code. The name is a JNDI name relative to the
+ java:comp/env context and must be unique within an
+ component.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:selector xpath="jakartaee:resource-env-ref"/>
+ <xsd:field xpath="jakartaee:resource-env-ref-name"/>
+ </xsd:unique>
+ <xsd:unique name="messaged-message-destination-ref-uniqueness">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The message-destination-ref-name element specifies the name
+ of a message destination reference; its value is
+ the message destination reference name used in the component
+ code. The name is a JNDI name relative to the
+ java:comp/env context and must be unique within an
+ component.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:selector xpath="jakartaee:message-destination-ref"/>
+ <xsd:field xpath="jakartaee:message-destination-ref-name"/>
+ </xsd:unique>
+ <xsd:unique name="messaged-res-ref-name-uniqueness">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The res-ref-name element specifies the name of a
+ resource manager connection factory reference. The name
+ is a JNDI name relative to the java:comp/env context.
+ The name must be unique within an component.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:selector xpath="jakartaee:resource-ref"/>
+ <xsd:field xpath="jakartaee:res-ref-name"/>
+ </xsd:unique>
+ <xsd:unique name="messaged-env-entry-name-uniqueness">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The env-entry-name element contains the name of a
+ component's environment entry. The name is a JNDI
+ name relative to the java:comp/env context. The
+ name must be unique within an component.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:selector xpath="jakartaee:env-entry"/>
+ <xsd:field xpath="jakartaee:env-entry-name"/>
+ </xsd:unique>
+ </xsd:element>
+ </xsd:choice>
+ <xsd:attribute name="id"
+ type="xsd:ID"/>
+ </xsd:complexType>
+
+
+<!-- **************************************************** -->
+
+ <xsd:complexType name="entity-beanType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ Support for entity beans is optional as of Enterprise Beans 3.2.
+
+ The entity-beanType declares an entity bean. The declaration
+ consists of:
+
+ - an optional description
+ - an optional display name
+ - an optional icon element that contains a small and a large
+ icon file name
+ - a unique name assigned to the enterprise bean
+ in the deployment descriptor
+ - an optional mapped-name element that can be used to provide
+ vendor-specific deployment information such as the physical
+ jndi-name of the entity bean's remote home interface. This
+ element is not required to be supported by all implementations.
+ Any use of this element is non-portable.
+ - the names of the entity bean's remote home
+ and remote interfaces, if any
+ - the names of the entity bean's local home and local
+ interfaces, if any
+ - the entity bean's implementation class
+ - the optional entity bean's persistence management type. If
+ this element is not specified it is defaulted to Container.
+ - the entity bean's primary key class name
+ - an indication of the entity bean's reentrancy
+ - an optional specification of the
+ entity bean's cmp-version
+ - an optional specification of the entity bean's
+ abstract schema name
+ - an optional list of container-managed fields
+ - an optional specification of the primary key
+ field
+ - an optional declaration of the bean's environment
+ entries
+ - an optional declaration of the bean's enterprise bean
+ references
+ - an optional declaration of the bean's local enterprise bean
+ references
+ - an optional declaration of the bean's web
+ service references
+ - an optional declaration of the security role
+ references
+ - an optional declaration of the security identity
+ to be used for the execution of the bean's methods
+ - an optional declaration of the bean's
+ resource manager connection factory references
+ - an optional declaration of the bean's
+ resource environment references
+ - an optional declaration of the bean's message
+ destination references
+ - an optional set of query declarations
+ for finder and select methods for an entity
+ bean with cmp-version 2.x.
+
+ The optional abstract-schema-name element must be specified
+ for an entity bean with container-managed persistence and
+ cmp-version 2.x.
+
+ The optional primkey-field may be present in the descriptor
+ if the entity's persistence-type is Container.
+
+ The optional cmp-version element may be present in the
+ descriptor if the entity's persistence-type is Container. If
+ the persistence-type is Container and the cmp-version
+ element is not specified, its value defaults to 2.x.
+
+ The optional home and remote elements must be specified if
+ the entity bean cmp-version is 1.x.
+
+ The optional home and remote elements must be specified if
+ the entity bean has a remote home and remote interface.
+
+ The optional local-home and local elements must be specified
+ if the entity bean has a local home and local interface.
+
+ Either both the local-home and the local elements or both
+ the home and the remote elements must be specified.
+
+ The optional query elements must be present if the
+ persistence-type is Container and the cmp-version is 2.x and
+ query methods other than findByPrimaryKey have been defined
+ for the entity bean.
+
+ The other elements that are optional are "optional" in the
+ sense that they are omitted if the lists represented by them
+ are empty.
+
+ At least one cmp-field element must be present in the
+ descriptor if the entity's persistence-type is Container and
+ the cmp-version is 1.x, and none must not be present if the
+ entity's persistence-type is Bean.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:sequence>
+ <xsd:group ref="jakartaee:descriptionGroup"/>
+ <xsd:element name="ejb-name"
+ type="jakartaee:ejb-nameType"/>
+ <xsd:element name="mapped-name"
+ type="jakartaee:xsdStringType"
+ minOccurs="0"/>
+ <xsd:element name="home"
+ type="jakartaee:homeType"
+ minOccurs="0"/>
+ <xsd:element name="remote"
+ type="jakartaee:remoteType"
+ minOccurs="0"/>
+ <xsd:element name="local-home"
+ type="jakartaee:local-homeType"
+ minOccurs="0"/>
+ <xsd:element name="local"
+ type="jakartaee:localType"
+ minOccurs="0"/>
+ <xsd:element name="ejb-class"
+ type="jakartaee:ejb-classType"/>
+ <xsd:element name="persistence-type"
+ type="jakartaee:persistence-typeType"/>
+ <xsd:element name="prim-key-class"
+ type="jakartaee:fully-qualified-classType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The prim-key-class element contains the
+ fully-qualified name of an
+ entity bean's primary key class.
+
+ If the definition of the primary key class is
+ deferred to deployment time, the prim-key-class
+ element should specify java.lang.Object.
+
+ Support for entity beans is optional as of Enterprise Beans 3.2.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="reentrant"
+ type="jakartaee:true-falseType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The reentrant element specifies whether an entity
+ bean is reentrant or not.
+
+ The reentrant element must be one of the two
+ following: true or false
+
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="cmp-version"
+ type="jakartaee:cmp-versionType"
+ minOccurs="0"/>
+ <xsd:element name="abstract-schema-name"
+ type="jakartaee:java-identifierType"
+ minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The abstract-schema-name element specifies the name
+ of the abstract schema type of an entity bean with
+ cmp-version 2.x. It is used in Enterprise Beans QL queries.
+
+ For example, the abstract-schema-name for an entity
+ bean whose local interface is
+ com.acme.commerce.Order might be Order.
+
+ Support for entity beans is optional as of Enterprise Beans 3.2.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="cmp-field"
+ type="jakartaee:cmp-fieldType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="primkey-field"
+ type="jakartaee:string"
+ minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The primkey-field element is used to specify the
+ name of the primary key field for an entity with
+ container-managed persistence.
+
+ The primkey-field must be one of the fields declared
+ in the cmp-field element, and the type of the field
+ must be the same as the primary key type.
+
+ The primkey-field element is not used if the primary
+ key maps to multiple container-managed fields
+ (i.e. the key is a compound key). In this case, the
+ fields of the primary key class must be public, and
+ their names must correspond to the field names of
+ the entity bean class that comprise the key.
+
+ Support for entity beans is optional as of Enterprise Beans 3.2.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:group ref="jakartaee:jndiEnvironmentRefsGroup"/>
+ <xsd:element name="security-role-ref"
+ type="jakartaee:security-role-refType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="security-identity"
+ type="jakartaee:security-identityType"
+ minOccurs="0"/>
+ <xsd:element name="query"
+ type="jakartaee:queryType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ </xsd:sequence>
+ <xsd:attribute name="id"
+ type="xsd:ID"/>
+ </xsd:complexType>
+
+
+<!-- **************************************************** -->
+
+ <xsd:complexType name="exclude-listType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The exclude-listType specifies one or more methods which
+ the Assembler marks to be uncallable.
+
+ If the method permission relation contains methods that are
+ in the exclude list, the Deployer should consider those
+ methods to be uncallable.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:sequence>
+ <xsd:element name="description"
+ type="jakartaee:descriptionType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="method"
+ type="jakartaee:methodType"
+ maxOccurs="unbounded"/>
+ </xsd:sequence>
+ <xsd:attribute name="id"
+ type="xsd:ID"/>
+ </xsd:complexType>
+
+
+<!-- **************************************************** -->
+
+ <xsd:complexType name="application-exceptionType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The application-exceptionType declares an application
+ exception. The declaration consists of:
+
+ - the exception class. When the container receives
+ an exception of this type, it is required to
+ forward this exception as an applcation exception
+ to the client regardless of whether it is a checked
+ or unchecked exception.
+ - an optional rollback element. If this element is
+ set to true, the container must rollback the current
+ transaction before forwarding the exception to the
+ client. If not specified, it defaults to false.
+ - an optional inherited element. If this element is
+ set to true, subclasses of the exception class type
+ are also automatically considered application
+ exceptions (unless overriden at a lower level).
+ If set to false, only the exception class type is
+ considered an application-exception, not its
+ exception subclasses. If not specified, this
+ value defaults to true.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:sequence>
+ <xsd:element name="exception-class"
+ type="jakartaee:fully-qualified-classType"/>
+ <xsd:element name="rollback"
+ type="jakartaee:true-falseType"
+ minOccurs="0"/>
+ <xsd:element name="inherited"
+ type="jakartaee:true-falseType"
+ minOccurs="0"/>
+ </xsd:sequence>
+ <xsd:attribute name="id"
+ type="xsd:ID"/>
+ </xsd:complexType>
+
+
+<!-- **************************************************** -->
+
+ <xsd:complexType name="interceptorsType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The interceptorsType element declares one or more interceptor
+ classes used by components within this ejb-jar file or .war file. The declaration
+ consists of :
+
+ - An optional description.
+ - One or more interceptor elements.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:sequence>
+ <xsd:element name="description"
+ type="jakartaee:descriptionType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="interceptor"
+ type="jakartaee:interceptorType"
+ maxOccurs="unbounded"/>
+ </xsd:sequence>
+ <xsd:attribute name="id"
+ type="xsd:ID"/>
+ </xsd:complexType>
+
+
+<!-- **************************************************** -->
+
+ <xsd:complexType name="interceptorType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The interceptorType element declares information about a single
+ interceptor class. It consists of :
+
+ - An optional description.
+ - The fully-qualified name of the interceptor class.
+ - An optional list of around invoke methods declared on the
+ interceptor class and/or its super-classes.
+ - An optional list of around timeout methods declared on the
+ interceptor class and/or its super-classes.
+ - An optional list environment dependencies for the interceptor
+ class and/or its super-classes.
+ - An optional list of post-activate methods declared on the
+ interceptor class and/or its super-classes.
+ - An optional list of pre-passivate methods declared on the
+ interceptor class and/or its super-classes.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:sequence>
+ <xsd:element name="description"
+ type="jakartaee:descriptionType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="interceptor-class"
+ type="jakartaee:fully-qualified-classType"/>
+ <xsd:element name="around-invoke"
+ type="jakartaee:around-invokeType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="around-timeout"
+ type="jakartaee:around-timeoutType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="around-construct"
+ type="jakartaee:lifecycle-callbackType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:group ref="jakartaee:jndiEnvironmentRefsGroup"/>
+ <xsd:element name="post-activate"
+ type="jakartaee:lifecycle-callbackType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="pre-passivate"
+ type="jakartaee:lifecycle-callbackType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ </xsd:sequence>
+ <xsd:attribute name="id"
+ type="xsd:ID"/>
+ </xsd:complexType>
+
+
+<!-- **************************************************** -->
+
+ <xsd:complexType name="interceptor-bindingType">
+ <xsd:annotation>
+ <xsd:documentation>
+ <![CDATA[
+ The interceptor-bindingType element describes the binding of
+ interceptor classes to beans within the ejb-jar file or .war file.
+ It consists of :
+
+ - An optional description.
+ - The name of an ejb within the module or the wildcard value "*",
+ which is used to define interceptors that are bound to all
+ beans in the ejb-jar file or .war file.
+ - A list of interceptor classes that are bound to the contents of
+ the ejb-name element or a specification of the total ordering
+ over the interceptors defined for the given level and above.
+ - An optional exclude-default-interceptors element. If set to true,
+ specifies that default interceptors are not to be applied to
+ a bean-class and/or business method.
+ - An optional exclude-class-interceptors element. If set to true,
+ specifies that class interceptors are not to be applied to
+ a business method.
+ - An optional set of method elements for describing the name/params
+ of a method-level interceptor.
+
+ Interceptors bound to all classes using the wildcard syntax
+ "*" are default interceptors for the components in the ejb-jar file or .war file.
+ In addition, interceptors may be bound at the level of the bean
+ class (class-level interceptors) or business methods (method-level
+ interceptors ).
+
+ The binding of interceptors to classes is additive. If interceptors
+ are bound at the class-level and/or default-level as well as the
+ method-level, both class-level and/or default-level as well as
+ method-level will apply.
+
+ The method-name element may be used to bind a constructor-level
+ interceptor using the unqualified name of the bean class as the value;
+ the optional method-params elements identify the constructor if a bean
+ class has a constructor annotated with the Inject annotation in addition
+ to a no-arg constructor.
+
+ There are four possible styles of the interceptor element syntax :
+
+ 1.
+ <interceptor-binding>
+ <ejb-name>*</ejb-name>
+ <interceptor-class>INTERCEPTOR</interceptor-class>
+ </interceptor-binding>
+
+ Specifying the ejb-name as the wildcard value "*" designates
+ default interceptors (interceptors that apply to all session and
+ message-driven beans contained in the ejb-jar file or .war file).
+
+ 2.
+ <interceptor-binding>
+ <ejb-name>EJBNAME</ejb-name>
+ <interceptor-class>INTERCEPTOR</interceptor-class>
+ </interceptor-binding>
+
+ This style is used to refer to interceptors associated with the
+ specified enterprise bean(class-level interceptors).
+
+ 3.
+ <interceptor-binding>
+ <ejb-name>EJBNAME</ejb-name>
+ <interceptor-class>INTERCEPTOR</interceptor-class>
+ <method>
+ <method-name>METHOD</method-name>
+ </method>
+ </interceptor-binding>
+
+ This style is used to associate a method-level interceptor with
+ the specified enterprise bean. If there are multiple methods
+ with the same overloaded name, the element of this style refers
+ to all the methods with the overloaded name. Method-level
+ interceptors can only be associated with business methods of the
+ bean class. Note that the wildcard value "*" cannot be used
+ to specify method-level interceptors.
+
+ 4.
+ <interceptor-binding>
+ <ejb-name>EJBNAME</ejb-name>
+ <interceptor-class>INTERCEPTOR</interceptor-class>
+ <method>
+ <method-name>METHOD</method-name>
+ <method-params>
+ <method-param>PARAM-1</method-param>
+ <method-param>PARAM-2</method-param>
+ ...
+ <method-param>PARAM-N</method-param>
+ </method-params>
+ </method>
+ </interceptor-binding>
+
+ This style is used to associate a method-level interceptor with
+ the specified method of the specified enterprise bean. This
+ style is used to refer to a single method within a set of methods
+ with an overloaded name. The values PARAM-1 through PARAM-N
+ are the fully-qualified Java types of the method's input parameters
+ (if the method has no input arguments, the method-params element
+ contains no method-param elements). Arrays are specified by the
+ array element's type, followed by one or more pair of square
+ brackets (e.g. int[][]).
+
+ ]]>
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:sequence>
+ <xsd:element name="description"
+ type="jakartaee:descriptionType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="ejb-name"
+ type="jakartaee:string"/>
+ <xsd:choice>
+ <xsd:element name="interceptor-class"
+ type="jakartaee:fully-qualified-classType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="interceptor-order"
+ type="jakartaee:interceptor-orderType"
+ minOccurs="1"/>
+ </xsd:choice>
+ <xsd:element name="exclude-default-interceptors"
+ type="jakartaee:true-falseType"
+ minOccurs="0"/>
+ <xsd:element name="exclude-class-interceptors"
+ type="jakartaee:true-falseType"
+ minOccurs="0"/>
+ <xsd:element name="method"
+ type="jakartaee:named-methodType"
+ minOccurs="0"/>
+ </xsd:sequence>
+ <xsd:attribute name="id"
+ type="xsd:ID"/>
+ </xsd:complexType>
+
+
+<!-- **************************************************** -->
+
+ <xsd:complexType name="interceptor-orderType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The interceptor-orderType element describes a total ordering
+ of interceptor classes.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:sequence>
+ <xsd:element name="interceptor-class"
+ type="jakartaee:fully-qualified-classType"
+ minOccurs="1"
+ maxOccurs="unbounded"/>
+ </xsd:sequence>
+ <xsd:attribute name="id"
+ type="xsd:ID"/>
+ </xsd:complexType>
+
+
+<!-- **************************************************** -->
+
+ <xsd:complexType name="named-methodType">
+ <xsd:sequence>
+ <xsd:element name="method-name"
+ type="jakartaee:string"/>
+ <xsd:element name="method-params"
+ type="jakartaee:method-paramsType"
+ minOccurs="0"/>
+ </xsd:sequence>
+ <xsd:attribute name="id"
+ type="xsd:ID"/>
+ </xsd:complexType>
+
+
+<!-- **************************************************** -->
+
+ <xsd:complexType name="init-methodType">
+ <xsd:sequence>
+ <xsd:element name="create-method"
+ type="jakartaee:named-methodType"/>
+ <xsd:element name="bean-method"
+ type="jakartaee:named-methodType"/>
+ </xsd:sequence>
+ <xsd:attribute name="id"
+ type="xsd:ID"/>
+ </xsd:complexType>
+
+
+<!-- **************************************************** -->
+
+ <xsd:complexType name="remove-methodType">
+ <xsd:sequence>
+ <xsd:element name="bean-method"
+ type="jakartaee:named-methodType"/>
+ <xsd:element name="retain-if-exception"
+ type="jakartaee:true-falseType"
+ minOccurs="0"/>
+ </xsd:sequence>
+ <xsd:attribute name="id"
+ type="xsd:ID"/>
+ </xsd:complexType>
+
+
+<!-- **************************************************** -->
+
+ <xsd:complexType name="message-driven-beanType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The message-driven element declares a message-driven
+ bean. The declaration consists of:
+
+ - an optional description
+ - an optional display name
+ - an optional icon element that contains a small and a large
+ icon file name.
+ - a name assigned to the enterprise bean in
+ the deployment descriptor
+ - an optional mapped-name element that can be used to provide
+ vendor-specific deployment information such as the physical
+ jndi-name of destination from which this message-driven bean
+ should consume. This element is not required to be supported
+ by all implementations. Any use of this element is non-portable.
+ - the message-driven bean's implementation class
+ - an optional declaration of the bean's messaging
+ type
+ - an optional declaration of the bean's timeout method for
+ handling programmatically created timers
+ - an optional declaration of timers to be automatically created at
+ deployment time
+ - the optional message-driven bean's transaction management
+ type. If it is not defined, it is defaulted to Container.
+ - an optional declaration of the bean's
+ message-destination-type
+ - an optional declaration of the bean's
+ message-destination-link
+ - an optional declaration of the message-driven bean's
+ activation configuration properties
+ - an optional list of the message-driven bean class and/or
+ superclass around-invoke methods.
+ - an optional list of the message-driven bean class and/or
+ superclass around-timeout methods.
+ - an optional declaration of the bean's environment
+ entries
+ - an optional declaration of the bean's enterprise bean references
+ - an optional declaration of the bean's local enterprise bean
+ references
+ - an optional declaration of the bean's web service
+ references
+ - an optional declaration of the security role
+ references
+ - an optional declaration of the security
+ identity to be used for the execution of the bean's
+ methods
+ - an optional declaration of the bean's
+ resource manager connection factory
+ references
+ - an optional declaration of the bean's resource
+ environment references.
+ - an optional declaration of the bean's message
+ destination references
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:sequence>
+ <xsd:group ref="jakartaee:descriptionGroup"/>
+ <xsd:element name="ejb-name"
+ type="jakartaee:ejb-nameType"/>
+ <xsd:element name="mapped-name"
+ type="jakartaee:xsdStringType"
+ minOccurs="0"/>
+ <xsd:element name="ejb-class"
+ type="jakartaee:ejb-classType"
+ minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The ejb-class element specifies the fully qualified name
+ of the bean class for this ejb. It is required unless
+ there is a component-defining annotation for the same
+ ejb-name.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="messaging-type"
+ type="jakartaee:fully-qualified-classType"
+ minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The messaging-type element specifies the message
+ listener interface of the message-driven bean.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="timeout-method"
+ type="jakartaee:named-methodType"
+ minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The timeout-method element specifies the method that
+ will receive callbacks for programmatically
+ created timers.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="timer"
+ type="jakartaee:timerType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="transaction-type"
+ type="jakartaee:transaction-typeType"
+ minOccurs="0"/>
+ <xsd:element name="message-destination-type"
+ type="jakartaee:message-destination-typeType"
+ minOccurs="0"/>
+ <xsd:element name="message-destination-link"
+ type="jakartaee:message-destination-linkType"
+ minOccurs="0"/>
+ <xsd:element name="activation-config"
+ type="jakartaee:activation-configType"
+ minOccurs="0"/>
+ <xsd:element name="around-invoke"
+ type="jakartaee:around-invokeType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="around-timeout"
+ type="jakartaee:around-timeoutType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:group ref="jakartaee:jndiEnvironmentRefsGroup"/>
+ <xsd:element name="security-role-ref"
+ type="jakartaee:security-role-refType"
+ minOccurs="0"
+ maxOccurs="unbounded">
+ </xsd:element>
+ <xsd:element name="security-identity"
+ type="jakartaee:security-identityType"
+ minOccurs="0"/>
+ </xsd:sequence>
+ <xsd:attribute name="id"
+ type="xsd:ID"/>
+ </xsd:complexType>
+
+
+<!-- **************************************************** -->
+
+ <xsd:complexType name="methodType">
+ <xsd:annotation>
+ <xsd:documentation>
+ <![CDATA[
+ The methodType is used to denote a method of an enterprise
+ bean. The method may be any of the following or a set of
+ any of the following methods may be designated:
+ business interface method
+ home interface method
+ component interface method
+ web service endpoint interface method
+ no-interface view method
+ singleton session bean lifecycle callback method
+ stateful session bean lifecycle callback method (see
+ limitations)
+ timeout callback method
+ message-driven bean message listener method
+
+ The ejb-name element must be the name of one of the enterprise
+ beans declared in the deployment descriptor.
+ The optional method-intf element allows distinguishing between a
+ method with the same signature that is multiply defined
+ across any of the above.
+ The method-name element specifies the method name.
+ The optional method-params elements identify a single method
+ among multiple methods with an overloaded method name.
+
+ There are three possible styles of using methodType element
+ within a method element:
+
+ 1.
+ <method>
+ <ejb-name>EJBNAME</ejb-name>
+ <method-name>*</method-name>
+ </method>
+
+ This style is used to refer to all of the following methods
+ of the specified enterprise bean:
+ business interface methods
+ home interface methods
+ component interface methods
+ web service endpoint interface methods
+ no-interface view methods
+ singleton session bean lifecycle callback methods
+ timeout callback methods
+ message-driven bean message listener method
+
+ This style may also be used in combination with the
+ method-intf element that contains LifecycleCallback as
+ the value to specify transaction attributes of a stateful
+ session bean PostConstruct, PreDestroy, PrePassivate,
+ and PostActivate lifecycle callback methods or to override
+ transaction attributes of a singleton session bean
+ PostConstruct and PreDestroy lifecycle callback methods.
+
+ 2.
+ <method>
+ <ejb-name>EJBNAME</ejb-name>
+ <method-name>METHOD</method-name>
+ </method>
+
+ This style is used to refer to the specified method of
+ the specified enterprise bean. If there are multiple
+ methods with the same overloaded name, the element of
+ this style refers to all the methods with the overloaded
+ name.
+
+ This style may be used to refer to stateful session bean
+ PostConstruct, PreDestroy, PrePassivate, and PostActivate
+ lifecycle callback methods to specify their transaction
+ attributes if any of the following is true:
+ there is only one method with this name in the specified
+ enterprise bean
+ all overloaded methods with this name in the specified
+ enterprise bean are lifecycle callback methods
+ method-intf element is specified and it contains
+ LifecycleCallback as the value
+
+ 3.
+ <method>
+ <ejb-name>EJBNAME</ejb-name>
+ <method-name>METHOD</method-name>
+ <method-params>
+ <method-param>PARAM-1</method-param>
+ <method-param>PARAM-2</method-param>
+ ...
+ <method-param>PARAM-n</method-param>
+ </method-params>
+ </method>
+
+ This style is used to refer to a single method within a
+ set of methods with an overloaded name. PARAM-1 through
+ PARAM-n are the fully-qualified Java types of the
+ method's input parameters (if the method has no input
+ arguments, the method-params element contains no
+ method-param elements). Arrays are specified by the
+ array element's type, followed by one or more pair of
+ square brackets (e.g. int[][]).
+ If a method with the same name and signature is defined
+ on more than one interface of an enterprise bean, this
+ style refers to all those methods.
+
+ Examples:
+
+ Style 1: The following method element refers to all of the
+ following methods of the EmployeeService bean:
+ no interface view methods
+ business interface methods
+ home interface methods
+ component business interface methods
+ singleton session bean lifecycle callback methods, if any
+ timeout callback methods
+ web service endpoint interface methods
+ message-driven bean message listener methods (if the bean
+ a message-driven bean)
+
+ <method>
+ <ejb-name>EmployeeService</ejb-name>
+ <method-name>*</method-name>
+ </method>
+
+ Style 2: The following method element refers to all the
+ create methods of the EmployeeService bean's home
+ interface(s).
+
+ <method>
+ <ejb-name>EmployeeService</ejb-name>
+ <method-name>create</method-name>
+ </method>
+
+ Style 3: The following method element refers to the
+ create(String firstName, String LastName) method of the
+ EmployeeService bean's home interface(s).
+
+ <method>
+ <ejb-name>EmployeeService</ejb-name>
+ <method-name>create</method-name>
+ <method-params>
+ <method-param>java.lang.String</method-param>
+ <method-param>java.lang.String</method-param>
+ </method-params>
+ </method>
+
+ The following example illustrates a Style 3 element with
+ more complex parameter types. The method
+ foobar(char s, int i, int[] iar, mypackage.MyClass mycl,
+ mypackage.MyClass[][] myclaar) would be specified as:
+
+ <method>
+ <ejb-name>EmployeeService</ejb-name>
+ <method-name>foobar</method-name>
+ <method-params>
+ <method-param>char</method-param>
+ <method-param>int</method-param>
+ <method-param>int[]</method-param>
+ <method-param>mypackage.MyClass</method-param>
+ <method-param>mypackage.MyClass[][]</method-param>
+ </method-params>
+ </method>
+
+ The optional method-intf element can be used when it becomes
+ necessary to differentiate between a method that is defined
+ multiple times with the same name and signature across any
+ of the following methods of an enterprise bean:
+ business interface methods
+ home interface methods
+ component interface methods
+ web service endpoint methods
+ no-interface view methods
+ singleton or stateful session bean lifecycle callback methods
+ timeout callback methods
+ message-driven bean message listener methods
+
+ However, if the same method is a method of both the local
+ business interface, and the local component interface,
+ the same attribute applies to the method for both interfaces.
+ Likewise, if the same method is a method of both the remote
+ business interface and the remote component interface, the same
+ attribute applies to the method for both interfaces.
+
+ For example, the method element
+
+ <method>
+ <ejb-name>EmployeeService</ejb-name>
+ <method-intf>Remote</method-intf>
+ <method-name>create</method-name>
+ <method-params>
+ <method-param>java.lang.String</method-param>
+ <method-param>java.lang.String</method-param>
+ </method-params>
+ </method>
+
+ can be used to differentiate the create(String, String)
+ method defined in the remote interface from the
+ create(String, String) method defined in the remote home
+ interface, which would be defined as
+
+ <method>
+ <ejb-name>EmployeeService</ejb-name>
+ <method-intf>Home</method-intf>
+ <method-name>create</method-name>
+ <method-params>
+ <method-param>java.lang.String</method-param>
+ <method-param>java.lang.String</method-param>
+ </method-params>
+ </method>
+
+ and the create method that is defined in the local home
+ interface which would be defined as
+
+ <method>
+ <ejb-name>EmployeeService</ejb-name>
+ <method-intf>LocalHome</method-intf>
+ <method-name>create</method-name>
+ <method-params>
+ <method-param>java.lang.String</method-param>
+ <method-param>java.lang.String</method-param>
+ </method-params>
+ </method>
+
+ The method-intf element can be used with all three Styles
+ of the method element usage. For example, the following
+ method element example could be used to refer to all the
+ methods of the EmployeeService bean's remote home interface
+ and the remote business interface.
+
+ <method>
+ <ejb-name>EmployeeService</ejb-name>
+ <method-intf>Home</method-intf>
+ <method-name>*</method-name>
+ </method>
+
+ ]]>
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:sequence>
+ <xsd:element name="description"
+ type="jakartaee:descriptionType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="ejb-name"
+ type="jakartaee:ejb-nameType"/>
+ <xsd:element name="method-intf"
+ type="jakartaee:method-intfType"
+ minOccurs="0">
+ </xsd:element>
+ <xsd:element name="method-name"
+ type="jakartaee:method-nameType"/>
+ <xsd:element name="method-params"
+ type="jakartaee:method-paramsType"
+ minOccurs="0"/>
+ </xsd:sequence>
+ <xsd:attribute name="id"
+ type="xsd:ID"/>
+ </xsd:complexType>
+
+
+<!-- **************************************************** -->
+
+ <xsd:complexType name="method-intfType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The method-intf element allows a method element to
+ differentiate between the methods with the same name and
+ signature that are multiply defined across the home and
+ component interfaces (e.g, in both an enterprise bean's
+ remote and local interfaces or in both an enterprise bean's
+ home and remote interfaces, etc.); the component and web
+ service endpoint interfaces, and so on.
+
+ Local applies to the local component interface, local business
+ interfaces, and the no-interface view.
+
+ Remote applies to both remote component interface and the remote
+ business interfaces.
+
+ ServiceEndpoint refers to methods exposed through a web service
+ endpoint.
+
+ Timer refers to the bean's timeout callback methods.
+
+ MessageEndpoint refers to the methods of a message-driven bean's
+ message-listener interface.
+
+ LifecycleCallback refers to the PostConstruct and PreDestroy
+ lifecycle callback methods of a singleton session bean and
+ to the PostConstruct, PreDestroy, PrePassivate, and PostActivate
+ lifecycle callback methods of a stateful session bean.
+
+ The method-intf element must be one of the following:
+
+ Home
+ Remote
+ LocalHome
+ Local
+ ServiceEndpoint
+ Timer
+ MessageEndpoint
+ LifecycleCallback
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:simpleContent>
+ <xsd:restriction base="jakartaee:string">
+ <xsd:enumeration value="Home"/>
+ <xsd:enumeration value="Remote"/>
+ <xsd:enumeration value="LocalHome"/>
+ <xsd:enumeration value="Local"/>
+ <xsd:enumeration value="ServiceEndpoint"/>
+ <xsd:enumeration value="Timer"/>
+ <xsd:enumeration value="MessageEndpoint"/>
+ <xsd:enumeration value="LifecycleCallback"/>
+ </xsd:restriction>
+ </xsd:simpleContent>
+ </xsd:complexType>
+
+
+<!-- **************************************************** -->
+
+ <xsd:complexType name="method-nameType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The method-nameType contains a name of an enterprise
+ bean method or the asterisk (*) character. The asterisk is
+ used when the element denotes all the methods of an
+ enterprise bean's client view interfaces.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:simpleContent>
+ <xsd:restriction base="jakartaee:string"/>
+ </xsd:simpleContent>
+ </xsd:complexType>
+
+
+<!-- **************************************************** -->
+
+ <xsd:complexType name="method-paramsType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The method-paramsType defines a list of the
+ fully-qualified Java type names of the method parameters.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:sequence>
+ <xsd:element name="method-param"
+ type="jakartaee:java-typeType"
+ minOccurs="0"
+ maxOccurs="unbounded">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The method-param element contains a primitive
+ or a fully-qualified Java type name of a method
+ parameter.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ </xsd:sequence>
+ <xsd:attribute name="id"
+ type="xsd:ID"/>
+ </xsd:complexType>
+
+
+<!-- **************************************************** -->
+
+ <xsd:complexType name="method-permissionType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The method-permissionType specifies that one or more
+ security roles are allowed to invoke one or more enterprise
+ bean methods. The method-permissionType consists of an
+ optional description, a list of security role names or an
+ indicator to state that the method is unchecked for
+ authorization, and a list of method elements.
+
+ Except as noted below the security roles used in the
+ method-permissionType must be defined in the security-role
+ elements of the deployment descriptor, and the methods
+ must be methods defined in the enterprise bean's no-interface
+ view, business, home, component and/or web service endpoint
+ interfaces.
+
+ If the role name "**" is included in the list of allowed
+ roles, and the application has not defined in its deployment
+ descriptor an application security role with this name,
+ then the list of allowed roles includes every and any
+ authenticated user.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:sequence>
+ <xsd:element name="description"
+ type="jakartaee:descriptionType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:choice>
+ <xsd:element name="role-name"
+ type="jakartaee:role-nameType"
+ maxOccurs="unbounded"/>
+ <xsd:element name="unchecked"
+ type="jakartaee:emptyType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The unchecked element specifies that a method is
+ not checked for authorization by the container
+ prior to invocation of the method.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ </xsd:choice>
+ <xsd:element name="method"
+ type="jakartaee:methodType"
+ maxOccurs="unbounded"/>
+ </xsd:sequence>
+ <xsd:attribute name="id"
+ type="xsd:ID"/>
+ </xsd:complexType>
+
+
+<!-- **************************************************** -->
+
+ <xsd:complexType name="multiplicityType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The multiplicityType describes the multiplicity of the
+ role that participates in a relation.
+
+ The value must be one of the two following:
+
+ One
+ Many
+
+ Support for entity beans is optional as of Enterprise Beans 3.2.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:simpleContent>
+ <xsd:restriction base="jakartaee:string">
+ <xsd:enumeration value="One"/>
+ <xsd:enumeration value="Many"/>
+ </xsd:restriction>
+ </xsd:simpleContent>
+ </xsd:complexType>
+
+
+<!-- **************************************************** -->
+
+ <xsd:complexType name="persistence-typeType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The persistence-typeType specifies an entity bean's persistence
+ management type.
+
+ The persistence-type element must be one of the two following:
+
+ Bean
+ Container
+
+ Support for entity beans is optional as of Enterprise Beans 3.2.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:simpleContent>
+ <xsd:restriction base="jakartaee:string">
+ <xsd:enumeration value="Bean"/>
+ <xsd:enumeration value="Container"/>
+ </xsd:restriction>
+ </xsd:simpleContent>
+ </xsd:complexType>
+
+
+<!-- **************************************************** -->
+
+ <xsd:complexType name="queryType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The queryType defines a finder or select
+ query. It contains
+ - an optional description of the query
+ - the specification of the finder or select
+ method it is used by
+ - an optional specification of the result type
+ mapping, if the query is for a select method
+ and entity objects are returned.
+ - the Enterprise Beans QL query string that defines the query.
+
+ Queries that are expressible in Enterprise Beans QL must use the ejb-ql
+ element to specify the query. If a query is not expressible
+ in Enterprise Beans QL, the description element should be used to
+ describe the semantics of the query and the ejb-ql element
+ should be empty.
+
+ The result-type-mapping is an optional element. It can only
+ be present if the query-method specifies a select method
+ that returns entity objects. The default value for the
+ result-type-mapping element is "Local".
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:sequence>
+ <xsd:element name="description"
+ type="jakartaee:descriptionType"
+ minOccurs="0"/>
+ <xsd:element name="query-method"
+ type="jakartaee:query-methodType"/>
+ <xsd:element name="result-type-mapping"
+ type="jakartaee:result-type-mappingType"
+ minOccurs="0"/>
+ <xsd:element name="ejb-ql"
+ type="jakartaee:xsdStringType"/>
+ </xsd:sequence>
+ <xsd:attribute name="id"
+ type="xsd:ID"/>
+ </xsd:complexType>
+
+
+<!-- **************************************************** -->
+
+ <xsd:complexType name="query-methodType">
+ <xsd:annotation>
+ <xsd:documentation>
+ <![CDATA[
+ The query-method specifies the method for a finder or select
+ query.
+
+ The method-name element specifies the name of a finder or select
+ method in the entity bean's implementation class.
+
+ Each method-param must be defined for a query-method using the
+ method-params element.
+
+ It is used by the query-method element.
+
+ Example:
+
+ <query>
+ <description>Method finds large orders</description>
+ <query-method>
+ <method-name>findLargeOrders</method-name>
+ <method-params></method-params>
+ </query-method>
+ <ejb-ql>
+ SELECT OBJECT(o) FROM Order o
+ WHERE o.amount > 1000
+ </ejb-ql>
+ </query>
+
+ Support for entity beans is optional as of Enterprise Beans 3.2.
+
+ ]]>
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:sequence>
+ <xsd:element name="method-name"
+ type="jakartaee:method-nameType"/>
+ <xsd:element name="method-params"
+ type="jakartaee:method-paramsType"/>
+ </xsd:sequence>
+ <xsd:attribute name="id"
+ type="xsd:ID"/>
+ </xsd:complexType>
+
+
+<!-- **************************************************** -->
+
+ <xsd:complexType name="relationship-role-sourceType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The relationship-role-sourceType designates the source of a
+ role that participates in a relationship. A
+ relationship-role-sourceType is used by
+ relationship-role-source elements to uniquely identify an
+ entity bean.
+
+ Support for entity beans is optional as of Enterprise Beans 3.2.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:sequence>
+ <xsd:element name="description"
+ type="jakartaee:descriptionType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="ejb-name"
+ type="jakartaee:ejb-nameType"/>
+ </xsd:sequence>
+ <xsd:attribute name="id"
+ type="xsd:ID"/>
+ </xsd:complexType>
+
+
+<!-- **************************************************** -->
+
+ <xsd:complexType name="relationshipsType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The relationshipsType describes the relationships in
+ which entity beans with container-managed persistence
+ participate. The relationshipsType contains an optional
+ description; and a list of ejb-relation elements, which
+ specify the container managed relationships.
+
+ Support for entity beans is optional as of Enterprise Beans 3.2.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:sequence>
+ <xsd:element name="description"
+ type="jakartaee:descriptionType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="ejb-relation"
+ type="jakartaee:ejb-relationType"
+ maxOccurs="unbounded">
+ <xsd:unique name="role-name-uniqueness">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The ejb-relationship-role-name contains the name of a
+ relationship role. The name must be unique within
+ a relationship, but can be reused in different
+ relationships.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:selector xpath=".//jakartaee:ejb-relationship-role-name"/>
+ <xsd:field xpath="."/>
+ </xsd:unique>
+ </xsd:element>
+ </xsd:sequence>
+ <xsd:attribute name="id"
+ type="xsd:ID"/>
+ </xsd:complexType>
+
+
+<!-- **************************************************** -->
+
+ <xsd:complexType name="result-type-mappingType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The result-type-mappingType is used in the query element to
+ specify whether an abstract schema type returned by a query
+ for a select method is to be mapped to an EJBLocalObject or
+ EJBObject type.
+
+ The value must be one of the following:
+
+ Local
+ Remote
+
+ </xsd:documentation>
... 25088 lines suppressed ...
---------------------------------------------------------------------
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