[jboss-cvs] JBossAS SVN: r99453 - in projects/metadata/rar/trunk/src: test/java/org/jboss/test/metadata/rar and 1 other directory.

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

Author: jeff.zhang
Date: 2010-01-15 06:07:23 -0500 (Fri, 15 Jan 2010)
New Revision: 99453

Modified:
   projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/spec/ConnectorMetaData.java
   projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/spec/JCA10DTDMetaData.java
   projects/metadata/rar/trunk/src/test/java/org/jboss/test/metadata/rar/RA10DTDUnitTestCase.java
Log:
[JBMETA-247] consolidate rar metadata for dtd 1.0 and xsd 1.5

Modified: projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/spec/ConnectorMetaData.java
===================================================================
--- projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/spec/ConnectorMetaData.java	2010-01-15 11:07:12 UTC (rev 99452)
+++ projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/spec/ConnectorMetaData.java	2010-01-15 11:07:23 UTC (rev 99453)
@@ -51,12 +51,12 @@
    private String eisType;
 
    /** The resource adapter version */
-   private String raVersion;
+   String raVersion;
 
    /** The license */
    private LicenseMetaData lmd;
    
-   private ResourceAdapterMetaData ra;
+   ResourceAdapterMetaData ra;
 
    /**
     * Callback for the DTD information

Modified: projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/spec/JCA10DTDMetaData.java
===================================================================
--- projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/spec/JCA10DTDMetaData.java	2010-01-15 11:07:12 UTC (rev 99452)
+++ projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/spec/JCA10DTDMetaData.java	2010-01-15 11:07:23 UTC (rev 99453)
@@ -21,6 +21,7 @@
  */
 package org.jboss.metadata.rar.spec;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import javax.xml.bind.annotation.XmlAttribute;
@@ -90,13 +91,40 @@
    public void setOldVersion(String oldVersion)
    {
       this.oldVersion = oldVersion;
+      this.raVersion = oldVersion;
    }
 
    
    @XmlElement(name="resourceadapter", required=true)
-   public void setRa10(RA10MetaData ra) throws Exception{
-      this.ra10 = ra;
+   public void setRa10(RA10MetaData ra10) throws Exception{
+      this.ra10 = ra10;
+      if (ra == null)
+      {
+         ra = new ResourceAdapterMetaData();
+      }
+      ra.setSecurityPermissions(ra10.getSecurityPermissions());
+      if (ra.getOutboundRa() == null)
+      {
+         ra.setOutboundRa(new OutboundRaMetaData());
+      }
+      ra.getOutboundRa().setAuthMechanisms(ra10.getAuthMechanisms());
+      ra.getOutboundRa().setTransSupport(ra10.getTransSupport());
+      ra.getOutboundRa().setReAuthSupport(ra10.isReAuthSupport());
+      if (ra.getOutboundRa().getConDefs() == null || ra.getOutboundRa().getConDefs().size() == 0)
+      {
+         ConnectionDefinitionMetaData cdm = new ConnectionDefinitionMetaData();
+         ra.getOutboundRa().setConDefs(new ArrayList<ConnectionDefinitionMetaData>());
+         ra.getOutboundRa().getConDefs().add(cdm);
+      }
+      ConnectionDefinitionMetaData cdmd = ra.getOutboundRa().getConDefs().get(0);
+      cdmd.setManagedConnectionFactoryClass(ra10.getManagedConnectionFactoryClass());
+      cdmd.setConnectionFactoryInterfaceClass(ra10.getConnectionFactoryInterfaceClass());
+      cdmd.setConnectionFactoryImplementationClass(ra10.getConnectionFactoryImplementationClass());
+      cdmd.setConnectionInterfaceClass(ra10.getConnectionInterfaceClass());
+      cdmd.setConnectionImplementationClass(ra10.getConnectionImplementationClass());
+      cdmd.setConfigProps(ra10.getConfigProps());
    }
+   
    public RA10MetaData getRa10() {
       return ra10;
    }

Modified: projects/metadata/rar/trunk/src/test/java/org/jboss/test/metadata/rar/RA10DTDUnitTestCase.java
===================================================================
--- projects/metadata/rar/trunk/src/test/java/org/jboss/test/metadata/rar/RA10DTDUnitTestCase.java	2010-01-15 11:07:12 UTC (rev 99452)
+++ projects/metadata/rar/trunk/src/test/java/org/jboss/test/metadata/rar/RA10DTDUnitTestCase.java	2010-01-15 11:07:23 UTC (rev 99453)
@@ -23,10 +23,13 @@
 
 
 import org.jboss.metadata.rar.spec.ActivationspecMetaData;
-import org.jboss.metadata.rar.spec.RA10MetaData;
+import org.jboss.metadata.rar.spec.ConnectionDefinitionMetaData;
 import org.jboss.metadata.rar.spec.ConnectorMetaData;
 import org.jboss.metadata.rar.spec.JCA10DTDMetaData;
+import org.jboss.metadata.rar.spec.OutboundRaMetaData;
+import org.jboss.metadata.rar.spec.RA10MetaData;
 import org.jboss.metadata.rar.spec.TransactionSupportMetaData;
+
 import org.jboss.test.metadata.common.MetaDataSchemaResolverFactory;
 import org.jboss.test.metadata.javaee.AbstractJavaEEEverythingTest;
 import org.jboss.xb.binding.resolver.MutableSchemaResolver;
@@ -84,6 +87,30 @@
       assertFalse(ra10.isReAuthSupport());
       assertNotNull(ra10.getSecurityPermissions());
       assertEquals(ra10.getSecurityPermissions().get(0).getSecurityPermissionSpec(), "sa");
+      
+      //also test ra for 1.5/1.6 element tree compatible
+      assertNotNull(connector.getRa());
+      assertEquals(connector.getRAVersion(), "6.0");
+      
+      OutboundRaMetaData omd = connector.getRa().getOutboundRa();
+      assertNotNull(omd.getConDefs());
+      ConnectionDefinitionMetaData cdmd = omd.getConDefs().get(0);
+      
+      assertTrue(cdmd.getManagedConnectionFactoryClass().endsWith("JmsManagedConnectionFactory"));
+      assertEquals(cdmd.getConfigProps().size(), 7);
+      assertEquals(cdmd.getConfigProps().get(6).getName(), "UseTryLock");
+      assertTrue(cdmd.getConnectionFactoryInterfaceClass().endsWith("JmsConnectionFactory"));
+      assertTrue(cdmd.getConnectionFactoryImplementationClass().endsWith("JmsConnectionFactoryImpl"));
+      assertTrue(cdmd.getConnectionInterfaceClass().endsWith("Session"));
+      assertTrue(cdmd.getConnectionImplementationClass().endsWith("JmsSession"));
+
+      assertEquals(omd.getTransSupport(), TransactionSupportMetaData.XATransaction);
+      assertNotNull(omd.getAuthMechanisms().get(0));
+      assertEquals(omd.getAuthMechanisms().get(0).getAuthenticationMechanismType(), "BasicPassword");
+      assertTrue(omd.getAuthMechanisms().get(0).getCredentialInterfaceClass().endsWith("PasswordCredential"));
+      assertFalse(omd.isReAuthSupport());
+      assertNotNull(connector.getRa().getSecurityPermissions());
+      assertEquals(connector.getRa().getSecurityPermissions().get(0).getSecurityPermissionSpec(), "sa");
    }
 
 }