Merged from trunk up to r799240

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-broker-0-10@821747 13f79535-47bb-0310-9956-ffa450edef68

43 files changed, 297 insertions, 183 deletions

diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java
index 7ce51c8918..0644bd88a8 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java
@@ -52,6 +52,8 @@ import static org.apache.qpid.transport.Option.*;
 import javax.jms.*;
 import javax.jms.IllegalStateException;
 
+import java.lang.ref.WeakReference;
+
 import java.util.Date;
 import java.util.HashMap;
 import java.util.UUID;
@@ -72,6 +74,34 @@ public class AMQSession_0_10 extends AMQSession<BasicMessageConsumer_0_10, Basic
     private static final Logger _logger = LoggerFactory.getLogger(AMQSession_0_10.class);
 
     private static Timer timer = new Timer("ack-flusher", true);
+    private static class Flusher extends TimerTask
+    {
+
+        private WeakReference<AMQSession_0_10> session;
+        public Flusher(AMQSession_0_10 session)
+        {
+            this.session = new WeakReference<AMQSession_0_10>(session);
+        }
+
+        public void run() {
+            AMQSession_0_10 ssn = session.get();
+            if (ssn == null)
+            {
+                cancel();
+            }
+            else
+            {
+                try
+                {
+                    ssn.flushAcknowledgments(true);
+                }
+                catch (Throwable t)
+                {
+                    _logger.error("error flushing acks", t);
+                }
+            }
+        }
+    }
 
 
     /**
@@ -129,20 +159,7 @@ public class AMQSession_0_10 extends AMQSession<BasicMessageConsumer_0_10, Basic
 
         if (maxAckDelay > 0)
         {
-            flushTask = new TimerTask()
-            {
-                public void run()
-                {
-                    try
-                    {
-                        flushAcknowledgments(true);
-                    }
-                    catch (Throwable t)
-                    {
-                        _logger.error("error flushing acks", t);
-                    }
-                }
-            };
+            flushTask = new Flusher(this);
             timer.schedule(flushTask, new Date(), maxAckDelay);
         }
     }
@@ -319,6 +336,7 @@ public class AMQSession_0_10 extends AMQSession<BasicMessageConsumer_0_10, Basic
         if (flushTask != null)
         {
             flushTask.cancel();
+            flushTask = null;
         }
         flushAcknowledgments();
         getQpidSession().sync();
diff --git a/qpid/java/common/src/main/java/org/apache/qpid/transport/Session.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/Session.java
index 68d9a13cef..1c732d31e6 100644
--- a/qpid/java/common/src/main/java/org/apache/qpid/transport/Session.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/Session.java
@@ -41,7 +41,6 @@ import static org.apache.qpid.transport.Session.State.*;
 import static org.apache.qpid.transport.util.Functions.*;
 import static org.apache.qpid.util.Serial.*;
 import static org.apache.qpid.util.Strings.*;
-import java.util.UUID;
 
 /**
  * Session
@@ -232,7 +231,6 @@ public class Session extends SessionInvoker
     void attach()
     {
         initReceiver();
-        name = new Binary(toUTF8(UUID.randomUUID().toString()));
         sessionAttach(name.getBytes());
         // XXX: when the broker and client support full session
         // recovery we should use expiry as the requested timeout
diff --git a/qpid/java/doc/broker-0.5-network.dia b/qpid/java/doc/broker-0.5-network.dia
index 425ea2249e..f30decde4b 100644
--- a/qpid/java/doc/broker-0.5-network.dia
+++ b/qpid/java/doc/broker-0.5-network.dia
diff --git a/qpid/java/doc/broker-0.N-network-phase-1.dia b/qpid/java/doc/broker-0.N-network-phase-1.dia
new file mode 100644
index 0000000000..4ac8213b23
--- /dev/null
+++ b/qpid/java/doc/broker-0.N-network-phase-1.dia
diff --git a/qpid/java/doc/broker-0.N-state.dia b/qpid/java/doc/broker-0.N-state.dia
new file mode 100644
index 0000000000..5ef83a871b
--- /dev/null
+++ b/qpid/java/doc/broker-0.N-state.dia
diff --git a/qpid/java/doc/client-0.5-network-processing.dia b/qpid/java/doc/client-0.5-network-processing.dia
index 9bb009d0ab..acacc4f462 100644
--- a/qpid/java/doc/client-0.5-network-processing.dia
+++ b/qpid/java/doc/client-0.5-network-processing.dia
diff --git a/qpid/java/doc/client-0.N-network-processing.dia b/qpid/java/doc/client-0.N-network-processing.dia
new file mode 100644
index 0000000000..ed2c340969
--- /dev/null
+++ b/qpid/java/doc/client-0.N-network-processing.dia
diff --git a/qpid/java/doc/common-0.N-network.dia b/qpid/java/doc/common-0.N-network.dia
new file mode 100644
index 0000000000..826ac32e5b
--- /dev/null
+++ b/qpid/java/doc/common-0.N-network.dia
diff --git a/qpid/java/doc/network-driver-protocol-engine-sequence.dia b/qpid/java/doc/network-driver-protocol-engine-sequence.dia
new file mode 100644
index 0000000000..16cdc7e1dc
--- /dev/null
+++ b/qpid/java/doc/network-driver-protocol-engine-sequence.dia
diff --git a/qpid/java/management/eclipse-plugin/icons/back.gif b/qpid/java/management/eclipse-plugin/icons/back.gif
new file mode 100644
index 0000000000..d3a10077a5
--- /dev/null
+++ b/qpid/java/management/eclipse-plugin/icons/back.gif
diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/BackAction.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/BackAction.java
new file mode 100644
index 0000000000..2998c5db53
--- /dev/null
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/BackAction.java
@@ -0,0 +1,59 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.qpid.management.ui.actions;
+
+import org.apache.qpid.management.ui.jmx.MBeanUtility;
+import org.apache.qpid.management.ui.views.MBeanView;
+import org.eclipse.jface.action.Action;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.actions.ActionFactory.IWorkbenchAction;
+
+
+public class BackAction extends Action implements IWorkbenchAction
+{
+    private static final String ID = "org.apache.qpid.management.ui.actions.back";
+
+    public BackAction()
+    {
+        setText("Back");
+        setImageDescriptor(org.apache.qpid.management.ui.Activator.getImageDescriptor("/icons/back.gif"));
+        setId(ID);
+    }
+
+    public void run()
+    {
+        MBeanView mbeanview = (MBeanView)PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().findView(MBeanView.ID);
+        try
+        {
+            mbeanview.back();
+        }
+        catch (Exception ex)
+        {
+            MBeanUtility.handleException(ex);
+        }
+
+    }
+
+    public void dispose()
+    {
+
+    }
+}
diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/MBeanView.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/MBeanView.java
index 35d1b4a34f..ffb601fdca 100644
--- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/MBeanView.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/MBeanView.java
@@ -20,6 +20,8 @@
  */
 package org.apache.qpid.management.ui.views;
 
