You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by lk...@apache.org on 2020/10/10 02:46:19 UTC
[netbeans] branch master updated: Improve Java EE support
This is an automated email from the ASF dual-hosted git repository.
lkishalmi 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 1fbf59e Improve Java EE support
1fbf59e is described below
commit 1fbf59eec8e166a38ce61fa48d7e1ec1b4adff4f
Author: Jose Contreras <pe...@gmail.com>
AuthorDate: Fri Oct 2 19:17:23 2020 -0500
Improve Java EE support
-Fix wrong namespace for JSF 2.2 and 2.3 versions inside JSFCatalog
-Download a fresh web-facelettaglibrary_2_2.xsd from Oracle, previous
one is incorrect
-Add missing validations for FACELETS_TAGLIB_SCHEMA versions 22 and 23
-Add missing Java EE 8 xml file
-Add missing Java EE 8 entries to some xml files
-Add missing directory to the rat-exclusions file
-Add missing connector_1_6.xsd file
-Add missing file to licenseinfo.xml in j2ee.dd module
-Add missing directory to .gitignore
-Add missing Deployment Descriptor Files to a .properties file
-Add missing .xsd files to the EnterpriseCatalog file
-Add missing action that generates the application-client_8.mdd file
-Add missing files to licenseinfo.xml in j2ee.clientproject module
---
enterprise/j2ee.clientproject/licenseinfo.xml | 1 +
.../ui/resources/application-client-8.xml | 7 +
enterprise/j2ee.dd/.gitignore | 1 +
enterprise/j2ee.dd/build.xml | 44 +-
enterprise/j2ee.dd/licenseinfo.xml | 2 +
enterprise/j2ee.dd/nbproject/project.properties | 3 +-
.../dd/impl/resources/application-client_8.mdd | 865 ++++++++++++++
.../j2ee/dd/impl/resources/connector_1_6.xsd | 1261 ++++++++++++++++++++
.../j2ee.ddloaders/nbproject/project.properties | 3 +-
.../modules/j2ee/ddloaders/Bundle.properties | 9 +
.../j2ee/ddloaders/catalog/EnterpriseCatalog.java | 33 +-
.../resources/dd-loaders-mime-resolver.xml | 40 +
.../modules/j2ee/ddloaders/resources/layer.xml | 224 ++++
.../modules/j2ee/sun/dd/api/ASDDVersion.java | 2 +-
.../org/netbeans/modules/web/jsf/JSFCatalog.java | 33 +-
.../jsf/impl/facesmodel/JSFConfigModelImpl.java | 4 +-
.../jsf/resources/web-facelettaglibrary_2_2.xsd | 33 +-
.../parsing/impl/indexing/IndexerCache.java | 12 +
nbbuild/rat-exclusions.txt | 1 +
19 files changed, 2530 insertions(+), 48 deletions(-)
diff --git a/enterprise/j2ee.clientproject/licenseinfo.xml b/enterprise/j2ee.clientproject/licenseinfo.xml
index 57df688..655c2e1 100644
--- a/enterprise/j2ee.clientproject/licenseinfo.xml
+++ b/enterprise/j2ee.clientproject/licenseinfo.xml
@@ -27,6 +27,7 @@
<file>src/org/netbeans/modules/j2ee/clientproject/ui/resources/application-client-5.xml</file>
<file>src/org/netbeans/modules/j2ee/clientproject/ui/resources/application-client-6.xml</file>
<file>src/org/netbeans/modules/j2ee/clientproject/ui/resources/application-client-7.xml</file>
+ <file>src/org/netbeans/modules/j2ee/clientproject/ui/resources/application-client-8.xml</file>
<license ref="Apache-2.0-ASF" />
<comment type="TEMPLATE_MINIMAL_IP"/>
</fileset>
diff --git a/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/resources/application-client-8.xml b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/resources/application-client-8.xml
new file mode 100644
index 0000000..ddcf814
--- /dev/null
+++ b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/resources/application-client-8.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application-client xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+ version="8"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/application-client_8.xsd">
+
+</application-client>
diff --git a/enterprise/j2ee.dd/.gitignore b/enterprise/j2ee.dd/.gitignore
index aea9687..0223612 100644
--- a/enterprise/j2ee.dd/.gitignore
+++ b/enterprise/j2ee.dd/.gitignore
@@ -8,6 +8,7 @@ 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/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/*
diff --git a/enterprise/j2ee.dd/build.xml b/enterprise/j2ee.dd/build.xml
index 27ce0f8..58138bf 100644
--- a/enterprise/j2ee.dd/build.xml
+++ b/enterprise/j2ee.dd/build.xml
@@ -685,7 +685,22 @@
<replacetoken>setVersion("7");</replacetoken>
<replacevalue>setVersionString("7");</replacevalue>
</replace>
-
+ <replace file="${s2b_root_app_8}/Application.java" summary="true">
+ <replacetoken>public java.lang.String getVersion() {</replacetoken>
+ <replacevalue>public java.lang.String getVersionString() {</replacevalue>
+ </replace>
+ <replace file="${s2b_root_app_8}/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_8}/Application.java" summary="true">
+ <replacetoken>(getVersion()</replacetoken>
+ <replacevalue>(getVersionString()</replacevalue>
+ </replace>
+ <replace file="${s2b_root_app_8}/Application.java" summary="true">
+ <replacetoken>setVersion("8");</replacetoken>
+ <replacevalue>setVersionString("8");</replacevalue>
+ </replace>
<schema2beans schema="${s2b_res_root}/application-client_1_4.xsd"
mddFile="${s2b_res_root}/application-client_1_4.mdd"
@@ -731,6 +746,17 @@
rootDir="src"
java5="true"/>
<echo file="${s2b_root_client_7_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_7_0;</echo>
+ <schema2beans schema="${s2b_res_root}/application-client_8.xsd"
+ mddFile="${s2b_res_root}/application-client_8.mdd"
+ package="org.netbeans.modules.j2ee.dd.impl.client.model_8_0"
+ schemaType="xmlschema"
+ useInterfaces="true"
+ validate="true"
+ attrProp="true"
+ removeUnreferencedNodes="true"
+ 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>
<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>
@@ -763,6 +789,22 @@
<replacetoken>setVersion("7");</replacetoken>
<replacevalue>setVersionString("7");</replacevalue>
</replace>
+ <replace file="${s2b_root_client_8_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_8_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_8_0}/ApplicationClient.java" summary="true">
+ <replacetoken>(getVersion()</replacetoken>
+ <replacevalue>(getVersionString()</replacevalue>
+ </replace>
+ <replace file="${s2b_root_client_8_0}/ApplicationClient.java" summary="true">
+ <replacetoken>setVersion("8");</replacetoken>
+ <replacevalue>setVersionString("8");</replacevalue>
+ </replace>
</target>
<target name="compile" depends="dd2beansgen,projectized-common.compile"/>
diff --git a/enterprise/j2ee.dd/licenseinfo.xml b/enterprise/j2ee.dd/licenseinfo.xml
index 8d612e6..8c684bf 100755
--- a/enterprise/j2ee.dd/licenseinfo.xml
+++ b/enterprise/j2ee.dd/licenseinfo.xml
@@ -46,8 +46,10 @@
<file>src/org/netbeans/modules/j2ee/dd/impl/resources/application-client_6.xsd</file>
<file>src/org/netbeans/modules/j2ee/dd/impl/resources/application-client_7.mdd</file>
<file>src/org/netbeans/modules/j2ee/dd/impl/resources/application-client_7.xsd</file>
+ <file>src/org/netbeans/modules/j2ee/dd/impl/resources/application-client_8.mdd</file>
<file>src/org/netbeans/modules/j2ee/dd/impl/resources/application-client_8.xsd</file>
<file>src/org/netbeans/modules/j2ee/dd/impl/resources/connector_1_5.xsd</file>
+ <file>src/org/netbeans/modules/j2ee/dd/impl/resources/connector_1_6.xsd</file>
<file>src/org/netbeans/modules/j2ee/dd/impl/resources/connector_1_7.xsd</file>
<file>src/org/netbeans/modules/j2ee/dd/impl/resources/ejb-jar_2_1.mdd</file>
<file>src/org/netbeans/modules/j2ee/dd/impl/resources/ejb-jar_2_1.xsd</file>
diff --git a/enterprise/j2ee.dd/nbproject/project.properties b/enterprise/j2ee.dd/nbproject/project.properties
index 091c4cd..7ce861a 100644
--- a/enterprise/j2ee.dd/nbproject/project.properties
+++ b/enterprise/j2ee.dd/nbproject/project.properties
@@ -15,7 +15,8 @@
# specific language governing permissions and limitations
# under the License.
-javac.source=1.6
+javac.compilerargs=-Xlint:all -Xlint:-serial
+javac.source=1.8
javac.fork=true
spec.version.base=1.50.0
is.autoload=true
diff --git a/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/resources/application-client_8.mdd b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/resources/application-client_8.mdd
new file mode 100644
index 0000000..47b45b9
--- /dev/null
+++ b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/resources/application-client_8.mdd
@@ -0,0 +1,865 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<metaDD>
+ <meta-element>
+ <dtd-name>application-client</dtd-name>
+ <namespace>http://xmlns.jcp.org/xml/ns/javaee</namespace>
+ <bean-name>ApplicationClient</bean-name>
+ <meta-property>
+ <bean-name>ModuleName</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>Description</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>DisplayName</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>Icon</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>EnvEntry</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>EjbRef</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>ServiceRef</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>ResourceRef</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>ResourceEnvRef</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>MessageDestinationRef</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>PersistenceUnitRef</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>PostConstruct</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>PreDestroy</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>CallbackHandler</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>MessageDestination</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>DataSource</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>JmsConnectionFactory</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>JmsDestination</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>MailSession</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>ConnectionFactory</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>AdministeredObject</bean-name>
+ </meta-property>
+ </meta-element>
+ <meta-element>
+ <dtd-name>string</dtd-name>
+ <namespace>http://xmlns.jcp.org/xml/ns/javaee</namespace>
+ <bean-name>String</bean-name>
+ <wrapper-class>java.lang.String</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>env-entryType</dtd-name>
+ <namespace>http://xmlns.jcp.org/xml/ns/javaee</namespace>
+ <bean-name>EnvEntryType</bean-name>
+ <meta-property>
+ <bean-name>Description</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>EnvEntryName</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>EnvEntryType</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>EnvEntryValue</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>MappedName</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>InjectionTarget</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>LookupName</bean-name>
+ </meta-property>
+ </meta-element>
+ <meta-element>
+ <dtd-name>ejb-refType</dtd-name>
+ <namespace>http://xmlns.jcp.org/xml/ns/javaee</namespace>
+ <bean-name>EjbRefType</bean-name>
+ <meta-property>
+ <bean-name>Description</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>EjbRefName</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>EjbRefType</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>Home</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>Remote</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>EjbLink</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>MappedName</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>InjectionTarget</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>LookupName</bean-name>
+ </meta-property>
+ </meta-element>
+ <meta-element>
+ <dtd-name>resource-refType</dtd-name>
+ <namespace>http://xmlns.jcp.org/xml/ns/javaee</namespace>
+ <bean-name>ResourceRefType</bean-name>
+ <meta-property>
+ <bean-name>Description</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>ResRefName</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>ResType</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>ResAuth</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>ResSharingScope</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>MappedName</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>InjectionTarget</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>LookupName</bean-name>
+ </meta-property>
+ </meta-element>
+ <meta-element>
+ <dtd-name>resource-env-refType</dtd-name>
+ <namespace>http://xmlns.jcp.org/xml/ns/javaee</namespace>
+ <bean-name>ResourceEnvRefType</bean-name>
+ <meta-property>
+ <bean-name>Description</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>ResourceEnvRefName</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>ResourceEnvRefType</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>MappedName</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>InjectionTarget</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>LookupName</bean-name>
+ </meta-property>
+ </meta-element>
+ <meta-element>
+ <dtd-name>message-destination-refType</dtd-name>
+ <namespace>http://xmlns.jcp.org/xml/ns/javaee</namespace>
+ <bean-name>MessageDestinationRefType</bean-name>
+ <meta-property>
+ <bean-name>Description</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>MessageDestinationRefName</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>MessageDestinationType</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>MessageDestinationUsage</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>MessageDestinationLink</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>MappedName</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>InjectionTarget</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>LookupName</bean-name>
+ </meta-property>
+ </meta-element>
+ <meta-element>
+ <dtd-name>persistence-unit-refType</dtd-name>
+ <namespace>http://xmlns.jcp.org/xml/ns/javaee</namespace>
+ <bean-name>PersistenceUnitRefType</bean-name>
+ <meta-property>
+ <bean-name>Description</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>PersistenceUnitRefName</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>PersistenceUnitName</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>MappedName</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>InjectionTarget</bean-name>
+ </meta-property>
+ </meta-element>
+ <meta-element>
+ <dtd-name>lifecycle-callbackType</dtd-name>
+ <namespace>http://xmlns.jcp.org/xml/ns/javaee</namespace>
+ <bean-name>LifecycleCallbackType</bean-name>
+ <meta-property>
+ <bean-name>LifecycleCallbackClass</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>LifecycleCallbackMethod</bean-name>
+ </meta-property>
+ </meta-element>
+ <meta-element>
+ <dtd-name>fully-qualified-classType</dtd-name>
+ <namespace>http://xmlns.jcp.org/xml/ns/javaee</namespace>
+ <bean-name>FullyQualifiedClassType</bean-name>
+ <wrapper-class>java.lang.String</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>message-destinationType</dtd-name>
+ <namespace>http://xmlns.jcp.org/xml/ns/javaee</namespace>
+ <bean-name>MessageDestinationType</bean-name>
+ <meta-property>
+ <bean-name>Description</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>DisplayName</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>Icon</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>MessageDestinationName</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>MappedName</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>LookupName</bean-name>
+ </meta-property>
+ </meta-element>
+ <meta-element>
+ <dtd-name>data-sourceType</dtd-name>
+ <namespace>http://xmlns.jcp.org/xml/ns/javaee</namespace>
+ <bean-name>DataSourceType</bean-name>
+ <meta-property>
+ <bean-name>Description</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>Name</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>ClassName</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>ServerName</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>PortNumber</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>DatabaseName</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>Url</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>User</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>Password</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>Property2</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>LoginTimeout</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>Transactional</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>IsolationLevel</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>InitialPoolSize</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>MaxPoolSize</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>MinPoolSize</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>MaxIdleTime</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>MaxStatements</bean-name>
+ </meta-property>
+ </meta-element>
+ <meta-element>
+ <dtd-name>jms-connection-factoryType</dtd-name>
+ <namespace>http://xmlns.jcp.org/xml/ns/javaee</namespace>
+ <bean-name>JmsConnectionFactoryType</bean-name>
+ <meta-property>
+ <bean-name>Description</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>Name</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>InterfaceName</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>ClassName</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>ResourceAdapter</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>User</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>Password</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>ClientId</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>Property2</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>Transactional</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>MaxPoolSize</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>MinPoolSize</bean-name>
+ </meta-property>
+ </meta-element>
+ <meta-element>
+ <dtd-name>jms-destinationType</dtd-name>
+ <namespace>http://xmlns.jcp.org/xml/ns/javaee</namespace>
+ <bean-name>JmsDestinationType</bean-name>
+ <meta-property>
+ <bean-name>Description</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>Name</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>InterfaceName</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>ClassName</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>ResourceAdapter</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>DestinationName</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>Property2</bean-name>
+ </meta-property>
+ </meta-element>
+ <meta-element>
+ <dtd-name>mail-sessionType</dtd-name>
+ <namespace>http://xmlns.jcp.org/xml/ns/javaee</namespace>
+ <bean-name>MailSessionType</bean-name>
+ <meta-property>
+ <bean-name>Description</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>Name</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>StoreProtocol</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>StoreProtocolClass</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>TransportProtocol</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>TransportProtocolClass</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>Host</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>User</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>Password</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>From</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>Property2</bean-name>
+ </meta-property>
+ </meta-element>
+ <meta-element>
+ <dtd-name>connection-factory-resourceType</dtd-name>
+ <namespace>http://xmlns.jcp.org/xml/ns/javaee</namespace>
+ <bean-name>ConnectionFactoryResourceType</bean-name>
+ <meta-property>
+ <bean-name>Description</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>Name</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>InterfaceName</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>ResourceAdapter</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>MaxPoolSize</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>MinPoolSize</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>TransactionSupport</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>Property2</bean-name>
+ </meta-property>
+ </meta-element>
+ <meta-element>
+ <dtd-name>administered-objectType</dtd-name>
+ <namespace>http://xmlns.jcp.org/xml/ns/javaee</namespace>
+ <bean-name>AdministeredObjectType</bean-name>
+ <meta-property>
+ <bean-name>Description</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>Name</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>InterfaceName</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>ClassName</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>ResourceAdapter</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>Property2</bean-name>
+ </meta-property>
+ </meta-element>
+ <meta-element>
+ <dtd-name>descriptionType</dtd-name>
+ <namespace>http://xmlns.jcp.org/xml/ns/javaee</namespace>
+ <bean-name>DescriptionType</bean-name>
+ <wrapper-class>java.lang.String</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>xsdStringType</dtd-name>
+ <namespace>http://xmlns.jcp.org/xml/ns/javaee</namespace>
+ <bean-name>XsdStringType</bean-name>
+ <wrapper-class>java.lang.String</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>jndi-nameType</dtd-name>
+ <namespace>http://xmlns.jcp.org/xml/ns/javaee</namespace>
+ <bean-name>JndiNameType</bean-name>
+ <wrapper-class>java.lang.String</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>propertyType</dtd-name>
+ <namespace>http://xmlns.jcp.org/xml/ns/javaee</namespace>
+ <bean-name>PropertyType</bean-name>
+ <meta-property>
+ <bean-name>Name</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>Value</bean-name>
+ </meta-property>
+ </meta-element>
+ <meta-element>
+ <dtd-name>xsdIntegerType</dtd-name>
+ <namespace>http://xmlns.jcp.org/xml/ns/javaee</namespace>
+ <bean-name>XsdIntegerType</bean-name>
+ <wrapper-class>java.math.BigInteger</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>transaction-supportType</dtd-name>
+ <namespace>http://xmlns.jcp.org/xml/ns/javaee</namespace>
+ <bean-name>TransactionSupportType</bean-name>
+ <wrapper-class>java.lang.String</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>xsdBooleanType</dtd-name>
+ <namespace>http://xmlns.jcp.org/xml/ns/javaee</namespace>
+ <bean-name>XsdBooleanType</bean-name>
+ <wrapper-class>boolean</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>jdbc-urlType</dtd-name>
+ <namespace>http://xmlns.jcp.org/xml/ns/javaee</namespace>
+ <bean-name>JdbcUrlType</bean-name>
+ <wrapper-class>java.lang.String</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>isolation-levelType</dtd-name>
+ <namespace>http://xmlns.jcp.org/xml/ns/javaee</namespace>
+ <bean-name>IsolationLevelType</bean-name>
+ <wrapper-class>java.lang.String</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>display-nameType</dtd-name>
+ <namespace>http://xmlns.jcp.org/xml/ns/javaee</namespace>
+ <bean-name>DisplayNameType</bean-name>
+ <wrapper-class>java.lang.String</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>iconType</dtd-name>
+ <namespace>http://xmlns.jcp.org/xml/ns/javaee</namespace>
+ <bean-name>IconType</bean-name>
+ <meta-property>
+ <bean-name>SmallIcon</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>LargeIcon</bean-name>
+ </meta-property>
+ </meta-element>
+ <meta-element>
+ <dtd-name>pathType</dtd-name>
+ <namespace>http://xmlns.jcp.org/xml/ns/javaee</namespace>
+ <bean-name>PathType</bean-name>
+ <wrapper-class>java.lang.String</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>java-identifierType</dtd-name>
+ <namespace>http://xmlns.jcp.org/xml/ns/javaee</namespace>
+ <bean-name>JavaIdentifierType</bean-name>
+ <wrapper-class>java.lang.String</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>injection-targetType</dtd-name>
+ <namespace>http://xmlns.jcp.org/xml/ns/javaee</namespace>
+ <bean-name>InjectionTargetType</bean-name>
+ <meta-property>
+ <bean-name>InjectionTargetClass</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>InjectionTargetName</bean-name>
+ </meta-property>
+ </meta-element>
+ <meta-element>
+ <dtd-name>message-destination-typeType</dtd-name>
+ <namespace>http://xmlns.jcp.org/xml/ns/javaee</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>http://xmlns.jcp.org/xml/ns/javaee</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>http://xmlns.jcp.org/xml/ns/javaee</namespace>
+ <bean-name>MessageDestinationLinkType</bean-name>
+ <wrapper-class>java.lang.String</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>res-authType</dtd-name>
+ <namespace>http://xmlns.jcp.org/xml/ns/javaee</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>http://xmlns.jcp.org/xml/ns/javaee</namespace>
+ <bean-name>ResSharingScopeType</bean-name>
+ <wrapper-class>java.lang.String</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>service-refType</dtd-name>
+ <namespace>http://xmlns.jcp.org/xml/ns/javaee</namespace>
+ <bean-name>ServiceRefType</bean-name>
+ <meta-property>
+ <bean-name>Description</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>DisplayName</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>Icon</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>ServiceRefName</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>ServiceInterface</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>ServiceRefType</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>WsdlFile</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>JaxrpcMappingFile</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>ServiceQname</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>PortComponentRef</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>Handler</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>HandlerChains</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>MappedName</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>InjectionTarget</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>LookupName</bean-name>
+ </meta-property>
+ </meta-element>
+ <meta-element>
+ <dtd-name>xsdAnyURIType</dtd-name>
+ <namespace>http://xmlns.jcp.org/xml/ns/javaee</namespace>
+ <bean-name>XsdAnyURIType</bean-name>
+ <wrapper-class>java.net.URI</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>xsdQNameType</dtd-name>
+ <namespace>http://xmlns.jcp.org/xml/ns/javaee</namespace>
+ <bean-name>XsdQNameType</bean-name>
+ <wrapper-class>javax.xml.namespace.QName</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>port-component-refType</dtd-name>
+ <namespace>http://xmlns.jcp.org/xml/ns/javaee</namespace>
+ <bean-name>PortComponentRefType</bean-name>
+ <meta-property>
+ <bean-name>ServiceEndpointInterface</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>EnableMtom</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>MtomThreshold</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>Addressing</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>RespectBinding</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>PortComponentLink</bean-name>
+ </meta-property>
+ </meta-element>
+ <meta-element>
+ <dtd-name>handlerType</dtd-name>
+ <namespace>http://xmlns.jcp.org/xml/ns/javaee</namespace>
+ <bean-name>HandlerType</bean-name>
+ <meta-property>
+ <bean-name>Description</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>DisplayName</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>Icon</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>HandlerName</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>HandlerClass</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>InitParam</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>SoapHeader</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>SoapRole</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>PortName</bean-name>
+ </meta-property>
+ </meta-element>
+ <meta-element>
+ <dtd-name>handler-chainsType</dtd-name>
+ <namespace>http://xmlns.jcp.org/xml/ns/javaee</namespace>
+ <bean-name>HandlerChainsType</bean-name>
+ <meta-property>
+ <bean-name>HandlerChain</bean-name>
+ </meta-property>
+ </meta-element>
+ <meta-element>
+ <dtd-name>handler-chainType</dtd-name>
+ <namespace>http://xmlns.jcp.org/xml/ns/javaee</namespace>
+ <bean-name>HandlerChainType</bean-name>
+ <meta-property>
+ <bean-name>ServiceNamePattern</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>PortNamePattern</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>ProtocolBindings</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>Handler</bean-name>
+ </meta-property>
+ </meta-element>
+ <meta-element>
+ <dtd-name>qname-pattern</dtd-name>
+ <namespace>http://xmlns.jcp.org/xml/ns/javaee</namespace>
+ <bean-name>QnamePattern</bean-name>
+ <wrapper-class>java.lang.String</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>protocol-bindingListType</dtd-name>
+ <namespace>http://xmlns.jcp.org/xml/ns/javaee</namespace>
+ <bean-name>ProtocolBindingListType</bean-name>
+ <wrapper-class>String</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>param-valueType</dtd-name>
+ <namespace>http://xmlns.jcp.org/xml/ns/javaee</namespace>
+ <bean-name>ParamValueType</bean-name>
+ <meta-property>
+ <bean-name>Description</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>ParamName</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>ParamValue</bean-name>
+ </meta-property>
+ </meta-element>
+ <meta-element>
+ <dtd-name>true-falseType</dtd-name>
+ <namespace>http://xmlns.jcp.org/xml/ns/javaee</namespace>
+ <bean-name>TrueFalseType</bean-name>
+ <wrapper-class>boolean</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>xsdNonNegativeIntegerType</dtd-name>
+ <namespace>http://xmlns.jcp.org/xml/ns/javaee</namespace>
+ <bean-name>XsdNonNegativeIntegerType</bean-name>
+ <wrapper-class>java.math.BigInteger</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>addressingType</dtd-name>
+ <namespace>http://xmlns.jcp.org/xml/ns/javaee</namespace>
+ <bean-name>AddressingType</bean-name>
+ <meta-property>
+ <bean-name>Enabled</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>Required</bean-name>
+ </meta-property>
+ <meta-property>
+ <bean-name>Responses</bean-name>
+ </meta-property>
+ </meta-element>
+ <meta-element>
+ <dtd-name>respect-bindingType</dtd-name>
+ <namespace>http://xmlns.jcp.org/xml/ns/javaee</namespace>
+ <bean-name>RespectBindingType</bean-name>
+ <meta-property>
+ <bean-name>Enabled</bean-name>
+ </meta-property>
+ </meta-element>
+ <meta-element>
+ <dtd-name>addressing-responsesType</dtd-name>
+ <namespace>http://xmlns.jcp.org/xml/ns/javaee</namespace>
+ <bean-name>AddressingResponsesType</bean-name>
+ <wrapper-class>java.lang.String</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>ejb-ref-nameType</dtd-name>
+ <namespace>http://xmlns.jcp.org/xml/ns/javaee</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>http://xmlns.jcp.org/xml/ns/javaee</namespace>
+ <bean-name>EjbRefTypeType</bean-name>
+ <wrapper-class>java.lang.String</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>homeType</dtd-name>
+ <namespace>http://xmlns.jcp.org/xml/ns/javaee</namespace>
+ <bean-name>HomeType</bean-name>
+ <wrapper-class>java.lang.String</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>remoteType</dtd-name>
+ <namespace>http://xmlns.jcp.org/xml/ns/javaee</namespace>
+ <bean-name>RemoteType</bean-name>
+ <wrapper-class>java.lang.String</wrapper-class>
+ </meta-element>
+ <meta-element>
+ <dtd-name>ejb-linkType</dtd-name>
+ <namespace>http://xmlns.jcp.org/xml/ns/javaee</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>http://xmlns.jcp.org/xml/ns/javaee</namespace>
+ <bean-name>EnvEntryTypeValuesType</bean-name>
+ <wrapper-class>java.lang.String</wrapper-class>
+ </meta-element>
+</metaDD>
diff --git a/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/resources/connector_1_6.xsd b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/resources/connector_1_6.xsd
new file mode 100644
index 0000000..45d875c
--- /dev/null
+++ b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/resources/connector_1_6.xsd
@@ -0,0 +1,1261 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
+ targetNamespace="http://java.sun.com/xml/ns/javaee"
+ xmlns:javaee="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ elementFormDefault="qualified"
+ attributeFormDefault="unqualified"
+ version="1.6">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+
+ Copyright 2003-2009 Sun Microsystems, Inc. All rights reserved.
+
+ The contents of this file are subject to the terms of either the
+ GNU General Public License Version 2 only ("GPL") or the Common
+ Development and Distribution License("CDDL") (collectively, the
+ "License"). You may not use this file except in compliance with
+ the License. You can obtain a copy of the License at
+ https://glassfish.dev.java.net/public/CDDL+GPL.html or
+ glassfish/bootstrap/legal/LICENSE.txt. See the License for the
+ specific language governing permissions and limitations under the
+ License.
+
+ When distributing the software, include this License Header
+ Notice in each file and include the License file at
+ glassfish/bootstrap/legal/LICENSE.txt. Sun designates this
+ particular file as subject to the "Classpath" exception as
+ provided by Sun in the GPL Version 2 section of the License file
+ that accompanied this code. If applicable, add the following
+ below the License Header, with the fields enclosed by brackets []
+ replaced by your own identifying information:
+ "Portions Copyrighted [year] [name of copyright owner]"
+
+ Contributor(s):
+
+ If you wish your version of this file to be governed by only the
+ CDDL or only the GPL Version 2, indicate your decision by adding
+ "[Contributor] elects to include this software in this
+ distribution under the [CDDL or GPL Version 2] license." If you
+ don't indicate a single choice of license, a recipient has the
+ option to distribute your version of this file under either the
+ CDDL, the GPL Version 2 or to extend the choice of license to its
+ licensees as provided above. However, if you add GPL Version 2
+ code and therefore, elected the GPL Version 2 license, then the
+ option applies only if the new code is made subject to such
+ option by the copyright holder.
+
+ </xsd:documentation>
+ </xsd:annotation>
+
+ <xsd:annotation>
+ <xsd:documentation>
+
+ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+
+ Copyright 2003-2009 Sun Microsystems, Inc. All rights reserved.
+
+ The contents of this file are subject to the terms of either the
+ GNU General Public License Version 2 only ("GPL") or the Common
+ Development and Distribution License("CDDL") (collectively, the
+ "License"). You may not use this file except in compliance with
+ the License. You can obtain a copy of the License at
+ https://glassfish.dev.java.net/public/CDDL+GPL.html or
+ glassfish/bootstrap/legal/LICENSE.txt. See the License for the
+ specific language governing permissions and limitations under the
+ License.
+
+ When distributing the software, include this License Header
+ Notice in each file and include the License file at
+ glassfish/bootstrap/legal/LICENSE.txt. Sun designates this
+ particular file as subject to the "Classpath" exception as
+ provided by Sun in the GPL Version 2 section of the License file
+ that accompanied this code. If applicable, add the following
+ below the License Header, with the fields enclosed by brackets []
+ replaced by your own identifying information:
+ "Portions Copyrighted [year] [name of copyright owner]"
+
+ Contributor(s):
+
+ If you wish your version of this file to be governed by only the
+ CDDL or only the GPL Version 2, indicate your decision by adding
+ "[Contributor] elects to include this software in this
+ distribution under the [CDDL or GPL Version 2] license." If you
+ don't indicate a single choice of license, a recipient has the
+ option to distribute your version of this file under either the
+ CDDL, the GPL Version 2 or to extend the choice of license to its
+ licensees as provided above. However, if you add GPL Version 2
+ code and therefore, elected the GPL Version 2 license, then the
+ option applies only if the new code is made subject to such
+ option by the copyright holder.
+
+ </xsd:documentation>
+ </xsd:annotation>
+
+ <xsd:annotation>
+ <xsd:documentation>
+ <![CDATA[[
+ This is the XML Schema for the Connector 1.6 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 Java EE namespace:
+
+ http://java.sun.com/xml/ns/javaee
+
+ and by indicating the version of the schema by
+ using the version element as shown below:
+
+ <connector xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/connector_1_6.xsd"
+ version="1.6">
+ ...
+ </connector>
+
+ The instance documents may indicate the published version of
+ the schema using the xsi:schemaLocation attribute for Java EE
+ namespace with the following location:
+
+ http://java.sun.com/xml/ns/javaee/connector_1_6.xsd
+
+ ]]>
+ </xsd:documentation>
+ </xsd:annotation>
+
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The following conventions apply to all Java 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="javaee_6.xsd"/>
+
+
+<!-- **************************************************** -->
+
+ <xsd:element name="connector"
+ type="javaee: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="javaee: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
+ javax.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="javaee: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 Connectors specification for more information.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="config-property"
+ type="javaee: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="javaee: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>javax.jms.Destination
+ </adminobject-interface>
+
+ ]]>
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="adminobject-class"
+ type="javaee: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="javaee: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
+ javax.resource.spi.security.PasswordCredential interface.
+ The Kerbv5 mechanism type should support the
+ org.ietf.jgss.GSSCredential interface or the deprecated
+ javax.resource.spi.security.GenericCredential interface.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:sequence>
+ <xsd:element name="description"
+ type="javaee:descriptionType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="authentication-mechanism-type"
+ type="javaee: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 Connector architecture specification.
+
+ ]]>
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="credential-interface"
+ type="javaee: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="javaee: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="javaee: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="javaee:descriptionType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="config-property-name"
+ type="javaee:config-property-nameType"/>
+ <xsd:element name="config-property-type"
+ type="javaee:config-property-typeType"/>
+ <xsd:element name="config-property-value"
+ type="javaee: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="javaee: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 Connector 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="javaee: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 Connector 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="javaee: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 Connector 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="javaee:fully-qualified-classType">
+ <xsd:annotation>
+ <xsd:documentation>
+ <![CDATA[[
+ The element managedconnectionfactory-class specifies
+ the fully qualified name of the Java class that
+ implements the
+ javax.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="javaee:config-propertyType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="connectionfactory-interface"
+ type="javaee: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>javax.resource.cci.ConnectionFactory
+ </connectionfactory-interface>
+
+ ]]>
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="connectionfactory-impl-class"
+ type="javaee: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="javaee: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>javax.resource.cci.Connection
+ </connection-interface>
+
+ ]]>
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="connection-impl-class"
+ type="javaee: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="javaee: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 (Java EE)
+ Specification, version 6.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:group ref="javaee:descriptionGroup"/>
+ <xsd:element name="vendor-name"
+ type="javaee: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="javaee: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="javaee: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="javaee:licenseType"
+ minOccurs="0"/>
+ <xsd:element name="resourceadapter"
+ type="javaee:resourceadapterType"/>
+ <xsd:element name="required-work-context"
+ type="javaee: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="javaee:dewey-versionType"
+ fixed="1.6"
+ 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:
+
+ javax.resource.spi.security.PasswordCredential
+ org.ietf.jgss.GSSCredential
+ javax.resource.spi.security.GenericCredential
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:simpleContent>
+ <xsd:restriction base="javaee:fully-qualified-classType">
+ <xsd:enumeration value="javax.resource.spi.security.PasswordCredential"/>
+ <xsd:enumeration value="org.ietf.jgss.GSSCredential"/>
+ <xsd:enumeration value="javax.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="javaee: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="javaee:messagelistener"/>
+ <xsd:field xpath="javaee: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="javaee:descriptionType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="license-required"
+ type="javaee: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="javaee: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="javaee: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>javax.jms.MessageListener
+ </messagelistener-type>
+
+ ]]>
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="activationspec"
+ type="javaee: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 JTA 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="javaee:connection-definitionType"
+ maxOccurs="unbounded"
+ minOccurs="0"/>
+ <xsd:element name="transaction-support"
+ type="javaee:transaction-supportType"
+ minOccurs="0"/>
+ <xsd:element name="authentication-mechanism"
+ type="javaee:authentication-mechanismType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="reauthentication-support"
+ type="javaee: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="javaee:descriptionType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="config-property-name"
+ type="javaee: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="javaee: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 javax.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="javaee:config-propertyType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="outbound-resourceadapter"
+ type="javaee: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="javaee:connection-definition"/>
+ <xsd:field xpath="javaee:connectionfactory-interface"/>
+ </xsd:unique>
+ </xsd:element>
+ <xsd:element name="inbound-resourceadapter"
+ type="javaee:inbound-resourceadapterType"
+ minOccurs="0"/>
+ <xsd:element name="adminobject"
+ type="javaee: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="javaee:adminobject"/>
+ <xsd:field xpath="javaee:adminobject-interface"/>
+ <xsd:field xpath="javaee:adminobject-class"/>
+ </xsd:unique>
+ </xsd:element>
+ <xsd:element name="security-permission"
+ type="javaee: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="javaee:descriptionType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="security-permission-spec"
+ type="javaee: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://java.sun.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:complexType name="transaction-supportType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The transaction-supportType specifies the level of
+ transaction support provided by the resource adapter. It is
+ used by transaction-support elements.
+
+ The value must be one of the following:
+
+ NoTransaction
+ LocalTransaction
+ XATransaction
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:simpleContent>
+ <xsd:restriction base="javaee:string">
+ <xsd:enumeration value="NoTransaction"/>
+ <xsd:enumeration value="LocalTransaction"/>
+ <xsd:enumeration value="XATransaction"/>
+ </xsd:restriction>
+ </xsd:simpleContent>
+ </xsd:complexType>
+
+</xsd:schema>
diff --git a/enterprise/j2ee.ddloaders/nbproject/project.properties b/enterprise/j2ee.ddloaders/nbproject/project.properties
index 206c6ec..cb45bdd 100644
--- a/enterprise/j2ee.ddloaders/nbproject/project.properties
+++ b/enterprise/j2ee.ddloaders/nbproject/project.properties
@@ -15,7 +15,8 @@
# specific language governing permissions and limitations
# under the License.
-javac.source=1.6
+javac.compilerargs=-Xlint:all -Xlint:-serial
+javac.source=1.8
spec.version.base=1.47.0
javadoc.arch=${basedir}/arch.xml
diff --git a/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/Bundle.properties b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/Bundle.properties
index 4d7dccf..942f6ca 100644
--- a/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/Bundle.properties
+++ b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/Bundle.properties
@@ -27,20 +27,29 @@ DDLoadersResolver=Ejb Jar files
Loaders/text/x-dd-application1.4/Factories/org-netbeans-modules-j2ee-ddloaders-web-DDDataLoader.instance=Deployment Descriptor Files
Loaders/text/x-dd-application5.0/Factories/org-netbeans-modules-j2ee-ddloaders-web-DDDataLoader.instance=Deployment Descriptor Files
Loaders/text/x-dd-application6.0/Factories/org-netbeans-modules-j2ee-ddloaders-web-DDDataLoader.instance=Deployment Descriptor Files
+Loaders/text/x-dd-application7.0/Factories/org-netbeans-modules-j2ee-ddloaders-web-DDDataLoader.instance=Deployment Descriptor Files
+Loaders/text/x-dd-application8.0/Factories/org-netbeans-modules-j2ee-ddloaders-web-DDDataLoader.instance=Deployment Descriptor Files
Loaders/text/x-dd-client1.3/Factories/org-netbeans-modules-j2ee-ddloaders-web-DDDataLoader.instance=Deployment Descriptor Files
Loaders/text/x-dd-client1.4/Factories/org-netbeans-modules-j2ee-ddloaders-web-DDDataLoader.instance=Deployment Descriptor Files
Loaders/text/x-dd-client5.0/Factories/org-netbeans-modules-j2ee-ddloaders-web-DDDataLoader.instance=Deployment Descriptor Files
Loaders/text/x-dd-client6.0/Factories/org-netbeans-modules-j2ee-ddloaders-web-DDDataLoader.instance=Deployment Descriptor Files
+Loaders/text/x-dd-client7.0/Factories/org-netbeans-modules-j2ee-ddloaders-web-DDDataLoader.instance=Deployment Descriptor Files
+Loaders/text/x-dd-client8.0/Factories/org-netbeans-modules-j2ee-ddloaders-web-DDDataLoader.instance=Deployment Descriptor Files
Loaders/text/x-dd-ejbjar2.0/Factories/org-netbeans-modules-j2ee-ddloaders-web-DDDataLoader.instance=Deployment Descriptor Files
Loaders/text/x-dd-ejbjar2.1/Factories/org-netbeans-modules-j2ee-ddloaders-web-DDDataLoader.instance=Deployment Descriptor Files
Loaders/text/x-dd-ejbjar3.0/Factories/org-netbeans-modules-j2ee-ddloaders-web-DDDataLoader.instance=Deployment Descriptor Files
Loaders/text/x-dd-ejbjar3.1/Factories/org-netbeans-modules-j2ee-ddloaders-web-DDDataLoader.instance=Deployment Descriptor Files
+Loaders/text/x-dd-ejbjar3.2/Factories/org-netbeans-modules-j2ee-ddloaders-web-DDDataLoader.instance=Deployment Descriptor Files
Loaders/text/x-dd-servlet2.2/Factories/org-netbeans-modules-j2ee-ddloaders-web-DDDataLoader.instance=Deployment Descriptor Files
Loaders/text/x-dd-servlet2.3/Factories/org-netbeans-modules-j2ee-ddloaders-web-DDDataLoader.instance=Deployment Descriptor Files
Loaders/text/x-dd-servlet2.4/Factories/org-netbeans-modules-j2ee-ddloaders-web-DDDataLoader.instance=Deployment Descriptor Files
Loaders/text/x-dd-servlet2.5/Factories/org-netbeans-modules-j2ee-ddloaders-web-DDDataLoader.instance=Deployment Descriptor Files
Loaders/text/x-dd-servlet3.0/Factories/org-netbeans-modules-j2ee-ddloaders-web-DDDataLoader.instance=Deployment Descriptor Files
+Loaders/text/x-dd-servlet3.1/Factories/org-netbeans-modules-j2ee-ddloaders-web-DDDataLoader.instance=Deployment Descriptor Files
+Loaders/text/x-dd-servlet4.0/Factories/org-netbeans-modules-j2ee-ddloaders-web-DDDataLoader.instance=Deployment Descriptor Files
Loaders/text/x-dd-servlet-fragment3.0/Factories/org-netbeans-modules-j2ee-ddloaders-web-DDDataLoader.instance=Deployment Descriptor Files
+Loaders/text/x-dd-servlet-fragment3.1/Factories/org-netbeans-modules-j2ee-ddloaders-web-DDDataLoader.instance=Deployment Descriptor Files
+Loaders/text/x-dd-servlet-fragment4.0/Factories/org-netbeans-modules-j2ee-ddloaders-web-DDDataLoader.instance=Deployment Descriptor Files
Loaders/text/x-dd-web2.5/Factories/org-netbeans-modules-j2ee-ddloaders-web-DDDataLoader.instance=Deployment Descriptor Files
Loaders/text/x-dd-web3.0/Factories/org-netbeans-modules-j2ee-ddloaders-web-DDDataLoader.instance=Deployment Descriptor Files
Loaders/text/x-dd/Factories/org-netbeans-modules-j2ee-ddloaders-web-DDDataLoader.instance=Deployment Descriptor Files
diff --git a/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/catalog/EnterpriseCatalog.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/catalog/EnterpriseCatalog.java
index 72a7e99..28083bf 100644
--- a/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/catalog/EnterpriseCatalog.java
+++ b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/catalog/EnterpriseCatalog.java
@@ -60,54 +60,57 @@ public final class EnterpriseCatalog implements CatalogReader, CatalogDescriptor
private void initialize(){
// xml.xsd
schemas.add(new SchemaInfo("xml.xsd", XML_NS));
- // application-client
+ // Application Client schema
schemas.add(new SchemaInfo("application-client_1_4.xsd", J2EE_NS));
schemas.add(new SchemaInfo("application-client_5.xsd", JAVAEE_NS));
schemas.add(new SchemaInfo("application-client_6.xsd", JAVAEE_NS));
schemas.add(new SchemaInfo("application-client_7.xsd", NEW_JAVAEE_NS));
- // application
+ schemas.add(new SchemaInfo("application-client_8.xsd", NEW_JAVAEE_NS));
+ // Application schema
schemas.add(new SchemaInfo("application_1_4.xsd", J2EE_NS));
schemas.add(new SchemaInfo("application_5.xsd", JAVAEE_NS));
schemas.add(new SchemaInfo("application_6.xsd", JAVAEE_NS));
schemas.add(new SchemaInfo("application_7.xsd", NEW_JAVAEE_NS));
- // web services
+ schemas.add(new SchemaInfo("application_8.xsd", NEW_JAVAEE_NS));
+ // Web services schema
schemas.add(new SchemaInfo("j2ee_web_services_1_1.xsd", J2EE_NS));
schemas.add(new SchemaInfo("javaee_web_services_1_2.xsd", JAVAEE_NS));
schemas.add(new SchemaInfo("javaee_web_services_1_3.xsd", JAVAEE_NS));
schemas.add(new SchemaInfo("javaee_web_services_1_4.xsd", NEW_JAVAEE_NS));
- // web services client
+ // Web services client schema
schemas.add(new SchemaInfo("j2ee_web_services_client_1_1.xsd", J2EE_NS));
schemas.add(new SchemaInfo("javaee_web_services_client_1_2.xsd", JAVAEE_NS));
schemas.add(new SchemaInfo("javaee_web_services_client_1_3.xsd", JAVAEE_NS));
schemas.add(new SchemaInfo("javaee_web_services_client_1_4.xsd", NEW_JAVAEE_NS));
- // JCA connector 1.5
+ // Java EE Connector schema
schemas.add(new SchemaInfo("connector_1_5.xsd", J2EE_NS));
+ schemas.add(new SchemaInfo("connector_1_6.xsd", JAVAEE_NS));
schemas.add(new SchemaInfo("connector_1_7.xsd", NEW_JAVAEE_NS));
- // ejb-jar
+ // Enterprise JavaBeans Deployment Descriptor Schema
schemas.add(new SchemaInfo("ejb-jar_2_1.xsd", J2EE_NS));
schemas.add(new SchemaInfo("ejb-jar_3_0.xsd", JAVAEE_NS));
schemas.add(new SchemaInfo("ejb-jar_3_1.xsd", JAVAEE_NS));
schemas.add(new SchemaInfo("ejb-jar_3_2.xsd", NEW_JAVAEE_NS));
- // web-app
+ // Web Application Deployment Descriptor schema
schemas.add(new SchemaInfo("web-app_2_4.xsd", J2EE_NS));
schemas.add(new SchemaInfo("web-app_2_5.xsd", JAVAEE_NS));
schemas.add(new SchemaInfo("web-app_3_0.xsd", JAVAEE_NS));
schemas.add(new SchemaInfo("web-app_3_1.xsd", NEW_JAVAEE_NS));
schemas.add(new SchemaInfo("web-app_4_0.xsd", NEW_JAVAEE_NS));
-
+ // Web Application Deployment Descriptor common definitions schema
schemas.add(new SchemaInfo("web-common_3_0.xsd", JAVAEE_NS));
schemas.add(new SchemaInfo("web-common_3_1.xsd", NEW_JAVAEE_NS));
schemas.add(new SchemaInfo("web-common_4_0.xsd", NEW_JAVAEE_NS));
-
+ // Web Application Deployment Descriptor fragment schema
schemas.add(new SchemaInfo("web-fragment_3_0.xsd", JAVAEE_NS));
schemas.add(new SchemaInfo("web-fragment_3_1.xsd", NEW_JAVAEE_NS));
schemas.add(new SchemaInfo("web-fragment_4_0.xsd", NEW_JAVAEE_NS));
- // jsp
+ // JavaServer Pages Deployment Descriptor schema
schemas.add(new SchemaInfo("jsp_2_0.xsd", J2EE_NS));
schemas.add(new SchemaInfo("jsp_2_1.xsd", JAVAEE_NS));
schemas.add(new SchemaInfo("jsp_2_2.xsd", JAVAEE_NS));
schemas.add(new SchemaInfo("jsp_2_3.xsd", NEW_JAVAEE_NS));
- // j2ee and java ee schemas
+ // J2EE and Java EE definitions file that contains common schema components
schemas.add(new SchemaInfo("j2ee_1_4.xsd", J2EE_NS));
schemas.add(new SchemaInfo("javaee_5.xsd", JAVAEE_NS));
schemas.add(new SchemaInfo("javaee_6.xsd", JAVAEE_NS));
@@ -116,13 +119,15 @@ public final class EnterpriseCatalog implements CatalogReader, CatalogDescriptor
// web 2.2 and 2.3 dtds
schemas.add(new SchemaInfo("web-app_2_2.dtd", "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN", true)); //NO18N
schemas.add(new SchemaInfo("web-app_2_3.dtd", "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN", true)); //NO18N
- // cdi
+ // Contexts and Dependency Injection schema
schemas.add(new SchemaInfo("beans_1_0.xsd", JAVAEE_NS));
schemas.add(new SchemaInfo("beans_1_1.xsd", NEW_JAVAEE_NS));
- // permissions
+ schemas.add(new SchemaInfo("beans_2_0.xsd", NEW_JAVAEE_NS));
+ // Java EE application permissions schema
schemas.add(new SchemaInfo("permissions_7.xsd", NEW_JAVAEE_NS));
- // batch API
+ // Schema for batch.xml-based artifact loading in Java Batch
schemas.add(new SchemaInfo("batchXML_1_0.xsd", NEW_JAVAEE_NS));
+ // Batch Job Specification Language (JSL) schema
schemas.add(new SchemaInfo("jobXML_1_0.xsd", NEW_JAVAEE_NS));
}
diff --git a/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/resources/dd-loaders-mime-resolver.xml b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/resources/dd-loaders-mime-resolver.xml
index e54e4ff..13fd659 100644
--- a/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/resources/dd-loaders-mime-resolver.xml
+++ b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/resources/dd-loaders-mime-resolver.xml
@@ -67,6 +67,16 @@
</file>
<file>
<ext name="xml"/>
+ <resolver mime="text/x-dd-servlet4.0">
+ <xml-rule>
+ <element name="web-app" ns="http://xmlns.jcp.org/xml/ns/javaee">
+ <attr name="version" text="4.0"/>
+ </element>
+ </xml-rule>
+ </resolver>
+ </file>
+ <file>
+ <ext name="xml"/>
<resolver mime="text/x-dd-servlet-fragment3.0">
<xml-rule>
<element name="web-fragment" ns="http://java.sun.com/xml/ns/javaee">
@@ -87,6 +97,16 @@
</file>
<file>
<ext name="xml"/>
+ <resolver mime="text/x-dd-servlet-fragment4.0">
+ <xml-rule>
+ <element name="web-fragment" ns="http://xmlns.jcp.org/xml/ns/javaee">
+ <attr name="version" text="4.0"/>
+ </element>
+ </xml-rule>
+ </resolver>
+ </file>
+ <file>
+ <ext name="xml"/>
<resolver mime="text/x-dd-ejbjar2.0">
<xml-rule>
<doctype public-id="-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 2.0//EN"/>
@@ -183,6 +203,16 @@
</file>
<file>
<ext name="xml"/>
+ <resolver mime="text/x-dd-client8.0">
+ <xml-rule>
+ <element name="application-client" ns="http://xmlns.jcp.org/xml/ns/javaee">
+ <attr name="version" text="8"/>
+ </element>
+ </xml-rule>
+ </resolver>
+ </file>
+ <file>
+ <ext name="xml"/>
<resolver mime="text/x-dd-application1.4">
<xml-rule>
<element name="application" ns="http://java.sun.com/xml/ns/j2ee">
@@ -221,4 +251,14 @@
</xml-rule>
</resolver>
</file>
+ <file>
+ <ext name="xml"/>
+ <resolver mime="text/x-dd-application8.0">
+ <xml-rule>
+ <element name="application" ns="http://xmlns.jcp.org/xml/ns/javaee">
+ <attr name="version" text="8"/>
+ </element>
+ </xml-rule>
+ </resolver>
+ </file>
</MIME-resolver>
diff --git a/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/resources/layer.xml b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/resources/layer.xml
index 2083c4a..f58a25e 100644
--- a/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/resources/layer.xml
+++ b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/resources/layer.xml
@@ -24,6 +24,9 @@
<folder name="Navigator">
<folder name="Panels">
<folder name="text">
+ <folder name="x-dd-application8.0">
+ <file name="org-netbeans-modules-xml-text-navigator-XMLNavigatorPanel.instance"/>
+ </folder>
<folder name="x-dd-application7.0">
<file name="org-netbeans-modules-xml-text-navigator-XMLNavigatorPanel.instance"/>
</folder>
@@ -36,6 +39,9 @@
<folder name="x-dd-application1.4">
<file name="org-netbeans-modules-xml-text-navigator-XMLNavigatorPanel.instance"/>
</folder>
+ <folder name="x-dd-client8.0">
+ <file name="org-netbeans-modules-xml-text-navigator-XMLNavigatorPanel.instance"/>
+ </folder>
<folder name="x-dd-client7.0">
<file name="org-netbeans-modules-xml-text-navigator-XMLNavigatorPanel.instance"/>
</folder>
@@ -84,12 +90,18 @@
<folder name="x-dd-servlet3.1">
<file name="org-netbeans-modules-xml-text-navigator-XMLNavigatorPanel.instance"/>
</folder>
+ <folder name="x-dd-servlet4.0">
+ <file name="org-netbeans-modules-xml-text-navigator-XMLNavigatorPanel.instance"/>
+ </folder>
<folder name="x-dd-servlet-fragment3.0">
<file name="org-netbeans-modules-xml-text-navigator-XMLNavigatorPanel.instance"/>
</folder>
<folder name="x-dd-servlet-fragment3.1">
<file name="org-netbeans-modules-xml-text-navigator-XMLNavigatorPanel.instance"/>
</folder>
+ <folder name="x-dd-servlet-fragment4.0">
+ <file name="org-netbeans-modules-xml-text-navigator-XMLNavigatorPanel.instance"/>
+ </folder>
</folder>
</folder>
</folder>
@@ -431,6 +443,170 @@
</file>
</folder>
</folder>
+ <folder name="x-dd-web-fragment3.1">
+ <folder name="Factories">
+ <file name="org-netbeans-modules-j2ee-ddloaders-web-DDDataLoader.instance">
+ <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.j2ee.ddloaders.Bundle"/>
+ </file>
+ <file name="org-netbeans-modules-j2ee-ddloaders-web-DDWebFragment30DataLoader.instance"/>
+ <file name="org-netbeans-modules-j2ee-ddloaders-ejb-EjbJarDataLoader.instance"/>
+ <file name="org-netbeans-modules-j2ee-ddloaders-ejb-EjbJar30DataLoader.instance"/>
+ <file name="org-netbeans-modules-j2ee-ddloaders-client-ClientDataLoader.instance"/>
+ <file name="org-netbeans-modules-j2ee-ddloaders-app-EarDataLoader.instance"/>
+ </folder>
+ <folder name="Actions">
+ <file name="org-netbeans-modules-xml-tools-actions-CheckAction.shadow">
+ <attr name="originalFile" stringvalue="Actions/XML/org-netbeans-modules-xml-tools-actions-CheckAction.instance"/>
+ <attr name="position" intvalue="1300"/>
+ </file>
+ <file name="org-netbeans-modules-xml-tools-actions-ValidateAction.shadow">
+ <attr name="originalFile" stringvalue="Actions/XML/org-netbeans-modules-xml-tools-actions-ValidateAction.instance"/>
+ <attr name="position" intvalue="1400"/>
+ </file>
+ <file name="org-openide-actions-CopyAction.shadow">
+ <attr name="originalFile" stringvalue="Actions/Edit/org-openide-actions-CopyAction.instance"/>
+ <attr name="position" intvalue="600"/>
+ </file>
+ <file name="org-openide-actions-CutAction.shadow">
+ <attr name="originalFile" stringvalue="Actions/Edit/org-openide-actions-CutAction.instance"/>
+ <attr name="position" intvalue="500"/>
+ </file>
+ <file name="org-openide-actions-DeleteAction.shadow">
+ <attr name="originalFile" stringvalue="Actions/Edit/org-openide-actions-DeleteAction.instance"/>
+ <attr name="position" intvalue="900"/>
+ </file>
+ <file name="org-openide-actions-EditAction.shadow">
+ <attr name="originalFile" stringvalue="Actions/System/org-openide-actions-EditAction.instance"/>
+ <attr name="position" intvalue="200"/>
+ </file>
+ <file name="org-openide-actions-FileSystemAction.shadow">
+ <attr name="originalFile" stringvalue="Actions/System/org-openide-actions-FileSystemAction.instance"/>
+ <attr name="position" intvalue="300"/>
+ </file>
+ <file name="org-openide-actions-OpenAction.shadow">
+ <attr name="originalFile" stringvalue="Actions/System/org-openide-actions-OpenAction.instance"/>
+ <attr name="position" intvalue="100"/>
+ </file>
+ <file name="org-openide-actions-PasteAction.shadow">
+ <attr name="originalFile" stringvalue="Actions/Edit/org-openide-actions-PasteAction.instance"/>
+ <attr name="position" intvalue="700"/>
+ </file>
+ <file name="org-openide-actions-PropertiesAction.shadow">
+ <attr name="originalFile" stringvalue="Actions/System/org-openide-actions-PropertiesAction.instance"/>
+ <attr name="position" intvalue="1700"/>
+ </file>
+ <file name="org-openide-actions-SaveAsTemplateAction.shadow">
+ <attr name="originalFile" stringvalue="Actions/System/org-openide-actions-SaveAsTemplateAction.instance"/>
+ <attr name="position" intvalue="1100"/>
+ </file>
+ <file name="org-openide-actions-ToolsAction.shadow">
+ <attr name="originalFile" stringvalue="Actions/System/org-openide-actions-ToolsAction.instance"/>
+ <attr name="position" intvalue="1600"/>
+ </file>
+ <file name="sep-1.instance">
+ <attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
+ <attr name="position" intvalue="400"/>
+ </file>
+ <file name="sep-2.instance">
+ <attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
+ <attr name="position" intvalue="800"/>
+ </file>
+ <file name="sep-3.instance">
+ <attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
+ <attr name="position" intvalue="1000"/>
+ </file>
+ <file name="sep-4.instance">
+ <attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
+ <attr name="position" intvalue="1200"/>
+ </file>
+ <file name="sep-5.instance">
+ <attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
+ <attr name="position" intvalue="1500"/>
+ </file>
+ </folder>
+ </folder>
+ <folder name="x-dd-web-fragment4.0">
+ <folder name="Factories">
+ <file name="org-netbeans-modules-j2ee-ddloaders-web-DDDataLoader.instance">
+ <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.j2ee.ddloaders.Bundle"/>
+ </file>
+ <file name="org-netbeans-modules-j2ee-ddloaders-web-DDWebFragment30DataLoader.instance"/>
+ <file name="org-netbeans-modules-j2ee-ddloaders-ejb-EjbJarDataLoader.instance"/>
+ <file name="org-netbeans-modules-j2ee-ddloaders-ejb-EjbJar30DataLoader.instance"/>
+ <file name="org-netbeans-modules-j2ee-ddloaders-client-ClientDataLoader.instance"/>
+ <file name="org-netbeans-modules-j2ee-ddloaders-app-EarDataLoader.instance"/>
+ </folder>
+ <folder name="Actions">
+ <file name="org-netbeans-modules-xml-tools-actions-CheckAction.shadow">
+ <attr name="originalFile" stringvalue="Actions/XML/org-netbeans-modules-xml-tools-actions-CheckAction.instance"/>
+ <attr name="position" intvalue="1300"/>
+ </file>
+ <file name="org-netbeans-modules-xml-tools-actions-ValidateAction.shadow">
+ <attr name="originalFile" stringvalue="Actions/XML/org-netbeans-modules-xml-tools-actions-ValidateAction.instance"/>
+ <attr name="position" intvalue="1400"/>
+ </file>
+ <file name="org-openide-actions-CopyAction.shadow">
+ <attr name="originalFile" stringvalue="Actions/Edit/org-openide-actions-CopyAction.instance"/>
+ <attr name="position" intvalue="600"/>
+ </file>
+ <file name="org-openide-actions-CutAction.shadow">
+ <attr name="originalFile" stringvalue="Actions/Edit/org-openide-actions-CutAction.instance"/>
+ <attr name="position" intvalue="500"/>
+ </file>
+ <file name="org-openide-actions-DeleteAction.shadow">
+ <attr name="originalFile" stringvalue="Actions/Edit/org-openide-actions-DeleteAction.instance"/>
+ <attr name="position" intvalue="900"/>
+ </file>
+ <file name="org-openide-actions-EditAction.shadow">
+ <attr name="originalFile" stringvalue="Actions/System/org-openide-actions-EditAction.instance"/>
+ <attr name="position" intvalue="200"/>
+ </file>
+ <file name="org-openide-actions-FileSystemAction.shadow">
+ <attr name="originalFile" stringvalue="Actions/System/org-openide-actions-FileSystemAction.instance"/>
+ <attr name="position" intvalue="300"/>
+ </file>
+ <file name="org-openide-actions-OpenAction.shadow">
+ <attr name="originalFile" stringvalue="Actions/System/org-openide-actions-OpenAction.instance"/>
+ <attr name="position" intvalue="100"/>
+ </file>
+ <file name="org-openide-actions-PasteAction.shadow">
+ <attr name="originalFile" stringvalue="Actions/Edit/org-openide-actions-PasteAction.instance"/>
+ <attr name="position" intvalue="700"/>
+ </file>
+ <file name="org-openide-actions-PropertiesAction.shadow">
+ <attr name="originalFile" stringvalue="Actions/System/org-openide-actions-PropertiesAction.instance"/>
+ <attr name="position" intvalue="1700"/>
+ </file>
+ <file name="org-openide-actions-SaveAsTemplateAction.shadow">
+ <attr name="originalFile" stringvalue="Actions/System/org-openide-actions-SaveAsTemplateAction.instance"/>
+ <attr name="position" intvalue="1100"/>
+ </file>
+ <file name="org-openide-actions-ToolsAction.shadow">
+ <attr name="originalFile" stringvalue="Actions/System/org-openide-actions-ToolsAction.instance"/>
+ <attr name="position" intvalue="1600"/>
+ </file>
+ <file name="sep-1.instance">
+ <attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
+ <attr name="position" intvalue="400"/>
+ </file>
+ <file name="sep-2.instance">
+ <attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
+ <attr name="position" intvalue="800"/>
+ </file>
+ <file name="sep-3.instance">
+ <attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
+ <attr name="position" intvalue="1000"/>
+ </file>
+ <file name="sep-4.instance">
+ <attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
+ <attr name="position" intvalue="1200"/>
+ </file>
+ <file name="sep-5.instance">
+ <attr name="instanceClass" stringvalue="javax.swing.JSeparator"/>
+ <attr name="position" intvalue="1500"/>
+ </file>
+ </folder>
+ </folder>
<!-- Actions for ejb-jar.xml version 3.0 (see issue 76967)-->
<folder name="x-dd-ejbjar3.0">
<folder name="Factories">
@@ -611,6 +787,18 @@
<file name="org-netbeans-modules-j2ee-ddloaders-app-EarDataLoader.instance"/>
</folder>
</folder>
+ <folder name="x-dd-servlet4.0">
+ <folder name="Factories">
+ <file name="org-netbeans-modules-j2ee-ddloaders-web-DDDataLoader.instance">
+ <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.j2ee.ddloaders.Bundle"/>
+ </file>
+ <file name="org-netbeans-modules-j2ee-ddloaders-web-DDWeb30DataLoader.instance"/>
+ <file name="org-netbeans-modules-j2ee-ddloaders-ejb-EjbJarDataLoader.instance"/>
+ <file name="org-netbeans-modules-j2ee-ddloaders-ejb-EjbJar30DataLoader.instance"/>
+ <file name="org-netbeans-modules-j2ee-ddloaders-client-ClientDataLoader.instance"/>
+ <file name="org-netbeans-modules-j2ee-ddloaders-app-EarDataLoader.instance"/>
+ </folder>
+ </folder>
<folder name="x-dd-servlet-fragment3.0">
<folder name="Factories">
<file name="org-netbeans-modules-j2ee-ddloaders-web-DDDataLoader.instance">
@@ -635,6 +823,18 @@
<file name="org-netbeans-modules-j2ee-ddloaders-app-EarDataLoader.instance"/>
</folder>
</folder>
+ <folder name="x-dd-servlet-fragment4.0">
+ <folder name="Factories">
+ <file name="org-netbeans-modules-j2ee-ddloaders-web-DDDataLoader.instance">
+ <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.j2ee.ddloaders.Bundle"/>
+ </file>
+ <file name="org-netbeans-modules-j2ee-ddloaders-web-DDWebFragment30DataLoader.instance"/>
+ <file name="org-netbeans-modules-j2ee-ddloaders-ejb-EjbJarDataLoader.instance"/>
+ <file name="org-netbeans-modules-j2ee-ddloaders-ejb-EjbJar30DataLoader.instance"/>
+ <file name="org-netbeans-modules-j2ee-ddloaders-client-ClientDataLoader.instance"/>
+ <file name="org-netbeans-modules-j2ee-ddloaders-app-EarDataLoader.instance"/>
+ </folder>
+ </folder>
<folder name="x-dd-ejbjar2.0">
<folder name="Factories">
<file name="org-netbeans-modules-j2ee-ddloaders-web-DDDataLoader.instance">
@@ -719,6 +919,18 @@
<file name="org-netbeans-modules-j2ee-ddloaders-app-EarDataLoader.instance"/>
</folder>
</folder>
+ <folder name="x-dd-client8.0">
+ <folder name="Factories">
+ <file name="org-netbeans-modules-j2ee-ddloaders-web-DDDataLoader.instance">
+ <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.j2ee.ddloaders.Bundle"/>
+ </file>
+ <file name="org-netbeans-modules-j2ee-ddloaders-web-DDWeb25DataLoader.instance"/>
+ <file name="org-netbeans-modules-j2ee-ddloaders-ejb-EjbJarDataLoader.instance"/>
+ <file name="org-netbeans-modules-j2ee-ddloaders-ejb-EjbJar30DataLoader.instance"/>
+ <file name="org-netbeans-modules-j2ee-ddloaders-client-ClientDataLoader.instance"/>
+ <file name="org-netbeans-modules-j2ee-ddloaders-app-EarDataLoader.instance"/>
+ </folder>
+ </folder>
<folder name="x-dd-application1.4">
<folder name="Factories">
<file name="org-netbeans-modules-j2ee-ddloaders-web-DDDataLoader.instance">
@@ -767,6 +979,18 @@
<file name="org-netbeans-modules-j2ee-ddloaders-app-EarDataLoader.instance"/>
</folder>
</folder>
+ <folder name="x-dd-application8.0">
+ <folder name="Factories">
+ <file name="org-netbeans-modules-j2ee-ddloaders-web-DDDataLoader.instance">
+ <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.j2ee.ddloaders.Bundle"/>
+ </file>
+ <file name="org-netbeans-modules-j2ee-ddloaders-web-DDWeb25DataLoader.instance"/>
+ <file name="org-netbeans-modules-j2ee-ddloaders-ejb-EjbJarDataLoader.instance"/>
+ <file name="org-netbeans-modules-j2ee-ddloaders-ejb-EjbJar30DataLoader.instance"/>
+ <file name="org-netbeans-modules-j2ee-ddloaders-client-ClientDataLoader.instance"/>
+ <file name="org-netbeans-modules-j2ee-ddloaders-app-EarDataLoader.instance"/>
+ </folder>
+ </folder>
</folder>
</folder>
</filesystem>
diff --git a/enterprise/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/api/ASDDVersion.java b/enterprise/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/api/ASDDVersion.java
index 61b8e25..4568ba8 100644
--- a/enterprise/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/api/ASDDVersion.java
+++ b/enterprise/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/api/ASDDVersion.java
@@ -258,7 +258,7 @@ public final class ASDDVersion {
"GlassFish Server 3.1" // NOI18N
);
- /** Represents GF Server 5.1
+ /** Represents GF Server 5.0
*/
public static final ASDDVersion GLASSFISH_5_0 = new ASDDVersion(
"5.0", 100, // NOI18N
diff --git a/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/JSFCatalog.java b/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/JSFCatalog.java
index 8bc295a..d414b66 100644
--- a/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/JSFCatalog.java
+++ b/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/JSFCatalog.java
@@ -48,6 +48,7 @@ public class JSFCatalog implements CatalogReader, CatalogDescriptor2, org.xml.sa
private static final String URL_JSF_2_3="nbres:/org/netbeans/modules/web/jsf/resources/web-facesconfig_2_3.xsd"; // 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
private static final String JSF_1_2_XSD="web-facesconfig_1_2.xsd"; // NOI18N
private static final String JSF_2_0_XSD="web-facesconfig_2_0.xsd"; // NOI18N
private static final String JSF_2_1_XSD="web-facesconfig_2_1.xsd"; // NOI18N
@@ -56,8 +57,8 @@ public class JSFCatalog implements CatalogReader, CatalogDescriptor2, org.xml.sa
private static final String JSF_1_2=JAVAEE_NS+"/"+JSF_1_2_XSD; // NOI18N
private static final String JSF_2_0=JAVAEE_NS+"/"+JSF_2_0_XSD; // NOI18N
private static final String JSF_2_1=JAVAEE_NS+"/"+JSF_2_1_XSD; // NOI18N
- private static final String JSF_2_2=JAVAEE_NS+"/"+JSF_2_2_XSD; // NOI18N
- private static final String JSF_2_3=JAVAEE_NS+"/"+JSF_2_3_XSD; // NOI18N
+ private static final String JSF_2_2=NEW_JAVAEE_NS+"/"+JSF_2_2_XSD; // NOI18N
+ private static final String JSF_2_3=NEW_JAVAEE_NS+"/"+JSF_2_3_XSD; // NOI18N
public static final String JSF_ID_1_2="SCHEMA:"+JSF_1_2; // NOI18N
public static final String JSF_ID_2_0="SCHEMA:"+JSF_2_0; // NOI18N
public static final String JSF_ID_2_1="SCHEMA:"+JSF_2_1; // NOI18N
@@ -74,22 +75,22 @@ public class JSFCatalog implements CatalogReader, CatalogDescriptor2, org.xml.sa
public static final String RES_FACES_CONFIG_2_3 = "faces-config_2_3.xml";
//facelets
- private static final String FILE_FACELETS_TAGLIB_SCHAMA_23="web-facelettaglibrary_2_3.xsd"; //NOI18N
- private static final String FILE_FACELETS_TAGLIB_SCHAMA_22="web-facelettaglibrary_2_2.xsd"; //NOI18N
- private static final String FILE_FACELETS_TAGLIB_SCHAMA_20="web-facelettaglibrary_2_0.xsd"; //NOI18N
+ private static final String FILE_FACELETS_TAGLIB_SCHEMA_23="web-facelettaglibrary_2_3.xsd"; //NOI18N
+ private static final String FILE_FACELETS_TAGLIB_SCHEMA_22="web-facelettaglibrary_2_2.xsd"; //NOI18N
+ private static final String FILE_FACELETS_TAGLIB_SCHEMA_20="web-facelettaglibrary_2_0.xsd"; //NOI18N
private static final String FILE_FACELETS_TAGLIB_DTD_10="facelet-taglib_1_0.dtd"; //NOI18N
- private static final String URL_FACELETS_TAGLIB_SCHEMA_23 = JAVAEE_NS + "/" + FILE_FACELETS_TAGLIB_SCHAMA_23; // NOI18N
+ private static final String URL_FACELETS_TAGLIB_SCHEMA_23 = NEW_JAVAEE_NS + "/" + FILE_FACELETS_TAGLIB_SCHEMA_23; // NOI18N
private static final String ID_FACELETS_TAGLIB_SCHEMA_23 ="SCHEMA:" + URL_FACELETS_TAGLIB_SCHEMA_23;
- private static final String URL_FACELETS_TAGLIB_SCHEMA_22 = JAVAEE_NS + "/" + FILE_FACELETS_TAGLIB_SCHAMA_22; // NOI18N
+ private static final String URL_FACELETS_TAGLIB_SCHEMA_22 = NEW_JAVAEE_NS + "/" + FILE_FACELETS_TAGLIB_SCHEMA_22; // NOI18N
private static final String ID_FACELETS_TAGLIB_SCHEMA_22 ="SCHEMA:" + URL_FACELETS_TAGLIB_SCHEMA_22;
- private static final String URL_FACELETS_TAGLIB_SCHEMA_20 = JAVAEE_NS + "/" + FILE_FACELETS_TAGLIB_SCHAMA_20; // NOI18N
+ private static final String URL_FACELETS_TAGLIB_SCHEMA_20 = JAVAEE_NS + "/" + FILE_FACELETS_TAGLIB_SCHEMA_20; // NOI18N
private static final String ID_FACELETS_TAGLIB_SCHEMA_20 ="SCHEMA:" + URL_FACELETS_TAGLIB_SCHEMA_20;
private static final String ID_FACELETS_TAGLIB_DTD_10 = "-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN"; //NOI18N
- private static final String RESOURCE_URL_FACELETS_TAGLIB_SCHEMA_23 ="nbres:/org/netbeans/modules/web/jsf/resources/" + FILE_FACELETS_TAGLIB_SCHAMA_23; // NOI18N
- private static final String RESOURCE_URL_FACELETS_TAGLIB_SCHEMA_22 ="nbres:/org/netbeans/modules/web/jsf/resources/" + FILE_FACELETS_TAGLIB_SCHAMA_22; // NOI18N
- private static final String RESOURCE_URL_FACELETS_TAGLIB_SCHEMA_20 ="nbres:/org/netbeans/modules/web/jsf/resources/" + FILE_FACELETS_TAGLIB_SCHAMA_20; // NOI18N
+ private static final String RESOURCE_URL_FACELETS_TAGLIB_SCHEMA_23 ="nbres:/org/netbeans/modules/web/jsf/resources/" + FILE_FACELETS_TAGLIB_SCHEMA_23; // NOI18N
+ private static final String RESOURCE_URL_FACELETS_TAGLIB_SCHEMA_22 ="nbres:/org/netbeans/modules/web/jsf/resources/" + FILE_FACELETS_TAGLIB_SCHEMA_22; // NOI18N
+ private static final String RESOURCE_URL_FACELETS_TAGLIB_SCHEMA_20 ="nbres:/org/netbeans/modules/web/jsf/resources/" + FILE_FACELETS_TAGLIB_SCHEMA_20; // NOI18N
private static final String RESOURCE_URL_FACELETS_TAGLIB_DTD_10 ="nbres:/org/netbeans/modules/web/jsf/resources/" + FILE_FACELETS_TAGLIB_DTD_10; // NOI18N
@@ -112,6 +113,8 @@ public class JSFCatalog implements CatalogReader, CatalogDescriptor2, org.xml.sa
list.add(JSF_ID_2_3);
list.add(ID_FACELETS_TAGLIB_DTD_10);
list.add(ID_FACELETS_TAGLIB_SCHEMA_20);
+ list.add(ID_FACELETS_TAGLIB_SCHEMA_22);
+ list.add(ID_FACELETS_TAGLIB_SCHEMA_23);
return list.listIterator();
}
@@ -197,7 +200,7 @@ public class JSFCatalog implements CatalogReader, CatalogDescriptor2, org.xml.sa
}
/**
- * Resolves schema definition file for taglib descriptor (spec.1_1, 1_2, 2_0, 2_1)
+ * Resolves schema definition file for taglib descriptor (spec.1_1, 1_2, 2_0, 2_1, 2_2, 2_3)
* @param publicId publicId for resolved entity (null in our case)
* @param systemId systemId for resolved entity
* @return InputSource for publisId,
@@ -235,8 +238,12 @@ public class JSFCatalog implements CatalogReader, CatalogDescriptor2, org.xml.sa
return new org.xml.sax.InputSource(URL_JSF_2_2);
} else if (systemId!=null && systemId.endsWith(JSF_2_3_XSD)) {
return new org.xml.sax.InputSource(URL_JSF_2_3);
- } else if (systemId!=null && systemId.endsWith(FILE_FACELETS_TAGLIB_SCHAMA_20)) {
+ } else if (systemId!=null && systemId.endsWith(FILE_FACELETS_TAGLIB_SCHEMA_20)) {
return new org.xml.sax.InputSource(RESOURCE_URL_FACELETS_TAGLIB_SCHEMA_20);
+ } else if (systemId!=null && systemId.endsWith(FILE_FACELETS_TAGLIB_SCHEMA_22)) {
+ return new org.xml.sax.InputSource(RESOURCE_URL_FACELETS_TAGLIB_SCHEMA_22);
+ } else if (systemId!=null && systemId.endsWith(FILE_FACELETS_TAGLIB_SCHEMA_23)) {
+ return new org.xml.sax.InputSource(RESOURCE_URL_FACELETS_TAGLIB_SCHEMA_23);
} else {
return null;
}
diff --git a/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/impl/facesmodel/JSFConfigModelImpl.java b/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/impl/facesmodel/JSFConfigModelImpl.java
index 9a545fc..2c04e2a 100644
--- a/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/impl/facesmodel/JSFConfigModelImpl.java
+++ b/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/impl/facesmodel/JSFConfigModelImpl.java
@@ -95,12 +95,12 @@ public class JSFConfigModelImpl extends AbstractDocumentModel<JSFConfigComponent
|| checkSchemaLocation(
getRootComponent().getPeer(),
"http://xmlns.jcp.org/xml/ns/javaee/web-facesconfig_2_3.xsd"))) { //NOI18N
- version = JSFVersion.JSF_2_2;
+ version = JSFVersion.JSF_2_3;
} else if (JSFConfigQNames.JSF_2_2_NS.equals(namespaceURI)
&& (getRootComponent().getVersion().equals("2.2") //NOI18N
|| checkSchemaLocation(
getRootComponent().getPeer(),
- "http://java.sun.com/xml/ns/javaee/web-facesconfig_2_2.xsd"))) { //NOI18N
+ "http://xmlns.jcp.org/xml/ns/javaee/web-facesconfig_2_2.xsd"))) { //NOI18N
version = JSFVersion.JSF_2_2;
} else if (JSFConfigQNames.JSF_2_1_NS.equals(namespaceURI)
&& (getRootComponent().getVersion().equals("2.1") //NOI18N
diff --git a/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/resources/web-facelettaglibrary_2_2.xsd b/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/resources/web-facelettaglibrary_2_2.xsd
index 713d197..779e014 100644
--- a/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/resources/web-facelettaglibrary_2_2.xsd
+++ b/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/resources/web-facelettaglibrary_2_2.xsd
@@ -1,9 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
+<xsd:schema targetNamespace="http://xmlns.jcp.org/xml/ns/javaee"
+ xmlns:javaee="http://xmlns.jcp.org/xml/ns/javaee"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:xml="http://www.w3.org/XML/1998/namespace"
+ elementFormDefault="qualified"
+ attributeFormDefault="unqualified"
+ version="2.2">
+ <xsd:include schemaLocation="javaee_7.xsd"/>
+
+ <xsd:annotation>
+ <xsd:documentation>
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- Copyright (c) 2011 - 2012 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2011-2013 Oracle and/or its affiliates. All rights reserved.
The contents of this file are subject to the terms of either the GNU
General Public License Version 2 only ("GPL") or the Common Development
@@ -38,16 +48,9 @@
and therefore, elected the GPL Version 2 license, then the option applies
only if the new code is made subject to such option by the copyright
holder.
-
--->
-<xsd:schema targetNamespace="http://java.sun.com/xml/ns/javaee"
- xmlns:javaee="http://java.sun.com/xml/ns/javaee"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:xml="http://www.w3.org/XML/1998/namespace"
- elementFormDefault="qualified"
- attributeFormDefault="unqualified"
- version="2.2">
- <xsd:include schemaLocation="javaee_6.xsd"/>
+
+ </xsd:documentation>
+ </xsd:annotation>
<xsd:annotation>
<xsd:documentation>
@@ -59,9 +62,9 @@
<p>JSF 2.2 Facelet Tag Libraries that wish to conform to this
schema must declare it in the following manner.</p>
- <pre><facelet-taglib xmlns="http://java.sun.com/xml/ns/javaee"
+ <facelet-taglib xmlns="http://xmlns.jcp.org/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facelettaglibary_2_2.xsd"
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-facelettaglibary_2_2.xsd"
version="2.2">
...
@@ -72,7 +75,7 @@
version of the schema using xsi:schemaLocation attribute
for javaee namespace with the following location:</p>
- <p>http://java.sun.com/xml/ns/javaee/web-facelettaglibary_2_2.xsd</p>
+ <p>http://xmlns.jcp.org/xml/ns/javaee/web-facelettaglibary_2_2.xsd</p>
]]>
</xsd:documentation>
diff --git a/ide/parsing.indexing/src/org/netbeans/modules/parsing/impl/indexing/IndexerCache.java b/ide/parsing.indexing/src/org/netbeans/modules/parsing/impl/indexing/IndexerCache.java
index 387954d..82e3f10 100644
--- a/ide/parsing.indexing/src/org/netbeans/modules/parsing/impl/indexing/IndexerCache.java
+++ b/ide/parsing.indexing/src/org/netbeans/modules/parsing/impl/indexing/IndexerCache.java
@@ -269,15 +269,27 @@ public abstract class IndexerCache <T extends SourceIndexerFactory> {
"text/x-dd-servlet2.4", //NOI18N
"text/x-dd-servlet2.5", //NOI18N
"text/x-dd-servlet3.0", //NOI18N
+ "text/x-dd-servlet3.1", //NOI18N
+ "text/x-dd-servlet4.0", //NOI18N
"text/x-dd-servlet-fragment3.0", //NOI18N
+ "text/x-dd-servlet-fragment3.1", //NOI18N
+ "text/x-dd-servlet-fragment4.0", //NOI18N
"text/x-dd-ejbjar2.0", //NOI18N
"text/x-dd-ejbjar2.1", //NOI18N
"text/x-dd-ejbjar3.0", //NOI18N
+ "text/x-dd-ejbjar3.1", //NOI18N
+ "text/x-dd-ejbjar3.2", //NOI18N
"text/x-dd-client1.3", //NOI18N
"text/x-dd-client1.4", //NOI18N
"text/x-dd-client5.0", //NOI18N
+ "text/x-dd-client6.0", //NOI18N
+ "text/x-dd-client7.0", //NOI18N
+ "text/x-dd-client8.0", //NOI18N
"text/x-dd-application1.4", //NOI18N
"text/x-dd-application5.0", //NOI18N
+ "text/x-dd-application6.0", //NOI18N
+ "text/x-dd-application7.0", //NOI18N
+ "text/x-dd-application8.0", //NOI18N
"text/x-dd-sun-web+xml", //NOI18N
"text/x-dd-sun-ejb-jar+xml", //NOI18N
"text/x-dd-sun-application+xml", //NOI18N
diff --git a/nbbuild/rat-exclusions.txt b/nbbuild/rat-exclusions.txt
index 54f8f46..dc6d4a1 100644
--- a/nbbuild/rat-exclusions.txt
+++ b/nbbuild/rat-exclusions.txt
@@ -35,6 +35,7 @@ enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/client/model_1_4/*
enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/client/model_5_0/*
enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/client/model_6_0/*
enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/client/model_7_0/*
+enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/client/model_8_0/*
enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/model_2_1/*
enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/model_3_0/*
enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/model_3_1/*
---------------------------------------------------------------------
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