You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ta...@apache.org on 2019/04/09 12:41:59 UTC
[myfaces] branch master updated: refactored
This is an automated email from the ASF dual-hosted git repository.
tandraschko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces.git
The following commit(s) were added to refs/heads/master by this push:
new 212b168 refactored
212b168 is described below
commit 212b168c11dc83acbb95a9f70c0b4e7f69836185
Author: Thomas Andraschko <ta...@apache.org>
AuthorDate: Tue Apr 9 14:41:52 2019 +0200
refactored
---
.../myfaces/application/ApplicationImpl.java | 2 +-
.../org/apache/myfaces/config/MyfacesConfig.java | 24 ++++++++++------------
.../view/ViewDeclarationLanguageFactoryImpl.java | 2 +-
.../myfaces/webapp/AbstractFacesInitializer.java | 2 +-
.../myfaces/webapp/FacesInitializerFactory.java | 2 +-
5 files changed, 15 insertions(+), 17 deletions(-)
diff --git a/impl/src/main/java/org/apache/myfaces/application/ApplicationImpl.java b/impl/src/main/java/org/apache/myfaces/application/ApplicationImpl.java
index e85a3b4..11be07d 100755
--- a/impl/src/main/java/org/apache/myfaces/application/ApplicationImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/application/ApplicationImpl.java
@@ -346,7 +346,7 @@ public class ApplicationImpl extends Application
private ELResolver createFacesResolver()
{
FacesContext facesContext = getFacesContext();
- boolean supportJSPAndFacesEL = MyfacesConfig.getCurrentInstance(facesContext).isSupportJSPAndFacesEL();
+ boolean supportJSPAndFacesEL = MyfacesConfig.getCurrentInstance(facesContext).isSupportJSP();
CompositeELResolver resolver;
if (supportJSPAndFacesEL)
{
diff --git a/impl/src/main/java/org/apache/myfaces/config/MyfacesConfig.java b/impl/src/main/java/org/apache/myfaces/config/MyfacesConfig.java
index c669f1c..4b3c2ae 100755
--- a/impl/src/main/java/org/apache/myfaces/config/MyfacesConfig.java
+++ b/impl/src/main/java/org/apache/myfaces/config/MyfacesConfig.java
@@ -238,18 +238,16 @@ public class MyfacesConfig
public static final int COMPONENT_UNIQUE_IDS_CACHE_SIZE_DEFAULT = 100;
/**
- * If set false, myfaces won't support JSP and javax.faces.el. JSP are deprecated in JSF 2.X, javax.faces.el in
- * in JSF 1.2. Default value is true.
+ * If set false, myfaces won't support JSP. JSP are deprecated in JSF 2.X. Default value is true.
*
- * If this property is set is false, JSF 1.1 VariableResolver and PropertyResolver config (replaced in JSF 1.2 by
- * ELResolver) and all related logic for JSP is skipped, making EL evaluation faster.
+ * If this property is set is false, all related logic for JSP is skipped.
*/
@JSFWebConfigParam(since="2.0.13,2.1.7", expectedValues="true,false", defaultValue="true",
- desc="If set false, myfaces won't support JSP and javax.faces.el. JSP are deprecated in " +
- "JSF 2.X, javax.faces.el in in JSF 1.2. Default value is true.",
+ desc="If set false, myfaces won't support JSP. JSP are deprecated in " +
+ "JSF 2.X. Default value is true.",
group="EL", tags="performance ")
- public final static String SUPPORT_JSP_AND_FACES_EL = "org.apache.myfaces.SUPPORT_JSP_AND_FACES_EL";
- public final static boolean SUPPORT_JSP_AND_FACES_EL_DEFAULT = true;
+ public final static String SUPPORT_JSP = "org.apache.myfaces.SUPPORT_JSP";
+ public final static boolean SUPPORT_JSP_DEFAULT = true;
/**
* When the application runs inside Google Application Engine container (GAE),
@@ -790,7 +788,7 @@ public class MyfacesConfig
private String defaultResponseWriterContentTypeMode = DEFAULT_RESPONSE_WRITER_CONTENT_TYPE_MODE_DEFAULT;
private boolean viewUniqueIdsCacheEnabled = VIEW_UNIQUE_IDS_CACHE_ENABLED_DEFAULT;
private int componentUniqueIdsCacheSize = COMPONENT_UNIQUE_IDS_CACHE_SIZE_DEFAULT;
- private boolean supportJSPAndFacesEL = SUPPORT_JSP_AND_FACES_EL_DEFAULT;
+ private boolean supportJSP = SUPPORT_JSP_DEFAULT;
private String gaeJsfJarFiles = GAE_JSF_JAR_FILES_DEFAULT;
private String gaeJsfAnnotationsJarFiles = GAE_JSF_ANNOTATIONS_JAR_FILES_DEFAULT;
private boolean strictJsf2ViewNotFound = STRICT_JSF_2_VIEW_NOT_FOUND_DEFAULT;
@@ -992,8 +990,8 @@ public class MyfacesConfig
cfg.componentUniqueIdsCacheSize = getInt(extCtx, COMPONENT_UNIQUE_IDS_CACHE_SIZE,
COMPONENT_UNIQUE_IDS_CACHE_SIZE_DEFAULT);
- cfg.supportJSPAndFacesEL = getBoolean(extCtx, SUPPORT_JSP_AND_FACES_EL,
- SUPPORT_JSP_AND_FACES_EL_DEFAULT);
+ cfg.supportJSP = getBoolean(extCtx, SUPPORT_JSP,
+ SUPPORT_JSP_DEFAULT);
cfg.gaeJsfJarFiles = getString(extCtx, GAE_JSF_JAR_FILES,
GAE_JSF_JAR_FILES_DEFAULT);
@@ -1408,9 +1406,9 @@ public class MyfacesConfig
return componentUniqueIdsCacheSize;
}
- public boolean isSupportJSPAndFacesEL()
+ public boolean isSupportJSP()
{
- return supportJSPAndFacesEL;
+ return supportJSP;
}
public String getGaeJsfJarFiles()
diff --git a/impl/src/main/java/org/apache/myfaces/view/ViewDeclarationLanguageFactoryImpl.java b/impl/src/main/java/org/apache/myfaces/view/ViewDeclarationLanguageFactoryImpl.java
index 7785845..027faba 100644
--- a/impl/src/main/java/org/apache/myfaces/view/ViewDeclarationLanguageFactoryImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/view/ViewDeclarationLanguageFactoryImpl.java
@@ -113,7 +113,7 @@ public class ViewDeclarationLanguageFactoryImpl extends ViewDeclarationLanguageF
logWarningIfLegacyFaceletViewHandlerIsPresent(context);
- if (MyfacesConfig.getCurrentInstance(context).isSupportJSPAndFacesEL())
+ if (MyfacesConfig.getCurrentInstance(context).isSupportJSP())
{
_supportedLanguages = new ViewDeclarationLanguageStrategy[2];
_supportedLanguages[0] = new FaceletViewDeclarationLanguageStrategy();
diff --git a/impl/src/main/java/org/apache/myfaces/webapp/AbstractFacesInitializer.java b/impl/src/main/java/org/apache/myfaces/webapp/AbstractFacesInitializer.java
index f78d9b4..6f57524 100644
--- a/impl/src/main/java/org/apache/myfaces/webapp/AbstractFacesInitializer.java
+++ b/impl/src/main/java/org/apache/myfaces/webapp/AbstractFacesInitializer.java
@@ -283,7 +283,7 @@ public abstract class AbstractFacesInitializer implements FacesInitializer
{
BeanManager beanManager = CDIUtils.getBeanManager(externalContext);
CdiAnnotationProviderExtension extension =
- BeanProvider.getContextualReference(beanManager, CdiAnnotationProviderExtension.class, false);
+ BeanProvider.getContextualReference(beanManager, CdiAnnotationProviderExtension.class, true);
if (extension != null)
{
extension.release();
diff --git a/impl/src/main/java/org/apache/myfaces/webapp/FacesInitializerFactory.java b/impl/src/main/java/org/apache/myfaces/webapp/FacesInitializerFactory.java
index 5865230..0b58bf0 100644
--- a/impl/src/main/java/org/apache/myfaces/webapp/FacesInitializerFactory.java
+++ b/impl/src/main/java/org/apache/myfaces/webapp/FacesInitializerFactory.java
@@ -101,7 +101,7 @@ public class FacesInitializerFactory
private static FacesInitializer _getDefaultFacesInitializer(ServletContext context)
{
// No MyfacesConfig available yet, we must read the parameter directly:
- String initParameter = context.getInitParameter(MyfacesConfig.SUPPORT_JSP_AND_FACES_EL);
+ String initParameter = context.getInitParameter(MyfacesConfig.SUPPORT_JSP);
if (Boolean.FALSE.toString().equals(initParameter))
{
return new FaceletsInitilializer();