+import java.util.LinkedList;
+
 import javax.management.MBeanServerConnection;
 
 import static org.apache.qpid.management.ui.Constants.*;
@@ -29,6 +31,7 @@ import org.apache.qpid.management.ui.ApplicationRegistry;
 import org.apache.qpid.management.ui.ManagedBean;
 import org.apache.qpid.management.ui.ManagedServer;
 import org.apache.qpid.management.ui.ServerRegistry;
+import org.apache.qpid.management.ui.actions.BackAction;
 import org.apache.qpid.management.ui.jmx.JMXManagedObject;
 import org.apache.qpid.management.ui.jmx.JMXServerRegistry;
 import org.apache.qpid.management.ui.jmx.MBeanUtility;
@@ -71,6 +74,10 @@ public class MBeanView extends ViewPart
     private TabFolder _typeTabFolder = null;
     
     private TabFolder _notificationTabFolder = null;
+
+    private LinkedList<Object> _backHistory;
+    private BackAction _backAction;
+    
     /*
      * Listener for the selection events in the navigation view
      */ 
@@ -90,6 +97,10 @@ public class MBeanView extends ViewPart
             _mbean = null;
             clearView();
             
+            //clear the back history, it is only for use when opening subsequent mbeans not in the nav tree
+            _backHistory.clear();
+            _backAction.setEnabled(false);
+            
             // If a selected node(mbean) gets unregistered from mbean server, mbeanview should 
             // make the tabfolber for that mbean invisible
             if (_selectedNode == null)
@@ -111,22 +122,48 @@ public class MBeanView extends ViewPart
     
     public void openMBean(ManagedBean mbean)
     {
+        openMBean(mbean, false);
+    }
+    
+    private void openMBean(ManagedBean mbean, boolean undoing)
+    {
         if(mbean == null)
         {
             return;
         }
         
+        //if an mbean is about to be opened (but not returning to using back) from the mbean view,
+        //then record the current viewed area/object as a means of back history
+        if(!undoing)
+        {
+            if(_backHistory.isEmpty())
+            {
+                //ensure the button is enabled if this is to be the first history item
+                _backAction.setEnabled(true);
+            }
+            
+            if(_mbean == null)
+            {
+                //queue etc selection area is open, record the tree object
+                _backHistory.addLast(_selectedNode);
+            }
+            else
+            {
+                _backHistory.addLast(_mbean); 
+            }
+        }
+        
         _mbean = mbean;
         
         try
         {
             clearView();
+            
+            setFormTitle();
             showMBean(mbean);
             
             _form.layout(true);
             _form.getBody().layout(true, true);
-            
-            setFormTitle();
         }
         catch(Exception ex)
         {
@@ -311,6 +348,11 @@ public class MBeanView extends ViewPart
         createNotificationsTabFolder();
         
         ViewUtility.setMBeanView(this);
+        
+        _backAction = new BackAction();
+        getViewSite().getActionBars().getToolBarManager().add(_backAction);
+        _backAction.setEnabled(false);
+        _backHistory = new LinkedList<Object>();
     }
     
     private void refreshTab(TabItem tab)
@@ -433,10 +475,12 @@ public class MBeanView extends ViewPart
     
     public void mbeanUnregistered(ManagedBean mbean)
     {
-        //if the mbean is actually open, clear the view
+        //if the mbean is actually open, clear the view and empty the Back history
         if(mbean == _mbean)
         {
             clearView();
+            _backHistory.clear();
+            _backAction.setEnabled(false);
             ViewUtility.popupInfoMessage("MBean Unregistered", 
                     "The open MBean was unregistered from the server.");
         }
@@ -502,4 +546,45 @@ public class MBeanView extends ViewPart
         IActionBars bars = getViewSite().getActionBars();
         bars.getStatusLineManager().setMessage(message);
     }
+
+    public void back() throws Exception
+    {
+        if(_backHistory.isEmpty())
+        {
+            return;
+        }
+        
+        Object previous = _backHistory.removeLast();
+        if(_backHistory.isEmpty())
+        {
+            //if this is the last history item, disable the action button
+            _backAction.setEnabled(false);
+        }
+        
+        if(previous instanceof ManagedBean)
+        {
+            openMBean((ManagedBean)previous, true);
+        }
+        else if (previous instanceof TreeObject)
+        {
+            _mbean = null;
+            clearView();
+            setFormTitle();
+            
+            TreeObject node = (TreeObject) previous;
+            String mbeanType = node.getType();
+            
+            if (NODE_TYPE_TYPEINSTANCE.equals(mbeanType))
+            {
+                generateTypeTabFolder();
+            }
+            else if (NODE_TYPE_MBEANTYPE.equals(mbeanType))
+            {
+                showTypeTabFolder(node.getName());
+            }
+        }
+        
+        _form.layout(true);
+        _form.getBody().layout(true, true);
+    }
 }
diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ViewUtility.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ViewUtility.java
index ddd5b0f451..eb34f6c51c 100644
--- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ViewUtility.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ViewUtility.java
@@ -1003,4 +1003,22 @@ public class ViewUtility
         }
     }
 
+    public static void centerChildInParentShell(Shell parent, Shell child)
+    {
+        //get current parent shell size and location
+        int parentLocX = parent.getBounds().x;
+        int parentLocY = parent.getBounds().y;
+        int parentWidth = parent.getBounds().width;
+        int parentHeight = parent.getBounds().height;
+
+        //get current child size
+        int childWidth = child.getSize().x;
+        int childHeight = child.getSize().y;
+
+        //centre the child within/over the parent
+        child.setBounds((parentWidth - childWidth)/2  + parentLocX, 
+                        (parentHeight - childHeight)/2 + parentLocY, 
+                        childWidth, childHeight);
+    }
+
 }
diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/exchange/ExchangeOperationsTabControl.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/exchange/ExchangeOperationsTabControl.java
index dcdd199a7d..35b3e8150c 100644
--- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/exchange/ExchangeOperationsTabControl.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/exchange/ExchangeOperationsTabControl.java
@@ -24,6 +24,7 @@ import static org.apache.qpid.management.ui.Constants.EXCHANGE_TYPE;
 import static org.apache.qpid.management.ui.Constants.DEFAULT_EXCHANGE_TYPE_VALUES;
 
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 
 import javax.management.MBeanServerConnection;
@@ -552,6 +553,7 @@ public class ExchangeOperationsTabControl extends TabControl
         }
         else
         {
+            Collections.sort(queueList);
             destinationCombo.setItems(queueList.toArray(new String[0]));
         }
         destinationCombo.select(0);
@@ -597,6 +599,8 @@ public class ExchangeOperationsTabControl extends TabControl
 
         shell.setDefaultButton(okButton);
         shell.pack();
+        ViewUtility.centerChildInParentShell(parent, shell);
+        
         shell.open();
     }
     
diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/exchange/HeadersExchangeOperationsTabControl.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/exchange/HeadersExchangeOperationsTabControl.java
index e7ab034094..5146bab74c 100644
--- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/exchange/HeadersExchangeOperationsTabControl.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/exchange/HeadersExchangeOperationsTabControl.java
@@ -21,6 +21,7 @@
 package org.apache.qpid.management.ui.views.exchange;
 
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 
 import javax.management.MBeanServerConnection;
@@ -527,6 +528,7 @@ public class HeadersExchangeOperationsTabControl extends TabControl
         }
         else
         {
+            Collections.sort(queueList);
             destinationCombo.setItems(queueList.toArray(new String[0]));
         }
         destinationCombo.select(0);
@@ -572,6 +574,8 @@ public class HeadersExchangeOperationsTabControl extends TabControl
 
         shell.setDefaultButton(okButton);
         shell.pack();
+        ViewUtility.centerChildInParentShell(parent, shell);
+        
         shell.open();
     }
     
diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/logging/ConfigurationFileTabControl.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/logging/ConfigurationFileTabControl.java
index 0214607a21..6af90d117c 100644
--- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/logging/ConfigurationFileTabControl.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/logging/ConfigurationFileTabControl.java
@@ -477,7 +477,10 @@ public class ConfigurationFileTabControl extends TabControl
                 }
             });
             
+            shell.setDefaultButton(okButton);
             shell.pack();
+            ViewUtility.centerChildInParentShell(parent, shell);
+            
             shell.open();
         }
     }
@@ -537,6 +540,8 @@ public class ConfigurationFileTabControl extends TabControl
 
         shell.setDefaultButton(okButton);
         shell.pack();
+        ViewUtility.centerChildInParentShell(parent, shell);
+
         shell.open();
     }
 }
diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/logging/RuntimeTabControl.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/logging/RuntimeTabControl.java
index 5013d8f734..012c22e6de 100644
--- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/logging/RuntimeTabControl.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/logging/RuntimeTabControl.java
@@ -443,6 +443,8 @@ public class RuntimeTabControl extends TabControl
 
             shell.setDefaultButton(okButton);
             shell.pack();
+            ViewUtility.centerChildInParentShell(parent, shell);
+            
             shell.open();
         }
     }
@@ -504,6 +506,8 @@ public class RuntimeTabControl extends TabControl
 
         shell.setDefaultButton(okButton);
         shell.pack();
+        ViewUtility.centerChildInParentShell(parent, shell);
+
         shell.open();
     }
 }
diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/queue/QueueOperationsTabControl.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/queue/QueueOperationsTabControl.java
index 5623c3cb51..d04884102d 100644
--- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/queue/QueueOperationsTabControl.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/queue/QueueOperationsTabControl.java
@@ -25,6 +25,7 @@ import static org.apache.qpid.management.ui.Constants.RESULT;
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 import java.util.SortedSet;
 import java.util.TreeSet;
@@ -829,6 +830,7 @@ public class QueueOperationsTabControl extends TabControl
         }
         else
         {
+            Collections.sort(queueList);
             destinationCombo.setItems(queueList.toArray(new String[0]));
         }
         destinationCombo.select(0);
@@ -880,6 +882,8 @@ public class QueueOperationsTabControl extends TabControl
 
         shell.setDefaultButton(okButton);
         shell.pack();
+        ViewUtility.centerChildInParentShell(parent, shell);
+        
         shell.open();
     }
     
@@ -949,6 +953,8 @@ public class QueueOperationsTabControl extends TabControl
 
         shell.setDefaultButton(okButton);
         shell.pack();
+        ViewUtility.centerChildInParentShell(parent, shell);
+        
         shell.open();
     }
     
diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/users/UserManagementTabControl.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/users/UserManagementTabControl.java
index 3abc83d0d8..b474827493 100644
--- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/users/UserManagementTabControl.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/users/UserManagementTabControl.java
@@ -265,7 +265,17 @@ public class UserManagementTabControl extends TabControl
                                                                         selectionIndex).getData();
                     String user = selectedLogger.get(USERNAME).toString();
                     InputDialog id = new InputDialog(setPasswordButton.getShell(),"Set Password",
-                                        "Please enter the new password for '" + user + "':",null,null);
+                                        "Please enter the new password for '" + user + "':",null,null){
+                        @Override
+                        protected Control createDialogArea(Composite parent)
+                        {
+                            Control control = super.createDialogArea(parent);
+                            //set the Text field echo char to '*' to mask the password 
+                            getText().setEchoChar('*');
+                            //return the normal result
+                            return control;
+                        }
+                    };
                     
                     int returnValue;
                     while((returnValue = id.open()) == InputDialog.OK)
@@ -686,6 +696,8 @@ public class UserManagementTabControl extends TabControl
 
         shell.setDefaultButton(okButton);
         shell.pack();
