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

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

Author: jeff.zhang
Date: 2009-02-09 23:27:17 -0500 (Mon, 09 Feb 2009)
New Revision: 84028

Added:
   projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/JcaDs50_testCfBasic.xml
Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/ConnectionFactoryDeploymentGroup.java
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/JcaDs50UnitTestCase.java
Log:
[JBMETA-167] add connector-factories test

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/ConnectionFactoryDeploymentGroup.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/ConnectionFactoryDeploymentGroup.java	2009-02-10 04:25:29 UTC (rev 84027)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/ConnectionFactoryDeploymentGroup.java	2009-02-10 04:27:17 UTC (rev 84028)
@@ -22,9 +22,7 @@
 package org.jboss.metadata.rar.jboss.mcf;
 
 import java.io.Serializable;
-import java.net.URL;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 import javax.xml.bind.annotation.XmlElement;
@@ -38,7 +36,7 @@
 import org.jboss.xb.annotations.JBossXmlSchema;
 
 /**
- * A ManagedConnectionFactoryDeploymentGroup.
+ * A ConnectionFactoryDeploymentGroup.
  * 
  * @author Jeff Zhang
  * @version $Revision$
@@ -50,7 +48,7 @@
       namespace=JavaEEMetaDataConstants.JBOSS_NS,
       elementFormDefault=XmlNsForm.QUALIFIED,
       normalizeSpace=true)
- at XmlType(name="connection-factories")
+ at XmlType(name="connection-factories", namespace="")
 public class ConnectionFactoryDeploymentGroup implements Serializable
 {
    /** The serialVersionUID */

Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/JcaDs50UnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/JcaDs50UnitTestCase.java	2009-02-10 04:25:29 UTC (rev 84027)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/JcaDs50UnitTestCase.java	2009-02-10 04:27:17 UTC (rev 84028)
@@ -21,6 +21,7 @@
 */
 package org.jboss.test.metadata.rar;
 
+import org.jboss.metadata.rar.jboss.mcf.ConnectionFactoryDeploymentGroup;
 import org.jboss.metadata.rar.jboss.mcf.DataSourceDeploymentMetaData;
 import org.jboss.metadata.rar.jboss.mcf.LocalDataSourceDeploymentMetaData;
 import org.jboss.metadata.rar.jboss.mcf.ManagedConnectionFactoryDeploymentGroup;
@@ -42,9 +43,8 @@
    public static SchemaBindingResolver initResolver()
    {
       DefaultSchemaResolver resolver = new DefaultSchemaResolver();
-      //resolver.addClassBinding("", ManagedConnectionFactoryDeploymentGroup.class);
-      //resolver.addClassBindingForLocation("jboss-ds_5_0.dtd", ManagedConnectionFactoryDeploymentGroup.class);
       resolver.addClassBindingForLocation("jboss-ds_5_0.xsd", ManagedConnectionFactoryDeploymentGroup.class);
+      //resolver.addClassBindingForLocation("jboss-ds_5_0.xsd", ConnectionFactoryDeploymentGroup.class);
       return resolver;
    }
 
@@ -56,6 +56,11 @@
    {
       return unmarshal(ManagedConnectionFactoryDeploymentGroup.class);
    }
+   
+   protected ConnectionFactoryDeploymentGroup unmarshalCFD() throws Exception
+   {
+      return unmarshal(ConnectionFactoryDeploymentGroup.class);
+   }
 
    /**
     * test a minimal local-tx-datasource
@@ -96,7 +101,19 @@
       assertNotNull(ld.getDbmsMetaData());
       assertEquals(ld.getDbmsMetaData().getTypeMapping(), "Hypersonic SQL");
    }
+   
+   /**
+    * test a basic connection-factories, for example jms-ds.xml
+    */   
+   /*
+   public void testCfBasic() throws Exception
+   {
 
+      ConnectionFactoryDeploymentGroup ds = unmarshalCFD();
+      ManagedConnectionFactoryDeploymentMetaData mcfd = (ManagedConnectionFactoryDeploymentMetaData)ds.getDeployments().get(0);
+      assertNotNull(mcfd);
+   }
+   */
    /**
     * test a everything of no-tx-datasource
     */ 

Added: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/JcaDs50_testCfBasic.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/JcaDs50_testCfBasic.xml	                        (rev 0)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/JcaDs50_testCfBasic.xml	2009-02-10 04:27:17 UTC (rev 84028)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- $Id$ -->
+
+<connection-factories xmlns="http://www.jboss.com/xml/ns/javaee"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee
+                            http://www.jboss.org/j2ee/schema/jboss-ds_5_0.xsd">
+
+  <!-- JMS XA Resource adapter, use this to get transacted JMS in beans -->
+  <tx-connection-factory>
+    <jndi-name>JmsXA</jndi-name>
+    <xa-transaction/>
+    <rar-name>jms-ra.rar</rar-name>
+    <connection-definition>org.jboss.resource.adapter.jms.JmsConnectionFactory</connection-definition>
+    <config-property name="SessionDefaultType" type="java.lang.String">javax.jms.Topic</config-property>
+    <config-property name="JmsProviderAdapterJNDI" type="java.lang.String">java:/DefaultJMSProvider</config-property>
+    <security-domain-and-application>JmsXARealm</security-domain-and-application>
+    <max-pool-size>20</max-pool-size>
+  </tx-connection-factory>
+
+</connection-factories>


Property changes on: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/JcaDs50_testCfBasic.xml
___________________________________________________________________
Name: svn:keywords
   + Id Reversion Date