[jboss-cvs] JBossAS SVN: r112371 - 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-10-25 10:03:58 -0400 (Tue, 25 Oct 2011)
New Revision: 112371

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-688] Non spec compliant feedback

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-10-24 16:18:01 UTC (rev 112370)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/DeployersLogger.java	2011-10-25 14:03:58 UTC (rev 112371)
@@ -144,4 +144,22 @@
    @LogMessage(level = WARN)
    @Message(id = 20013, value = "Connection factory not bound: %s")
    public void connectionFactoryNotBound(String clz);
+
+   /**
+    * Admin object not spec compliant
+    * @param clz The class name
+    */
+   @LogMessage(level = INFO)
+   @Message(id = 20014, value = "Admin object not specification compliant. " +
+            "See 13.4.2.3 for additional details: %s")
+   public void adminObjectNotSpecCompliant(String clz);
+
+   /**
+    * Connection factory not spec compliant
+    * @param clz The class name
+    */
+   @LogMessage(level = INFO)
+   @Message(id = 20015, value = "Connection factory not specification compliant. " +
+            "See 6.5.1.3 for additional details: %s")
+   public void connectionFactoryNotSpecCompliant(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-10-24 16:18:01 UTC (rev 112370)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java	2011-10-25 14:03:58 UTC (rev 112371)
@@ -95,9 +95,6 @@
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
 import javax.resource.ResourceException;
 import javax.resource.spi.ActivationSpec;
 import javax.resource.spi.BootstrapContext;
@@ -904,7 +901,10 @@
                                  }
 
                                  if (!adminObjectBound)
+                                 {
                                     log.adminObjectNotBound(aoMeta.getAdminobjectClass().getValue());
+                                    log.adminObjectNotSpecCompliant(aoMeta.getAdminobjectClass().getValue());
+                                 }
                               }
                            }
                         }
@@ -1536,6 +1536,15 @@
                         else
                         {
                            log.connectionFactoryNotBound(mcf.getClass().getName());
+
+                           if (cf != null)
+                           {
+                              log.connectionFactoryNotSpecCompliant(cf.getClass().getName());
+                           }
+                           else
+                           {
+                              log.connectionFactoryNotSpecCompliant(mcf.getClass().getName());
+                           }
                         }
                      }
                   }
@@ -2015,6 +2024,15 @@
                                     else
                                     {
                                        log.connectionFactoryNotBound(mcf.getClass().getName());
+
+                                       if (cf != null)
+                                       {
+                                          log.connectionFactoryNotSpecCompliant(cf.getClass().getName());
+                                       }
+                                       else
+                                       {
+                                          log.connectionFactoryNotSpecCompliant(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-10-24 16:18:01 UTC (rev 112370)
+++ projects/jboss-jca/trunk/doc/userguide/en-US/modules/logging.xml	2011-10-25 14:03:58 UTC (rev 112371)
@@ -785,6 +785,16 @@
             <entry>Connection factory not bound</entry>
           </row>
           <row>
+            <entry>20014</entry>
+            <entry><code>INFO</code></entry>
+            <entry>Admin object not spec compliant</entry>
+          </row>
+          <row>
+            <entry>20015</entry>
+            <entry><code>INFO</code></entry>
+            <entry>Connection factory not spec compliant</entry>
+          </row>
+          <row>
             <entry>20051</entry>
             <entry><code>EXCEPTION</code></entry>
             <entry>Unable to start</entry>