[jboss-cvs] JBossAS SVN: r100689 - 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: jeff.zhang
Date: 2010-02-08 03:23:40 -0500 (Mon, 08 Feb 2010)
New Revision: 100689

Modified:
   projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/rules/mc/MCGetMetaData.java
   projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployer.java
Log:
[JBJCA-261] make RADeploy use ValidateObject back that MCGetMetaData works

Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/rules/mc/MCGetMetaData.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/rules/mc/MCGetMetaData.java	2010-02-08 08:13:48 UTC (rev 100688)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/rules/mc/MCGetMetaData.java	2010-02-08 08:23:40 UTC (rev 100689)
@@ -27,6 +27,7 @@
 import org.jboss.jca.deployers.common.validator.Rule;
 import org.jboss.jca.deployers.common.validator.Severity;
 import org.jboss.jca.deployers.common.validator.Validate;
+import org.jboss.jca.deployers.common.validator.ValidateObject;
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;
@@ -52,28 +53,27 @@
 
    /**
     * Validate
-    * @param vo The validate object
+    * @param v The validate object
     * @param rb The resource bundle 
     * @return The list of failures found; <code>null</code> if none
     */
    @SuppressWarnings("unchecked")
-   public List<Failure> validate(Validate vo, ResourceBundle rb)
+   public List<Failure> validate(Validate v, ResourceBundle rb)
    {
-      if (vo != null && 
-          Key.MANAGED_CONNECTION == vo.getKey() &&
-          ManagedConnection.class.isAssignableFrom(vo.getClazz()))
+      if (v != null && 
+          Key.MANAGED_CONNECTION == v.getKey() &&
+          ManagedConnection.class.isAssignableFrom(v.getClazz()))
       {
          boolean error = false;
+         ValidateObject vo = (ValidateObject)v;
 
          try
          {
             Class clz = vo.getClazz();
             Method gmd = clz.getMethod("getMetaData", (Class[])null);
-            
-            //TODO should consider object call
-            //Object md = gmd.invoke(vo.getObject(), (Object[])null);
+            Object md = gmd.invoke(vo.getObject(), (Object[])null);
 
-            if (gmd == null)
+            if (md == null)
                error = true;
          }
          catch (Throwable t)

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	2010-02-08 08:13:48 UTC (rev 100688)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployer.java	2010-02-08 08:23:40 UTC (rev 100689)
@@ -28,7 +28,7 @@
 import org.jboss.jca.deployers.common.validator.FailureHelper;
 import org.jboss.jca.deployers.common.validator.Key;
 import org.jboss.jca.deployers.common.validator.Severity;
-import org.jboss.jca.deployers.common.validator.ValidateClass;
+import org.jboss.jca.deployers.common.validator.ValidateObject;
 import org.jboss.jca.deployers.common.validator.Validator;
 import org.jboss.jca.fungal.deployers.CloneableDeployer;
 import org.jboss.jca.fungal.deployers.DeployException;
@@ -321,7 +321,7 @@
             log.info("Required license terms for " + url.toExternalForm());
 
          ResourceAdapter resourceAdapter = null;
-         List<ValidateClass> archiveValidationObjects = new ArrayList<ValidateClass>();
+         List<ValidateObject> archiveValidationObjects = new ArrayList<ValidateObject>();
          List<Object> beanValidationObjects = new ArrayList<Object>();
          List<Object> associationObjects = new ArrayList<Object>();
 
@@ -342,8 +342,8 @@
                   log.trace("ResourceAdapter defined in classloader: " + resourceAdapter.getClass().getClassLoader());
                }
 
-               archiveValidationObjects.add(new ValidateClass(Key.RESOURCE_ADAPTER, 
-                                                               resourceAdapter.getClass(), 
+               archiveValidationObjects.add(new ValidateObject(Key.RESOURCE_ADAPTER, 
+                                                               resourceAdapter, 
                                                                cmd.getRa().getConfigProperty()));
                beanValidationObjects.add(resourceAdapter);
             }
@@ -373,8 +373,8 @@
 
                         mcf.setLogWriter(new PrintWriter(printStream));
 
-                        archiveValidationObjects.add(new ValidateClass(Key.MANAGED_CONNECTION_FACTORY,
-                                                                        mcf.getClass(),
+                        archiveValidationObjects.add(new ValidateObject(Key.MANAGED_CONNECTION_FACTORY,
+                                                                        mcf,
                                                                         cdMeta.getConfigProps()));
                         beanValidationObjects.add(mcf);
                         associationObjects.add(mcf);
@@ -389,7 +389,7 @@
                                      cf.getClass().getClassLoader());
                         }
 
-                        archiveValidationObjects.add(new ValidateClass(Key.CONNECTION_FACTORY, cf.getClass()));
+                        archiveValidationObjects.add(new ValidateObject(Key.CONNECTION_FACTORY, cf));
 
                         if (cf instanceof Serializable && cf instanceof Referenceable)
                         {
@@ -437,7 +437,7 @@
                                      o.getClass().getClassLoader());
                         }
 
-                        archiveValidationObjects.add(new ValidateClass(Key.ACTIVATION_SPEC, o.getClass(), cpm));
+                        archiveValidationObjects.add(new ValidateObject(Key.ACTIVATION_SPEC, o, cpm));
                         beanValidationObjects.add(o);
                         associationObjects.add(o);
                      }
@@ -467,7 +467,7 @@
                         }
 
                         archiveValidationObjects.add(
-                           new ValidateClass(Key.ADMIN_OBJECT, o.getClass(), aoMeta.getConfigProps()));
+                           new ValidateObject(Key.ADMIN_OBJECT, o, aoMeta.getConfigProps()));
                         beanValidationObjects.add(o);
                      }
                   }
@@ -480,7 +480,7 @@
          {
             Validator validator = new Validator();
             List<Failure> failures = validator.validate(archiveValidationObjects.toArray(
-               new ValidateClass[archiveValidationObjects.size()]));
+               new ValidateObject[archiveValidationObjects.size()]));
 
             if (failures != null && failures.size() > 0)
             {