Return-Path: Delivered-To: apmail-myfaces-commits-archive@www.apache.org Received: (qmail 26075 invoked from network); 12 Sep 2009 03:56:46 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 12 Sep 2009 03:56:46 -0000 Received: (qmail 1627 invoked by uid 500); 12 Sep 2009 03:56:46 -0000 Delivered-To: apmail-myfaces-commits-archive@myfaces.apache.org Received: (qmail 1487 invoked by uid 500); 12 Sep 2009 03:56:45 -0000 Mailing-List: contact commits-help@myfaces.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "MyFaces Development" Delivered-To: mailing list commits@myfaces.apache.org Received: (qmail 1478 invoked by uid 99); 12 Sep 2009 03:56:45 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 12 Sep 2009 03:56:45 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 12 Sep 2009 03:56:41 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 5061E23888A2; Sat, 12 Sep 2009 03:56:20 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r814106 - in /myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core: CustomInformation.java ExtValContext.java InformationProviderBean.java Date: Sat, 12 Sep 2009 03:56:20 -0000 To: commits@myfaces.apache.org From: gpetracek@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090912035620.5061E23888A2@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gpetracek Date: Sat Sep 12 03:56:18 2009 New Revision: 814106 URL: http://svn.apache.org/viewvc?rev=814106&view=rev Log: EXTVAL-58 custom extval-context Modified: myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/CustomInformation.java myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/ExtValContext.java myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/InformationProviderBean.java Modified: myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/CustomInformation.java URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/CustomInformation.java?rev=814106&r1=814105&r2=814106&view=diff ============================================================================== --- myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/CustomInformation.java (original) +++ myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/CustomInformation.java Sat Sep 12 03:56:18 2009 @@ -29,6 +29,8 @@ public enum CustomInformation { BASE_PACKAGE, + EXTVAL_CONTEXT, + COMPONENT_META_DATA_EXTRACTOR, VALIDATION_PARAMETER_EXTRACTOR, Modified: myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/ExtValContext.java URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/ExtValContext.java?rev=814106&r1=814105&r2=814106&view=diff ============================================================================== --- myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/ExtValContext.java (original) +++ myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/ExtValContext.java Sat Sep 12 03:56:18 2009 @@ -54,7 +54,7 @@ { private final Log logger = LogFactory.getLog(getClass()); - private static ExtValContext extValContext = new ExtValContext(); + private static ExtValContext extValContext; private FactoryFinder factoryFinder = DefaultFactoryFinder.getInstance(); private Map rendererInterceptors = new HashMap(); @@ -269,6 +269,17 @@ public static ExtValContext getContext() { + if(extValContext == null) + { + extValContext = new ExtValContext(); + Object customExtValContext = ExtValUtils.getELHelper().getBean( + extValContext.getInformationProviderBean().get(CustomInformation.EXTVAL_CONTEXT)); + + if(customExtValContext instanceof ExtValContext) + { + extValContext = (ExtValContext)customExtValContext; + } + } return extValContext; } Modified: myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/InformationProviderBean.java URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/InformationProviderBean.java?rev=814106&r1=814105&r2=814106&view=diff ============================================================================== --- myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/InformationProviderBean.java (original) +++ myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/InformationProviderBean.java Sat Sep 12 03:56:18 2009 @@ -75,7 +75,8 @@ } customizableInfos.put(CustomInformation.BASE_PACKAGE, basePackage); - + customizableInfos.put(CustomInformation.EXTVAL_CONTEXT, "customExtValContext"); + customizableInfos.put(CustomInformation.COMPONENT_META_DATA_EXTRACTOR, "ComponentMetaDataExtractor"); customizableInfos.put(CustomInformation.VALIDATION_PARAMETER_EXTRACTOR, @@ -143,6 +144,9 @@ case BASE_PACKAGE: return value; + case EXTVAL_CONTEXT: + return value; + /* * postfix used by the SimpleAnnotationToValidationStrategyNameMapper * the SimpleAnnotationToValidationStrategyNameMapper is for custom strategies only