I am commiting the patch supplied by Arnaud Simon. This patch contains support for dtx.

Currently there is one test case failing. I will try to fix it, if not Arnuad will provide a patch soon


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@534541 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 70 insertions, 36 deletions

diff --git a/qpid/java/broker/etc/config.xml b/qpid/java/broker/etc/config.xml
index b5b81bbeb0..b4b946ec24 100644
--- a/qpid/java/broker/etc/config.xml
+++ b/qpid/java/broker/etc/config.xml
@@ -90,14 +90,18 @@
     <virtualhosts>
         <virtualhost>
             <name>localhost</name>
-            <localhost>
-                <store>
-                    <!-- <class>org.apache.qpid.server.store.berkeleydb.BDBMessageStore</class>
-                    <environment-path>${work}/localhost-store</environment-path> -->
-
-                    <class>org.apache.qpid.server.store.MemoryMessageStore</class>
-                </store>
-
+            <localhost>                
+							  <store>                  
+                    <environment-path>${work}/localhost-store</environment-path> 
+                   <!-- <class>org.apache.qpid.server.store.berkeleydb.messageStore.MessageStoreImpl</class> -->
+                    <class>org.apache.qpid.server.messageStore.MemoryMessageStore</class>
+                </store>             
+                <txn>
+                    <environment-tx-timeout>60</environment-tx-timeout>
+                	  <!-- <class>org.apache.qpid.server.store.berkeleydb.txn.TransactionManagerImpl</class> -->
+                	  <class>org.apache.qpid.server.messageStore.MemoryTransactionManager</class>
+                </txn>
+                
                 <security>
                     <!-- Need protocol changes to allow this-->
                     <authentication>
@@ -125,9 +129,12 @@
         <virtualhost>
             <name>development</name>
             <development>
-                <store>
-                    <class>org.apache.qpid.server.store.MemoryMessageStore</class>
-                </store>
+                <store>                  
+                    <class>org.apache.qpid.server.messageStore.MemoryMessageStore</class>
+                </store>             
+                <txn>
+                  	  <class>org.apache.qpid.server.messageStore.MemoryTransactionManager</class>
+                </txn>
                 <security>
                     <name>passwordfile-notusedyet</name>
                     <mechanism>PLAIN</mechanism>
@@ -139,9 +146,12 @@
         <virtualhost>
             <name>test</name>
             <test>
-                <store>
-                    <class>org.apache.qpid.server.store.MemoryMessageStore</class>
-                </store>
+                <store>                  
+                    <class>org.apache.qpid.server.messageStore.MemoryMessageStore</class>
+                </store>             
+                <txn>
+                  	  <class>org.apache.qpid.server.messageStore.MemoryTransactionManager</class>
+                </txn>
                 <security>
                     <name>passwordfile-notusedyet</name>
                     <mechanism>PLAIN</mechanism>
diff --git a/qpid/java/broker/etc/persistent_config.xml b/qpid/java/broker/etc/persistent_config.xml
index 178a73515c..90d014b6fb 100644
--- a/qpid/java/broker/etc/persistent_config.xml
+++ b/qpid/java/broker/etc/persistent_config.xml
@@ -73,12 +73,15 @@
     <virtualhosts>
         <virtualhost>
             <name>localhost</name>
-            <localhost>
-                <store>
-                    <class>org.apache.qpid.server.store.berkeleydb.BDBMessageStore</class>
+            <localhost>               
+								<store>                  
                     <environment-path>${work}/bdbstore/localhost-store</environment-path>
-                </store>
-
+                   <class>org.apache.qpid.server.store.berkeleydb.messageStore.MessageStoreImpl</class> 
+                </store>             
+                <txn>
+                    <environment-tx-timeout>60</environment-tx-timeout>
+                	 <class>org.apache.qpid.server.store.berkeleydb.txn.TransactionManagerImpl</class> 
+                </txn>
                 <security>
                     <access>
                         <class>org.apache.qpid.server.security.access.PrincipalDatabaseAccessManager</class>
@@ -100,20 +103,28 @@
         <virtualhost>
             <name>development</name>
             <development>
-                <store>
-                    <class>org.apache.qpid.server.store.berkeleydb.BDBMessageStore</class>
-                    <environment-path>${work}/bdbstore/development-store</environment-path>
-                </store>
+            <store>                  
+                   <environment-path>${work}/bdbstore/development-store</environment-path>
+                   <class>org.apache.qpid.server.store.berkeleydb.messageStore.MessageStoreImpl</class> 
+           </store>             
+                <txn>
+                    <environment-tx-timeout>60</environment-tx-timeout>
+                	 <class>org.apache.qpid.server.store.berkeleydb.txn.TransactionManagerImpl</class> 
+                </txn>              
             </development>
         </virtualhost>
 
         <virtualhost>
             <name>test</name>
             <test>
-                <store>
-                    <class>org.apache.qpid.server.store.berkeleydb.BDBMessageStore</class>
-                    <environment-path>${work}/bdbstore/test-store</environment-path>
-                </store>
+              <store>                  
+                   <environment-path>${work}/bdbstore/test-store</environment-path>
+                   <class>org.apache.qpid.server.store.berkeleydb.messageStore.MessageStoreImpl</class> 
+           </store>             
+                <txn>
+                    <environment-tx-timeout>60</environment-tx-timeout>
+                	 <class>org.apache.qpid.server.store.berkeleydb.txn.TransactionManagerImpl</class> 
+                </txn>     
             </test>
         </virtualhost>
 
diff --git a/qpid/java/broker/etc/transient_config.xml b/qpid/java/broker/etc/transient_config.xml
index 164d66cd1b..ddd5203ccb 100644
--- a/qpid/java/broker/etc/transient_config.xml
+++ b/qpid/java/broker/etc/transient_config.xml
@@ -73,9 +73,14 @@
         <virtualhost>
             <name>localhost</name>
             <localhost>
-                <store>
-                    <class>org.apache.qpid.server.store.MemoryMessageStore</class>
-                </store>
+                <store>                  
+                   <class>org.apache.qpid.server.store.berkeleydb.messageStore.MessageStoreImpl</class> 
+                </store>             
+                <txn>
+                    <environment-tx-timeout>60</environment-tx-timeout>
+                	 <class>org.apache.qpid.server.store.berkeleydb.txn.TransactionManagerImpl</class> 
+                </txn>
+            
 
                 <security>
                     <access>
@@ -98,18 +103,26 @@
         <virtualhost>
             <name>development</name>
             <development>
-                <store>
-                    <class>org.apache.qpid.server.store.MemoryMessageStore</class>
-                </store>
+                  <store>                  
+                   <class>org.apache.qpid.server.store.berkeleydb.messageStore.MessageStoreImpl</class> 
+                </store>             
+                <txn>
+                    <environment-tx-timeout>60</environment-tx-timeout>
+                	 <class>org.apache.qpid.server.store.berkeleydb.txn.TransactionManagerImpl</class> 
+                </txn>
             </development>
         </virtualhost>
 
         <virtualhost>
             <name>test</name>
             <test>
-                <store>
-                    <class>org.apache.qpid.server.store.MemoryMessageStore</class>
-                </store>
+                 <store>                  
+                   <class>org.apache.qpid.server.store.berkeleydb.messageStore.MessageStoreImpl</class> 
+                </store>             
+                <txn>
+                    <environment-tx-timeout>60</environment-tx-timeout>
+                	 <class>org.apache.qpid.server.store.berkeleydb.txn.TransactionManagerImpl</class> 
+                </txn>
             </test>
         </virtualhost>