[jboss-cvs] JBossAS SVN: r61529 - 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-21 04:38:08 -0400 (Wed, 21 Mar 2007)
New Revision: 61529

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/TxConnectionFactoryDeploymentMetaData.java
Log:
[JBAS-1425] Programmatic deployment.

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-21 08:37:44 UTC (rev 61528)
+++ trunk/connector/src/main/org/jboss/resource/metadata/mcf/LocalDataSourceDeploymentMetaData.java	2007-03-21 08:38:08 UTC (rev 61529)
@@ -51,6 +51,8 @@
             
    public LocalDataSourceDeploymentMetaData()
    {
+      setTrackConnectionByTransaction(true);
+      setLocalTransactions(true);
    }
       
    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-21 08:37:44 UTC (rev 61528)
+++ trunk/connector/src/main/org/jboss/resource/metadata/mcf/ManagedConnectionFactoryDeploymentMetaData.java	2007-03-21 08:38:08 UTC (rev 61529)
@@ -90,6 +90,13 @@
    
    @XmlElement(name="validate-on-match")
    private boolean validateOnMatch = true;
+
+   @XmlElement(name="isSameRM-override-value")
+   private Boolean isSameRMOverrideValue;
+   
+   @XmlJavaTypeAdapter(ManagedConnectionEmptyContentAdapter.class)
+   @XmlElement(name="track-connection-by-tx")
+   private boolean trackConnectionByTransaction;
       
    /** The transactionSupportMetaData */
    private ManagedConnectionFactoryTransactionSupportMetaData transactionSupportMetaData = ManagedConnectionFactoryTransactionSupportMetaData.NONE;
@@ -112,6 +119,11 @@
    @XmlJavaTypeAdapter(MetaDataTypeMappingAdapter.class)
    private String typeMapping;
 
+   /** The localTransactions */
+   @XmlJavaTypeAdapter(ManagedConnectionEmptyContentAdapter.class)
+   @XmlElement(name="local-transaction")
+   private boolean localTransactions;
+
    
    /**
     * Get the connectionDefinition.
@@ -443,4 +455,36 @@
       
    }
 
+   public Boolean getIsSameRMOverrideValue()
+   {
+      return isSameRMOverrideValue;
+   }
+
+   public void setIsSameRMOverrideValue(Boolean isSameRMOverrideValue)
+   {
+      this.isSameRMOverrideValue = isSameRMOverrideValue;
+   }
+
+   public boolean isTrackConnectionByTransaction()
+   {
+      return trackConnectionByTransaction;
+   }
+
+   public void setTrackConnectionByTransaction(boolean trackConnectionByTransaction)
+   {
+      this.trackConnectionByTransaction = trackConnectionByTransaction;
+   }
+
+   public boolean isLocalTransactions()
+   {
+      return localTransactions;
+   }
+
+   public void setLocalTransactions(boolean localTransactions)
+   {
+      this.localTransactions = localTransactions;
+   }
+   
+   
+   
 }

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-21 08:37:44 UTC (rev 61528)
+++ trunk/connector/src/main/org/jboss/resource/metadata/mcf/TxConnectionFactoryDeploymentMetaData.java	2007-03-21 08:38:08 UTC (rev 61529)
@@ -23,6 +23,7 @@
 
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 
 /**
@@ -37,52 +38,19 @@
 
    /** The serialVersionUID */
    private static final long serialVersionUID = -8491548124974331799L;
-   
-   /** The trackConnectionByTransaction */
-   @XmlElement(name="track-connection-by-tx")
-   private boolean trackConnectionByTransaction;
-   
-   /** The localTransactions */
-   private boolean localTransactions;
-   
-   /**
-    * Get the trackConnectionByTransaction.
-    * 
-    * @return the trackConnectionByTransaction.
-    */
-   public boolean isTrackConnectionByTransaction()
-   {
-      return trackConnectionByTransaction;
-   }
+      
+   @XmlElement(name="xa-resource-timeout")
+   private int xaResourceTimeout;
 
-   /**
-    * Set the trackConnectionByTransaction.
-    * 
-    * @param trackConnectionByTransaction The trackConnectionByTransaction to set.
-    */
-   public void setTrackConnectionByTransaction(boolean trackConnectionByTransaction)
+   public int getXaResourceTimeout()
    {
-      this.trackConnectionByTransaction = trackConnectionByTransaction;
+      return xaResourceTimeout;
    }
 
-   /**
-    * Get the localTransactions.
-    * 
-    * @return the localTransactions.
-    */
-   public boolean isLocalTransactions()
+   public void setXaResourceTimeout(int xaResourceTimeout)
    {
-      return localTransactions;
+      this.xaResourceTimeout = xaResourceTimeout;
    }
-
-   /**
-    * Set the localTransactions.
-    * 
-    * @param localTransactions The localTransactions to set.
-    */
-   public void setLocalTransactions(boolean localTransactions)
-   {
-      this.localTransactions = localTransactions;
-   }
-
+   
+   
 }