[jboss-cvs] JBossAS SVN: r107402 - in projects/jboss-jca/trunk: common/src/main/java/org/jboss/jca/common/metadata and 2 other directories.

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

Author: maeste
Date: 2010-08-04 17:33:41 -0400 (Wed, 04 Aug 2010)
New Revision: 107402

Modified:
   projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/annotations/Annotations.java
   projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/MetadataFactory.java
   projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/jbossra/JbossRaParser.java
   projects/jboss-jca/trunk/deployers/src/test/resources/ra16standard303jbossra.rar/META-INF/jboss-ra.xml
Log:
JBJCA-385:fixing regression

Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/annotations/Annotations.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/annotations/Annotations.java	2010-08-04 21:22:34 UTC (rev 107401)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/annotations/Annotations.java	2010-08-04 21:33:41 UTC (rev 107402)
@@ -284,8 +284,6 @@
       // Vendor name
       XsdString vendorName = new XsdString(conAnnotation.vendorName(), null);
 
-      // Version
-      String version = conAnnotation.version();
 
       // Description
       ArrayList<LocalizedXsdString> descriptions = null;
@@ -371,12 +369,6 @@
       // Reauthentication support
       boolean reauthenticationSupport = conAnnotation.reauthenticationSupport();
 
-      if (version != null && !version.equals("") && !"1.6".equals(version))
-      {
-         log.fatal("Annotations are supported only for verion 1.6");
-         throw new ValidateException("Annotations are supported only for verion 1.6");
-      }
-
       // AuthenticationMechanism
       ArrayList<AuthenticationMechanism> authenticationMechanisms = processAuthenticationMechanism(conAnnotation
             .authMechanisms());

Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/MetadataFactory.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/MetadataFactory.java	2010-08-04 21:22:34 UTC (rev 107401)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/MetadataFactory.java	2010-08-04 21:33:41 UTC (rev 107402)
@@ -121,9 +121,9 @@
             input = new FileInputStream(metadataFile);
             result = (new JbossRaParser()).parse(input);
 
-            log.debugf("Total parse for $s took %d ms", url, (System.currentTimeMillis() - start));
+            log.debugf("Total parse for %s took %d ms", url, (System.currentTimeMillis() - start));
 
-            log.tracef("successufully deployed $s", result.toString());
+            log.tracef("successufully deployed %s", result.toString());
          }
          catch (Exception e)
          {

Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/jbossra/JbossRaParser.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/jbossra/JbossRaParser.java	2010-08-04 21:22:34 UTC (rev 107401)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/jbossra/JbossRaParser.java	2010-08-04 21:33:41 UTC (rev 107402)
@@ -80,36 +80,33 @@
                break;
             }
             case START_ELEMENT : {
-               if (JbossRa10.NAMESPACE.equals(reader.getNamespaceURI()))
+               System.out.println(reader.getNamespaceURI());
+               if (JbossRa20.NAMESPACE.equals(reader.getNamespaceURI()))
                {
                   switch (Tag.forName(reader.getLocalName()))
                   {
                      case JBOSSRA : {
-                        jbossRa = parseJbossRa10(reader);
+                        jbossRa = parseJbossRa20(reader);
                         break;
                      }
                      default :
                         throw new ParserException("Unexpected element:" + reader.getLocalName());
                   }
-
                }
-               else if (JbossRa20.NAMESPACE.equals(reader.getNamespaceURI()))
+
+               else
                {
                   switch (Tag.forName(reader.getLocalName()))
                   {
                      case JBOSSRA : {
-                        jbossRa = parseJbossRa20(reader);
+                        jbossRa = parseJbossRa10(reader);
                         break;
                      }
                      default :
                         throw new ParserException("Unexpected element:" + reader.getLocalName());
                   }
+
                }
-               else
-               {
-                  throw new ParserException(String.format("Namespace %s is not supported by %s parser",
-                        reader.getNamespaceURI(), this.getClass().getName()));
-               }
 
                break;
             }

Modified: projects/jboss-jca/trunk/deployers/src/test/resources/ra16standard303jbossra.rar/META-INF/jboss-ra.xml
===================================================================
--- projects/jboss-jca/trunk/deployers/src/test/resources/ra16standard303jbossra.rar/META-INF/jboss-ra.xml	2010-08-04 21:22:34 UTC (rev 107401)
+++ projects/jboss-jca/trunk/deployers/src/test/resources/ra16standard303jbossra.rar/META-INF/jboss-ra.xml	2010-08-04 21:33:41 UTC (rev 107402)
@@ -2,10 +2,10 @@
 
 <!-- $Id $ -->
 
-<jboss-ra xmlns="http://www.jboss.org/schema/ra"
+
+<jboss-ra xmlns="http://www.jboss.org/schema/ra/2.0"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://www.jboss.org/schema/ra
-          http://www.jboss.org/schema/jboss-ra_2_0.xsd">
+          xsi:schemaLocation="http://www.jboss.org/schema/ra/2.0 http://www.jboss.org/jee/schema/ironjacamar/2.0/jboss-ra_2_0.xsd">
    <ra-config-property>
       <ra-config-property-name>myIntProperty</ra-config-property-name>
       <ra-config-property-type>java.lang.Integer</ra-config-property-type>