[jboss-cvs] JBossAS SVN: r97624 - in projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers: fungal and 1 other directory.

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

Author: jesper.pedersen
Date: 2009-12-09 12:00:40 -0500 (Wed, 09 Dec 2009)
New Revision: 97624

Modified:
   projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/Key.java
   projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/ValidateObject.java
   projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployer.java
Log:
Initialize connection factory

Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/Key.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/Key.java	2009-12-09 16:48:50 UTC (rev 97623)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/Key.java	2009-12-09 17:00:40 UTC (rev 97624)
@@ -42,6 +42,9 @@
    /** Managed connection */
    public static final int MANAGED_CONNECTION = 4;
    
+   /** Connection factory */
+   public static final int CONNECTION_FACTORY = 5;
+
    /**
     * Constructor
     */

Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/ValidateObject.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/ValidateObject.java	2009-12-09 16:48:50 UTC (rev 97623)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/ValidateObject.java	2009-12-09 17:00:40 UTC (rev 97624)
@@ -41,9 +41,6 @@
    public ValidateObject(int key,
                          Object object)
    {
-      if (object == null)
-         throw new IllegalArgumentException("Object is null");
-
       this.key = key;
       this.object = object;
    }

Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployer.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployer.java	2009-12-09 16:48:50 UTC (rev 97623)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployer.java	2009-12-09 17:00:40 UTC (rev 97624)
@@ -23,6 +23,7 @@
 package org.jboss.jca.deployers.fungal;
 
 import org.jboss.jca.core.api.CloneableBootstrapContext;
+import org.jboss.jca.core.connectionmanager.notx.NoTxConnectionManager;
 import org.jboss.jca.deployers.common.validator.Failure;
 import org.jboss.jca.deployers.common.validator.FailureHelper;
 import org.jboss.jca.deployers.common.validator.Key;
@@ -51,6 +52,7 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import javax.resource.spi.BootstrapContext;
+import javax.resource.spi.ManagedConnectionFactory;
 import javax.resource.spi.ResourceAdapter;
 import javax.resource.spi.ResourceAdapterAssociation;
 
@@ -308,11 +310,16 @@
                   {
                      if (cdMeta.getManagedConnectionFactoryClass() != null)
                      {
-                        Object o = initAndInject(cdMeta.getManagedConnectionFactoryClass(), 
-                                                 cdMeta.getConfigProps(), cl);
-                        archiveValidationObjects.add(new ValidateObject(Key.MANAGED_CONNECTION_FACTORY, o));
-                        beanValidationObjects.add(o);
-                        associationObjects.add(o);
+                        ManagedConnectionFactory mcf =
+                           (ManagedConnectionFactory)initAndInject(cdMeta.getManagedConnectionFactoryClass(), 
+                                                                   cdMeta.getConfigProps(), cl);
+                        archiveValidationObjects.add(new ValidateObject(Key.MANAGED_CONNECTION_FACTORY, mcf));
+                        beanValidationObjects.add(mcf);
+                        associationObjects.add(mcf);
+
+                        // ConnectionFactory
+                        Object cf = mcf.createConnectionFactory(new NoTxConnectionManager());
+                        archiveValidationObjects.add(new ValidateObject(Key.CONNECTION_FACTORY, cf));
                      }
                   }
                }