You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gp...@apache.org on 2013/10/13 21:04:42 UTC
svn commit: r1531734 - in /myfaces/core/trunk:
impl/src/main/java/org/apache/myfaces/cdi/dependent/
impl/src/main/java/org/apache/myfaces/cdi/util/
shared/src/main/java/org/apache/myfaces/shared/config/
Author: gpetracek
Date: Sun Oct 13 19:04:41 2013
New Revision: 1531734
URL: http://svn.apache.org/r1531734
Log:
MYFACES-3797 cleanup (more appropriate names)
Added:
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/cdi/dependent/RequestDependentBeanStorage.java
- copied, changed from r1531727, myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/cdi/dependent/DependentBeanStorage.java
Removed:
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/cdi/dependent/DependentBeanStorage.java
Modified:
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/cdi/dependent/DependentBeanExtension.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/cdi/util/ExternalArtifactResolver.java
myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/config/MyfacesConfig.java
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/cdi/dependent/DependentBeanExtension.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/cdi/dependent/DependentBeanExtension.java?rev=1531734&r1=1531733&r2=1531734&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/cdi/dependent/DependentBeanExtension.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/cdi/dependent/DependentBeanExtension.java Sun Oct 13 19:04:41 2013
@@ -28,7 +28,7 @@ public class DependentBeanExtension impl
@SuppressWarnings("UnusedDeclaration")
public void registerAnnotatedTypes(@Observes BeforeBeanDiscovery beforeBeanDiscovery, BeanManager beanManager)
{
- beforeBeanDiscovery.addAnnotatedType(beanManager.createAnnotatedType(DependentBeanStorage.class));
+ beforeBeanDiscovery.addAnnotatedType(beanManager.createAnnotatedType(RequestDependentBeanStorage.class));
beforeBeanDiscovery.addAnnotatedType(beanManager.createAnnotatedType(ViewDependentBeanStorage.class));
}
}
Copied: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/cdi/dependent/RequestDependentBeanStorage.java (from r1531727, myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/cdi/dependent/DependentBeanStorage.java)
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/cdi/dependent/RequestDependentBeanStorage.java?p2=myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/cdi/dependent/RequestDependentBeanStorage.java&p1=myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/cdi/dependent/DependentBeanStorage.java&r1=1531727&r2=1531734&rev=1531734&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/cdi/dependent/DependentBeanStorage.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/cdi/dependent/RequestDependentBeanStorage.java Sun Oct 13 19:04:41 2013
@@ -21,6 +21,6 @@ package org.apache.myfaces.cdi.dependent
import javax.enterprise.context.RequestScoped;
@RequestScoped
-public class DependentBeanStorage extends AbstractBeanStorage
+public class RequestDependentBeanStorage extends AbstractBeanStorage
{
}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/cdi/util/ExternalArtifactResolver.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/cdi/util/ExternalArtifactResolver.java?rev=1531734&r1=1531733&r2=1531734&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/cdi/util/ExternalArtifactResolver.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/cdi/util/ExternalArtifactResolver.java Sun Oct 13 19:04:41 2013
@@ -20,7 +20,7 @@ package org.apache.myfaces.cdi.util;
import org.apache.myfaces.cdi.dependent.AbstractBeanStorage;
import org.apache.myfaces.cdi.dependent.DependentBeanEntry;
-import org.apache.myfaces.cdi.dependent.DependentBeanStorage;
+import org.apache.myfaces.cdi.dependent.RequestDependentBeanStorage;
import org.apache.myfaces.cdi.dependent.ViewDependentBeanStorage;
import org.apache.myfaces.shared.config.MyfacesConfig;
import org.apache.myfaces.util.ExternalSpecifications;
@@ -41,34 +41,34 @@ public class ExternalArtifactResolver
public static final String JAVAX_FACES_CONVERT_PACKAGE_NAME = "javax.faces.convert";
public static final String JAVAX_FACES_VALIDATOR_PACKAGE_NAME = "javax.faces.validator";
- private static volatile Boolean converterInjectionEnabled;
- private static volatile Boolean validatorInjectionEnabled;
+ private static volatile Boolean managedConvertersEnabled;
+ private static volatile Boolean managedValidatorsEnabled;
- public static boolean isConverterInjectionEnabled()
+ private static boolean isManagedConvertersEnabled()
{
- if (converterInjectionEnabled != null)
+ if (managedConvertersEnabled != null)
{
- return converterInjectionEnabled;
+ return managedConvertersEnabled;
}
initConverterInjectionEnabled();
- return converterInjectionEnabled;
+ return managedConvertersEnabled;
}
private static synchronized void initConverterInjectionEnabled()
{
- if (converterInjectionEnabled != null)
+ if (managedConvertersEnabled != null)
{
return;
}
- converterInjectionEnabled = MyfacesConfig.getCurrentInstance(
- FacesContext.getCurrentInstance().getExternalContext()).isConverterInjectionEnabled();
+ managedConvertersEnabled = MyfacesConfig.getCurrentInstance(
+ FacesContext.getCurrentInstance().getExternalContext()).isCdiManagedConvertersEnabled();
}
public static Converter resolveManagedConverter(Class<? extends Converter> converterClass)
{
- if (!isConverterInjectionEnabled())
+ if (!isManagedConvertersEnabled())
{
return null;
}
@@ -85,31 +85,31 @@ public class ExternalArtifactResolver
return getContextualReference(beanManager, converterClass);
}
- public static boolean isValidatorInjectionEnabled()
+ private static boolean isManagedValidatorsEnabled()
{
- if (validatorInjectionEnabled != null)
+ if (managedValidatorsEnabled != null)
{
- return validatorInjectionEnabled;
+ return managedValidatorsEnabled;
}
initValidatorInjectionEnabled();
- return validatorInjectionEnabled;
+ return managedValidatorsEnabled;
}
private static synchronized void initValidatorInjectionEnabled()
{
- if (validatorInjectionEnabled != null)
+ if (managedValidatorsEnabled != null)
{
return;
}
- validatorInjectionEnabled = MyfacesConfig.getCurrentInstance(
- FacesContext.getCurrentInstance().getExternalContext()).isValidatorInjectionEnabled();
+ managedValidatorsEnabled = MyfacesConfig.getCurrentInstance(
+ FacesContext.getCurrentInstance().getExternalContext()).isCdiManagedValidatorsEnabled();
}
public static Validator resolveManagedValidator(Class<? extends Validator> validatorClass)
{
- if (!isValidatorInjectionEnabled())
+ if (!isManagedValidatorsEnabled())
{
return null;
}
@@ -157,7 +157,7 @@ public class ExternalArtifactResolver
}
else
{
- beanStorage = getContextualReference(beanManager, DependentBeanStorage.class);
+ beanStorage = getContextualReference(beanManager, RequestDependentBeanStorage.class);
}
//noinspection unchecked
Modified: myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/config/MyfacesConfig.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/config/MyfacesConfig.java?rev=1531734&r1=1531733&r2=1531734&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/config/MyfacesConfig.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/config/MyfacesConfig.java Sun Oct 13 19:04:41 2013
@@ -429,15 +429,15 @@ public class MyfacesConfig
@JSFWebConfigParam(defaultValue = "false", since = "2.2.0", expectedValues="true, false", group="cdi",
tags="injection",
desc="Enable or disable CDI support for converters.")
- private static final String INIT_PARAM_CONVERTER_INJECTION_ENABLED =
- "org.apache.myfaces.CONVERTER_INJECTION_ENABLED";
- private static final boolean INIT_PARAM_CONVERTER_INJECTION_DEFAULT = false;
+ private static final String INIT_PARAM_CDI_MANAGED_CONVERTERS_ENABLED =
+ "org.apache.myfaces.CDI_MANAGED_CONVERTERS_ENABLED";
+ private static final boolean INIT_PARAM_CDI_MANAGED_CONVERTERS_DEFAULT = false;
@JSFWebConfigParam(defaultValue = "false", since = "2.2.0", expectedValues="true, false", group="cdi",
tags="injection",
desc="Enable or disable CDI support for validators.")
- private static final String INIT_PARAM_VALIDATOR_INJECTION_ENABLED =
- "org.apache.myfaces.VALIDATOR_INJECTION_ENABLED";
- private static final boolean INIT_PARAM_VALIDATOR_INJECTION_DEFAULT = false;
+ private static final String INIT_PARAM_CDI_MANAGED_VALIDATORS_ENABLED =
+ "org.apache.myfaces.CDI_MANAGED_VALIDATORS_ENABLED";
+ private static final boolean INIT_PARAM_CDI_MANAGED_VALIDATORS_DEFAULT = false;
private boolean _prettyHtml;
private boolean _detectJavascript;
@@ -471,8 +471,8 @@ public class MyfacesConfig
private String _gaeJsfJarFiles;
private String _gaeJsfAnnotationsJarFiles;
private boolean _earlyFlushEnabled;
- private boolean _converterInjectionEnabled;
- private boolean _validatorInjectionEnabled;
+ private boolean _cdiManagedConvertersEnabled;
+ private boolean _cdiManagedValidatorsEnabled;
private static final boolean TOMAHAWK_AVAILABLE;
private static final boolean MYFACES_IMPL_AVAILABLE;
@@ -574,8 +574,8 @@ public class MyfacesConfig
setGaeJsfJarFiles(INIT_PARAM_GAE_JSF_JAR_FILES_DEFAULT);
setGaeJsfAnnotationsJarFiles(INIT_PARAM_GAE_JSF_ANNOTATIONS_JAR_FILES_DEFAULT);
setEarlyFlushEnabled(INIT_PARAM_EARLY_FLUSH_ENABLED_DEFAULT);
- setConverterInjectionEnabled(INIT_PARAM_CONVERTER_INJECTION_DEFAULT);
- setValidatorInjectionEnabled(INIT_PARAM_VALIDATOR_INJECTION_DEFAULT);
+ setCdiManagedConvertersEnabled(INIT_PARAM_CDI_MANAGED_CONVERTERS_DEFAULT);
+ setCdiManagedValidatorsEnabled(INIT_PARAM_CDI_MANAGED_VALIDATORS_DEFAULT);
}
private static MyfacesConfig createAndInitializeMyFacesConfig(ExternalContext extCtx)
@@ -686,10 +686,10 @@ public class MyfacesConfig
myfacesConfig.setEarlyFlushEnabled(WebConfigParamUtils.getBooleanInitParameter(extCtx,
INIT_PARAM_EARLY_FLUSH_ENABLED, INIT_PARAM_EARLY_FLUSH_ENABLED_DEFAULT));
- myfacesConfig.setConverterInjectionEnabled(WebConfigParamUtils.getBooleanInitParameter(extCtx,
- INIT_PARAM_CONVERTER_INJECTION_ENABLED, INIT_PARAM_CONVERTER_INJECTION_DEFAULT));
- myfacesConfig.setValidatorInjectionEnabled(WebConfigParamUtils.getBooleanInitParameter(extCtx,
- INIT_PARAM_VALIDATOR_INJECTION_ENABLED, INIT_PARAM_VALIDATOR_INJECTION_DEFAULT));
+ myfacesConfig.setCdiManagedConvertersEnabled(WebConfigParamUtils.getBooleanInitParameter(extCtx,
+ INIT_PARAM_CDI_MANAGED_CONVERTERS_ENABLED, INIT_PARAM_CDI_MANAGED_CONVERTERS_DEFAULT));
+ myfacesConfig.setCdiManagedValidatorsEnabled(WebConfigParamUtils.getBooleanInitParameter(extCtx,
+ INIT_PARAM_CDI_MANAGED_VALIDATORS_ENABLED, INIT_PARAM_CDI_MANAGED_VALIDATORS_DEFAULT));
if (TOMAHAWK_AVAILABLE)
{
@@ -1219,23 +1219,23 @@ public class MyfacesConfig
this._earlyFlushEnabled = earlyFlushEnabled;
}
- public boolean isConverterInjectionEnabled()
+ public boolean isCdiManagedConvertersEnabled()
{
- return _converterInjectionEnabled;
+ return _cdiManagedConvertersEnabled;
}
- public void setConverterInjectionEnabled(boolean converterInjectionEnabled)
+ public void setCdiManagedConvertersEnabled(boolean cdiManagedConvertersEnabled)
{
- this._converterInjectionEnabled = converterInjectionEnabled;
+ this._cdiManagedConvertersEnabled = cdiManagedConvertersEnabled;
}
- public boolean isValidatorInjectionEnabled()
+ public boolean isCdiManagedValidatorsEnabled()
{
- return _validatorInjectionEnabled;
+ return _cdiManagedValidatorsEnabled;
}
- public void setValidatorInjectionEnabled(boolean validatorInjectionEnabled)
+ public void setCdiManagedValidatorsEnabled(boolean cdiManagedValidatorsEnabled)
{
- this._validatorInjectionEnabled = validatorInjectionEnabled;
+ this._cdiManagedValidatorsEnabled = cdiManagedValidatorsEnabled;
}
}