Skip to content

Commit 090a214

Browse files
ebarboniebarboni
authored
Merge pull request #1903 from apache/master
sync master to release 113 branch for beta2
2 parents e911149 + dcb9ac3 commit 090a214

File tree

108 files changed

+8603
-4737
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

108 files changed

+8603
-4737
lines changed

‎enterprise/servletjspapi/build.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@
8989
<include name="web-common_4_0.xsd"/>
9090
<include name="web-facelettaglibrary_2_0.xsd"/>
9191
<include name="web-facelettaglibrary_2_2.xsd"/>
92+
<include name="web-facelettaglibrary_2_3.xsd"/>
9293
<include name="web-fragment_3_0.xsd"/>
9394
<include name="web-fragment_3_1.xsd"/>
9495
<include name="web-fragment_4_0.xsd"/>

‎enterprise/servletjspapi/nbproject/project.properties‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@
1616
# under the License.
1717

1818
is.autoload=true
19-
release.external/generated-servlet-jsp-api-3.1_2.3.jar=modules/ext/servlet3.1-jsp2.3-api.jar
2019
javac.compilerargs=-Xlint:unchecked
2120
javac.source=1.6
2221
spec.version.base=1.37.0
22+
23+
release.external/generated-servlet-jsp-api-3.1_2.3.jar=modules/ext/servlet3.1-jsp2.3-api.jar
24+
extra.module.files=modules/ext/servlet3.1-jsp2.3-api.jar

‎enterprise/web.beans/src/org/netbeans/modules/web/beans/impl/model/EnableBeansFilter.java‎

Lines changed: 75 additions & 60 deletions
Large diffs are not rendered by default.

‎enterprise/web.jsf.editor/src/org/netbeans/modules/web/jsf/editor/facelets/libdefs/core.xml‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,12 @@
4242
<val>date</val>
4343
<val>time</val>
4444
<val>both</val>
45+
<val>localDate</val>
46+
<val>localDateTime</val>
47+
<val>localTime</val>
48+
<val>offsetTime</val>
49+
<val>offsetDateTime</val>
50+
<val>zonedDateTime</val>
4551
</type>
4652
</attr>
4753
</tag>
@@ -108,11 +114,14 @@
108114
<tag name="validateDoubleRange"/>
109115
<tag name="validateLength"/>
110116
<tag name="validateLongRange"/>
117+
<tag name="validateWholeBean"/>
118+
<tag name="importConstants"/>
119+
<tag name="websocket"/>
111120
<tag name="validateBean"/>
112121
<tag name="validateRegex"/>
113122
<tag name="validateRequired"/>
114123
<tag name="validator"/>
115124
<tag name="valueChangeListener"/>
116125
<tag name="verbatim"/>
117126
<tag name="view"/>
118-
</library>
127+
</library>

‎enterprise/web.jsf.editor/src/org/netbeans/modules/web/jsf/editor/facelets/libdefs/html.xml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353
<tag name="column"/>
5454
<tag name="commandButton"/>
5555
<tag name="commandLink"/>
56+
<tag name="commandScript"/>
5657
<tag name="dataTable">
5758
<attr name="frame">
5859
<type name="enum">
@@ -133,5 +134,8 @@
133134
<val>lineDirection</val>
134135
</type>
135136
</attr>
137+
<attr name="group">
138+
<type name="text"/>
139+
</attr>
136140
</tag>
137-
</library>
141+
</library>

