[jboss-cvs] JBossAS SVN: r112148 - in projects/jboss-jca/branches/Branch_1_0: 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-08-29 08:59:04 -0400 (Mon, 29 Aug 2011)
New Revision: 112148

Modified:
   projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/DeployersLogger.java
   projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java
   projects/jboss-jca/branches/Branch_1_0/doc/userguide/en-US/modules/logging.xml
Log:
[JBJCA-658] Log invalid config properties

Modified: projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/DeployersLogger.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/DeployersLogger.java	2011-08-29 12:54:24 UTC (rev 112147)
+++ projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/DeployersLogger.java	2011-08-29 12:59:04 UTC (rev 112148)
@@ -98,4 +98,12 @@
    @LogMessage(level = ERROR)
    @Message(id = 20007, value = "Exception during createSubject(): %s")
    public void subjectCreationError(String detail, @Cause Throwable t);
+
+   /**
+    * Invalid config property
+    * @param cp The config property name
+    */
+   @LogMessage(level = WARN)
+   @Message(id = 20008, value = "Invalid config-property: %s")
+   public void invalidConfigProperty(String cp);
 }

Modified: projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java	2011-08-29 12:54:24 UTC (rev 112147)
+++ projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java	2011-08-29 12:59:04 UTC (rev 112148)
@@ -1016,6 +1016,22 @@
             {
                ResourceAdapter10 ra10 = (ResourceAdapter10) cmd.getResourceadapter();
 
+               if (raxml != null && raxml.getConfigProperties() != null && raxml.getConfigProperties().size() > 0)
+               {
+                  for (String s : raxml.getConfigProperties().keySet())
+                  {
+                     log.invalidConfigProperty(s);
+                  }
+               }
+
+               if (ijmd != null && ijmd.getConfigProperties() != null && ijmd.getConfigProperties().size() > 0)
+               {
+                  for (String s : ijmd.getConfigProperties().keySet())
+                  {
+                     log.invalidConfigProperty(s);
+                  }
+               }
+
                List<String> mcfs = findManagedConnectionFactories(ra10);
 
                Set<CommonConnDef> connectionDefinitions = null;

Modified: projects/jboss-jca/branches/Branch_1_0/doc/userguide/en-US/modules/logging.xml
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/doc/userguide/en-US/modules/logging.xml	2011-08-29 12:54:24 UTC (rev 112147)
+++ projects/jboss-jca/branches/Branch_1_0/doc/userguide/en-US/modules/logging.xml	2011-08-29 12:59:04 UTC (rev 112148)
@@ -755,6 +755,11 @@
             <entry>Exception during createSubject()</entry>
           </row>
           <row>
+            <entry>20008</entry>
+            <entry><code>WARN</code></entry>
+            <entry>Invalid config property</entry>
+          </row>
+          <row>
             <entry>20051</entry>
             <entry><code>EXCEPTION</code></entry>
             <entry>Unable to start</entry>