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 2017/08/25 21:10:24 UTC
svn commit: r1806236 - in
/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces:
application/ApplicationImpl.java application/cdi/
cdi/util/CDIExternalArtifactResolver.java
cdi/util/ExternalArtifactResolver.java
Author: tandraschko
Date: Fri Aug 25 21:10:23 2017
New Revision: 1806236
URL: http://svn.apache.org/viewvc?rev=1806236&view=rev
Log:
MYFACES-4147 Remove CDI_MANAGED_CONVERTERS_ENABLED and CDI_MANAGED_VALIDATORS_ENABLED
Removed:
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/application/cdi/
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/util/CDIExternalArtifactResolver.java
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/util/ExternalArtifactResolver.java
Modified:
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/application/ApplicationImpl.java
Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/application/ApplicationImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/application/ApplicationImpl.java?rev=1806236&r1=1806235&r2=1806236&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/application/ApplicationImpl.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/application/ApplicationImpl.java Fri Aug 25 21:10:23 2017
@@ -97,9 +97,6 @@ import javax.naming.InitialContext;
import javax.naming.NamingException;
import org.apache.commons.beanutils.BeanUtils;
-import org.apache.myfaces.application.cdi.ConverterWrapper;
-import org.apache.myfaces.cdi.util.ExternalArtifactResolver;
-import org.apache.myfaces.application.cdi.ValidatorWrapper;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFWebConfigParam;
import org.apache.myfaces.cdi.behavior.FacesBehaviorCDIWrapper;
import org.apache.myfaces.cdi.behavior.FacesClientBehaviorCDIWrapper;
@@ -137,7 +134,6 @@ import org.apache.myfaces.flow.FlowHandl
import org.apache.myfaces.lifecycle.LifecycleImpl;
import org.apache.myfaces.shared.config.MyfacesConfig;
import org.apache.myfaces.shared.util.ClassUtils;
-import org.apache.myfaces.util.ExternalSpecifications;
import org.apache.myfaces.view.facelets.FaceletCompositionContext;
import org.apache.myfaces.view.facelets.el.ELText;
@@ -265,8 +261,6 @@ public class ApplicationImpl extends App
/** Value of javax.faces.DATETIMECONVERTER_DEFAULT_TIMEZONE_IS_SYSTEM_TIMEZONE parameter */
private boolean _dateTimeConverterDefaultTimeZoneIsSystemTimeZone = false;
- private final ExternalArtifactResolver _externalArtifactResolver;
-
private SearchExpressionHandler _searchExpressionHandler;
private SearchKeywordResolver _searchExpressionResolver;
@@ -328,17 +322,6 @@ public class ApplicationImpl extends App
{
_dateTimeConverterDefaultTimeZoneIsSystemTimeZone = true;
}
-
- if (ExternalSpecifications.isCDIAvailable(getFaceContext().getExternalContext()))
- {
- _externalArtifactResolver = (ExternalArtifactResolver)
- ClassUtils.newInstance(
- "org.apache.myfaces.cdi.util.CDIExternalArtifactResolver");
- }
- else
- {
- _externalArtifactResolver = null;
- }
}
// ~ Methods
@@ -1665,17 +1648,7 @@ public class ApplicationImpl extends App
private Converter createConverterInstance(Class<? extends Converter> converterClass)
throws InstantiationException, IllegalAccessException
{
- Converter result = _externalArtifactResolver != null ?
- _externalArtifactResolver.resolveManagedConverter(converterClass) : null;
-
- if (result == null)
- {
- return converterClass.newInstance();
- }
- else
- {
- return new ConverterWrapper(result);
- }
+ return converterClass.newInstance();
}
@Override
@@ -2202,17 +2175,7 @@ public class ApplicationImpl extends App
private Validator createValidatorInstance(Class<? extends Validator> validatorClass)
throws InstantiationException, IllegalAccessException
{
- Validator result = _externalArtifactResolver != null ?
- _externalArtifactResolver.resolveManagedValidator(validatorClass) : null;
-
- if (result == null)
- {
- return validatorClass.newInstance();
- }
- else
- {
- return new ValidatorWrapper(result);
- }
+ return validatorClass.newInstance();
}
/**