[jboss-cvs] JBossAS SVN: r92846 - in projects/webbeans-ri-int/trunk: deployer/src/main/java/org/jboss/webbeans/integration/deployer/env and 2 other directories.

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

Author: pete.muir at jboss.org
Date: 2009-08-26 16:37:27 -0400 (Wed, 26 Aug 2009)
New Revision: 92846

Modified:
   projects/webbeans-ri-int/trunk/deployer/src/main/assembly/resources/META-INF/webbeans-services-jboss-beans.xml
   projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/WebBeansBootstrapDeployer.java
   projects/webbeans-ri-int/trunk/ejb/pom.xml
   projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/validation/JBossValidationServices.java
Log:
Wiring ready for when BV deployer is added

Modified: projects/webbeans-ri-int/trunk/deployer/src/main/assembly/resources/META-INF/webbeans-services-jboss-beans.xml
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/src/main/assembly/resources/META-INF/webbeans-services-jboss-beans.xml	2009-08-26 20:32:14 UTC (rev 92845)
+++ projects/webbeans-ri-int/trunk/deployer/src/main/assembly/resources/META-INF/webbeans-services-jboss-beans.xml	2009-08-26 20:37:27 UTC (rev 92846)
@@ -33,9 +33,6 @@
    <!-- Access to the caller context Principal -->
    <bean name="JBossSecurityServices" class="org.jboss.webbeans.integration.security.JBossSecurityServices" />
    
-   <!-- Access to the default BeanValidaton Factory -->
-   <bean name="JBossValidationServices" class="org.jboss.webbeans.integration.validation.JBossValidationServices" />
-   
 <!--   <bean name="JBossJSFServices" class="org.jboss.webbeans.integration.jsf.JBossJSFServices" />-->
   
 </deployment>

Modified: projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/WebBeansBootstrapDeployer.java
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/WebBeansBootstrapDeployer.java	2009-08-26 20:32:14 UTC (rev 92845)
+++ projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/WebBeansBootstrapDeployer.java	2009-08-26 20:37:27 UTC (rev 92846)
@@ -47,6 +47,7 @@
       super(false);
       setDisableOptional(true);
       addOutput(BeanMetaData.class);
+      addInput("javax.validation.ValidatorFactory");
    }
 
    protected void deployInternal(DeploymentUnit unit, BootstrapInfo info) throws DeploymentException
@@ -58,7 +59,9 @@
       ValueMetaData deploymentValue = info.getDeployment();
       if (deploymentValue == null)
          throw new DeploymentException("Missing deployment: " + unit);
+      
 
+
       String bootstrapName = DeployersUtils.getBootstrapBeanName(unit);
       BeanMetaDataBuilder bootstrap = BeanMetaDataBuilder.createBuilder(bootstrapName, "org.jboss.webbeans.integration.deployer.env.helpers.BootstrapBean");
       
@@ -70,7 +73,7 @@
       bootstrap.addPropertyMetaData("transactionServices", bootstrap.createInject("JBossTransactionServices"));
       bootstrap.addPropertyMetaData("applicationContext", createBeanStore());
       bootstrap.addPropertyMetaData("securityServices", bootstrap.createInject("JBossSecurityServices"));
-      bootstrap.addPropertyMetaData("validationServices", bootstrap.createInject("JBossValidationServices"));
+      bootstrap.addPropertyMetaData("validationServices", createValidationServices(unit));
       bootstrap.setCreate("initialize");
       bootstrap.setStart("boot");
       bootstrap.setDestroy("shutdown");
@@ -114,4 +117,21 @@
       unit.addAttachment(beanName + "_" + BeanMetaData.class.getSimpleName(), builder.getBeanMetaData());
       return builder.createInject(beanName);
    }
+   
+   protected ValueMetaData createValidationServices(DeploymentUnit unit) throws DeploymentException
+   {
+      Object validatorFactory = unit.getAttachment("javax.validation.ValidatorFactory");
+      
+      if (validatorFactory == null)
+      {
+         // TODO enable when jsr303.deployer is present
+         //throw new DeploymentException("Missing ValidatorFactory attachment in deployment: " + unit);
+      }
+      
+      String beanName = unit.getName() + "_JBossValidationServices";
+      BeanMetaDataBuilder builder = BeanMetaDataBuilder.createBuilder(beanName, "org.jboss.webbeans.integration.validation.JBossValidationServices");
+      unit.addAttachment(beanName + "_" + BeanMetaData.class.getSimpleName(), builder.getBeanMetaData());
+      builder.addConstructorParameter("javax.validation.ValidatorFactory", validatorFactory);
+      return builder.createInject(beanName);
+   }
 }

Modified: projects/webbeans-ri-int/trunk/ejb/pom.xml
===================================================================
--- projects/webbeans-ri-int/trunk/ejb/pom.xml	2009-08-26 20:32:14 UTC (rev 92845)
+++ projects/webbeans-ri-int/trunk/ejb/pom.xml	2009-08-26 20:37:27 UTC (rev 92846)
@@ -8,8 +8,7 @@
   <artifactId>webbeans-jboss-int-jboss-ejb</artifactId>
   <version>5.2.0-SNAPSHOT</version>
   <packaging>jar</packaging>
-  <name>Web Beans JBoss EJB3 Integration</name>
-  <description>Web Beans RI Int JBoss EJB3</description>
+  <name>Web Beans Container Services: JBoss AS</name>
   
   <!-- Do not add version information here, use ../pom.xml instead -->
   <dependencies>

Modified: projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/validation/JBossValidationServices.java
===================================================================
--- projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/validation/JBossValidationServices.java	2009-08-26 20:32:14 UTC (rev 92845)
+++ projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/validation/JBossValidationServices.java	2009-08-26 20:37:27 UTC (rev 92846)
@@ -27,9 +27,16 @@
 public class JBossValidationServices implements ValidationServices
 {
 
+   private final ValidatorFactory validatorFactory;
+   
+   public JBossValidationServices(ValidatorFactory validatorFactory)
+   {
+      this.validatorFactory = validatorFactory;
+   }
+
    public ValidatorFactory getDefaultValidatorFactory()
    {
-      throw new UnsupportedOperationException();
+      return validatorFactory;
    }
 
 }