[jboss-cvs] JBossAS SVN: r111999 - in projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata: ds and 1 other directory.

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

Author: jesper.pedersen
Date: 2011-08-11 09:12:47 -0400 (Thu, 11 Aug 2011)
New Revision: 111999

Modified:
   projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/common/CommonIronJacamarParser.java
   projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ds/DsParser.java
Log:
[JBJCA-649] Support incorrect legacy elements

Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/common/CommonIronJacamarParser.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/common/CommonIronJacamarParser.java	2011-08-11 11:14:07 UTC (rev 111998)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/common/CommonIronJacamarParser.java	2011-08-11 13:12:47 UTC (rev 111999)
@@ -229,8 +229,21 @@
                      useFastFail = elementAsBoolean(reader);
                      break;
                   }
-                  default :
-                     throw new ParserException(bundle.unexpectedElement(reader.getLocalName()));
+                  default : {
+                     if (reader.getLocalName().equals("background-validation-minutes"))
+                     {
+                        Integer backgroundValidationMinutes = elementAsInteger(reader);
+                        backgroundValidationMillis = backgroundValidationMinutes.intValue() * 60000L;
+                     }
+                     else if (reader.getLocalName().equals("useFastFail"))
+                     {
+                        useFastFail = elementAsBoolean(reader);
+                     }
+                     else
+                     {
+                        throw new ParserException(bundle.unexpectedElement(reader.getLocalName()));
+                     }
+                  }
                }
                break;
             }

Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ds/DsParser.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ds/DsParser.java	2011-08-11 11:14:07 UTC (rev 111998)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ds/DsParser.java	2011-08-11 13:12:47 UTC (rev 111999)
@@ -708,8 +708,21 @@
                      validConnectionChecker = parseExtension(reader, currTag.getLocalName());
                      break;
                   }
-                  default :
-                     throw new ParserException(bundle.unexpectedElement(reader.getLocalName()));
+                  default : {
+                     if (reader.getLocalName().equals("background-validation-minutes"))
+                     {
+                        Integer backgroundValidationMinutes = elementAsInteger(reader);
+                        backgroundValidationMillis = backgroundValidationMinutes.intValue() * 60000L;
+                     }
+                     else if (reader.getLocalName().equals("useFastFail"))
+                     {
+                        useFastFail = elementAsBoolean(reader);
+                     }
+                     else
+                     {
+                        throw new ParserException(bundle.unexpectedElement(reader.getLocalName()));
+                     }
+                  }
                }
                break;
             }