diff --git a/source/java/org/alfresco/repo/transaction/TransactionListenerAdapter.java b/source/java/org/alfresco/repo/transaction/TransactionListenerAdapter.java
index a625ff5d78..96d59f57cc 100644
--- a/source/java/org/alfresco/repo/transaction/TransactionListenerAdapter.java
+++ b/source/java/org/alfresco/repo/transaction/TransactionListenerAdapter.java
@@ -21,8 +21,10 @@ package org.alfresco.repo.transaction;
 /**
  * NO-OP listener.
  * 
+ * @deprecated              Since 5.0, use {@link org.alfresco.util.transaction.TransactionListenerAdapter}
  * @author Derek Hulley
  */
+@Deprecated
 public abstract class TransactionListenerAdapter implements TransactionListener
 {
     /**
diff --git a/source/test-java/org/alfresco/repo/transaction/AlfrescoTransactionSupportTest.java b/source/test-java/org/alfresco/repo/transaction/AlfrescoTransactionSupportTest.java
index 81c5165ba0..ad3f13c0c4 100644
--- a/source/test-java/org/alfresco/repo/transaction/AlfrescoTransactionSupportTest.java
+++ b/source/test-java/org/alfresco/repo/transaction/AlfrescoTransactionSupportTest.java
@@ -127,22 +127,70 @@ public class AlfrescoTransactionSupportTest extends TestCase
         // anonymous inner class to test it
         TransactionListener listener = new TransactionListener()
         {
+            @Override
             public void flush()
             {
                 strings.add("flush");
             }
+            @Override
             public void beforeCommit(boolean readOnly)
             {
                 strings.add("beforeCommit");
             }
+            @Override
             public void beforeCompletion()
             {
                 strings.add("beforeCompletion");
             }
+            @Override
             public void afterCommit()
             {
                 strings.add("afterCommit");
             }
+            @Override
+            public void afterRollback()
+            {
+                strings.add("afterRollback");
+            }
+        };
+        
+        // begin a transaction
+        UserTransaction txn = transactionService.getUserTransaction();
+        txn.begin();
+        
+        // register it
+        AlfrescoTransactionSupport.bindListener(listener);
+
+        // test commit
+        txn.commit();
+        assertTrue("beforeCommit not called on listener", strings.contains("beforeCommit"));
+        assertTrue("beforeCompletion not called on listener", strings.contains("beforeCompletion"));
+        assertTrue("afterCommit not called on listener", strings.contains("afterCommit"));
+    }
+    
+    public void testListenerNew() throws Exception
+    {
+        final List<String> strings = new ArrayList<String>(1);
+
+        // anonymous inner class to test it
+        org.alfresco.util.transaction.TransactionListener listener = new org.alfresco.util.transaction.TransactionListener()
+        {
+            @Override
+            public void beforeCommit(boolean readOnly)
+            {
+                strings.add("beforeCommit");
+            }
+            @Override
+            public void beforeCompletion()
+            {
+                strings.add("beforeCompletion");
+            }
+            @Override
+            public void afterCommit()
+            {
+                strings.add("afterCommit");
+            }
+            @Override
             public void afterRollback()
             {
                 strings.add("afterRollback");