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

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

Author: jesper.pedersen
Date: 2011-09-21 10:21:52 -0400 (Wed, 21 Sep 2011)
New Revision: 112259

Modified:
   projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/DeployersLogger.java
   projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java
   projects/jboss-jca/trunk/doc/userguide/en-US/modules/logging.xml
Log:
[JBJCA-675] More feedback on invalid objects

Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/DeployersLogger.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/DeployersLogger.java	2011-09-20 16:45:33 UTC (rev 112258)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/DeployersLogger.java	2011-09-21 14:21:52 UTC (rev 112259)
@@ -128,4 +128,20 @@
    @LogMessage(level = ERROR)
    @Message(id = 20011, value = "Admin object with missing class-name")
    public void adminObjectNull();
+
+   /**
+    * Admin object not bound
+    * @param clz The class name
+    */
+   @LogMessage(level = WARN)
+   @Message(id = 20012, value = "Admin object not bound: %s")
+   public void adminObjectNotBound(String clz);
+
+   /**
+    * Connection factory not bound
+    * @param clz The class name
+    */
+   @LogMessage(level = WARN)
+   @Message(id = 20013, value = "Connection factory not bound: %s")
+   public void connectionFactoryNotBound(String clz);
 }

Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java	2011-09-20 16:45:33 UTC (rev 112258)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java	2011-09-21 14:21:52 UTC (rev 112259)
@@ -888,6 +888,10 @@
                                                               t);
                                  }
                               }
+                              else
+                              {
+                                  log.adminObjectNotBound(aoMeta.getAdminobjectClass().getValue());
+                              }
                            }
                         }
                         else
@@ -1427,6 +1431,10 @@
                               }
                            }
                         }
+                        else
+                        {
+                            log.connectionFactoryNotBound(mcf.getClass().getName());
+                        }
                      }
                   }
                } 
@@ -1901,6 +1909,10 @@
                                           }
                                        }
                                     }
+                                    else
+                                    {
+                                        log.connectionFactoryNotBound(mcf.getClass().getName());
+                                    }
                                  }
                               }
                            }

Modified: projects/jboss-jca/trunk/doc/userguide/en-US/modules/logging.xml
===================================================================
--- projects/jboss-jca/trunk/doc/userguide/en-US/modules/logging.xml	2011-09-20 16:45:33 UTC (rev 112258)
+++ projects/jboss-jca/trunk/doc/userguide/en-US/modules/logging.xml	2011-09-21 14:21:52 UTC (rev 112259)
@@ -775,6 +775,16 @@
             <entry>Admin object with missing class-name</entry>
           </row>
           <row>
+            <entry>20012</entry>
+            <entry><code>WARN</code></entry>
+            <entry>Admin object not bound</entry>
+          </row>
+          <row>
+            <entry>20013</entry>
+            <entry><code>WARN</code></entry>
+            <entry>Connection factory not bound</entry>
+          </row>
+          <row>
             <entry>20051</entry>
             <entry><code>EXCEPTION</code></entry>
             <entry>Unable to start</entry>