[jboss-cvs] JBossAS SVN: r106664 - trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/env.

[jboss-cvs-commits at lists.jboss.org]

Author: marius.bogoevici
Date: 2010-07-13 15:40:19 -0400 (Tue, 13 Jul 2010)
New Revision: 106664

Modified:
   trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/env/WeldBootstrapDeployer.java
Log:
JBAS-8128: Allow the creation of an empty validation service, even in the absence of a ValidationFactory for the deployment.

Modified: trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/env/WeldBootstrapDeployer.java
===================================================================
--- trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/env/WeldBootstrapDeployer.java	2010-07-13 19:13:00 UTC (rev 106663)
+++ trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/env/WeldBootstrapDeployer.java	2010-07-13 19:40:19 UTC (rev 106664)
@@ -21,9 +21,6 @@
  */
 package org.jboss.weld.integration.deployer.env;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import org.jboss.beans.metadata.spi.BeanMetaData;
 import org.jboss.beans.metadata.spi.ValueMetaData;
 import org.jboss.beans.metadata.spi.builder.BeanMetaDataBuilder;
@@ -131,15 +128,20 @@
    {
       Object validatorFactory = unit.getAttachment(DeployersUtils.JAVAX_VALIDATION_VALIDATOR_FACTORY);
 
-      if (validatorFactory == null)
+      if (validatorFactory == null && isValidationFactoryRequired(unit))
       {
-         throw new DeploymentException("Missing ValidatorFactory attachment in deployment: " + unit);
+            throw new DeploymentException("Missing ValidatorFactory attachment in deployment: " + unit);
       }
-
       String beanName = unit.getName() + "_JBossValidationServices";
       BeanMetaDataBuilder builder = BeanMetaDataBuilder.createBuilder(beanName, "org.jboss.weld.integration.validation.JBossValidationServices");
       unit.addAttachment(beanName + "_" + BeanMetaData.class.getSimpleName(), builder.getBeanMetaData());
       builder.addConstructorParameter(DeployersUtils.JAVAX_VALIDATION_VALIDATOR_FACTORY, validatorFactory);
       return builder.createInject(beanName);
    }
+
+   protected boolean isValidationFactoryRequired(DeploymentUnit deploymentUnit)
+   {
+      //TODO: define more strict criteria for determining whether the presence of a validation factory is required (e.g. JSF, JPA deployments) 
+      return false;
+   }
 }
\ No newline at end of file