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 2008/09/29 13:32:04 UTC
svn commit: r700066 [1/2] - in
/myfaces/extensions/validator/branches/jsf_1.1:
component-support/generic-support/src/main/java/org/apache/myfaces/extensions/validator/generic/startup/
component-support/trinidad-support/src/main/java/org/apache/myfaces/...
Author: gpetracek
Date: Mon Sep 29 04:32:01 2008
New Revision: 700066
URL: http://svn.apache.org/viewvc?rev=700066&view=rev
Log:
pluggable factories
Added:
myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/factory/
myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/factory/DefaultFactoryFinder.java
myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/factory/FactoryFinder.java
myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/factory/FactoryNameEnum.java
myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/mapper/ClassMappingFactory.java
myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/util/JsfUtils.java
Removed:
myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/ClassMappingFactory.java
myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/util/ExtValUtils.java
myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/util/FactoryUtils.java
myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/util/ValidationUtils.java
Modified:
myfaces/extensions/validator/branches/jsf_1.1/component-support/generic-support/src/main/java/org/apache/myfaces/extensions/validator/generic/startup/GenericModuleStartupListener.java
myfaces/extensions/validator/branches/jsf_1.1/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/startup/TrinidadModuleStartupListener.java
myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/ExtValContext.java
myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/annotation/extractor/DefaultComponentAnnotationExtractorFactory.java
myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/component/DefaultComponentInitializerFactory.java
myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/rendering/DefaultRenderingContextInitializerFactory.java
myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/interceptor/ValidationInterceptor.java
myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/extractor/DefaultMetaDataExtractorFactory.java
myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/extractor/mapper/CustomConventionValidationStrategyToMetaDataExtractorNameMapper.java
myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/extractor/mapper/DefaultValidationStrategyToMetaDataExtractorNameMapper.java
myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/extractor/mapper/SimpleValidationStrategyToMetaDataExtractorNameMapper.java
myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/renderkit/AbstractRenderKitWrapperFactory.java
myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/renderkit/ExtValRenderKit.java
myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/renderkit/ExtValRenderKitFactory.java
myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/startup/AbstractStartupListener.java
myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/AbstractValidationErrorMessageResolver.java
myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/DefaultMessageResolverFactory.java
myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/DefaultValidationErrorMessageResolver.java
myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/mapper/CustomConventionValidationStrategyToMsgResolverNameMapper.java
myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/mapper/DefaultValidationStrategyToMsgResolverNameMapper.java
myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/AbstractValidationStrategy.java
myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/DefaultValidationStrategyFactory.java
myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/mapper/CustomConventionAnnotationToValidationStrategyNameMapper.java
myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/mapper/DefaultAnnotationToValidationStrategyNameMapper.java
myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/mapper/SimpleAnnotationToValidationStrategyNameMapper.java
myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/PropertyValidationModuleStartupListener.java
myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/extractor/JoinMetaDataExtractor.java
myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/extractor/PatternMetaDataExtractor.java
myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/strategy/JoinValidationStrategy.java
myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/CrossValidationPhaseListener.java
myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/crossval/strategy/AbstractCompareStrategy.java
myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/util/CrossValidationUtils.java
Modified: myfaces/extensions/validator/branches/jsf_1.1/component-support/generic-support/src/main/java/org/apache/myfaces/extensions/validator/generic/startup/GenericModuleStartupListener.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/component-support/generic-support/src/main/java/org/apache/myfaces/extensions/validator/generic/startup/GenericModuleStartupListener.java?rev=700066&r1=700065&r2=700066&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/component-support/generic-support/src/main/java/org/apache/myfaces/extensions/validator/generic/startup/GenericModuleStartupListener.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/component-support/generic-support/src/main/java/org/apache/myfaces/extensions/validator/generic/startup/GenericModuleStartupListener.java Mon Sep 29 04:32:01 2008
@@ -20,6 +20,8 @@
import org.apache.myfaces.extensions.validator.core.startup.AbstractStartupListener;
import org.apache.myfaces.extensions.validator.core.ExtValContext;
+import org.apache.myfaces.extensions.validator.core.renderkit.AbstractRenderKitWrapperFactory;
+import org.apache.myfaces.extensions.validator.core.factory.FactoryNameEnum;
import org.apache.myfaces.extensions.validator.generic.renderkit.GenericRenderKitWrapperFactory;
/**
@@ -29,6 +31,7 @@
{
protected void init()
{
- ExtValContext.getContext().addRenderKitWrapperFactory(new GenericRenderKitWrapperFactory());
+ ExtValContext.getContext().getFactoryFinder().getFactory(FactoryNameEnum.RENDERKIT_WRAPPER_FACTORY,
+ AbstractRenderKitWrapperFactory.class).addRenderKitWrapperFactory(new GenericRenderKitWrapperFactory());
}
-}
\ No newline at end of file
+}
Modified: myfaces/extensions/validator/branches/jsf_1.1/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/startup/TrinidadModuleStartupListener.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/startup/TrinidadModuleStartupListener.java?rev=700066&r1=700065&r2=700066&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/startup/TrinidadModuleStartupListener.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/startup/TrinidadModuleStartupListener.java Mon Sep 29 04:32:01 2008
@@ -20,6 +20,8 @@
import org.apache.myfaces.extensions.validator.core.startup.AbstractStartupListener;
import org.apache.myfaces.extensions.validator.core.ExtValContext;
+import org.apache.myfaces.extensions.validator.core.renderkit.AbstractRenderKitWrapperFactory;
+import org.apache.myfaces.extensions.validator.core.factory.FactoryNameEnum;
import org.apache.myfaces.extensions.validator.trinidad.initializer.component.TrinidadComponentInitializer;
import org.apache.myfaces.extensions.validator.trinidad.WebXmlParameter;
import org.apache.myfaces.extensions.validator.internal.Priority;
@@ -38,7 +40,9 @@
private void initTrinidadSupport()
{
- ExtValContext.getContext().resetRenderKitWrapperFactory();
+ ExtValContext.getContext().getFactoryFinder()
+ .getFactory(FactoryNameEnum.RENDERKIT_WRAPPER_FACTORY, AbstractRenderKitWrapperFactory.class)
+ .deactivate();
String deactivateClientSideValidation = WebXmlParameter.DEACTIVATE_CLIENT_SIDE_TRINIDAD_VALIDATION;
@@ -47,4 +51,4 @@
ExtValContext.getContext().addComponentInitializer(new TrinidadComponentInitializer());
}
}
-}
\ No newline at end of file
+}
Modified: myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/ExtValContext.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/ExtValContext.java?rev=700066&r1=700065&r2=700066&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/ExtValContext.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/ExtValContext.java Mon Sep 29 04:32:01 2008
@@ -23,13 +23,15 @@
import org.apache.myfaces.extensions.validator.core.initializer.rendering.DefaultRenderingContextInitializer;
import org.apache.myfaces.extensions.validator.core.initializer.rendering.RenderingContextInitializer;
import org.apache.myfaces.extensions.validator.core.interceptor.RendererInterceptor;
-import org.apache.myfaces.extensions.validator.core.renderkit.AbstractRenderKitWrapperFactory;
-import org.apache.myfaces.extensions.validator.core.renderkit.DefaultRenderKitWrapperFactory;
import org.apache.myfaces.extensions.validator.core.recorder.ProcessedInformationRecorder;
+import org.apache.myfaces.extensions.validator.core.factory.FactoryFinder;
+import org.apache.myfaces.extensions.validator.core.factory.DefaultFactoryFinder;
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
import org.apache.myfaces.extensions.validator.util.ClassUtils;
+import org.apache.myfaces.extensions.validator.util.ELUtils;
+import javax.faces.context.FacesContext;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -44,9 +46,9 @@
{
private static ExtValContext extValContext = new ExtValContext();
+ private FactoryFinder factoryFinder = new DefaultFactoryFinder();
private Map<String, RendererInterceptor> rendererInterceptors = new HashMap<String, RendererInterceptor>();
private List<String> deniedInterceptors = new ArrayList<String>();
- private AbstractRenderKitWrapperFactory renderKitWrapperFactory = new DefaultRenderKitWrapperFactory();
private List<ProcessedInformationRecorder> processedInformationRecorders =
new ArrayList<ProcessedInformationRecorder>();
@@ -55,6 +57,19 @@
return extValContext;
}
+ public FactoryFinder getFactoryFinder()
+ {
+ return factoryFinder;
+ }
+
+ public void setFactoryFinder(FactoryFinder factoryFinder)
+ {
+ if(factoryFinder != null)
+ {
+ this.factoryFinder = factoryFinder;
+ }
+ }
+
public List<RendererInterceptor> getRendererInterceptors()
{
return new ArrayList<RendererInterceptor>(rendererInterceptors.values());
@@ -98,7 +113,7 @@
deregisterRendererInterceptor(rendererInterceptorClass);
}
- public static void addRenderingContextInitializer(RenderingContextInitializer renderingContextInitializer)
+ public void addRenderingContextInitializer(RenderingContextInitializer renderingContextInitializer)
{
DefaultRenderingContextInitializer.addRenderingContextInitializer(renderingContextInitializer);
}
@@ -108,28 +123,54 @@
DefaultComponentInitializer.addComponentInitializer(componentInitializer);
}
- public void addRenderKitWrapperFactory(AbstractRenderKitWrapperFactory renderKitWrapperFactory)
+ public List<ProcessedInformationRecorder> getProcessedInformationRecorders()
{
- this.renderKitWrapperFactory.addRenderKitWrapperFactory(renderKitWrapperFactory);
+ return processedInformationRecorders;
}
- public AbstractRenderKitWrapperFactory getRenderKitWrapperFactory()
+ public void addProcessedInformationRecorder(ProcessedInformationRecorder processedInformationRecorder)
{
- return renderKitWrapperFactory;
+ this.processedInformationRecorders.add(processedInformationRecorder);
}
- public void resetRenderKitWrapperFactory()
+ public InformationProviderBean getInformationProviderBean()
{
- this.renderKitWrapperFactory = null;
+ Map applicationMap = FacesContext.getCurrentInstance().getExternalContext().getApplicationMap();
+ InformationProviderBean bean = (InformationProviderBean) applicationMap.get(InformationProviderBean.BEAN_NAME);
+
+ if (bean == null)
+ {
+ return initInformationProviderBean(applicationMap);
+ }
+ return bean;
}
- public List<ProcessedInformationRecorder> getProcessedInformationRecorders()
+ private InformationProviderBean initInformationProviderBean(Map applicationMap)
{
- return processedInformationRecorders;
+ List<String> informationProviderBeanClassNames = new ArrayList<String>();
+
+ informationProviderBeanClassNames.add(WebXmlParameter.CUSTOM_CONVENTION_INFO_PROVIDER_BEAN);
+ informationProviderBeanClassNames.add(getCustomInformationProviderBeanClassName());
+ informationProviderBeanClassNames.add(InformationProviderBean.class.getName());
+
+ InformationProviderBean informationProviderBean;
+ for (String className : informationProviderBeanClassNames)
+ {
+ informationProviderBean = (InformationProviderBean) ClassUtils.tryToInstantiateClassForName(className);
+
+ if (informationProviderBean != null)
+ {
+ applicationMap.put(InformationProviderBean.BEAN_NAME, informationProviderBean);
+ return informationProviderBean;
+ }
+ }
+ throw new IllegalStateException(InformationProviderBean.class.getName() + " not found");
}
- public void addProcessedInformationRecorder(ProcessedInformationRecorder processedInformationRecorder)
+ private String getCustomInformationProviderBeanClassName()
{
- this.processedInformationRecorders.add(processedInformationRecorder);
+ InformationProviderBean bean = (InformationProviderBean) ELUtils.getBean(InformationProviderBean.CUSTOM_BEAN);
+
+ return (bean != null) ? bean.getClass().getName() : null;
}
-}
\ No newline at end of file
+}
Modified: myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/annotation/extractor/DefaultComponentAnnotationExtractorFactory.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/annotation/extractor/DefaultComponentAnnotationExtractorFactory.java?rev=700066&r1=700065&r2=700066&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/annotation/extractor/DefaultComponentAnnotationExtractorFactory.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/annotation/extractor/DefaultComponentAnnotationExtractorFactory.java Mon Sep 29 04:32:01 2008
@@ -19,8 +19,8 @@
package org.apache.myfaces.extensions.validator.core.annotation.extractor;
import org.apache.myfaces.extensions.validator.core.WebXmlParameter;
+import org.apache.myfaces.extensions.validator.core.ExtValContext;
import org.apache.myfaces.extensions.validator.util.ClassUtils;
-import org.apache.myfaces.extensions.validator.util.ExtValUtils;
import org.apache.myfaces.extensions.validator.internal.ToDo;
import org.apache.myfaces.extensions.validator.internal.Priority;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
@@ -58,7 +58,7 @@
annotationExtractorClassNames.add(WebXmlParameter.CUSTOM_COMPONENT_ANNOTATION_EXTRACTOR);
annotationExtractorClassNames
- .add(ExtValUtils.getInformationProviderBean().getCustomComponentAnnotationExtractor());
+ .add(ExtValContext.getContext().getInformationProviderBean().getCustomComponentAnnotationExtractor());
annotationExtractorClassNames.add(DefaultComponentAnnotationExtractor.class.getName());
for (String className : annotationExtractorClassNames)
Added: myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/factory/DefaultFactoryFinder.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/factory/DefaultFactoryFinder.java?rev=700066&view=auto
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/factory/DefaultFactoryFinder.java (added)
+++ myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/factory/DefaultFactoryFinder.java Mon Sep 29 04:32:01 2008
@@ -0,0 +1,252 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.myfaces.extensions.validator.core.factory;
+
+import org.apache.myfaces.extensions.validator.internal.UsageCategory;
+import org.apache.myfaces.extensions.validator.internal.UsageInformation;
+import org.apache.myfaces.extensions.validator.core.annotation.extractor.DefaultComponentAnnotationExtractorFactory;
+import org.apache.myfaces.extensions.validator.core.WebXmlParameter;
+import org.apache.myfaces.extensions.validator.core.ExtValContext;
+import org.apache.myfaces.extensions.validator.core.renderkit.DefaultRenderKitWrapperFactory;
+import org.apache.myfaces.extensions.validator.core.initializer.rendering.DefaultRenderingContextInitializerFactory;
+import org.apache.myfaces.extensions.validator.core.initializer.component.DefaultComponentInitializerFactory;
+import org.apache.myfaces.extensions.validator.core.metadata.extractor.DefaultMetaDataExtractorFactory;
+import org.apache.myfaces.extensions.validator.core.validation.strategy.DefaultValidationStrategyFactory;
+import org.apache.myfaces.extensions.validator.core.validation.message.resolver.DefaultMessageResolverFactory;
+import org.apache.myfaces.extensions.validator.util.ClassUtils;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.List;
+import java.util.ArrayList;
+
+/**
+ * @author Gerhard Petracek
+ * @since 1.x.1
+ */
+//dynamic approach to create the factories during the first request, when a faces-context is available
+@UsageInformation(UsageCategory.INTERNAL)
+public class DefaultFactoryFinder implements FactoryFinder
+{
+ Map<FactoryNameEnum, Object> factoryMap = new HashMap<FactoryNameEnum, Object>();
+
+ public <T> T getFactory(FactoryNameEnum factoryNameEnum, Class<T> targetClass)
+ {
+ if(!(factoryMap.containsKey(factoryNameEnum)))
+ {
+ initFactory(factoryNameEnum);
+ }
+
+ return (T)factoryMap.get(factoryNameEnum);
+ }
+
+ private void initFactory(FactoryNameEnum factoryName)
+ {
+ Object factory = null;
+ switch (factoryName)
+ {
+ case COMPONENT_ANNOTATION_EXTRACTOR_FACTORY:
+ factory = createComponentAnnotationExtractorFactory();
+ break;
+
+ case VALIDATION_STRATEGY_FACTORY:
+ factory = createValidationStrategyFactory();
+ break;
+
+ case MESSAGE_RESOLVER_FACTORY:
+ factory = createMessageResolverFactory();
+ break;
+
+ case META_DATA_EXTRACTOR_FACTORY:
+ factory = createMetaDataExtractorFactory();
+ break;
+
+ case COMPONENT_INITIALIZER_FACTORY:
+ factory = createComponentInitializerFactory();
+ break;
+
+ case RENDERKIT_WRAPPER_FACTORY:
+ factory = createRenderKitWrapperFactory();
+ break;
+
+ case RENDERING_CONTEXT_INITIALIZER_FACTORY:
+ factory = createRenderingContextInitializerFactory();
+ break;
+
+ default: //required by checkstyle
+ }
+
+ if(factory == null)
+ {
+ throw new IllegalStateException("not possible to create factory " + factoryName);
+ }
+
+ factoryMap.put(factoryName, factory);
+ }
+
+ private Object createComponentAnnotationExtractorFactory()
+ {
+ Object factory = null;
+
+ List<String> annotationExtractorFactoryClassNames = new ArrayList<String>();
+
+ annotationExtractorFactoryClassNames.add(WebXmlParameter.CUSTOM_COMPONENT_ANNOTATION_EXTRACTOR_FACTORY);
+ annotationExtractorFactoryClassNames
+ .add(ExtValContext.getContext().getInformationProviderBean()
+ .getCustomComponentAnnotationExtractorFactory());
+ annotationExtractorFactoryClassNames.add(DefaultComponentAnnotationExtractorFactory.class.getName());
+
+ for (String className : annotationExtractorFactoryClassNames)
+ {
+ factory = ClassUtils.tryToInstantiateClassForName(className);
+
+ if (factory != null)
+ {
+ break;
+ }
+ }
+ return factory;
+ }
+
+ private Object createValidationStrategyFactory()
+ {
+ Object factory = null;
+
+ List<String> validationStrategyFactoryClassNames = new ArrayList<String>();
+
+ validationStrategyFactoryClassNames.add(WebXmlParameter.CUSTOM_VALIDATION_STRATEGY_FACTORY);
+ validationStrategyFactoryClassNames
+ .add(ExtValContext.getContext().getInformationProviderBean().getCustomValidationStrategyFactory());
+ validationStrategyFactoryClassNames.add(DefaultValidationStrategyFactory.class.getName());
+
+ for (String className : validationStrategyFactoryClassNames)
+ {
+ factory = ClassUtils.tryToInstantiateClassForName(className);
+
+ if (factory != null)
+ {
+ break;
+ }
+ }
+
+ return factory;
+ }
+
+ private Object createMessageResolverFactory()
+ {
+ Object factory = null;
+ List<String> messageResolverFactoryClassNames = new ArrayList<String>();
+
+ messageResolverFactoryClassNames.add(WebXmlParameter.CUSTOM_MESSAGE_RESOLVER_FACTORY);
+ messageResolverFactoryClassNames
+ .add(ExtValContext.getContext().getInformationProviderBean().getCustomMessageResolverFactory());
+ messageResolverFactoryClassNames
+ .add(DefaultMessageResolverFactory.class.getName());
+
+ for (String className : messageResolverFactoryClassNames)
+ {
+ factory = ClassUtils.tryToInstantiateClassForName(className);
+
+ if (factory != null)
+ {
+ break;
+ }
+ }
+
+ return factory;
+ }
+
+ private Object createMetaDataExtractorFactory()
+ {
+ Object factory = null;
+ List<String> metaDataExtractorFactoryClassNames = new ArrayList<String>();
+
+ metaDataExtractorFactoryClassNames.add(WebXmlParameter.CUSTOM_META_DATA_EXTRACTOR_FACTORY);
+ metaDataExtractorFactoryClassNames
+ .add(ExtValContext.getContext().getInformationProviderBean().getCustomMetaDataExtractorFactory());
+ metaDataExtractorFactoryClassNames.add(DefaultMetaDataExtractorFactory.class.getName());
+
+ for (String className : metaDataExtractorFactoryClassNames)
+ {
+ factory = ClassUtils.tryToInstantiateClassForName(className);
+
+ if (factory != null)
+ {
+ break;
+ }
+ }
+
+ return factory;
+ }
+
+ private Object createComponentInitializerFactory()
+ {
+ Object factory = null;
+ List<String> componentInitializerFactoryClassNames = new ArrayList<String>();
+
+ componentInitializerFactoryClassNames.add(WebXmlParameter.CUSTOM_COMPONENT_INITIALIZER_FACTORY);
+ componentInitializerFactoryClassNames
+ .add(ExtValContext.getContext().getInformationProviderBean().getCustomComponentInitializerFactory());
+ componentInitializerFactoryClassNames.add(DefaultComponentInitializerFactory.class.getName());
+
+ for (String className : componentInitializerFactoryClassNames)
+ {
+ factory = ClassUtils.tryToInstantiateClassForName(className);
+
+ if (factory != null)
+ {
+ break;
+ }
+ }
+
+ return factory;
+ }
+
+ private Object createRenderKitWrapperFactory()
+ {
+ return new DefaultRenderKitWrapperFactory();
+ }
+
+ private Object createRenderingContextInitializerFactory()
+ {
+ Object factory = null;
+
+ List<String> renderingContextInitializerFactoryClassNames = new ArrayList<String>();
+
+ renderingContextInitializerFactoryClassNames
+ .add(WebXmlParameter.CUSTOM_RENDERING_CONTEXT_INITIALIZER_FACTORY);
+ renderingContextInitializerFactoryClassNames
+ .add(ExtValContext.getContext().getInformationProviderBean()
+ .getCustomRenderingContextInitializerFactory());
+ renderingContextInitializerFactoryClassNames
+ .add(DefaultRenderingContextInitializerFactory.class.getName());
+
+ for (String className : renderingContextInitializerFactoryClassNames)
+ {
+ factory = ClassUtils.tryToInstantiateClassForName(className);
+
+ if (factory != null)
+ {
+ break;
+ }
+ }
+
+ return factory;
+ }
+}
Added: myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/factory/FactoryFinder.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/factory/FactoryFinder.java?rev=700066&view=auto
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/factory/FactoryFinder.java (added)
+++ myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/factory/FactoryFinder.java Mon Sep 29 04:32:01 2008
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.myfaces.extensions.validator.core.factory;
+
+import org.apache.myfaces.extensions.validator.internal.UsageInformation;
+import org.apache.myfaces.extensions.validator.internal.UsageCategory;
+
+/**
+ * @author Gerhard Petracek
+ * @since 1.x.1
+ */
+@UsageInformation(UsageCategory.API)
+public interface FactoryFinder
+{
+ <T> T getFactory(FactoryNameEnum factoryNameEnum, Class<T> targetClass);
+}
Added: myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/factory/FactoryNameEnum.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/factory/FactoryNameEnum.java?rev=700066&view=auto
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/factory/FactoryNameEnum.java (added)
+++ myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/factory/FactoryNameEnum.java Mon Sep 29 04:32:01 2008
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.myfaces.extensions.validator.core.factory;
+
+/**
+ * @author Gerhard Petracek
+ * @since 1.x.1
+ */
+public enum FactoryNameEnum
+{
+ COMPONENT_ANNOTATION_EXTRACTOR_FACTORY,
+ VALIDATION_STRATEGY_FACTORY,
+ MESSAGE_RESOLVER_FACTORY,
+ META_DATA_EXTRACTOR_FACTORY,
+ COMPONENT_INITIALIZER_FACTORY,
+ RENDERKIT_WRAPPER_FACTORY,
+ RENDERING_CONTEXT_INITIALIZER_FACTORY
+}
Modified: myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/component/DefaultComponentInitializerFactory.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/component/DefaultComponentInitializerFactory.java?rev=700066&r1=700065&r2=700066&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/component/DefaultComponentInitializerFactory.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/component/DefaultComponentInitializerFactory.java Mon Sep 29 04:32:01 2008
@@ -18,12 +18,12 @@
*/
package org.apache.myfaces.extensions.validator.core.initializer.component;
-import org.apache.myfaces.extensions.validator.core.ClassMappingFactory;
+import org.apache.myfaces.extensions.validator.core.mapper.ClassMappingFactory;
import org.apache.myfaces.extensions.validator.core.WebXmlParameter;
+import org.apache.myfaces.extensions.validator.core.ExtValContext;
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
import org.apache.myfaces.extensions.validator.util.ClassUtils;
-import org.apache.myfaces.extensions.validator.util.ExtValUtils;
import javax.faces.component.UIComponent;
import java.util.ArrayList;
@@ -48,7 +48,7 @@
componentInitializerClassNames
.add(WebXmlParameter.CUSTOM_COMPONENT_INITIALIZER);
componentInitializerClassNames
- .add(ExtValUtils.getInformationProviderBean().getCustomComponentInitializer());
+ .add(ExtValContext.getContext().getInformationProviderBean().getCustomComponentInitializer());
componentInitializerClassNames
.add(DefaultComponentInitializer.class.getName());
}
Modified: myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/rendering/DefaultRenderingContextInitializerFactory.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/rendering/DefaultRenderingContextInitializerFactory.java?rev=700066&r1=700065&r2=700066&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/rendering/DefaultRenderingContextInitializerFactory.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/rendering/DefaultRenderingContextInitializerFactory.java Mon Sep 29 04:32:01 2008
@@ -18,12 +18,12 @@
*/
package org.apache.myfaces.extensions.validator.core.initializer.rendering;
-import org.apache.myfaces.extensions.validator.core.ClassMappingFactory;
+import org.apache.myfaces.extensions.validator.core.mapper.ClassMappingFactory;
import org.apache.myfaces.extensions.validator.core.WebXmlParameter;
+import org.apache.myfaces.extensions.validator.core.ExtValContext;
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
import org.apache.myfaces.extensions.validator.util.ClassUtils;
-import org.apache.myfaces.extensions.validator.util.ExtValUtils;
import javax.faces.render.RenderKit;
import java.util.ArrayList;
@@ -48,7 +48,7 @@
renderingContextClassNames
.add(WebXmlParameter.CUSTOM_RENDERING_CONTEXT_INITIALIZER);
renderingContextClassNames
- .add(ExtValUtils.getInformationProviderBean().getCustomRenderingContextInitializer());
+ .add(ExtValContext.getContext().getInformationProviderBean().getCustomRenderingContextInitializer());
renderingContextClassNames
.add(DefaultRenderingContextInitializer.class.getName());
}
Modified: myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/interceptor/ValidationInterceptor.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/interceptor/ValidationInterceptor.java?rev=700066&r1=700065&r2=700066&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/interceptor/ValidationInterceptor.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/interceptor/ValidationInterceptor.java Mon Sep 29 04:32:01 2008
@@ -23,11 +23,15 @@
import org.apache.myfaces.extensions.validator.core.validation.strategy.ValidationStrategy;
import org.apache.myfaces.extensions.validator.core.metadata.extractor.MetaDataExtractor;
import org.apache.myfaces.extensions.validator.core.annotation.extractor.AnnotationExtractor;
+import org.apache.myfaces.extensions.validator.core.annotation.extractor.AnnotationExtractorFactory;
import org.apache.myfaces.extensions.validator.core.annotation.AnnotationEntry;
import org.apache.myfaces.extensions.validator.core.ExtValContext;
+import org.apache.myfaces.extensions.validator.core.initializer.component.ComponentInitializer;
+import org.apache.myfaces.extensions.validator.core.mapper.ClassMappingFactory;
+import org.apache.myfaces.extensions.validator.core.factory.FactoryNameEnum;
import org.apache.myfaces.extensions.validator.core.recorder.ProcessedInformationRecorder;
-import org.apache.myfaces.extensions.validator.util.FactoryUtils;
-import org.apache.myfaces.extensions.validator.util.ValidationUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import javax.faces.context.FacesContext;
import javax.faces.component.UIComponent;
@@ -37,6 +41,7 @@
import java.io.IOException;
import java.util.Map;
import java.util.HashMap;
+import java.lang.annotation.Annotation;
/**
* @author Gerhard Petracek
@@ -45,6 +50,8 @@
@UsageInformation(UsageCategory.INTERNAL)
public class ValidationInterceptor extends AbstractRendererInterceptor
{
+ private final Log logger = LogFactory.getLog(getClass().getName());
+
@Override
public void beforeEncodeBegin(FacesContext facesContext, UIComponent uiComponent, Renderer wrapped)
throws IOException
@@ -62,16 +69,24 @@
ValidationStrategy validationStrategy;
MetaDataExtractor metaDataExtractor;
- AnnotationExtractor annotationExtractor = FactoryUtils.getComponentAnnotationExtractorFactory().create();
+ AnnotationExtractor annotationExtractor = ExtValContext.getContext().getFactoryFinder().getFactory(
+ FactoryNameEnum.COMPONENT_ANNOTATION_EXTRACTOR_FACTORY, AnnotationExtractorFactory.class).create();
Map<String, Object> metaData;
for (AnnotationEntry entry : annotationExtractor.extractAnnotations(facesContext, uiComponent))
{
- validationStrategy = FactoryUtils.getValidationStrategyFactory().create(entry.getAnnotation());
+
+ validationStrategy = ((ClassMappingFactory<Annotation, ValidationStrategy>)ExtValContext.getContext()
+ .getFactoryFinder()
+ .getFactory(FactoryNameEnum.VALIDATION_STRATEGY_FACTORY, ClassMappingFactory.class))
+ .create(entry.getAnnotation());
if (validationStrategy != null)
{
- metaDataExtractor = FactoryUtils.getMetaDataExtractorFactory().create(validationStrategy);
+ metaDataExtractor = ((ClassMappingFactory<ValidationStrategy, MetaDataExtractor>) ExtValContext
+ .getContext().getFactoryFinder()
+ .getFactory(FactoryNameEnum.META_DATA_EXTRACTOR_FACTORY, ClassMappingFactory.class))
+ .create(validationStrategy);
if(metaDataExtractor != null)
{
@@ -87,7 +102,9 @@
metaData = new HashMap<String, Object>();
}
- FactoryUtils.getComponentInitializerFactory().create(uiComponent)
+ ((ClassMappingFactory<UIComponent, ComponentInitializer>)ExtValContext.getContext().getFactoryFinder()
+ .getFactory(FactoryNameEnum.COMPONENT_INITIALIZER_FACTORY, ClassMappingFactory.class))
+ .create(uiComponent)
.configureComponent(facesContext, uiComponent, metaData);
}
}
@@ -105,6 +122,38 @@
recorder.recordUserInput(uiComponent, convertedObject);
}
- ValidationUtils.processExtValValidation(facesContext, uiComponent, convertedObject);
+ processValidation(facesContext, uiComponent, convertedObject);
+ }
+
+ protected void processValidation(FacesContext facesContext, UIComponent uiComponent, Object convertedObject)
+ {
+ if (!(uiComponent instanceof EditableValueHolder))
+ {
+ return;
+ }
+
+ ValidationStrategy validationStrategy;
+
+ AnnotationExtractor annotationExtractor = ExtValContext.getContext().getFactoryFinder()
+ .getFactory(FactoryNameEnum.COMPONENT_ANNOTATION_EXTRACTOR_FACTORY, AnnotationExtractorFactory.class)
+ .create();
+
+ for (AnnotationEntry entry : annotationExtractor.extractAnnotations(facesContext, uiComponent))
+ {
+ validationStrategy = ((ClassMappingFactory<Annotation, ValidationStrategy>)ExtValContext.getContext()
+ .getFactoryFinder()
+ .getFactory(FactoryNameEnum.VALIDATION_STRATEGY_FACTORY, ClassMappingFactory.class))
+ .create(entry.getAnnotation());
+
+ if (validationStrategy != null)
+ {
+ validationStrategy.validate(facesContext, uiComponent, entry, convertedObject);
+ }
+ else
+ {
+ logger.trace("no validation strategy found for "
+ + entry.getAnnotation().annotationType().getName());
+ }
+ }
}
}
\ No newline at end of file
Added: myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/mapper/ClassMappingFactory.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/mapper/ClassMappingFactory.java?rev=700066&view=auto
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/mapper/ClassMappingFactory.java (added)
+++ myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/mapper/ClassMappingFactory.java Mon Sep 29 04:32:01 2008
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.myfaces.extensions.validator.core.mapper;
+
+import org.apache.myfaces.extensions.validator.internal.UsageInformation;
+import org.apache.myfaces.extensions.validator.internal.UsageCategory;
+
+/**
+ * @author Gerhard Petracek
+ * @since 1.x.1
+ */
+@UsageInformation(UsageCategory.API)
+public interface ClassMappingFactory<P, R>
+{
+ R create(P source);
+}
Modified: myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/extractor/DefaultMetaDataExtractorFactory.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/extractor/DefaultMetaDataExtractorFactory.java?rev=700066&r1=700065&r2=700066&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/extractor/DefaultMetaDataExtractorFactory.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/extractor/DefaultMetaDataExtractorFactory.java Mon Sep 29 04:32:01 2008
@@ -18,7 +18,7 @@
*/
package org.apache.myfaces.extensions.validator.core.metadata.extractor;
-import org.apache.myfaces.extensions.validator.core.ClassMappingFactory;
+import org.apache.myfaces.extensions.validator.core.mapper.ClassMappingFactory;
import org.apache.myfaces.extensions.validator.core.validation.strategy.ValidationStrategy;
import org.apache.myfaces.extensions.validator.core.validation.strategy.BeanValidationStrategyAdapter;
import org.apache.myfaces.extensions.validator.core.metadata.extractor.mapper
Modified: myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/extractor/mapper/CustomConventionValidationStrategyToMetaDataExtractorNameMapper.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/extractor/mapper/CustomConventionValidationStrategyToMetaDataExtractorNameMapper.java?rev=700066&r1=700065&r2=700066&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/extractor/mapper/CustomConventionValidationStrategyToMetaDataExtractorNameMapper.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/extractor/mapper/CustomConventionValidationStrategyToMetaDataExtractorNameMapper.java Mon Sep 29 04:32:01 2008
@@ -20,7 +20,7 @@
import org.apache.myfaces.extensions.validator.core.mapper.AbstractCustomNameMapper;
import org.apache.myfaces.extensions.validator.core.validation.strategy.ValidationStrategy;
-import org.apache.myfaces.extensions.validator.util.ExtValUtils;
+import org.apache.myfaces.extensions.validator.core.ExtValContext;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
@@ -39,6 +39,7 @@
{
protected String getCustomNameMapperClassName()
{
- return ExtValUtils.getInformationProviderBean().getCustomValidationStrategyToMetaDataExtractorNameMapper();
+ return ExtValContext.getContext().getInformationProviderBean()
+ .getCustomValidationStrategyToMetaDataExtractorNameMapper();
}
}
Modified: myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/extractor/mapper/DefaultValidationStrategyToMetaDataExtractorNameMapper.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/extractor/mapper/DefaultValidationStrategyToMetaDataExtractorNameMapper.java?rev=700066&r1=700065&r2=700066&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/extractor/mapper/DefaultValidationStrategyToMetaDataExtractorNameMapper.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/extractor/mapper/DefaultValidationStrategyToMetaDataExtractorNameMapper.java Mon Sep 29 04:32:01 2008
@@ -20,7 +20,7 @@
import org.apache.myfaces.extensions.validator.core.mapper.NameMapper;
import org.apache.myfaces.extensions.validator.core.validation.strategy.ValidationStrategy;
-import org.apache.myfaces.extensions.validator.util.ExtValUtils;
+import org.apache.myfaces.extensions.validator.core.ExtValContext;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
@@ -36,14 +36,14 @@
{
public String createName(ValidationStrategy validationStrategy)
{
- return ExtValUtils.getInformationProviderBean()
+ return ExtValContext.getContext().getInformationProviderBean()
.getConventionNameForMetaDataExtractorName(
validationStrategy.getClass(), getClassName(validationStrategy.getClass().getSimpleName()));
}
protected String getClassName(String validationStrategyClassName)
{
- return ExtValUtils.getInformationProviderBean()
+ return ExtValContext.getContext().getInformationProviderBean()
.getConventionNameForMetaDataExtractorClass(validationStrategyClassName);
}
}
Modified: myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/extractor/mapper/SimpleValidationStrategyToMetaDataExtractorNameMapper.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/extractor/mapper/SimpleValidationStrategyToMetaDataExtractorNameMapper.java?rev=700066&r1=700065&r2=700066&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/extractor/mapper/SimpleValidationStrategyToMetaDataExtractorNameMapper.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/metadata/extractor/mapper/SimpleValidationStrategyToMetaDataExtractorNameMapper.java Mon Sep 29 04:32:01 2008
@@ -20,7 +20,7 @@
import org.apache.myfaces.extensions.validator.core.mapper.NameMapper;
import org.apache.myfaces.extensions.validator.core.validation.strategy.ValidationStrategy;
-import org.apache.myfaces.extensions.validator.util.ExtValUtils;
+import org.apache.myfaces.extensions.validator.core.ExtValContext;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
@@ -46,10 +46,10 @@
public String getSimpleMetaDataExtractorName(String validationStrategyPackageName,
String validationStrategyClassName)
{
- String postfix = ExtValUtils.getInformationProviderBean().getMetaDataExtractorPostfix();
+ String postfix = ExtValContext.getContext().getInformationProviderBean().getMetaDataExtractorPostfix();
return validationStrategyPackageName + validationStrategyClassName
- .replace(ExtValUtils.getInformationProviderBean().getValidationStrategyPostfix(), postfix)
+ .replace(ExtValContext.getContext().getInformationProviderBean().getValidationStrategyPostfix(),postfix)
.replace("ValidationStrategy", postfix)
.replace("Strategy", postfix);
}
Modified: myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/renderkit/AbstractRenderKitWrapperFactory.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/renderkit/AbstractRenderKitWrapperFactory.java?rev=700066&r1=700065&r2=700066&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/renderkit/AbstractRenderKitWrapperFactory.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/renderkit/AbstractRenderKitWrapperFactory.java Mon Sep 29 04:32:01 2008
@@ -20,7 +20,7 @@
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
-import org.apache.myfaces.extensions.validator.core.ClassMappingFactory;
+import org.apache.myfaces.extensions.validator.core.mapper.ClassMappingFactory;
import javax.faces.render.RenderKit;
@@ -32,6 +32,7 @@
public abstract class AbstractRenderKitWrapperFactory implements ClassMappingFactory<RenderKit, RenderKit>
{
protected AbstractRenderKitWrapperFactory wrapped;
+ private boolean deactivated = false;
public void addRenderKitWrapperFactory(AbstractRenderKitWrapperFactory renderKitWrapperFactory)
{
@@ -44,8 +45,23 @@
this.wrapped = renderKitWrapperFactory;
}
+ public void deactivate()
+ {
+ this.deactivated = true;
+ }
+
+ public boolean isDeactivated()
+ {
+ return deactivated;
+ }
+
public final RenderKit create(RenderKit renderKit)
{
+ if(isDeactivated())
+ {
+ return null;
+ }
+
RenderKit result = null;
if(this.wrapped != null)
@@ -62,4 +78,4 @@
}
protected abstract RenderKit createWrapper(RenderKit renderKit);
-}
\ No newline at end of file
+}
Modified: myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/renderkit/ExtValRenderKit.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/renderkit/ExtValRenderKit.java?rev=700066&r1=700065&r2=700066&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/renderkit/ExtValRenderKit.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/renderkit/ExtValRenderKit.java Mon Sep 29 04:32:01 2008
@@ -20,7 +20,10 @@
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
-import org.apache.myfaces.extensions.validator.util.FactoryUtils;
+import org.apache.myfaces.extensions.validator.core.ExtValContext;
+import org.apache.myfaces.extensions.validator.core.factory.FactoryNameEnum;
+import org.apache.myfaces.extensions.validator.core.mapper.ClassMappingFactory;
+import org.apache.myfaces.extensions.validator.core.initializer.rendering.RenderingContextInitializer;
import javax.faces.context.ResponseStream;
import javax.faces.context.ResponseWriter;
@@ -45,7 +48,10 @@
//a4j workaround
if(FacesContext.getCurrentInstance() != null)
{
- FactoryUtils.getRenderingContextInitializerFactory().create(wrapped).initContext();
+ ((ClassMappingFactory<RenderKit, RenderingContextInitializer>)ExtValContext.getContext()
+ .getFactoryFinder()
+ .getFactory(FactoryNameEnum.RENDERING_CONTEXT_INITIALIZER_FACTORY, ClassMappingFactory.class))
+ .create(wrapped).initContext();
}
this.wrapped = wrapped;
Modified: myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/renderkit/ExtValRenderKitFactory.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/renderkit/ExtValRenderKitFactory.java?rev=700066&r1=700065&r2=700066&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/renderkit/ExtValRenderKitFactory.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/renderkit/ExtValRenderKitFactory.java Mon Sep 29 04:32:01 2008
@@ -21,6 +21,7 @@
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
import org.apache.myfaces.extensions.validator.core.ExtValContext;
+import org.apache.myfaces.extensions.validator.core.factory.FactoryNameEnum;
import javax.faces.render.RenderKitFactory;
import javax.faces.render.RenderKit;
@@ -49,9 +50,10 @@
public RenderKit getRenderKit(FacesContext facesContext, String s)
{
RenderKit renderKit = this.wrapped.getRenderKit(facesContext, s);
- AbstractRenderKitWrapperFactory wrapperFactory = ExtValContext.getContext().getRenderKitWrapperFactory();
+ AbstractRenderKitWrapperFactory wrapperFactory = ExtValContext.getContext().getFactoryFinder()
+ .getFactory(FactoryNameEnum.RENDERKIT_WRAPPER_FACTORY, AbstractRenderKitWrapperFactory.class);
- if(wrapperFactory == null)
+ if(wrapperFactory.isDeactivated())
{
return renderKit;
}
@@ -62,4 +64,4 @@
{
return wrapped.getRenderKitIds();
}
-}
\ No newline at end of file
+}
Modified: myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/startup/AbstractStartupListener.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/startup/AbstractStartupListener.java?rev=700066&r1=700065&r2=700066&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/startup/AbstractStartupListener.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/startup/AbstractStartupListener.java Mon Sep 29 04:32:01 2008
@@ -20,7 +20,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.extensions.validator.util.ExtValUtils;
+import org.apache.myfaces.extensions.validator.util.JsfUtils;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
@@ -59,7 +59,7 @@
{
init();
- ExtValUtils.deregisterPhaseListener(this);
+ JsfUtils.deregisterPhaseListener(this);
}
catch (Throwable t)
{
Modified: myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/AbstractValidationErrorMessageResolver.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/AbstractValidationErrorMessageResolver.java?rev=700066&r1=700065&r2=700066&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/AbstractValidationErrorMessageResolver.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/AbstractValidationErrorMessageResolver.java Mon Sep 29 04:32:01 2008
@@ -21,8 +21,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.myfaces.extensions.validator.core.WebXmlParameter;
+import org.apache.myfaces.extensions.validator.core.ExtValContext;
import org.apache.myfaces.extensions.validator.util.ELUtils;
-import org.apache.myfaces.extensions.validator.util.ExtValUtils;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
@@ -146,7 +146,7 @@
{
try
{
- defaultBundle = ResourceBundle.getBundle(ExtValUtils.getInformationProviderBean()
+ defaultBundle = ResourceBundle.getBundle(ExtValContext.getContext().getInformationProviderBean()
.getConventionForMessageBundle(), locale);
}
catch (Throwable t)
Modified: myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/DefaultMessageResolverFactory.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/DefaultMessageResolverFactory.java?rev=700066&r1=700065&r2=700066&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/DefaultMessageResolverFactory.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/DefaultMessageResolverFactory.java Mon Sep 29 04:32:01 2008
@@ -18,7 +18,7 @@
*/
package org.apache.myfaces.extensions.validator.core.validation.message.resolver;
-import org.apache.myfaces.extensions.validator.core.ClassMappingFactory;
+import org.apache.myfaces.extensions.validator.core.mapper.ClassMappingFactory;
import org.apache.myfaces.extensions.validator.core.mapper.NameMapper;
import org.apache.myfaces.extensions.validator.core.validation.message.
resolver.mapper.CustomConfiguredValidationStrategyToMsgResolverNameMapper;
Modified: myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/DefaultValidationErrorMessageResolver.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/DefaultValidationErrorMessageResolver.java?rev=700066&r1=700065&r2=700066&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/DefaultValidationErrorMessageResolver.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/DefaultValidationErrorMessageResolver.java Mon Sep 29 04:32:01 2008
@@ -19,7 +19,7 @@
package org.apache.myfaces.extensions.validator.core.validation.message.resolver;
import org.apache.myfaces.extensions.validator.core.WebXmlParameter;
-import org.apache.myfaces.extensions.validator.util.ExtValUtils;
+import org.apache.myfaces.extensions.validator.core.ExtValContext;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
@@ -39,7 +39,7 @@
//not used at the moment - just for a convention
protected String getBaseName()
{
- return ExtValUtils.getInformationProviderBean()
+ return ExtValContext.getContext().getInformationProviderBean()
.getConventionForModuleMessageBundle(getClass().getPackage().getName());
}
Modified: myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/mapper/CustomConventionValidationStrategyToMsgResolverNameMapper.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/mapper/CustomConventionValidationStrategyToMsgResolverNameMapper.java?rev=700066&r1=700065&r2=700066&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/mapper/CustomConventionValidationStrategyToMsgResolverNameMapper.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/mapper/CustomConventionValidationStrategyToMsgResolverNameMapper.java Mon Sep 29 04:32:01 2008
@@ -20,7 +20,7 @@
import org.apache.myfaces.extensions.validator.core.mapper.AbstractCustomNameMapper;
import org.apache.myfaces.extensions.validator.core.validation.strategy.ValidationStrategy;
-import org.apache.myfaces.extensions.validator.util.ExtValUtils;
+import org.apache.myfaces.extensions.validator.core.ExtValContext;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
@@ -40,7 +40,7 @@
protected String getCustomNameMapperClassName()
{
- return ExtValUtils.getInformationProviderBean()
+ return ExtValContext.getContext().getInformationProviderBean()
.getCustomValidationStrategyToMsgResolverNameMapper();
}
}
Modified: myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/mapper/DefaultValidationStrategyToMsgResolverNameMapper.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/mapper/DefaultValidationStrategyToMsgResolverNameMapper.java?rev=700066&r1=700065&r2=700066&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/mapper/DefaultValidationStrategyToMsgResolverNameMapper.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/message/resolver/mapper/DefaultValidationStrategyToMsgResolverNameMapper.java Mon Sep 29 04:32:01 2008
@@ -20,7 +20,7 @@
import org.apache.myfaces.extensions.validator.core.mapper.NameMapper;
import org.apache.myfaces.extensions.validator.core.validation.strategy.ValidationStrategy;
-import org.apache.myfaces.extensions.validator.util.ExtValUtils;
+import org.apache.myfaces.extensions.validator.core.ExtValContext;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
@@ -36,14 +36,14 @@
{
public String createName(ValidationStrategy validationStrategy)
{
- return ExtValUtils.getInformationProviderBean()
+ return ExtValContext.getContext().getInformationProviderBean()
.getConventionNameForMessageResolverName(validationStrategy.getClass(),
getClassName(validationStrategy.getClass().getSimpleName()));
}
protected String getClassName(String strategyClassName)
{
- return ExtValUtils.getInformationProviderBean()
+ return ExtValContext.getContext().getInformationProviderBean()
.getConventionNameForMessageResolverClass(strategyClassName);
}
}
Modified: myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/AbstractValidationStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/AbstractValidationStrategy.java?rev=700066&r1=700065&r2=700066&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/AbstractValidationStrategy.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/AbstractValidationStrategy.java Mon Sep 29 04:32:01 2008
@@ -19,7 +19,9 @@
package org.apache.myfaces.extensions.validator.core.validation.strategy;
import org.apache.myfaces.extensions.validator.core.validation.message.resolver.MessageResolver;
-import org.apache.myfaces.extensions.validator.util.FactoryUtils;
+import org.apache.myfaces.extensions.validator.core.ExtValContext;
+import org.apache.myfaces.extensions.validator.core.mapper.ClassMappingFactory;
+import org.apache.myfaces.extensions.validator.core.factory.FactoryNameEnum;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
@@ -47,7 +49,11 @@
Locale locale = FacesContext.getCurrentInstance().getViewRoot().getLocale();
return this.messageResolver != null ? this.messageResolver.getMessage(key, locale) :
- FactoryUtils.getMessageResolverFactory().create(this).getMessage(key, locale);
+ ((ClassMappingFactory<ValidationStrategy, MessageResolver>)ExtValContext.getContext()
+ .getFactoryFinder()
+ .getFactory(FactoryNameEnum.MESSAGE_RESOLVER_FACTORY, ClassMappingFactory.class))
+ .create(this)
+ .getMessage(key, locale);
}
protected String getErrorMessageSummary(Annotation annotation)
Modified: myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/DefaultValidationStrategyFactory.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/DefaultValidationStrategyFactory.java?rev=700066&r1=700065&r2=700066&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/DefaultValidationStrategyFactory.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/DefaultValidationStrategyFactory.java Mon Sep 29 04:32:01 2008
@@ -18,8 +18,9 @@
*/
package org.apache.myfaces.extensions.validator.core.validation.strategy;
-import org.apache.myfaces.extensions.validator.core.ClassMappingFactory;
+import org.apache.myfaces.extensions.validator.core.mapper.ClassMappingFactory;
import org.apache.myfaces.extensions.validator.core.WebXmlParameter;
+import org.apache.myfaces.extensions.validator.core.ExtValContext;
import org.apache.myfaces.extensions.validator.core.mapper.NameMapper;
import org.apache.myfaces.extensions.validator.core.validation.strategy.mapper
.AnnotationToValidationStrategyBeanNameMapper;
@@ -33,7 +34,6 @@
.SimpleAnnotationToValidationStrategyNameMapper;
import org.apache.myfaces.extensions.validator.util.ClassUtils;
import org.apache.myfaces.extensions.validator.util.ELUtils;
-import org.apache.myfaces.extensions.validator.util.ExtValUtils;
import org.apache.myfaces.extensions.validator.internal.ToDo;
import org.apache.myfaces.extensions.validator.internal.Priority;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
@@ -159,7 +159,7 @@
annotationStrategyMapping = new HashMap<String, String>();
//setup internal static mappings
- for (String internalMappingSource : ExtValUtils
+ for (String internalMappingSource : ExtValContext.getContext()
.getInformationProviderBean().getStaticStrategyMappingSources())
{
setupStrategyMappings(internalMappingSource);
@@ -169,7 +169,7 @@
try
{
//build convention (strategy mapping)
- setupStrategyMappings(ExtValUtils.getInformationProviderBean()
+ setupStrategyMappings(ExtValContext.getContext().getInformationProviderBean()
.getCustomStaticStrategyMappingSource());
}
catch (Throwable t)
Modified: myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/mapper/CustomConventionAnnotationToValidationStrategyNameMapper.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/mapper/CustomConventionAnnotationToValidationStrategyNameMapper.java?rev=700066&r1=700065&r2=700066&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/mapper/CustomConventionAnnotationToValidationStrategyNameMapper.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/mapper/CustomConventionAnnotationToValidationStrategyNameMapper.java Mon Sep 29 04:32:01 2008
@@ -19,7 +19,7 @@
package org.apache.myfaces.extensions.validator.core.validation.strategy.mapper;
import org.apache.myfaces.extensions.validator.core.mapper.AbstractCustomNameMapper;
-import org.apache.myfaces.extensions.validator.util.ExtValUtils;
+import org.apache.myfaces.extensions.validator.core.ExtValContext;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
@@ -40,6 +40,7 @@
{
protected String getCustomNameMapperClassName()
{
- return ExtValUtils.getInformationProviderBean().getCustomAnnotationToValidationStrategyNameMapper();
+ return ExtValContext.getContext().getInformationProviderBean()
+ .getCustomAnnotationToValidationStrategyNameMapper();
}
}
Modified: myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/mapper/DefaultAnnotationToValidationStrategyNameMapper.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/mapper/DefaultAnnotationToValidationStrategyNameMapper.java?rev=700066&r1=700065&r2=700066&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/mapper/DefaultAnnotationToValidationStrategyNameMapper.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/mapper/DefaultAnnotationToValidationStrategyNameMapper.java Mon Sep 29 04:32:01 2008
@@ -19,7 +19,7 @@
package org.apache.myfaces.extensions.validator.core.validation.strategy.mapper;
import org.apache.myfaces.extensions.validator.core.mapper.NameMapper;
-import org.apache.myfaces.extensions.validator.util.ExtValUtils;
+import org.apache.myfaces.extensions.validator.core.ExtValContext;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
@@ -37,6 +37,7 @@
{
public String createName(Annotation annotation)
{
- return ExtValUtils.getInformationProviderBean().getConventionNameForValidationStrategy(annotation);
+ return ExtValContext.getContext().getInformationProviderBean()
+ .getConventionNameForValidationStrategy(annotation);
}
}
Modified: myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/mapper/SimpleAnnotationToValidationStrategyNameMapper.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/mapper/SimpleAnnotationToValidationStrategyNameMapper.java?rev=700066&r1=700065&r2=700066&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/mapper/SimpleAnnotationToValidationStrategyNameMapper.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/validation/strategy/mapper/SimpleAnnotationToValidationStrategyNameMapper.java Mon Sep 29 04:32:01 2008
@@ -19,7 +19,7 @@
package org.apache.myfaces.extensions.validator.core.validation.strategy.mapper;
import org.apache.myfaces.extensions.validator.core.mapper.NameMapper;
-import org.apache.myfaces.extensions.validator.util.ExtValUtils;
+import org.apache.myfaces.extensions.validator.core.ExtValContext;
import org.apache.myfaces.extensions.validator.internal.UsageInformation;
import org.apache.myfaces.extensions.validator.internal.UsageCategory;
@@ -37,6 +37,6 @@
public String createName(Annotation annotation)
{
return annotation.annotationType().getName() +
- ExtValUtils.getInformationProviderBean().getValidationStrategyPostfix();
+ ExtValContext.getContext().getInformationProviderBean().getValidationStrategyPostfix();
}
}
Added: myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/util/JsfUtils.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/util/JsfUtils.java?rev=700066&view=auto
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/util/JsfUtils.java (added)
+++ myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/util/JsfUtils.java Mon Sep 29 04:32:01 2008
@@ -0,0 +1,51 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.myfaces.extensions.validator.util;
+
+import org.apache.myfaces.extensions.validator.internal.UsageInformation;
+import org.apache.myfaces.extensions.validator.internal.UsageCategory;
+
+import javax.faces.FactoryFinder;
+import javax.faces.event.PhaseListener;
+import javax.faces.lifecycle.Lifecycle;
+import javax.faces.lifecycle.LifecycleFactory;
+import java.util.Iterator;
+
+
+/**
+ * @author Gerhard Petracek
+ */
+@UsageInformation(UsageCategory.INTERNAL)
+public class JsfUtils
+{
+ public static void deregisterPhaseListener(PhaseListener phaseListener)
+ {
+ LifecycleFactory lifecycleFactory = (LifecycleFactory)FactoryFinder.getFactory(FactoryFinder.LIFECYCLE_FACTORY);
+
+ String currentId;
+ Lifecycle currentLifecycle;
+ Iterator lifecycleIds = lifecycleFactory.getLifecycleIds();
+ while (lifecycleIds.hasNext())
+ {
+ currentId = (String) lifecycleIds.next();
+ currentLifecycle = lifecycleFactory.getLifecycle(currentId);
+ currentLifecycle.removePhaseListener(phaseListener);
+ }
+ }
+}
Modified: myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/PropertyValidationModuleStartupListener.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/PropertyValidationModuleStartupListener.java?rev=700066&r1=700065&r2=700066&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/PropertyValidationModuleStartupListener.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/PropertyValidationModuleStartupListener.java Mon Sep 29 04:32:01 2008
@@ -21,7 +21,6 @@
import org.apache.myfaces.extensions.validator.baseval.WebXmlParameter;
import org.apache.myfaces.extensions.validator.core.startup.AbstractStartupListener;
import org.apache.myfaces.extensions.validator.core.ExtValContext;
-import org.apache.myfaces.extensions.validator.util.ExtValUtils;
import org.apache.myfaces.extensions.validator.internal.ToDo;
import org.apache.myfaces.extensions.validator.internal.Priority;
import org.apache.myfaces.extensions.validator.crossval.recorder.CrossValidationUserInputRecorder;
@@ -45,11 +44,9 @@
if (jpaBasedValidation == null
|| !jpaBasedValidation.equalsIgnoreCase("true"))
{
- ExtValUtils
- .getInformationProviderBean()
+ ExtValContext.getContext().getInformationProviderBean()
.addStaticStrategyMappingSource(
- ExtValInformation.EXTENSIONS_VALIDATOR_BASE_PACKAGE_NAME
- + ".jpa_strategy_mappings");
+ ExtValInformation.EXTENSIONS_VALIDATOR_BASE_PACKAGE_NAME + ".jpa_strategy_mappings");
}
}
Modified: myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/extractor/JoinMetaDataExtractor.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/extractor/JoinMetaDataExtractor.java?rev=700066&r1=700065&r2=700066&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/extractor/JoinMetaDataExtractor.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/baseval/metadata/extractor/JoinMetaDataExtractor.java Mon Sep 29 04:32:01 2008
@@ -24,7 +24,9 @@
import org.apache.myfaces.extensions.validator.core.annotation.extractor.AnnotationExtractor;
import org.apache.myfaces.extensions.validator.core.metadata.extractor.MetaDataExtractor;
import org.apache.myfaces.extensions.validator.core.validation.strategy.ValidationStrategy;
-import org.apache.myfaces.extensions.validator.util.FactoryUtils;
+import org.apache.myfaces.extensions.validator.core.mapper.ClassMappingFactory;
+import org.apache.myfaces.extensions.validator.core.ExtValContext;
+import org.apache.myfaces.extensions.validator.core.factory.FactoryNameEnum;
import javax.faces.context.FacesContext;
import java.lang.annotation.Annotation;
@@ -53,9 +55,15 @@
for (AnnotationEntry entry : extractor
.extractAnnotations(FacesContext.getCurrentInstance(), targetExpression))
{
- validationStrategy = FactoryUtils .getValidationStrategyFactory().create(entry.getAnnotation());
-
- metaDataExtractor = FactoryUtils.getMetaDataExtractorFactory().create(validationStrategy);
+ validationStrategy = ((ClassMappingFactory<Annotation, ValidationStrategy>) ExtValContext.getContext()
+ .getFactoryFinder()
+ .getFactory(FactoryNameEnum.VALIDATION_STRATEGY_FACTORY, ClassMappingFactory.class))
+ .create(entry.getAnnotation());
+
+ metaDataExtractor = ((ClassMappingFactory<ValidationStrategy, MetaDataExtractor>) ExtValContext
+ .getContext().getFactoryFinder()
+ .getFactory(FactoryNameEnum.META_DATA_EXTRACTOR_FACTORY, ClassMappingFactory.class))
+ .create(validationStrategy);
if (metaDataExtractor != null)
{