[jboss-cvs] JBossAS SVN: r100409 - in projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers: common/validator/rules/mc and 1 other directories.

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

Author: jeff.zhang
Date: 2010-02-04 08:08:33 -0500 (Thu, 04 Feb 2010)
New Revision: 100409

Modified:
   projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/ValidateClass.java
   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] replace validateObject by validateClass in RADeployer

Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/ValidateClass.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/ValidateClass.java	2010-02-04 12:30:56 UTC (rev 100408)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/ValidateClass.java	2010-02-04 13:08:33 UTC (rev 100409)
@@ -33,13 +33,10 @@
    /** Key */
    private int key;
 
-   /** Onject */
-   private Object object;
-
    /** config-property */
    private List<ConfigPropertyMetaData> configProperties;
 
-   /** clazz */
+   /** Clazz */
    private Class<?> clazz;
    
    /**
@@ -48,9 +45,9 @@
     * @param object The key
     */
    public ValidateClass(int key,
-                         Object object)
+                         Class<?> clazz)
    {
-      this(key, object, null);
+      this(key, clazz, null);
    }
    
    /**
@@ -60,12 +57,11 @@
     * @param configProperties The list of config property metadata
     */
    public ValidateClass(int key,
-                         Object object,
+                         Class<?> clazz,
                          List<ConfigPropertyMetaData> configProperties)
    {
       this.key = key;
-      this.object = object;
-      this.clazz = object.getClass();
+      this.clazz = clazz;
       this.configProperties = configProperties;
    }
    
@@ -79,15 +75,6 @@
    }
 
    /**
-    * Get the object
-    * @return The object
-    */
-   public Object getObject()
-   {
-      return object;
-   }
-
-   /**
     * Get the clazz
     * @return The clazz
     */

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-04 12:30:56 UTC (rev 100408)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/validator/rules/mc/MCGetMetaData.java	2010-02-04 13:08:33 UTC (rev 100409)
@@ -61,7 +61,7 @@
    {
       if (vo != null && 
           Key.MANAGED_CONNECTION == vo.getKey() &&
-          vo.getClazz().isAssignableFrom(ManagedConnection.class))
+          ManagedConnection.class.isAssignableFrom(vo.getClazz()))
       {
          boolean error = false;
 
@@ -69,9 +69,11 @@
          {
             Class clz = vo.getClazz();
             Method gmd = clz.getMethod("getMetaData", (Class[])null);
-            Object md = gmd.invoke(vo.getObject(), (Object[])null);
+            
+            //TODO should consider object call
+            //Object md = gmd.invoke(vo.getObject(), (Object[])null);
 
-            if (md == null)
+            if (gmd == 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-04 12:30:56 UTC (rev 100408)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployer.java	2010-02-04 13:08:33 UTC (rev 100409)
@@ -29,7 +29,6 @@
 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;
@@ -344,7 +343,7 @@
                }
 
                archiveValidationObjects.add(new ValidateClass(Key.RESOURCE_ADAPTER, 
-                                                               resourceAdapter, 
+                                                               resourceAdapter.getClass(), 
                                                                cmd.getRa().getConfigProperty()));
                beanValidationObjects.add(resourceAdapter);
             }
@@ -375,7 +374,7 @@
                         mcf.setLogWriter(new PrintWriter(printStream));
 
                         archiveValidationObjects.add(new ValidateClass(Key.MANAGED_CONNECTION_FACTORY,
-                                                                        mcf,
+                                                                        mcf.getClass(),
                                                                         cdMeta.getConfigProps()));
                         beanValidationObjects.add(mcf);
                         associationObjects.add(mcf);
@@ -390,7 +389,7 @@
                                      cf.getClass().getClassLoader());
                         }
 
-                        archiveValidationObjects.add(new ValidateClass(Key.CONNECTION_FACTORY, cf));
+                        archiveValidationObjects.add(new ValidateClass(Key.CONNECTION_FACTORY, cf.getClass()));
 
                         if (cf instanceof Serializable && cf instanceof Referenceable)
                         {
@@ -438,7 +437,7 @@
                                      o.getClass().getClassLoader());
                         }
 
-                        archiveValidationObjects.add(new ValidateClass(Key.ACTIVATION_SPEC, o, cpm));
+                        archiveValidationObjects.add(new ValidateClass(Key.ACTIVATION_SPEC, o.getClass(), cpm));
                         beanValidationObjects.add(o);
                         associationObjects.add(o);
                      }
@@ -467,7 +466,7 @@
                                      o.getClass().getClassLoader());
                         }
 
-                        archiveValidationObjects.add(new ValidateClass(Key.ADMIN_OBJECT, o, aoMeta.getConfigProps()));
+                        archiveValidationObjects.add(new ValidateClass(Key.ADMIN_OBJECT, o.getClass(), aoMeta.getConfigProps()));
                         beanValidationObjects.add(o);
                      }
                   }