Skip to content

Support newer Jakarta Faces API versions: 3.0, 4.0, 4.1 (eclipse-jsf#8) #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bvfalcon wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Support newer Jakarta Faces API versions: 3.0, 4.0, 4.1 (eclipse-jsf#8) #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9d9f1da
Support newer Jakarta Faces API versions: 3.0, 4.0, 4.1 (eclipse-jsf#8)
bvfalcon Dec 4, 2024
e6028c5
feat: add proposals for convertDateTime.type
bvfalcon Feb 9, 2025
3af018d
feat: add additionalInfo for convertDateTime.pattern
bvfalcon Feb 12, 2025
3ea01fb
feat: improve validation
bvfalcon Feb 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 40 additions & 0 deletions ...ime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/ComponentFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,43 +81,83 @@ public class ComponentFactory
* Base class name for UIInput's
*/
public final static String BASE_CLASS_UIINPUT = "javax.faces.component.UIInput"; //$NON-NLS-1$
/**
* Base class name for UIInput's (Jakarta EE)
*/
public final static String BASE_CLASS_UIINPUT_JAKARTA = "jakarta.faces.component.UIInput"; //$NON-NLS-1$
/**
* Base class name for UIOutput's
*/
public final static String BASE_CLASS_UIOUTPUT = "javax.faces.component.UIOutput"; //$NON-NLS-1$
/**
* Base class name for UIOutput's (Jakarta EE)
*/
public final static String BASE_CLASS_UIOUTPUT_JAKARTA = "jakarta.faces.component.UIOutput"; //$NON-NLS-1$
/**
* Base class name for UICommand's
*/
public final static String BASE_CLASS_UICOMMAND = "javax.faces.component.UICommand"; //$NON-NLS-1$
/**
* Base class name for UICommand's (Jakarta EE)
*/
public final static String BASE_CLASS_UICOMMAND_JAKARTA = "jakarta.faces.component.UICommand"; //$NON-NLS-1$
/**
* Base class name for UIData's
*/
public final static String BASE_CLASS_UIDATA = "javax.faces.component.UIData"; //$NON-NLS-1$
/**
* Base class name for UIData's (Jakarta EE)
*/
public final static String BASE_CLASS_UIDATA_JAKARTA = "jakarta.faces.component.UIData"; //$NON-NLS-1$
/**
* Base class name for UIForm's
*/
public final static String BASE_CLASS_UIFORM = "javax.faces.component.UIForm"; //$NON-NLS-1$
/**
* Base class name for UIForm's (Jakarta EE)
*/
public final static String BASE_CLASS_UIFORM_JAKARTA = "jakarta.faces.component.UIForm"; //$NON-NLS-1$

/**
* Interface name for ValueHolder's
*/
public final static String INTERFACE_VALUEHOLDER = "javax.faces.component.ValueHolder"; //$NON-NLS-1$
/**
* Interface name for ValueHolder's (Jakarta EE)
*/
public final static String INTERFACE_VALUEHOLDER_JAKARTA = "jakarta.faces.component.ValueHolder"; //$NON-NLS-1$
/**
* Interface name for EditableValueHolder's
*/
public final static String INTERFACE_EDITABLEVALUEHOLDER = "javax.faces.component.EditableValueHolder"; //$NON-NLS-1$
/**
* Interface name for EditableValueHolder's (Jakarta EE)
*/
public final static String INTERFACE_EDITABLEVALUEHOLDER_JAKARTA = "jakarta.faces.component.EditableValueHolder"; //$NON-NLS-1$
/**
* Interface name for ActionSource's
*/
public final static String INTERFACE_ACTIONSOURCE = "javax.faces.component.ActionSource"; //$NON-NLS-1$
/**
* Interface name for ActionSource's (Jakarta EE)
*/
public final static String INTERFACE_ACTIONSOURCE_JAKARTA = "jakarta.faces.component.ActionSource"; //$NON-NLS-1$
/**
* Interface name for ActionSource2's
*/
public final static String INTERFACE_ACTIONSOURCE2 = "javax.faces.component.ActionSource2"; //$NON-NLS-1$
/**
* Interface name for ActionSource2's (Jakarta EE)
*/
public final static String INTERFACE_ACTIONSOURCE2_JAKARTA = "jakarta.faces.component.ActionSource2"; //$NON-NLS-1$
/**
* Interface name for NamingContainer's
*/
public final static String INTERFACE_NAMINGCONTAINER = "javax.faces.component.NamingContainer"; //$NON-NLS-1$
/**
* Interface name for NamingContainer's (Jakarta EE)
*/
public final static String INTERFACE_NAMINGCONTAINER_JAKARTA = "jakarta.faces.component.NamingContainer"; //$NON-NLS-1$

/**
* @param id
Expand Down
2 changes: 1 addition & 1 deletion ...untime/src/org/eclipse/jst/jsf/common/runtime/internal/view/model/common/ITagElement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public interface ITagElement extends Serializable

/**
* @return the fully qualified class name in dot separated format
* (i.e. javax.faces.webapp.ConverterTag)
* (i.e. javax.faces.webapp.ConverterTag or jakarta.faces.webapp.ConverterTag)
*/
public abstract String getTagHandlerClassName();

Expand Down
8 changes: 8 additions & 0 deletions ...g.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/TypeConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,10 @@ public class TypeConstants
* Type signature for the JSF Data Model type
*/
public static final String TYPE_DATA_MODEL = "Ljavax.faces.model.DataModel;"; //$NON-NLS-1$
/**
* Type signature for the Jakarta Faces Data Model type
*/
public static final String TYPE_DATA_MODEL_JAKARTA = "Ljakarta.faces.model.DataModel;"; //$NON-NLS-1$
/**
* Type signature for the Result Set type
*/
Expand All @@ -109,6 +113,10 @@ public class TypeConstants
* Type signature for the JSTL ResultSet type
*/
public static final String TYPE_JAVAX_SERVLET_JSP_JSTL_SQL_RESULT = "Ljavax.servlet.jsp.jstl.sql.Result;"; //$NON-NLS-1$
/**
* Type signature for the JSTL ResultSet type (Jakarta EE)
*/
public static final String TYPE_JAKARTA_SERVLET_JSP_JSTL_SQL_RESULT = "Ljakarta.servlet.jsp.jstl.sql.Result;"; //$NON-NLS-1$
/**
* Type signature of the base type of all enum types
*/
Expand Down
14 changes: 10 additions & 4 deletions jsf/plugins/org.eclipse.jst.jsf.core/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Automatic-Module-Name: org.eclipse.jst.jsf.core
Bundle-Name: %plugin.name
Bundle-SymbolicName: org.eclipse.jst.jsf.core; singleton:=true
Bundle-SymbolicName: org.eclipse.jst.jsf.core;singleton:=true
Bundle-Version: 1.9.3.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.jst.jsf.core.internal.JSFCorePlugin
Bundle-Vendor: %plugin.provider
Bundle-Localization: plugin
Expand All @@ -26,9 +27,9 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
org.eclipse.wst.common.emf;bundle-version="[1.1.103,2.0.0)",
org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)",
org.eclipse.emf.common;bundle-version="[2.2.0,3.0.0)",
org.eclipse.emf.ecore;bundle-version="[2.2.0,3.0.0)",
org.eclipse.emf.ecore;bundle-version="[2.2.0,3.0.0)";visibility:=reexport,
Copy link
Copy Markdown
Contributor

@nitind nitind Apr 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reexporting is an unusual choice these days. Why that change?

org.eclipse.core.commands;bundle-version="[3.2.0,4.0.0)",
org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,3.0.0)",
org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,3.0.0)";visibility:=reexport,
org.eclipse.emf.edit;bundle-version="[2.2.0,3.0.0)",
org.eclipse.jst.common.project.facet.core;bundle-version="[1.1.0,2.0.0)",
org.eclipse.jst.jsf.common.runtime;bundle-version="[1.0.0,2.0.0)",
Expand All @@ -37,7 +38,8 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
org.eclipse.wst.css.core;bundle-version="[1.1.200,2.0.0)",
org.eclipse.debug.core;bundle-version="[3.5.0,4.0.0)",
org.eclipse.ui;bundle-version="3.6.0"
Bundle-ActivationPolicy: lazy;exclude:="org.eclipse.jst.jsf.core.internal.contenttype"
Eclipse-LazyStart: true
Bundle-ActivationPolicy: lazy;exclude:=org.eclipse.jst.jsf.core.internal.contenttype
Export-Package: org.eclipse.jst.jsf.core,
org.eclipse.jst.jsf.core.internal;x-friends:="org.eclipse.jst.jsf.core.tests,org.eclipse.jst.jsf.ui,org.eclipse.jst.jsf.ui.tests",
org.eclipse.jst.jsf.core.internal.contentassist.el;x-friends:="org.eclipse.jst.jsf.contentassist.tests",
Expand All @@ -53,9 +55,12 @@ Export-Package: org.eclipse.jst.jsf.core,
org.eclipse.jst.jsf.core.internal.jsflibraryregistry.impl;x-friends:="org.eclipse.jst.jsf.core.tests,org.eclipse.jst.jsf.ui,org.eclipse.jst.jsf.ui.tests",
org.eclipse.jst.jsf.core.internal.jsflibraryregistry.util;x-friends:="org.eclipse.jst.jsf.core.tests,org.eclipse.jst.jsf.ui,org.eclipse.jst.jsf.ui.tests",
org.eclipse.jst.jsf.core.internal.launch;x-internal:=true,
org.eclipse.jst.jsf.core.internal.preferences,
org.eclipse.jst.jsf.core.internal.project.facet;x-friends:="org.eclipse.jst.jsf.core.tests,org.eclipse.jst.jsf.ui,org.eclipse.jst.jsf.ui.tests",
org.eclipse.jst.jsf.core.internal.provisional.contenttype,
org.eclipse.jst.jsf.core.internal.region;x-internal:=true,
org.eclipse.jst.jsf.core.internal.tld;x-friends:="org.eclipse.jst.pagedesigner,org.eclipse.jst.jsf.core.tests",
org.eclipse.jst.jsf.core.internal.util,
org.eclipse.jst.jsf.core.jsfappconfig,
org.eclipse.jst.jsf.core.jsfappconfig.internal;x-internal:=true,
org.eclipse.jst.jsf.core.jsflibraryconfiguration,
Expand Down Expand Up @@ -120,3 +125,4 @@ Export-Package: org.eclipse.jst.jsf.core,
org.eclipse.jst.jsf.validation.internal.facelet,
org.eclipse.jst.jsf.validation.internal.strategy;x-internal:=true
Bundle-RequiredExecutionEnvironment: JavaSE-17
Import-Package: org.eclipse.core.filebuffers
1 change: 1 addition & 0 deletions jsf/plugins/org.eclipse.jst.jsf.core/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ bin.includes = META-INF/,\
.,\
plugin.xml,\
plugin.properties,\
icons/,\
schema/,\
about.html,\
.options,\
Expand Down
Binary file added jsf/plugins/org.eclipse.jst.jsf.core/icons/jsf_facet.gif
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions jsf/plugins/org.eclipse.jst.jsf.core/model/jsflibraryregistry.ecore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,5 +84,12 @@
<eLiterals name="UNKNOWN" value="-1"/>
<eLiterals name="v1_1" value="1"/>
<eLiterals name="v1_2" value="2"/>
<eLiterals name="v2_0" value="3"/>
<eLiterals name="v2_1" value="4"/>
<eLiterals name="v2_2" value="5"/>
<eLiterals name="v2_3" value="6"/>
<eLiterals name="v3_0" value="7"/>
<eLiterals name="v4_0" value="8"/>
<eLiterals name="v4_1" value="9"/>
</eClassifiers>
</ecore:EPackage>
19 changes: 12 additions & 7 deletions jsf/plugins/org.eclipse.jst.jsf.core/model/jsflibraryregistry.genmodel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<genmodel:GenModel xmi:version="2.0"
xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2005 Oracle Corporation"
modelDirectory="/org.eclipse.jst.jsf.core/src" editDirectory="/org.eclipse.jst.jsf.core.edit/src"
editorDirectory="/org.eclipse.jst.jsf.core.editor/src" modelPluginID="org.eclipse.jst.jsf.core"
templateDirectory="templates" dynamicTemplates="true" modelName="JSFLibraryRegistry"
importerID="org.eclipse.emf.importer.ecore">
<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2005 Oracle Corporation" modelDirectory="/org.eclipse.jst.jsf.core/src"
editDirectory="/org.eclipse.jst.jsf.core.edit/src" editorDirectory="/org.eclipse.jst.jsf.core.editor/src"
modelPluginID="org.eclipse.jst.jsf.core" templateDirectory="templates" dynamicTemplates="true"
modelName="JSFLibraryRegistry" importerID="org.eclipse.emf.importer.ecore">
<foreignModel>jsflibraryregistry.ecore</foreignModel>
<genPackages prefix="JSFLibraryRegistry" basePackage="org.eclipse.jst.jsf.core.internal"
resource="XML" disposableProviderFactory="true" ecorePackage="jsflibraryregistry.ecore#/">
<genEnums ecoreEnum="jsflibraryregistry.ecore#//JSFVersion">
<genEnumLiterals ecoreEnumLiteral="jsflibraryregistry.ecore#//JSFVersion/UNKNOWN"/>
<genEnumLiterals ecoreEnumLiteral="jsflibraryregistry.ecore#//JSFVersion/v1_1"/>
<genEnumLiterals ecoreEnumLiteral="jsflibraryregistry.ecore#//JSFVersion/v1_2"/>
<genEnumLiterals ecoreEnumLiteral="jsflibraryregistry.ecore#//JSFVersion/v2_0"/>
<genEnumLiterals ecoreEnumLiteral="jsflibraryregistry.ecore#//JSFVersion/v2_1"/>
<genEnumLiterals ecoreEnumLiteral="jsflibraryregistry.ecore#//JSFVersion/v2_2"/>
<genEnumLiterals ecoreEnumLiteral="jsflibraryregistry.ecore#//JSFVersion/v2_3"/>
<genEnumLiterals ecoreEnumLiteral="jsflibraryregistry.ecore#//JSFVersion/v3_0"/>
<genEnumLiterals ecoreEnumLiteral="jsflibraryregistry.ecore#//JSFVersion/v4_0"/>
<genEnumLiterals ecoreEnumLiteral="jsflibraryregistry.ecore#//JSFVersion/v4_1"/>
</genEnums>
<genClasses ecoreClass="jsflibraryregistry.ecore#//JSFLibraryRegistry">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute jsflibraryregistry.ecore#//JSFLibraryRegistry/DefaultImplementationID"/>
Expand Down
27 changes: 10 additions & 17 deletions jsf/plugins/org.eclipse.jst.jsf.core/plugin.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,31 +9,22 @@
#
# Contributors:
# Gerry Kessler - initial API and implementation
###############################################################################
###############################################################################
plugin.name=JSF Tools - Core
plugin.provider=Eclipse Web Tools Platform
plugin.facet.name=JavaServer Faces
plugin.facet.description=Enables the project to be deployed with JSF capabilities.

