[jboss-cvs] JBossAS SVN: r112622 - projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/common.

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

Author: jesper.pedersen
Date: 2012-02-06 12:26:43 -0500 (Mon, 06 Feb 2012)
New Revision: 112622

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/BeanValidation.java
Log:
[JBJCA-743] Only enable bean validation for 1.6 archives

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	2012-02-06 17:24:57 UTC (rev 112621)
+++ projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java	2012-02-06 17:26:43 UTC (rev 112622)
@@ -2091,7 +2091,7 @@
          if (activateDeployment)
          {
             // Bean validation
-            if (getConfiguration().getBeanValidation())
+            if (getConfiguration().getBeanValidation() && cmd.getVersion() == Version.V_16)
             {
                List<Class> groupsClasses = null;
 

Modified: projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/common/BeanValidation.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/common/BeanValidation.java	2012-02-06 17:24:57 UTC (rev 112621)
+++ projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/common/BeanValidation.java	2012-02-06 17:26:43 UTC (rev 112622)
@@ -50,6 +50,10 @@
 
    private static boolean trace = log.isTraceEnabled();
 
+   private static ValidatorFactory factory;
+
+   private static String factoryName = "java:/ValidatorFactory";
+
    /**
     * Constructor
     */
@@ -72,13 +76,12 @@
          throw new IllegalArgumentException("Object is null");
       }
 
-      Context context = null;
       try
       {
-         context = new InitialContext();
+         if (factory == null)
+            initValidatorFactory();
 
-         ValidatorFactory vf = (ValidatorFactory) context.lookup("java:/ValidatorFactory");
-         Validator v = vf.usingContext().traversableResolver(new JCATraversableResolver()).getValidator();
+         Validator v = factory.usingContext().traversableResolver(new JCATraversableResolver()).getValidator();
 
          Set errors = null;
          if (groupsClasses == null || groupsClasses.size() == 0)
@@ -107,6 +110,39 @@
       {
          log.error(ne.getMessage(), ne);
       }
+   }
+
+   /**
+    * Set the validator factory
+    * @param f The factory
+    */
+   public synchronized static void setValidatorFactory(ValidatorFactory f)
+   {
+      factory = f;
+   }
+
+   /**
+    * Set the validator factory name
+    * @param name The factory name
+    */
+   public synchronized static void setValidatorFactoryName(String name)
+   {
+      factoryName = name;
+   }
+
+   /**
+    * Init the validator factory
+    * @exception NamingException Thrown if the validator can't be found
+    */
+   private synchronized static void initValidatorFactory() throws NamingException
+   {
+      Context context = null;
+      try
+      {
+         context = new InitialContext();
+
+         factory = (ValidatorFactory) context.lookup(factoryName);
+      }
       finally
       {
          try