+        ViewUtility.centerChildInParentShell(parent, shell);
+        
         shell.open();
     }
     
@@ -708,7 +720,7 @@ public class UserManagementTabControl extends TabControl
         passwordComposite.setLayout(new GridLayout(2,false));
         
         _toolkit.createLabel(passwordComposite,"Password:").setBackground(shell.getBackground());
-        final Text passwordText = new Text(passwordComposite, SWT.BORDER);
+        final Text passwordText = new Text(passwordComposite, SWT.BORDER | SWT.PASSWORD);
         passwordText.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false));
         
         Group buttonGroup = new Group(shell, SWT.NONE);
@@ -786,6 +798,8 @@ public class UserManagementTabControl extends TabControl
 
         shell.setDefaultButton(okButton);
         shell.pack();
+        ViewUtility.centerChildInParentShell(parent, shell);
+        
         shell.open();
     }
     
diff --git a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/vhost/VHostTabControl.java b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/vhost/VHostTabControl.java
index dae8d8d067..fef1e9f887 100644
--- a/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/vhost/VHostTabControl.java
+++ b/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/vhost/VHostTabControl.java
@@ -578,6 +578,8 @@ public class VHostTabControl extends TabControl
 
         shell.setDefaultButton(okButton);
         shell.pack();
+        ViewUtility.centerChildInParentShell(parent, shell);
+        
         shell.open();
     }
     
@@ -704,6 +706,8 @@ public class VHostTabControl extends TabControl
 
         shell.setDefaultButton(okButton);
         shell.pack();
+        ViewUtility.centerChildInParentShell(parent, shell);
+        
         shell.open();
     }
     
@@ -827,6 +831,8 @@ public class VHostTabControl extends TabControl
 
         shell.setDefaultButton(okButton);
         shell.pack();
+        ViewUtility.centerChildInParentShell(parent, shell);
+        
         shell.open();
     }
     
diff --git a/qpid/java/module.xml b/qpid/java/module.xml
index 9bf0270bd6..f31a52f0ff 100644
--- a/qpid/java/module.xml
+++ b/qpid/java/module.xml
@@ -239,6 +239,10 @@
   </concat>
   <property file="${build.scratch}/test-${profile}.properties"/>
 
+  <map property="test.excludefiles" value="${test.excludes}">
+    <globmapper from="*" to="${test.profiles}/*"/>
+  </map>
+
 
   <condition property="dontruntest" value="dontruntest" else="runtest">
          <contains substring="${module.name}" string="${exclude.modules}" />
@@ -535,9 +539,10 @@
       <sysproperty key="broker.clean" value="${broker.clean}"/>
       <sysproperty key="broker.version" value="${broker.version}"/>
       <sysproperty key="broker.ready" value="${broker.ready}" />
-      <sysproperty key="test.excludes" value="${test.excludes}"/>
-      <sysproperty key="test.excludesfile" value="${test.excludesfile}"/>
       <sysproperty key="test.output" value="${module.results}"/>