JSFELValidator=JSP JSF EL Validator

JSFv11Project=JavaServer Faces v1.1 Project
JSFv11PresetDesc=Configures a Dynamic Web application to use JSF v1.1

JSFv12Project=JavaServer Faces v1.2 Project
JSFv12PresetDesc=Configures a Dynamic Web application to use JSF v1.2

JSFv20Project=JavaServer Faces v2.0 Project
JSFv20PresetDesc=Configures a Dynamic Web application to use JSF v2.0

JSFv21Project=JavaServer Faces v2.1 Project
JSFv21PresetDesc=Configures a Dynamic Web application to use JSF v2.1

JSFv22Project=JavaServer Faces v2.2 Project
JSFv22PresetDesc=Configures a Dynamic Web application to use JSF v2.2

JSFv23Project=JavaServer Faces v2.3 Project
JSFv23PresetDesc=Configures a Dynamic Web application to use JSF v2.3

JSFv40Project=Jakarta Faces v4.0 Project
JSFv40PresetDesc=Configures a Dynamic Web application to use JSF v4.0

JSFv41Project=Jakarta Faces v4.1 Project
JSFv41PresetDesc=Configures a Dynamic Web application to use JSF v4.1
# ====================================================================

pluginName = Constraints Model
Expand Down Expand Up @@ -67,4 +58,6 @@ extension-point.name.14 = JSF AppConfig Locator Provider Factory (internal)
extension-point.name.15 = JSF AppConfig Manager Factory (internal)
Facelet.name=Facelet
FaceletComposite.name=Facelet Composite Component
extension-point.name.viewHandlerOverride = viewHandlerOverride
extension-point.name.viewHandlerOverride = viewHandlerOverride

JSF_Content_Type_Extension_Element.name=JSF
Loading