[jboss-cvs] JBossAS SVN: r61566 - trunk/connector/src/main/org/jboss/resource/metadata/mcf.

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

Author: weston.price at jboss.com
Date: 2007-03-22 01:32:24 -0400 (Thu, 22 Mar 2007)
New Revision: 61566

Modified:
   trunk/connector/src/main/org/jboss/resource/metadata/mcf/LocalDataSourceDeploymentMetaData.java
   trunk/connector/src/main/org/jboss/resource/metadata/mcf/ManagedConnectionFactoryDeploymentMetaData.java
   trunk/connector/src/main/org/jboss/resource/metadata/mcf/ServiceMetaDataAdapter.java
   trunk/connector/src/main/org/jboss/resource/metadata/mcf/TxConnectionFactoryDeploymentMetaData.java
   trunk/connector/src/main/org/jboss/resource/metadata/mcf/XADataSourceDeploymentMetaData.java
Log:
[JBAS-1425] Programmatic deployment improvements and cleanup.

Modified: trunk/connector/src/main/org/jboss/resource/metadata/mcf/LocalDataSourceDeploymentMetaData.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/metadata/mcf/LocalDataSourceDeploymentMetaData.java	2007-03-22 05:31:56 UTC (rev 61565)
+++ trunk/connector/src/main/org/jboss/resource/metadata/mcf/LocalDataSourceDeploymentMetaData.java	2007-03-22 05:32:24 UTC (rev 61566)
@@ -53,6 +53,7 @@
    {
       setTrackConnectionByTransaction(true);
       setLocalTransactions(true);
+      setTransactionSupportMetaData(ManagedConnectionFactoryTransactionSupportMetaData.LOCAL);
    }
       
    public String getConnectionUrl()

Modified: trunk/connector/src/main/org/jboss/resource/metadata/mcf/ManagedConnectionFactoryDeploymentMetaData.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/metadata/mcf/ManagedConnectionFactoryDeploymentMetaData.java	2007-03-22 05:31:56 UTC (rev 61565)
+++ trunk/connector/src/main/org/jboss/resource/metadata/mcf/ManagedConnectionFactoryDeploymentMetaData.java	2007-03-22 05:32:24 UTC (rev 61566)
@@ -315,26 +315,6 @@
    }
 
    /**
-    * Get the depends.
-    * 
-    * @return the depends.
-    */
-   public List<String> getDepends()
-   {
-      return dependsNames;
-   }
-
-   /**
-    * Set the depends.
-    * 
-    * @param depends The depends to set.
-    */
-   public void setDepends(List<String> depends)
-   {
-      this.dependsNames = depends;
-   }
-
-   /**
     * Get the dependsNames.
     * 
     * @return the dependsNames.

Modified: trunk/connector/src/main/org/jboss/resource/metadata/mcf/ServiceMetaDataAdapter.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/metadata/mcf/ServiceMetaDataAdapter.java	2007-03-22 05:31:56 UTC (rev 61565)
+++ trunk/connector/src/main/org/jboss/resource/metadata/mcf/ServiceMetaDataAdapter.java	2007-03-22 05:32:24 UTC (rev 61566)
@@ -35,19 +35,27 @@
  * @author <a href="weston.price at jboss.org">Weston Price</a>
  * @version $Revision: 1.1 $
  */
-public class ServiceMetaDataAdapter extends XmlAdapter<Object, List<ServiceMetaData>>
+public class ServiceMetaDataAdapter extends XmlAdapter<Object, ServiceMetaData>
 {
    
    @Override
-   public List<ServiceMetaData> unmarshal(Object e) throws Exception
+   public ServiceMetaData unmarshal(Object e) throws Exception
    {
-      ServiceMetaDataParser parser = new ServiceMetaDataParser((Element)e);
+      ServiceMetaDataParser parser = new ServiceMetaDataParser((Element)e);      
       List<ServiceMetaData> services = parser.parse();      
-      return services;
+      
+      ServiceMetaData md = null;
+      
+      if(services != null)
+      {
+         md = services.get(0);
+         
+      }
+      return md;
    }
 
    @Override
-   public Element marshal(List<ServiceMetaData> arg0) throws Exception
+   public Element marshal(ServiceMetaData arg0) throws Exception
    {
       // TODO implement marshalling
       return null;

Modified: trunk/connector/src/main/org/jboss/resource/metadata/mcf/TxConnectionFactoryDeploymentMetaData.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/metadata/mcf/TxConnectionFactoryDeploymentMetaData.java	2007-03-22 05:31:56 UTC (rev 61565)
+++ trunk/connector/src/main/org/jboss/resource/metadata/mcf/TxConnectionFactoryDeploymentMetaData.java	2007-03-22 05:32:24 UTC (rev 61566)
@@ -52,5 +52,10 @@
       this.xaResourceTimeout = xaResourceTimeout;
    }
    
-   
+   @Override
+   public ManagedConnectionFactoryTransactionSupportMetaData getTransactionSupportMetaData()
+   {
+      return isLocalTransactions() ? ManagedConnectionFactoryTransactionSupportMetaData.LOCAL : ManagedConnectionFactoryTransactionSupportMetaData.XA;
+   }
+
 }

Modified: trunk/connector/src/main/org/jboss/resource/metadata/mcf/XADataSourceDeploymentMetaData.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/metadata/mcf/XADataSourceDeploymentMetaData.java	2007-03-22 05:31:56 UTC (rev 61565)
+++ trunk/connector/src/main/org/jboss/resource/metadata/mcf/XADataSourceDeploymentMetaData.java	2007-03-22 05:32:24 UTC (rev 61566)
@@ -33,7 +33,7 @@
    public XADataSourceDeploymentMetaData()
    {
       setRarName(RAR_NAME);
-      
+      setTransactionSupportMetaData(ManagedConnectionFactoryTransactionSupportMetaData.XA);
    }
 
    public String getXaDataSourceClass()