‎enterprise/web.jsf.editor/src/org/netbeans/modules/web/jsf/editor/facelets/mojarra/ConfigManager.java‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1065,7 +1065,13 @@ private Document getDocument() throws Exception {
10651065
Schema schema;
10661066
if (version != null) {
10671067
String versionStr = version.getValue();
1068-
if ("2.2".equals(versionStr)) {
1068+
if ("2.3".equals(versionStr)) {
1069+
if ("facelet-taglib".equals(documentElement.getLocalName())) {
1070+
schema = DbfFactory.getSchema(servletContext, DbfFactory.FacesSchema.FACELET_TAGLIB_22);
1071+
} else {
1072+
schema = DbfFactory.getSchema(servletContext, DbfFactory.FacesSchema.FACES_23);
1073+
}
1074+
} else if ("2.2".equals(versionStr)) {
10691075
if ("facelet-taglib".equals(documentElement.getLocalName())) {
10701076
schema = DbfFactory.getSchema(servletContext, DbfFactory.FacesSchema.FACELET_TAGLIB_22);
10711077
} else {

‎enterprise/web.jsf/licenseinfo.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@
8484
<file>src/org/netbeans/modules/web/jsf/resources/javaee_web_services_client_1_2.xsd</file>
8585
<file>src/org/netbeans/modules/web/jsf/resources/web-facelettaglibrary_2_0.xsd</file>
8686
<file>src/org/netbeans/modules/web/jsf/resources/web-facelettaglibrary_2_2.xsd</file>
87+
<file>src/org/netbeans/modules/web/jsf/resources/web-facelettaglibrary_2_3.xsd</file>
8788
<file>src/org/netbeans/modules/web/jsf/resources/web-facesconfig_1_0.dtd</file>
8889
<file>src/org/netbeans/modules/web/jsf/resources/web-facesconfig_1_1.dtd</file>
8990
<file>src/org/netbeans/modules/web/jsf/resources/web-facesconfig_1_2.xsd</file>

‎enterprise/web.jsf/src/org/netbeans/modules/web/jsf/JSFCatalog.java‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,11 @@ public class JSFCatalog implements CatalogReader, CatalogDescriptor2, org.xml.sa
4141

4242
private static final String URL_JSF_1_0 ="nbres:/org/netbeans/modules/web/jsf/resources/web-facesconfig_1_0.dtd"; // NOI18N
4343
private static final String URL_JSF_1_1 ="nbres:/org/netbeans/modules/web/jsf/resources/web-facesconfig_1_1.dtd"; // NOI18N
44+
private static final String URL_JSF_1_2="nbres:/org/netbeans/modules/web/jsf/resources/web-facesconfig_1_2.xsd"; // NOI18N
45+
private static final String URL_JSF_2_0="nbres:/org/netbeans/modules/web/jsf/resources/web-facesconfig_2_0.xsd"; // NOI18N
46+
private static final String URL_JSF_2_1="nbres:/org/netbeans/modules/web/jsf/resources/web-facesconfig_2_1.xsd"; // NOI18N
47+
private static final String URL_JSF_2_2="nbres:/org/netbeans/modules/web/jsf/resources/web-facesconfig_2_2.xsd"; // NOI18N
48+
private static final String URL_JSF_2_3="nbres:/org/netbeans/modules/web/jsf/resources/web-facesconfig_2_3.xsd"; // NOI18N
4449

4550
public static final String JAVAEE_NS = "http://java.sun.com/xml/ns/javaee"; // NOI18N
4651
private static final String JSF_1_2_XSD="web-facesconfig_1_2.xsd"; // NOI18N
@@ -58,11 +63,7 @@ public class JSFCatalog implements CatalogReader, CatalogDescriptor2, org.xml.sa
5863
public static final String JSF_ID_2_1="SCHEMA:"+JSF_2_1; // NOI18N
5964
public static final String JSF_ID_2_2="SCHEMA:"+JSF_2_2; // NOI18N
6065
public static final String JSF_ID_2_3="SCHEMA:"+JSF_2_3; // NOI18N
61-
private static final String URL_JSF_1_2="nbres:/org/netbeans/modules/web/jsf/resources/web-facesconfig_1_2.xsd"; // NOI18N
62-
private static final String URL_JSF_2_0="nbres:/org/netbeans/modules/web/jsf/resources/web-facesconfig_2_0.xsd"; // NOI18N
63-
private static final String URL_JSF_2_1="nbres:/org/netbeans/modules/web/jsf/resources/web-facesconfig_2_1.xsd"; // NOI18N
64-
private static final String URL_JSF_2_2="nbres:/org/netbeans/modules/web/jsf/resources/web-facesconfig_2_2.xsd"; // NOI18N
65-
private static final String URL_JSF_2_3="nbres:/org/netbeans/modules/web/jsf/resources/web-facesconfig_2_3.xsd"; // NOI18N
66+
6667

6768
// faces-config resources
6869
public static final String RES_FACES_CONFIG_DEFAULT = "faces-config.xml";
@@ -137,6 +138,10 @@ else if (ID_FACELETS_TAGLIB_DTD_10.equals(publicId))
137138
return RESOURCE_URL_FACELETS_TAGLIB_DTD_10;
138139
else if(ID_FACELETS_TAGLIB_SCHEMA_20.equals(publicId))
139140
return RESOURCE_URL_FACELETS_TAGLIB_SCHEMA_20;
141+
else if(ID_FACELETS_TAGLIB_SCHEMA_22.equals(publicId))
142+
return RESOURCE_URL_FACELETS_TAGLIB_SCHEMA_22;
143+
else if(ID_FACELETS_TAGLIB_SCHEMA_23.equals(publicId))
144+
return RESOURCE_URL_FACELETS_TAGLIB_SCHEMA_23;
140145
else return null;
141146
}
142147

@@ -218,6 +223,8 @@ public org.xml.sax.InputSource resolveEntity(String publicId, String systemId) t
218223
return new org.xml.sax.InputSource(RESOURCE_URL_FACELETS_TAGLIB_SCHEMA_20);
219224
} else if (URL_FACELETS_TAGLIB_SCHEMA_22.equals(systemId)) {
220225
return new org.xml.sax.InputSource(RESOURCE_URL_FACELETS_TAGLIB_SCHEMA_22);
226+
} else if (URL_FACELETS_TAGLIB_SCHEMA_23.equals(systemId)) {
227+
return new org.xml.sax.InputSource(RESOURCE_URL_FACELETS_TAGLIB_SCHEMA_23);
221228
} else if (systemId!=null && systemId.endsWith(JSF_1_2_XSD)) {
222229
return new org.xml.sax.InputSource(URL_JSF_1_2);
223230
} else if (systemId!=null && systemId.endsWith(JSF_2_0_XSD)) {

‎enterprise/web.jsf/src/org/netbeans/modules/web/jsf/impl/facesmodel/JSFConfigModelImpl.java‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,13 @@ public JSFConfigComponentFactory getFactory() {
9090
public JSFVersion getVersion() {
9191
String namespaceURI = getRootComponent().getPeer().getNamespaceURI();
9292
JSFVersion version = JSFVersion.JSF_1_1;
93-
if (JSFConfigQNames.JSF_2_2_NS.equals(namespaceURI)
93+
if (JSFConfigQNames.JSF_2_3_NS.equals(namespaceURI)
94+
&& (getRootComponent().getVersion().equals("2.3") //NOI18N
95+
|| checkSchemaLocation(
96+
getRootComponent().getPeer(),
97+
"http://xmlns.jcp.org/xml/ns/javaee/web-facesconfig_2_3.xsd"))) { //NOI18N
98+
version = JSFVersion.JSF_2_2;
99+
} else if (JSFConfigQNames.JSF_2_2_NS.equals(namespaceURI)
94100
&& (getRootComponent().getVersion().equals("2.2") //NOI18N
95101
|| checkSchemaLocation(
96102
getRootComponent().getPeer(),

‎enterprise/web.jsf/src/org/netbeans/modules/web/jsf/impl/facesmodel/JSFConfigQNames.java‎

Lines changed: 109 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,12 +202,14 @@ public enum JSFConfigQNames {
202202
private QName qname_2_0;
203203
private QName qname_2_1;
204204
private QName qname_2_2;
205+
private QName qname_2_3;
205206

206207

207208
public static final String JSF_1_2_NS = "http://java.sun.com/xml/ns/javaee"; //NOI18N
208209
public static final String JSF_2_0_NS = "http://java.sun.com/xml/ns/javaee"; //NOI18N
209210
public static final String JSF_2_1_NS = "http://java.sun.com/xml/ns/javaee"; //NOI18N
210211
public static final String JSF_2_2_NS = "http://xmlns.jcp.org/xml/ns/javaee"; //NOI18N
212+
public static final String JSF_2_3_NS = "http://xmlns.jcp.org/xml/ns/javaee"; //NOI18N
211213
public static final String JSF_1_1_NS = javax.xml.XMLConstants.NULL_NS_URI;
212214
public static final String JSFCONFIG_PREFIX = javax.xml.XMLConstants.DEFAULT_NS_PREFIX;
213215

@@ -218,6 +220,7 @@ public enum JSFConfigQNames {
218220
qname_2_0 = new QName(JSF_2_0_NS, localName, JSFCONFIG_PREFIX);
219221
qname_2_1 = new QName(JSF_2_1_NS, localName, JSFCONFIG_PREFIX);
220222
qname_2_2 = new QName(JSF_2_2_NS, localName, JSFCONFIG_PREFIX);
223+
qname_2_3 = new QName(JSF_2_3_NS, localName, JSFCONFIG_PREFIX);
221224
}
222225

223226
public QName getQName(JSFVersion version) {
@@ -230,6 +233,8 @@ public QName getQName(JSFVersion version) {
230233
value = qname_2_1;
231234
} else if (version.equals(JSFVersion.JSF_2_2)) {
232235
value = qname_2_2;
236+
} else if (version.equals(JSFVersion.JSF_2_3)) {
237+
value = qname_2_3;
233238
}
234239
return value;
235240
}
@@ -260,6 +265,8 @@ public static boolean areSameQName(JSFConfigQNames jsfqname, Element element) {
260265
return jsfqname.getQName(JSFVersion.JSF_2_1).equals(qname);
261266
} else if (JSFConfigQNames.JSF_2_2_NS.equals(element.getNamespaceURI())) {
262267
return jsfqname.getQName(JSFVersion.JSF_2_2).equals(qname);
268+
} else if (JSFConfigQNames.JSF_2_3_NS.equals(element.getNamespaceURI())) {
269+
return jsfqname.getQName(JSFVersion.JSF_2_3).equals(qname);
263270
}
264271
return jsfqname.getLocalName().equals(qname.getLocalPart());
265272
}
@@ -269,6 +276,7 @@ public static boolean areSameQName(JSFConfigQNames jsfqname, Element element) {
269276
private static final Set<QName> mappedQNames_2_0 = new HashSet<QName>();
270277
private static final Set<QName> mappedQNames_2_1 = new HashSet<QName>();
271278
private static final Set<QName> mappedQNames_2_2 = new HashSet<QName>();
279+
private static final Set<QName> mappedQNames_2_3 = new HashSet<QName>();
272280

273281
static {
274282
mappedQNames_1_1.add(FACES_CONFIG.getQName(JSFVersion.JSF_1_1));
@@ -575,12 +583,111 @@ public static boolean areSameQName(JSFConfigQNames jsfqname, Element element) {
575583
mappedQNames_2_2.add(FINALIZER.getQName(JSFVersion.JSF_2_2));
576584
mappedQNames_2_2.add(FLOW_CALL.getQName(JSFVersion.JSF_2_2));
577585
mappedQNames_2_2.add(INBOUND_PARAMETER.getQName(JSFVersion.JSF_2_2));
586+
mappedQNames_2_3.add(FACES_CONFIG.getQName(JSFVersion.JSF_2_3));
587+
mappedQNames_2_3.add(MANAGED_BEAN.getQName(JSFVersion.JSF_2_3));
588+
mappedQNames_2_3.add(CONVERTER.getQName(JSFVersion.JSF_2_3));
589+
mappedQNames_2_3.add(NAVIGATION_RULE.getQName(JSFVersion.JSF_2_3));
590+
mappedQNames_2_3.add(NAVIGATION_CASE.getQName(JSFVersion.JSF_2_3));
591+
mappedQNames_2_3.add(DESCRIPTION.getQName(JSFVersion.JSF_2_3));
592+
mappedQNames_2_3.add(DISPLAY_NAME.getQName(JSFVersion.JSF_2_3));
593+
mappedQNames_2_3.add(ICON.getQName(JSFVersion.JSF_2_3));
594+
mappedQNames_2_3.add(APPLICATION.getQName(JSFVersion.JSF_2_3));
595+
mappedQNames_2_3.add(VIEW_HANDLER.getQName(JSFVersion.JSF_2_3));
596+
mappedQNames_2_3.add(RESOURCE_BUNDLE.getQName(JSFVersion.JSF_2_3));
597+
mappedQNames_2_3.add(FACTORY.getQName(JSFVersion.JSF_2_3));
598+
mappedQNames_2_3.add(COMPONENT.getQName(JSFVersion.JSF_2_3));
599+
mappedQNames_2_3.add(REFERENCED_BEAN.getQName(JSFVersion.JSF_2_3));
600+
mappedQNames_2_3.add(RENDER_KIT.getQName(JSFVersion.JSF_2_3));
601+
mappedQNames_2_3.add(LIFECYCLE.getQName(JSFVersion.JSF_2_3));
602+
mappedQNames_2_3.add(VALIDATOR.getQName(JSFVersion.JSF_2_3));
603+
mappedQNames_2_3.add(FACES_CONFIG_EXTENSION.getQName(JSFVersion.JSF_2_3));
604+
mappedQNames_2_3.add(RESOURCE_BUNDLE.getQName(JSFVersion.JSF_2_3));
605+
mappedQNames_2_3.add(ACTION_LISTENER.getQName(JSFVersion.JSF_2_3));
606+
mappedQNames_2_3.add(DEFAULT_RENDER_KIT_ID.getQName(JSFVersion.JSF_2_3));
607+
mappedQNames_2_3.add(MESSAGE_BUNDLE.getQName(JSFVersion.JSF_2_3));
608+
mappedQNames_2_3.add(NAVIGATION_HANDLER.getQName(JSFVersion.JSF_2_3));
609+
mappedQNames_2_3.add(STATE_MANAGER.getQName(JSFVersion.JSF_2_3));
610+
mappedQNames_2_3.add(EL_RESOLVER.getQName(JSFVersion.JSF_2_3));
611+
mappedQNames_2_3.add(PROPERTY_RESOLVER.getQName(JSFVersion.JSF_2_3));
612+
mappedQNames_2_3.add(VARIABLE_RESOLVER.getQName(JSFVersion.JSF_2_3));
613+
mappedQNames_2_3.add(LOCALE_CONFIG.getQName(JSFVersion.JSF_2_3));
614+
mappedQNames_2_3.add(APPLICATION_EXTENSION.getQName(JSFVersion.JSF_2_3));
615+
mappedQNames_2_3.add(DEFAULT_LOCALE.getQName(JSFVersion.JSF_2_3));
616+
mappedQNames_2_3.add(SUPPORTED_LOCALE.getQName(JSFVersion.JSF_2_3));
617+
mappedQNames_2_3.add(APPLICATION_FACTORY.getQName(JSFVersion.JSF_2_3));
618+
mappedQNames_2_3.add(FACES_CONTEXT_FACTORY.getQName(JSFVersion.JSF_2_3));
619+
mappedQNames_2_3.add(FACELET_CACHE_FACTORY.getQName(JSFVersion.JSF_2_3));
620+
mappedQNames_2_3.add(LIFECYCLE_FACTORY.getQName(JSFVersion.JSF_2_3));
621+
mappedQNames_2_3.add(RENDER_KIT_FACTORY.getQName(JSFVersion.JSF_2_3));
622+
mappedQNames_2_3.add(FACTORY_EXTENSION.getQName(JSFVersion.JSF_2_3));
623+
mappedQNames_2_3.add(FACET.getQName(JSFVersion.JSF_2_3));
624+
mappedQNames_2_3.add(ATTRIBUTE.getQName(JSFVersion.JSF_2_3));
625+
mappedQNames_2_3.add(PROPERTY.getQName(JSFVersion.JSF_2_3));
626+
mappedQNames_2_3.add(COMPONENT_EXTENSION.getQName(JSFVersion.JSF_2_3));
627+
mappedQNames_2_3.add(CONVERTER_EXTENSION.getQName(JSFVersion.JSF_2_3));
628+
mappedQNames_2_3.add(MANAGED_PROPERTY.getQName(JSFVersion.JSF_2_3));
629+
mappedQNames_2_3.add(MAP_ENTRIES.getQName(JSFVersion.JSF_2_3));
630+
mappedQNames_2_3.add(LIST_ENTRIES.getQName(JSFVersion.JSF_2_3));
631+
mappedQNames_2_3.add(MANAGED_BEAN_EXTENSION.getQName(JSFVersion.JSF_2_3));
632+
mappedQNames_2_3.add(NAVIGATION_RULE_EXTENSION.getQName(JSFVersion.JSF_2_3));
633+
mappedQNames_2_3.add(RENDER_KIT_EXTENSION.getQName(JSFVersion.JSF_2_3));
634+
mappedQNames_2_3.add(PHASE_LISTENER.getQName(JSFVersion.JSF_2_3));
635+
mappedQNames_2_3.add(LIFECYCLE_EXTENSION.getQName(JSFVersion.JSF_2_3));
636+
mappedQNames_2_3.add(VALIDATOR_EXTENSION.getQName(JSFVersion.JSF_2_3));
637+
mappedQNames_2_3.add(FACES_CONFIG_EXTENSION.getQName(JSFVersion.JSF_2_3));
638+
mappedQNames_2_3.add(IF.getQName(JSFVersion.JSF_2_3));
639+
mappedQNames_2_3.add(REDIRECT.getQName(JSFVersion.JSF_2_3));
640+
mappedQNames_2_3.add(VIEW_PARAM.getQName(JSFVersion.JSF_2_3));
641+
mappedQNames_2_3.add(PARTIAL_TRAVERSAL.getQName(JSFVersion.JSF_2_3));
642+
mappedQNames_2_3.add(SYSTEM_EVENT_LISTENER.getQName(JSFVersion.JSF_2_3));
643+
mappedQNames_2_3.add(RESOURCE_HANDLER.getQName(JSFVersion.JSF_2_3));
644+
mappedQNames_2_3.add(DEFAULT_VALIDATORS.getQName(JSFVersion.JSF_2_3));
645+
mappedQNames_2_3.add(ORDERING.getQName(JSFVersion.JSF_2_3));
646+
mappedQNames_2_3.add(AFTER.getQName(JSFVersion.JSF_2_3));
647+
mappedQNames_2_3.add(BEFORE.getQName(JSFVersion.JSF_2_3));
648+
mappedQNames_2_3.add(ABSOLUTE_ORDERING.getQName(JSFVersion.JSF_2_3));
649+
mappedQNames_2_3.add(OTHERS.getQName(JSFVersion.JSF_2_3));
650+
mappedQNames_2_3.add(EXCEPTION_HANDLER_FACTORY.getQName(JSFVersion.JSF_2_3));
651+
mappedQNames_2_3.add(EXTERNAL_CONTEXT_FACTORY.getQName(JSFVersion.JSF_2_3));
652+
mappedQNames_2_3.add(PARTIAL_VIEW_CONTEXT_FACTORY.getQName(JSFVersion.JSF_2_3));
653+
mappedQNames_2_3.add(VIEW_DECLARATION_LANGUAGE_FACTORY.getQName(JSFVersion.JSF_2_3));
654+
mappedQNames_2_3.add(TAG_HANDLER_DELEGATE_FACTORY.getQName(JSFVersion.JSF_2_3));
655+
mappedQNames_2_3.add(VISIT_CONTEXT_FACTORY.getQName(JSFVersion.JSF_2_3));
656+
mappedQNames_2_3.add(NAME.getQName(JSFVersion.JSF_2_3));
657+
mappedQNames_2_3.add(RENDERER.getQName(JSFVersion.JSF_2_3));
658+
mappedQNames_2_3.add(CLIENT_BEHAVIOR_RENDERER.getQName(JSFVersion.JSF_2_3));
659+
mappedQNames_2_3.add(BEHAVIOR.getQName(JSFVersion.JSF_2_3));
660+
mappedQNames_2_3.add(BEHAVIOR_EXTENSION.getQName(JSFVersion.JSF_2_3));
661+
mappedQNames_2_3.add(RESOURCE_LIBRARY_CONTRACTS.getQName(JSFVersion.JSF_2_3));
662+
mappedQNames_2_3.add(RESOURCE_BUNDLE.getQName(JSFVersion.JSF_2_3));
663+
mappedQNames_2_3.add(RESOURCE_HANDLER.getQName(JSFVersion.JSF_2_3));
664+
mappedQNames_2_3.add(URL_PATTERN.getQName(JSFVersion.JSF_2_3));
665+
mappedQNames_2_3.add(FLOW_HANDLER_FACTORY.getQName(JSFVersion.JSF_2_3));
666+
mappedQNames_2_3.add(FLASH_FACTORY.getQName(JSFVersion.JSF_2_3));
667+
mappedQNames_2_3.add(START_NODE.getQName(JSFVersion.JSF_2_3));
668+
mappedQNames_2_3.add(VIEW.getQName(JSFVersion.JSF_2_3));
669+
mappedQNames_2_3.add(VDL_DOCUMENT.getQName(JSFVersion.JSF_2_3));
670+
mappedQNames_2_3.add(DEFAULT_OUTCOME.getQName(JSFVersion.JSF_2_3));
671+
mappedQNames_2_3.add(SWITCH.getQName(JSFVersion.JSF_2_3));
672+
mappedQNames_2_3.add(METHOD_CALL.getQName(JSFVersion.JSF_2_3));
673+
mappedQNames_2_3.add(FLOW_RETURN.getQName(JSFVersion.JSF_2_3));
674+
mappedQNames_2_3.add(INITIALIZER.getQName(JSFVersion.JSF_2_3));
675+
mappedQNames_2_3.add(FINALIZER.getQName(JSFVersion.JSF_2_3));
676+
mappedQNames_2_3.add(FLOW_CALL.getQName(JSFVersion.JSF_2_3));
677+
mappedQNames_2_3.add(INBOUND_PARAMETER.getQName(JSFVersion.JSF_2_3));
678+
mappedQNames_2_3.add(OUTBOUND_PARAMETER.getQName(JSFVersion.JSF_2_3));
679+
mappedQNames_2_3.add(FLOW_REFERENCE.getQName(JSFVersion.JSF_2_3));
680+
mappedQNames_2_3.add(FLOW_ID.getQName(JSFVersion.JSF_2_3));
681+
mappedQNames_2_3.add(METHOD.getQName(JSFVersion.JSF_2_3));
682+
mappedQNames_2_3.add(FLOW_DEFINITION.getQName(JSFVersion.JSF_2_3));
683+
mappedQNames_2_3.add(PROTECTED_VIEWS.getQName(JSFVersion.JSF_2_3));
578684
mappedQNames_2_2.add(OUTBOUND_PARAMETER.getQName(JSFVersion.JSF_2_2));
579685
mappedQNames_2_2.add(FLOW_REFERENCE.getQName(JSFVersion.JSF_2_2));
580686
mappedQNames_2_2.add(FLOW_ID.getQName(JSFVersion.JSF_2_2));
581687
mappedQNames_2_2.add(METHOD.getQName(JSFVersion.JSF_2_2));
582688
mappedQNames_2_2.add(FLOW_DEFINITION.getQName(JSFVersion.JSF_2_2));
583689
mappedQNames_2_2.add(PROTECTED_VIEWS.getQName(JSFVersion.JSF_2_2));
690+
584691
}
585692

586693
public static Set<QName> getMappedQNames(JSFVersion version) {
@@ -593,6 +700,8 @@ public static Set<QName> getMappedQNames(JSFVersion version) {
593700
mappedQNames = mappedQNames_2_1;
594701
} else if (version.equals(JSFVersion.JSF_2_2)) {
595702
mappedQNames = mappedQNames_2_2;
703+
} else if (version.equals(JSFVersion.JSF_2_3)) {
704+
mappedQNames = mappedQNames_2_3;
596705
}
597706
return Collections.unmodifiableSet(mappedQNames);
598707
}

0 commit comments

Comments
 (0)