+      <syspropertyset>
+        <propertyref prefix="test"/>
+      </syspropertyset>
       <sysproperty key="max_prefetch" value ="${max_prefetch}"/>
       <sysproperty key="example.plugin.target" value="${project.root}/build/lib/plugins"/>
       <sysproperty key="QPID_EXAMPLE_HOME" value="${project.root}/build"/>
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
index 735aa4b1de..91732bc010 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
@@ -77,11 +77,11 @@ public class QpidTestCase extends TestCase
 
     static
     {
-        if (Boolean.getBoolean("test.excludes"))
+        if (Boolean.getBoolean("test.exclude"))
         {
             _logger.info("Some tests should be excluded, building the exclude list");
-            String exclusionListURIs = System.getProperties().getProperty("test.excludesfile", "");
-            String exclusionListString = System.getProperties().getProperty("test.excludeslist", "");
+            String exclusionListURIs = System.getProperties().getProperty("test.excludefiles", "");
+            String exclusionListString = System.getProperties().getProperty("test.excludelist", "");
             List<String> exclusionList = new ArrayList<String>();
 
             for (String uri : exclusionListURIs.split("\\s+"))
diff --git a/qpid/java/test-profiles/010ExcludeList-noPrefetch b/qpid/java/test-profiles/010ExcludeList-noPrefetch
deleted file mode 100644
index dca931b55b..0000000000
--- a/qpid/java/test-profiles/010ExcludeList-noPrefetch
+++ /dev/null
@@ -1,61 +0,0 @@
-org.apache.qpid.test.unit.client.channelclose.ChannelCloseTest#*
-org.apache.qpid.client.ResetMessageListenerTest#*
-org.apache.qpid.test.unit.transacted.TransactedTest#testRollback
-// those tests need durable subscribe states to be persisted
-org.apache.qpid.test.unit.topic.DurableSubscriptionTest#testDurSubRestoredAfterNonPersistentMessageSent
-org.apache.qpid.test.unit.ct.DurableSubscriberTest#testDurSubRestoresMessageSelector
-// This test cannot be run with no-prefetch
-org.apache.qpid.test.unit.xa.TopicTest#testMultiMessagesDurSubCrash
-//These tests are for the java broker
-org.apache.qpid.server.security.acl.SimpleACLTest#*
-org.apache.qpid.server.plugins.PluginTest#*
-// This test is not finished
-org.apache.qpid.test.testcases.TTLTest#*
-// Those tests require failover support
-org.apache.qpid.test.client.QueueBrowserAutoAckTest#testFailoverAsQueueBrowserCreated
-org.apache.qpid.test.client.QueueBrowserAutoAckTest#testFailoverWithQueueBrowser
-org.apache.qpid.test.client.QueueBrowserClientAckTest#testFailoverAsQueueBrowserCreated
-org.apache.qpid.test.client.QueueBrowserClientAckTest#testFailoverWithQueueBrowser
-org.apache.qpid.test.client.QueueBrowserDupsOkTest#testFailoverAsQueueBrowserCreated
-org.apache.qpid.test.client.QueueBrowserDupsOkTest#testFailoverWithQueueBrowser
-org.apache.qpid.test.client.QueueBrowserNoAckTest#testFailoverAsQueueBrowserCreated
-org.apache.qpid.test.client.QueueBrowserNoAckTest#testFailoverWithQueueBrowser
-org.apache.qpid.test.client.QueueBrowserPreAckTest#testFailoverAsQueueBrowserCreated
-org.apache.qpid.test.client.QueueBrowserPreAckTest#testFailoverWithQueueBrowser
-org.apache.qpid.test.client.QueueBrowserTransactedTest#testFailoverAsQueueBrowserCreated
-org.apache.qpid.test.client.QueueBrowserTransactedTest#testFailoverWithQueueBrowser
-org.apache.qpid.test.testcases.FailoverTest#*
-org.apache.qpid.test.client.failover.FailoverTest#*
-// Those tests are testing 0.8 specific semantics
-org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsConsumerDisconnectedNoTxP2P
-org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsConsumerDisconnectedTxP2P
-org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsNoRouteNoTxP2P
-org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsNoRouteTxP2P
-org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsConsumerDisconnectedNoTxPubSub
-org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsConsumerDisconnectedTxPubSub
-org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsNoRouteNoTxPubSub
-org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsNoRouteTxPubSub
-org.apache.qpid.test.testcases.MandatoryMessageTest#test_QPID_508_MandatoryFailsNoRouteNoTxP2P
-org.apache.qpid.test.testcases.MandatoryMessageTest#test_QPID_508_MandatoryFailsNoRouteTxP2P
-org.apache.qpid.test.testcases.MandatoryMessageTest#test_QPID_508_MandatoryFailsNoRouteNoTxPubSub
-org.apache.qpid.test.testcases.MandatoryMessageTest#test_QPID_508_MandatoryFailsNoRouteTxPubSub
-org.apache.qpid.test.client.FlowControlTest#*
-org.apache.qpid.test.unit.client.connection.ConnectionTest#testDefaultExchanges
-org.apache.qpid.test.unit.client.connection.ConnectionTest#testUnresolvedVirtualHostFailure
-// the 0.10 c++ broker does not implement forget
-org.apache.qpid.test.unit.xa.FaultTest#testForget
-// the 0-10 c++ broker does not implement priority / this test depends on a Java broker extension for queue creation
-org.apache.qpid.server.queue.PriorityTest
-//this test checks explicitly for 0-8 flow control semantics
-org.apache.qpid.test.client.FlowControlTest
-// The default cpp.testprofile does not start the cpp broker with authentication so this test will fail.
-org.apache.qpid.test.unit.client.connection.ConnectionTest#testPasswordFailureConnection
-// c++ broker doesn't do selectors, so this will fail
-org.apache.qpid.test.unit.topic.TopicSessionTest#testNonMatchingMessagesDoNotFillQueue
-// QPID-1225 : Temporary remove this test until the problem has been addressed
-org.apache.qpid.server.security.acl.SimpleACLTest#testClientPublishInvalidQueueSuccess
-
-// InVM Broker tests
-org.apache.qpid.test.client.timeouts.SyncWaitDelayTest#*
-// QPID-1262, QPID-1119 : This test fails occasionally due to potential protocol issue.
-org.apache.qpid.test.client.timeouts.SyncWaitTimeoutDelayTest#*
diff --git a/qpid/java/test-profiles/010ExcludeList-store b/qpid/java/test-profiles/010ExcludeList-store
deleted file mode 100644
index d4bc8b7b71..0000000000
--- a/qpid/java/test-profiles/010ExcludeList-store
+++ /dev/null
@@ -1,64 +0,0 @@
-org.apache.qpid.test.unit.client.channelclose.ChannelCloseTest#*
-org.apache.qpid.client.ResetMessageListenerTest#*
-// those tests should be run with prefetch off
-org.apache.qpid.client.MessageListenerMultiConsumerTest#testRecieveC2Only
-org.apache.qpid.client.MessageListenerMultiConsumerTest#testRecieveBoth
-org.apache.qpid.test.unit.xa.TopicTest#testMultiMessagesDurSubCrash
-org.apache.qpid.test.unit.xa.TopicTest#testMigrateDurableSubscriber
-org.apache.qpid.test.unit.ack.AcknowledgeTest#*
-// those tests need durable subscribe states to be persisted
-org.apache.qpid.test.unit.topic.DurableSubscriptionTest#testDurSubRestoredAfterNonPersistentMessageSent
-org.apache.qpid.test.unit.ct.DurableSubscriberTest#testDurSubRestoresMessageSelector
-//These tests are for the java broker
-org.apache.qpid.server.security.acl.SimpleACLTest#*
-org.apache.qpid.server.plugins.PluginTest#*
-// This test is not finished
-org.apache.qpid.test.testcases.TTLTest#*
-// Those tests require failover support
-org.apache.qpid.test.client.QueueBrowserAutoAckTest#testFailoverAsQueueBrowserCreated
-org.apache.qpid.test.client.QueueBrowserAutoAckTest#testFailoverWithQueueBrowser
-org.apache.qpid.test.client.QueueBrowserClientAckTest#testFailoverAsQueueBrowserCreated
-org.apache.qpid.test.client.QueueBrowserClientAckTest#testFailoverWithQueueBrowser
-org.apache.qpid.test.client.QueueBrowserDupsOkTest#testFailoverAsQueueBrowserCreated
-org.apache.qpid.test.client.QueueBrowserDupsOkTest#testFailoverWithQueueBrowser
-org.apache.qpid.test.client.QueueBrowserNoAckTest#testFailoverAsQueueBrowserCreated
-org.apache.qpid.test.client.QueueBrowserNoAckTest#testFailoverWithQueueBrowser
-org.apache.qpid.test.client.QueueBrowserPreAckTest#testFailoverAsQueueBrowserCreated
-org.apache.qpid.test.client.QueueBrowserPreAckTest#testFailoverWithQueueBrowser
-org.apache.qpid.test.client.QueueBrowserTransactedTest#testFailoverAsQueueBrowserCreated
-org.apache.qpid.test.client.QueueBrowserTransactedTest#testFailoverWithQueueBrowser
-org.apache.qpid.test.testcases.FailoverTest#*
-org.apache.qpid.test.client.failover.FailoverTest#*
-// Those tests are testing 0.8 specific semantics
-org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsConsumerDisconnectedNoTxP2P
-org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsConsumerDisconnectedTxP2P
-org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsNoRouteNoTxP2P
-org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsNoRouteTxP2P
-org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsConsumerDisconnectedNoTxPubSub
-org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsConsumerDisconnectedTxPubSub
-org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsNoRouteNoTxPubSub
-org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsNoRouteTxPubSub
-org.apache.qpid.test.testcases.MandatoryMessageTest#test_QPID_508_MandatoryFailsNoRouteNoTxP2P
-org.apache.qpid.test.testcases.MandatoryMessageTest#test_QPID_508_MandatoryFailsNoRouteTxP2P
-org.apache.qpid.test.testcases.MandatoryMessageTest#test_QPID_508_MandatoryFailsNoRouteNoTxPubSub
-org.apache.qpid.test.testcases.MandatoryMessageTest#test_QPID_508_MandatoryFailsNoRouteTxPubSub
-org.apache.qpid.test.client.FlowControlTest#*
-org.apache.qpid.test.unit.client.connection.ConnectionTest#testDefaultExchanges
-org.apache.qpid.test.unit.client.connection.ConnectionTest#testUnresolvedVirtualHostFailure
-// the 0.10 c++ broker does not implement forget
-org.apache.qpid.test.unit.xa.FaultTest#testForget
-// the 0-10 c++ broker does not implement priority / this test depends on a Java broker extension for queue creation
-org.apache.qpid.server.queue.PriorityTest
-//this test checks explicitly for 0-8 flow control semantics
-org.apache.qpid.test.client.FlowControlTest
-// The default cpp.testprofile does not start the cpp broker with authentication so this test will fail.
-org.apache.qpid.test.unit.client.connection.ConnectionTest#testPasswordFailureConnection
-// c++ broker doesn't do selectors, so this will fail 
-org.apache.qpid.test.unit.topic.TopicSessionTest#testNonMatchingMessagesDoNotFillQueue
-// QPID-1225 : Temporary remove this test until the problem has been addressed
-org.apache.qpid.server.security.acl.SimpleACLTest#testClientPublishInvalidQueueSuccess
-
-// InVM Broker tests
-org.apache.qpid.test.client.timeouts.SyncWaitDelayTest#*
-// QPID-1262, QPID-1119 : This test fails occasionally due to potential protocol issue.
-org.apache.qpid.test.client.timeouts.SyncWaitTimeoutDelayTest#*
diff --git a/qpid/java/test-profiles/010ExcludeList b/qpid/java/test-profiles/010Excludes
index ca12a4f8a5..69077a97c8 100644
--- a/qpid/java/test-profiles/010ExcludeList
+++ b/qpid/java/test-profiles/010Excludes
@@ -1,24 +1,14 @@
 org.apache.qpid.test.unit.client.channelclose.ChannelCloseTest#*
 org.apache.qpid.client.ResetMessageListenerTest#*
-// those tests should be run with prefetch off
-org.apache.qpid.client.MessageListenerMultiConsumerTest#testRecieveC2Only
-org.apache.qpid.client.MessageListenerMultiConsumerTest#testRecieveBoth
-org.apache.qpid.test.unit.xa.TopicTest#testMigrateDurableSubscriber
-// those tests need durable subscribe states to be persisted
-org.apache.qpid.test.unit.topic.DurableSubscriptionTest#testDurSubRestoredAfterNonPersistentMessageSent
-// those tests require broker recovery
-org.apache.qpid.test.unit.ct.DurableSubscriberTest#*
-org.apache.qpid.test.unit.xa.TopicTest#testDurSubCrash
-org.apache.qpid.test.unit.xa.TopicTest#testMultiMessagesDurSubCrash
-org.apache.qpid.test.unit.xa.TopicTest#testRecover
-org.apache.qpid.test.unit.xa.QueueTest#testRecover
-org.apache.qpid.test.unit.xa.QueueTest#testSendAndRecover
+
 //These tests are for the java broker
 org.apache.qpid.server.security.acl.SimpleACLTest#*
 org.apache.qpid.server.plugins.PluginTest#*
+
 // This test is not finished
 org.apache.qpid.test.testcases.TTLTest#*
 org.apache.qpid.test.client.failover.FailoverTest#test4MinuteFailover
+
 // Those tests are testing 0.8 specific semantics
 org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsConsumerDisconnectedNoTxP2P
 org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsConsumerDisconnectedTxP2P
@@ -35,29 +25,37 @@ org.apache.qpid.test.testcases.MandatoryMessageTest#test_QPID_508_MandatoryFails
 org.apache.qpid.test.client.FlowControlTest#*
 org.apache.qpid.test.unit.client.connection.ConnectionTest#testDefaultExchanges
 org.apache.qpid.test.unit.client.connection.ConnectionTest#testUnresolvedVirtualHostFailure
+
 // the 0.10 c++ broker does not implement forget
 org.apache.qpid.test.unit.xa.FaultTest#testForget
+
 // the 0-10 c++ broker does not implement priority / this test depends on a Java broker extension for queue creation
 org.apache.qpid.server.queue.PriorityTest
+
 //this test checks explicitly for 0-8 flow control semantics
 org.apache.qpid.test.client.FlowControlTest
+
 // 0-10 c++ broker doesn't implement virtual hosts, or those wackhy exchanges
 org.apache.qpid.test.unit.client.connection.ConnectionTest#testUnresolvedVirtualHostFailure
 org.apache.qpid.test.unit.client.connection.ConnectionTest#testDefaultExchanges
+
 // 0-10 c++ broker in cpp.testprofile is started with no auth so won't pass this test
 org.apache.qpid.test.unit.client.connection.ConnectionTest#testPasswordFailureConnection
+
 // c++ broker doesn't do selectors, so this will fail
 org.apache.qpid.test.unit.topic.TopicSessionTest#testNonMatchingMessagesDoNotFillQueue
-// QPID-1225 : Temporary remove this test until the problem has been addressed
-org.apache.qpid.server.security.acl.SimpleACLTest#testClientPublishInvalidQueueSuccess
+
 // InVM Broker tests
 org.apache.qpid.test.client.timeouts.SyncWaitDelayTest#*
+
 // QPID-1262, QPID-1119 : This test fails occasionally due to potential protocol issue.
 org.apache.qpid.test.client.timeouts.SyncWaitTimeoutDelayTest#*
+
 // c++ broker doesn't support priorities, TTL or message bouncing
 org.apache.qpid.server.exchange.ReturnUnroutableMandatoryMessageTest#*
 org.apache.qpid.server.queue.PriorityTest#*
 org.apache.qpid.server.queue.TimeToLiveTest#*
+
 // QPID-1727 , QPID-1726 :c++ broker does not support flow to disk on transient queues. Also it requries a persistent store impl. for Apache
 org.apache.qpid.test.client.QueueBrowsingFlowToDiskTest#*
 
@@ -70,12 +68,12 @@ org.apache.qpid.test.unit.client.connection.CloseAfterConnectionFailureTest#*
 //QPID-1818 : 0-10 Client code path does not correctly restore a transacted session after failover.
 org.apache.qpid.server.persistent.NoLocalAfterRecoveryTest#*
 
-// QPID-1823: this takes ages to run
-org.apache.qpid.client.SessionCreateTest#*
-
 // QPID-1730: the C++ server has a totally different logging mechanism. We should split this file differently
 org.apache.qpid.server.AlertingTest#*
 
 // The C++ server has a totally different persistence mechanism
 org.apache.qpid.server.store.PersistentStoreTest#*
 
+// QPID-1225 : Temporary remove this test until the problem has been addressed
+org.apache.qpid.server.security.acl.SimpleACLTest#testClientPublishInvalidQueueSuccess
+
diff --git a/qpid/java/test-profiles/010PrefetchExcludes b/qpid/java/test-profiles/010PrefetchExcludes
new file mode 100644
index 0000000000..6b0014b917
--- /dev/null
+++ b/qpid/java/test-profiles/010PrefetchExcludes
@@ -0,0 +1,4 @@
+// those tests should be run with prefetch off
+org.apache.qpid.client.MessageListenerMultiConsumerTest#testRecieveC2Only
+org.apache.qpid.client.MessageListenerMultiConsumerTest#testRecieveBoth
+org.apache.qpid.test.unit.xa.TopicTest#testMigrateDurableSubscriber
diff --git a/qpid/java/test-profiles/010TransientExcludes b/qpid/java/test-profiles/010TransientExcludes
new file mode 100644
index 0000000000..90b4251807
--- /dev/null
+++ b/qpid/java/test-profiles/010TransientExcludes
@@ -0,0 +1,10 @@
+// those tests need durable subscribe states to be persisted
+org.apache.qpid.test.unit.topic.DurableSubscriptionTest#testDurSubRestoredAfterNonPersistentMessageSent
+
+// those tests require broker recovery
+org.apache.qpid.test.unit.ct.DurableSubscriberTest#*
+org.apache.qpid.test.unit.xa.TopicTest#testDurSubCrash
+org.apache.qpid.test.unit.xa.TopicTest#testMultiMessagesDurSubCrash
+org.apache.qpid.test.unit.xa.TopicTest#testRecover
+org.apache.qpid.test.unit.xa.QueueTest#testRecover
+org.apache.qpid.test.unit.xa.QueueTest#testSendAndRecover
diff --git a/qpid/java/test-profiles/08ExcludeList b/qpid/java/test-profiles/08Excludes
index 0866694854..0866694854 100644
--- a/qpid/java/test-profiles/08ExcludeList
+++ b/qpid/java/test-profiles/08Excludes
diff --git a/qpid/java/test-profiles/08ExcludeList-nonvm b/qpid/java/test-profiles/08StandaloneExcludes
index e697201bfd..e697201bfd 100644
--- a/qpid/java/test-profiles/08ExcludeList-nonvm
+++ b/qpid/java/test-profiles/08StandaloneExcludes
diff --git a/qpid/java/test-profiles/08ExcludeList-nopersistence b/qpid/java/test-profiles/08TransientExcludes
index f81e9c213c..f81e9c213c 100644
--- a/qpid/java/test-profiles/08ExcludeList-nopersistence
+++ b/qpid/java/test-profiles/08TransientExcludes
diff --git a/qpid/java/test-profiles/ExcludeList b/qpid/java/test-profiles/Excludes
index a3a61b51db..a3a61b51db 100644
--- a/qpid/java/test-profiles/ExcludeList
+++ b/qpid/java/test-profiles/Excludes
diff --git a/qpid/java/test-profiles/XAExcludeList b/qpid/java/test-profiles/XAExcludes
index 1bb26c5f27..1bb26c5f27 100644
--- a/qpid/java/test-profiles/XAExcludeList
+++ b/qpid/java/test-profiles/XAExcludes
diff --git a/qpid/java/test-profiles/cpp.async.excludes b/qpid/java/test-profiles/cpp.async.excludes
new file mode 100644
index 0000000000..72d79fb754
--- /dev/null
+++ b/qpid/java/test-profiles/cpp.async.excludes
@@ -0,0 +1,5 @@
+// the C++ broker doesn't implement selectors, so they are not persisted with the subscription
+org.apache.qpid.test.unit.ct.DurableSubscriberTest#testDurSubRestoresMessageSelector
+
+// the C++ broker doesn't guarantee the order of messages on recovery
+org.apache.qpid.test.unit.xa.TopicTest#testMultiMessagesDurSubCrash
diff --git a/qpid/java/test-profiles/cpp.async.testprofile b/qpid/java/test-profiles/cpp.async.testprofile
index 5b6834e8c0..f06b56fbad 100644
--- a/qpid/java/test-profiles/cpp.async.testprofile
+++ b/qpid/java/test-profiles/cpp.async.testprofile
@@ -1,5 +1,3 @@
 include=cpp
-
+profile.excludes=010PrefetchExcludes
 broker.modules=--load-module ${broker.module.store}
-
-test.excludesfile=${test.profiles}/ExcludeList ${test.profiles}/010ExcludeList-store
diff --git a/qpid/java/test-profiles/cpp.cluster.testprofile b/qpid/java/test-profiles/cpp.cluster.testprofile
index 49ddc98f4f..143e0d88d0 100644
--- a/qpid/java/test-profiles/cpp.cluster.testprofile
+++ b/qpid/java/test-profiles/cpp.cluster.testprofile
@@ -2,7 +2,7 @@ include=cpp
 
 broker.modules=--load-module ${broker.module.cluster} --cluster-name cpp-java-test-cluster
 
-test.excludesfile=${test.profiles}/ExcludeList ${test.profiles}/XAExcludeList ${test.profiles}/010ExcludeList
+profile.excludes=XAExcludes 010PrefetchExcludes 010TransientExcludes
 
 profile.clustered=true
 profile.failoverMsgCount=10
diff --git a/qpid/java/test-profiles/cpp.noprefetch.testprofile b/qpid/java/test-profiles/cpp.noprefetch.testprofile
index 4c8c827e30..b2b9bc6de3 100644
--- a/qpid/java/test-profiles/cpp.noprefetch.testprofile
+++ b/qpid/java/test-profiles/cpp.noprefetch.testprofile
@@ -1,3 +1,3 @@
 include=cpp
-test.excludesfile=${test.profiles}/ExcludeList ${test.profiles}/010ExcludeList-noPrefetch
+profile.excludes=010TransientExcludes
 max_prefetch=0
diff --git a/qpid/java/test-profiles/010ExcludeList-ssl b/qpid/java/test-profiles/cpp.ssl.excludes
index bf21ab9cc7..bf21ab9cc7 100644
--- a/qpid/java/test-profiles/010ExcludeList-ssl
+++ b/qpid/java/test-profiles/cpp.ssl.excludes
diff --git a/qpid/java/test-profiles/cpp.ssl.testprofile b/qpid/java/test-profiles/cpp.ssl.testprofile
index 08d4fd895a..9f2581a83a 100644
--- a/qpid/java/test-profiles/cpp.ssl.testprofile
+++ b/qpid/java/test-profiles/cpp.ssl.testprofile
@@ -2,9 +2,6 @@ include=cpp
 
 broker.modules=--load-module ${broker.module.ssl} --ssl-cert-name localhost.localdomain --ssl-cert-password-file ${test.profiles}/test_resources/ssl/pfile --ssl-cert-db ${test.profiles}/test_resources/ssl/server_db/ --ssl-require-client-authentication --ssl-port @SSL_PORT
 
-test.excludesfile=${test.profiles}/ExcludeList ${test.profiles}/010ExcludeList ${test.profiles}/010ExcludeList-ssl
-test.excludeslist=org.apache.qpid.test.client.failover.FailoverTest#*
-
 profile.use_ssl=true
 broker.ready= Listening for SSL connections
 
diff --git a/qpid/java/test-profiles/cpp.testprofile b/qpid/java/test-profiles/cpp.testprofile
index 414e364ecc..1d5416fe19 100644
--- a/qpid/java/test-profiles/cpp.testprofile
+++ b/qpid/java/test-profiles/cpp.testprofile
@@ -14,4 +14,5 @@ broker.args=
 
 broker=${broker.executable} -p @PORT --data-dir ${build.data}/@PORT -t --auth no --no-module-dir ${broker.modules} ${broker.args}
 
-test.excludesfile=${test.profiles}/ExcludeList ${test.profiles}/010ExcludeList
+profile.excludes=010PrefetchExcludes 010TransientExcludes
+test.excludes=Excludes 010Excludes ${profile}.excludes ${profile.excludes}
diff --git a/qpid/java/test-profiles/default-longrunning.testprofile b/qpid/java/test-profiles/default-longrunning.testprofile
deleted file mode 100644
index bf24e4f9da..0000000000
--- a/qpid/java/test-profiles/default-longrunning.testprofile
+++ /dev/null
@@ -1 +0,0 @@
-test.includesfile=${test.profiles}/08LongRunningList
diff --git a/qpid/java/test-profiles/default.testprofile b/qpid/java/test-profiles/default.testprofile
index 80d2e6a8a4..5a08b79e10 100644
--- a/qpid/java/test-profiles/default.testprofile
+++ b/qpid/java/test-profiles/default.testprofile
@@ -20,8 +20,9 @@ test.port=15672
 test.port.ssl=15671
 test.port.alt=15673
 
-test.excludes=true
-test.excludesfile=${test.profiles}/ExcludeList ${test.profiles}/XAExcludeList ${test.profiles}/08ExcludeList ${test.profiles}/08ExcludeList-nopersistence
+test.exclude=true
+profile.excludes=08TransientExcludes
+test.excludes=Excludes XAExcludes 08Excludes ${profile}.excludes ${profile.excludes}
 test.fork=no
 test.mem=512M
 test=*Test
diff --git a/qpid/java/test-profiles/java-derby.testprofile b/qpid/java/test-profiles/java-derby.testprofile
index 1786e96712..52b63ae799 100644
--- a/qpid/java/test-profiles/java-derby.testprofile
+++ b/qpid/java/test-profiles/java-derby.testprofile
@@ -4,4 +4,4 @@ broker.clean=${test.profiles}/clean-dir ${build.data} ${project.root}/build/work
 broker.ready=Qpid Broker Ready
 broker.config=${project.root}/build/etc/config-systests-derby.xml
 
-test.excludesfile=${test.profiles}/ExcludeList ${test.profiles}/XAExcludeList ${test.profiles}/08ExcludeList-nonvm 
+profile.excludes=08StandaloneExcludes
diff --git a/qpid/java/test-profiles/java.testprofile b/qpid/java/test-profiles/java.testprofile
index d1e4c12bc1..f920124735 100644
--- a/qpid/java/test-profiles/java.testprofile
+++ b/qpid/java/test-profiles/java.testprofile
@@ -3,4 +3,4 @@ broker=${project.root}/build/bin/qpid-server -p @PORT -m @MPORT -c @CONFIG_FILE
 broker.clean=${test.profiles}/clean-dir ${build.data} ${project.root}/build/work/derbyDB
 broker.ready=Qpid Broker Ready
 
-test.excludesfile=${test.profiles}/ExcludeList ${test.profiles}/XAExcludeList ${test.profiles}/08ExcludeList-nonvm ${test.profiles}/08ExcludeList-nopersistence
+profile.excludes=08TransientExcludes 08StandaloneExcludes