NO-JIRA: Encapsulate fields, use private members and accesors (keep checkstyle happy)

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

73 files changed, 566 insertions, 295 deletions

diff --git a/qpid/java/broker/src/main/java/org/apache/log4j/QpidCompositeRollingAppender.java b/qpid/java/broker/src/main/java/org/apache/log4j/QpidCompositeRollingAppender.java
index d1f77ad5c7..96608acd42 100644
--- a/qpid/java/broker/src/main/java/org/apache/log4j/QpidCompositeRollingAppender.java
+++ b/qpid/java/broker/src/main/java/org/apache/log4j/QpidCompositeRollingAppender.java
@@ -99,59 +99,38 @@ public class QpidCompositeRollingAppender extends FileAppender
     private long nextCheck = System.currentTimeMillis() - 1;
 
     /** Holds date of last roll over */
-    Date now = new Date();
+    private Date now = new Date();
 
-    SimpleDateFormat sdf;
+    private SimpleDateFormat sdf;
 
     /** Helper class to determine next rollover time */
-    RollingCalendar rc = new RollingCalendar();
+    private RollingCalendar rc = new RollingCalendar();
 
-    /** The default maximum file size is 10MB. */
-    protected long maxFileSize = 10 * 1024 * 1024;
+    private long maxFileSize = 10 * 1024 * 1024;
 
-    /** There is zero backup files by default. */
-    protected int maxSizeRollBackups = 0;
-    /** How many sized based backups have been made so far */
-    protected int curSizeRollBackups = 0;
+    private int maxSizeRollBackups = 0;
+    private int curSizeRollBackups = 0;
 
-    /** not yet implemented */
-    protected int maxTimeRollBackups = -1;
-    protected int curTimeRollBackups = 0;
+    private int maxTimeRollBackups = -1;
+    private int curTimeRollBackups = 0;
 
-    /**
-     * By default newer files have lower numbers. (countDirection < 0) ie. log.1 is most recent, log.5 is the 5th
-     * backup, etc... countDirection > 0 does the opposite ie. log.1 is the first backup made, log.5 is the 5th backup
-     * made, etc. For infinite backups use countDirection > 0 to reduce rollOver costs.
-     */
-    protected int countDirection = -1;
+    private int countDirection = -1;
 
-    /** Style of rolling to Use.  BY_SIZE (1), BY_DATE(2), BY COMPOSITE(3) */
-    protected int rollingStyle = BY_COMPOSITE;
-    protected boolean rollDate = true;
-    protected boolean rollSize = true;
+    private int rollingStyle = BY_COMPOSITE;
+    private boolean rollDate = true;
+    private boolean rollSize = true;
 
-    /**
-     * By default file.log is always the current file.  Optionally file.log.yyyy-mm-dd for current formated datePattern
-     * can by the currently logging file (or file.log.curSizeRollBackup or even file.log.yyyy-mm-dd.curSizeRollBackup)
-     * This will make time based roll overs with a large number of backups much faster -- it won't have to rename all
-     * the backups!
-     */
-    protected boolean staticLogFileName = true;
+    private boolean staticLogFileName = true;
 
-    /** FileName provided in configuration.  Used for rolling properly */
-    protected String baseFileName;
+    private String baseFileName;
 
-    /** Do we want to .gz our backup files. */
-    protected boolean compress = false;
+    private boolean compress = false;
 
-    /** Do we want to use a second thread when compressing our backup files. */
-    protected boolean compressAsync = false;
+    private boolean compressAsync = false;
 
-    /** Do we want to start numbering files at zero. */
-    protected boolean zeroBased = false;
+    private boolean zeroBased = false;
 
-    /** Path provided in configuration.  Used for moving backup files to */
-    protected String backupFilesToPath = null;
+    private String backupFilesToPath = null;
     private final ConcurrentLinkedQueue<CompressJob> _compress = new ConcurrentLinkedQueue<CompressJob>();
     private AtomicBoolean _compressing = new AtomicBoolean(false);
     private static final String COMPRESS_EXTENSION = ".gz";
@@ -219,7 +198,7 @@ public class QpidCompositeRollingAppender extends FileAppender
         return datePattern;
     }
 
-    /** Returns the value of the <b>maxSizeRollBackups</b> option. */
+    /** There is zero backup files by default. */ /** Returns the value of the <b>maxSizeRollBackups</b> option. */
     public int getMaxSizeRollBackups()
     {
         return maxSizeRollBackups;
@@ -379,6 +358,11 @@ public class QpidCompositeRollingAppender extends FileAppender
         }
     }
 
+    /**
+     * By default newer files have lower numbers. (countDirection < 0) ie. log.1 is most recent, log.5 is the 5th
+     * backup, etc... countDirection > 0 does the opposite ie. log.1 is the first backup made, log.5 is the 5th backup
+     * made, etc. For infinite backups use countDirection > 0 to reduce rollOver costs.
+     */
     public int getCountDirection()
     {
         return countDirection;
@@ -389,6 +373,7 @@ public class QpidCompositeRollingAppender extends FileAppender
         countDirection = direction;
     }
 
+    /** Style of rolling to Use.  BY_SIZE (1), BY_DATE(2), BY COMPOSITE(3) */
     public int getRollingStyle()
     {
         return rollingStyle;
@@ -484,6 +469,7 @@ public class QpidCompositeRollingAppender extends FileAppender
         zeroBased = z;
     }
 
+    /** Path provided in configuration.  Used for moving backup files to */
     public String getBackupFilesToPath()
     {
         return backupFilesToPath;
@@ -1074,9 +1060,117 @@ public class QpidCompositeRollingAppender extends FileAppender
         }
     }
 
+    /** The default maximum file size is 10MB. */
+    protected long getMaxFileSize()
+    {
+        return maxFileSize;
+    }
+
+    /** How many sized based backups have been made so far */
+    protected int getCurSizeRollBackups()
+    {
+        return curSizeRollBackups;
+    }
+
+    protected void setCurSizeRollBackups(int curSizeRollBackups)
+    {
+        this.curSizeRollBackups = curSizeRollBackups;
+    }
+
+    /** not yet implemented */
+    protected int getMaxTimeRollBackups()
+    {
+        return maxTimeRollBackups;
+    }
+
+    protected void setMaxTimeRollBackups(int maxTimeRollBackups)
+    {
+        this.maxTimeRollBackups = maxTimeRollBackups;
+    }
+
+    protected int getCurTimeRollBackups()
+    {
+        return curTimeRollBackups;
+    }
+
+    protected void setCurTimeRollBackups(int curTimeRollBackups)
+    {
+        this.curTimeRollBackups = curTimeRollBackups;
+    }
+
+    protected boolean isRollDate()
+    {
+        return rollDate;
+    }
+
+    protected void setRollDate(boolean rollDate)
+    {
+        this.rollDate = rollDate;
+    }
+
+    protected boolean isRollSize()
+    {
+        return rollSize;
+    }
+
+    protected void setRollSize(boolean rollSize)
+    {
+        this.rollSize = rollSize;
+    }
+
+    /**
+     * By default file.log is always the current file.  Optionally file.log.yyyy-mm-dd for current formated datePattern
+     * can by the currently logging file (or file.log.curSizeRollBackup or even file.log.yyyy-mm-dd.curSizeRollBackup)
+     * This will make time based roll overs with a large number of backups much faster -- it won't have to rename all
+     * the backups!
+     */
+    protected boolean isStaticLogFileName()
+    {
+        return staticLogFileName;
+    }
+
+    /** FileName provided in configuration.  Used for rolling properly */
+    protected String getBaseFileName()
+    {
+        return baseFileName;
+    }
+
+    protected void setBaseFileName(String baseFileName)
+    {
+        this.baseFileName = baseFileName;
+    }
+
+    /** Do we want to .gz our backup files. */
+    protected boolean isCompress()
+    {
+        return compress;
+    }
+
+    protected void setCompress(boolean compress)
+    {
+        this.compress = compress;
+    }
+
+    /** Do we want to use a second thread when compressing our backup files. */
+    protected boolean isCompressAsync()
+    {
+        return compressAsync;
+    }
+
+    /** Do we want to start numbering files at zero. */
+    protected boolean isZeroBased()
+    {
+        return zeroBased;
+    }
+
+    protected void setBackupFilesToPath(String backupFilesToPath)
+    {
+        this.backupFilesToPath = backupFilesToPath;
+    }
+
     private static class CompressJob
     {
-        File _from, _to;
+        private File _from, _to;
 
         CompressJob(File from, File to)
         {
@@ -1095,9 +1189,9 @@ public class QpidCompositeRollingAppender extends FileAppender
         }
     }
 
-    Compressor compressor = null;
+    private Compressor compressor = null;
 
-    Executor executor;
+    private Executor executor;
 
     private class Compressor implements Runnable
     {
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/configuration/Configuration.java b/qpid/java/broker/src/main/java/org/apache/qpid/configuration/Configuration.java
index 0b63c68854..c6bfd34f45 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/configuration/Configuration.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/configuration/Configuration.java
@@ -33,16 +33,16 @@ public class Configuration
 {
     public static final String QPID_HOME = "QPID_HOME";
 
-    final String QPIDHOME = System.getProperty(QPID_HOME);
+    private final String QPIDHOME = System.getProperty(QPID_HOME);
 
     private static Logger _devlog = LoggerFactory.getLogger(Configuration.class);
 
     public static final String DEFAULT_LOG_CONFIG_FILENAME = "log4j.xml";
     public static final String DEFAULT_CONFIG_FILE = "etc/config.xml";
 
-    protected final Options _options = new Options();
-    protected CommandLine _commandLine;
-    protected File _configFile;
+    private final Options _options = new Options();
+    private CommandLine _commandLine;
+    private File _configFile;
 
 
     public Configuration()
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQBrokerManagerMBean.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQBrokerManagerMBean.java
index 9505aa7405..dc5f45cede 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQBrokerManagerMBean.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQBrokerManagerMBean.java
@@ -168,7 +168,7 @@ public class AMQBrokerManagerMBean extends AMQManagedObject implements ManagedBr
      */
     public void createNewExchange(String exchangeName, String type, boolean durable) throws JMException, MBeanException
     {
-        CurrentActor.set(new ManagementActor(_logActor.getRootMessageLogger()));
+        CurrentActor.set(new ManagementActor(getLogActor().getRootMessageLogger()));
         try
         {
             synchronized (_exchangeRegistry)
@@ -215,7 +215,7 @@ public class AMQBrokerManagerMBean extends AMQManagedObject implements ManagedBr
         // boolean inUse = false;
         // Check if there are queue-bindings with the exchange and unregister
         // when there are no bindings.
-        CurrentActor.set(new ManagementActor(_logActor.getRootMessageLogger()));
+        CurrentActor.set(new ManagementActor(getLogActor().getRootMessageLogger()));
         try
         {
             _exchangeRegistry.unregisterExchange(new AMQShortString(exchangeName), false);
@@ -255,7 +255,7 @@ public class AMQBrokerManagerMBean extends AMQManagedObject implements ManagedBr
             throw new JMException("The queue \"" + queueName + "\" already exists.");
         }
 
-        CurrentActor.set(new ManagementActor(_logActor.getRootMessageLogger()));
+        CurrentActor.set(new ManagementActor(getLogActor().getRootMessageLogger()));
         try
         {
             AMQShortString ownerShortString = null;
@@ -311,7 +311,7 @@ public class AMQBrokerManagerMBean extends AMQManagedObject implements ManagedBr
             throw new JMException("The Queue " + queueName + " is not a registered queue.");
         }
 
-        CurrentActor.set(new ManagementActor(_logActor.getRootMessageLogger()));
+        CurrentActor.set(new ManagementActor(getLogActor().getRootMessageLogger()));
         try
         {
             queue.delete();
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
index f05094e67d..f4a7a07331 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
@@ -129,7 +129,7 @@ public class AMQChannel implements SessionConfig, AMQSessionModel, AsyncAutoComm
     private IncomingMessage _currentMessage;
 
     /** Maps from consumer tag to subscription instance. Allows us to unsubscribe from a queue. */
-    protected final Map<AMQShortString, Subscription> _tag2SubscriptionMap = new HashMap<AMQShortString, Subscription>();
+    private final Map<AMQShortString, Subscription> _tag2SubscriptionMap = new HashMap<AMQShortString, Subscription>();
 
     private final MessageStore _messageStore;
 
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/TopicConfiguration.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/TopicConfiguration.java
index b2d51bbdc3..7a919a5829 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/TopicConfiguration.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/TopicConfiguration.java
@@ -57,8 +57,8 @@ public class TopicConfiguration extends ConfigurationPlugin implements ExchangeC
         }
     }
 
-    Map<String, TopicConfig> _topics = new HashMap<String, TopicConfig>();
-    Map<String,  Map<String, TopicConfig>> _subscriptions = new HashMap<String,  Map<String, TopicConfig>>();
+    private Map<String, TopicConfig> _topics = new HashMap<String, TopicConfig>();
+    private Map<String,  Map<String, TopicConfig>> _subscriptions = new HashMap<String,  Map<String, TopicConfig>>();
 
     public String[] getElementsProcessed()
     {
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/plugins/SlowConsumerDetectionConfiguration.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/plugins/SlowConsumerDetectionConfiguration.java
index c51058b30c..a90b1d514f 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/plugins/SlowConsumerDetectionConfiguration.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/plugins/SlowConsumerDetectionConfiguration.java
@@ -45,7 +45,7 @@ public class SlowConsumerDetectionConfiguration extends ConfigurationPlugin
     }
 
     //Set Default time unit to seconds
-    TimeUnit _timeUnit = TimeUnit.SECONDS;
+    private TimeUnit _timeUnit = TimeUnit.SECONDS;
 
     public String[] getElementsProcessed()
     {
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
index b6fe9576ea..cae07046fa 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
@@ -61,20 +61,20 @@ public abstract class AbstractExchange implements Exchange, Managable
 
     private Exchange _alternateExchange;
 
-    protected boolean _durable;
-    protected int _ticket;
+    private boolean _durable;
+    private int _ticket;
 
     private VirtualHost _virtualHost;
 
     private final List<Exchange.Task> _closeTaskList = new CopyOnWriteArrayList<Exchange.Task>();
 
 
-    protected AbstractExchangeMBean _exchangeMbean;
+    private AbstractExchangeMBean _exchangeMbean;
 
     /**
      * Whether the exchange is automatically deleted once all queues have detached from it
      */
-    protected boolean _autoDelete;
+    private boolean _autoDelete;
 
     //The logSubject for ths exchange
     private LogSubject _logSubject;
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchangeMBean.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchangeMBean.java
index 0981015656..782ef49d35 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchangeMBean.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchangeMBean.java
@@ -55,9 +55,9 @@ import java.util.Map;
 public abstract class AbstractExchangeMBean<T extends AbstractExchange> extends AMQManagedObject implements ManagedExchange
 {
     // open mbean data types for representing exchange bindings
-    protected OpenType[] _bindingItemTypes;
-    protected CompositeType _bindingDataType;
-    protected TabularType _bindinglistDataType;
+    private OpenType[] _bindingItemTypes;
+    private CompositeType _bindingDataType;
+    private TabularType _bindinglistDataType;
 
 
     private T _exchange;
@@ -108,17 +108,17 @@ public abstract class AbstractExchangeMBean<T extends AbstractExchange> extends
 
     public Integer getTicketNo()
     {
-        return _exchange._ticket;
+        return _exchange.getTicket();
     }
 
     public boolean isDurable()
     {
-        return _exchange._durable;
+        return _exchange.isDurable();
     }
 
     public boolean isAutoDelete()
     {
-        return _exchange._autoDelete;
+        return _exchange.isAutoDelete();
     }
 
     // Added exchangetype in the object name lets maangement apps to do any customization required
@@ -143,7 +143,7 @@ public abstract class AbstractExchangeMBean<T extends AbstractExchange> extends
             throw new JMException("Queue \"" + queueName + "\" is not registered with the virtualhost.");
         }
 
-        CurrentActor.set(new ManagementActor(_logActor.getRootMessageLogger()));
+        CurrentActor.set(new ManagementActor(getLogActor().getRootMessageLogger()));
         try
         {
             vhost.getBindingFactory().addBinding(binding,queue,getExchange(),null);
@@ -170,7 +170,7 @@ public abstract class AbstractExchangeMBean<T extends AbstractExchange> extends
             throw new JMException("Queue \"" + queueName + "\" is not registered with the virtualhost.");
         }
 
-        CurrentActor.set(new ManagementActor(_logActor.getRootMessageLogger()));
+        CurrentActor.set(new ManagementActor(getLogActor().getRootMessageLogger()));
         try
         {
             vhost.getBindingFactory().removeBinding(binding, queue, _exchange, Collections.<String, Object>emptyMap());
@@ -182,4 +182,35 @@ public abstract class AbstractExchangeMBean<T extends AbstractExchange> extends
         }
         CurrentActor.remove();
     }
+
+
+    protected OpenType[] getBindingItemTypes()
+    {
+        return _bindingItemTypes;
+    }
+
+    protected void setBindingItemTypes(OpenType[] bindingItemTypes)
+    {
+        _bindingItemTypes = bindingItemTypes;
+    }
+
+    protected CompositeType getBindingDataType()
+    {
+        return _bindingDataType;
+    }
+
+    protected void setBindingDataType(CompositeType bindingDataType)
+    {
+        _bindingDataType = bindingDataType;
+    }
+
+    protected TabularType getBindinglistDataType()
+    {
+        return _bindinglistDataType;
+    }
+
+    protected void setBindinglistDataType(TabularType bindinglistDataType)
+    {
+        _bindinglistDataType = bindinglistDataType;
+    }
 }
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DirectExchangeMBean.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DirectExchangeMBean.java
index 681eda9ccf..0bfaf7035d 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DirectExchangeMBean.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DirectExchangeMBean.java
@@ -51,7 +51,7 @@ final class DirectExchangeMBean extends AbstractExchangeMBean<DirectExchange>
 
     public TabularData bindings() throws OpenDataException
     {
-        TabularDataSupport bindingList = new TabularDataSupport(_bindinglistDataType);
+        TabularDataSupport bindingList = new TabularDataSupport(getBindinglistDataType());
 
         Map<String, List<String>> bindingMap = new HashMap<String, List<String>>();
 
@@ -71,7 +71,7 @@ final class DirectExchangeMBean extends AbstractExchangeMBean<DirectExchange>
         for(Map.Entry<String, List<String>> entry : bindingMap.entrySet())
         {
             Object[] bindingItemValues = {entry.getKey(), entry.getValue().toArray(new String[0])};
-            CompositeData bindingData = new CompositeDataSupport(_bindingDataType,
+            CompositeData bindingData = new CompositeDataSupport(getBindingDataType(),
                     COMPOSITE_ITEM_NAMES.toArray(new String[COMPOSITE_ITEM_NAMES.size()]),
                     bindingItemValues);
             bindingList.put(bindingData);
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/FanoutExchangeMBean.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/FanoutExchangeMBean.java
index 56fb664f40..61e23c896c 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/FanoutExchangeMBean.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/FanoutExchangeMBean.java
@@ -50,7 +50,7 @@ final class FanoutExchangeMBean extends AbstractExchangeMBean<FanoutExchange>
     public TabularData bindings() throws OpenDataException
     {
 
-        TabularDataSupport bindingList = new TabularDataSupport(_bindinglistDataType);
+        TabularDataSupport bindingList = new TabularDataSupport(getBindinglistDataType());
 
 
         ArrayList<String> queueNames = new ArrayList<String>();
@@ -62,7 +62,7 @@ final class FanoutExchangeMBean extends AbstractExchangeMBean<FanoutExchange>
         }
 
         Object[] bindingItemValues = {BINDING_KEY_SUBSTITUTE, queueNames.toArray(new String[0])};
-        CompositeData bindingData = new CompositeDataSupport(_bindingDataType,
+        CompositeData bindingData = new CompositeDataSupport(getBindingDataType(),
                 COMPOSITE_ITEM_NAMES.toArray(new String[COMPOSITE_ITEM_NAMES.size()]), 
                 bindingItemValues);
         bindingList.put(bindingData);
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchangeMBean.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchangeMBean.java
index 9b4753273b..395c6c8a91 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchangeMBean.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchangeMBean.java
@@ -68,20 +68,20 @@ final class HeadersExchangeMBean extends AbstractExchangeMBean<HeadersExchange>
     protected void init() throws OpenDataException
     {
 
-        _bindingItemTypes = new OpenType[3];
-        _bindingItemTypes[0] = SimpleType.INTEGER;
-        _bindingItemTypes[1] = SimpleType.STRING;
-        _bindingItemTypes[2] = new ArrayType(1, SimpleType.STRING);
-        _bindingDataType = new CompositeType("Exchange Binding", "Queue name and header bindings",
-                HEADERS_COMPOSITE_ITEM_NAMES.toArray(new String[HEADERS_COMPOSITE_ITEM_NAMES.size()]), 
-                HEADERS_COMPOSITE_ITEM_DESC.toArray(new String[HEADERS_COMPOSITE_ITEM_DESC.size()]), _bindingItemTypes);
-        _bindinglistDataType = new TabularType("Exchange Bindings", "List of exchange bindings for " + getName(),
-                                               _bindingDataType, HEADERS_TABULAR_UNIQUE_INDEX.toArray(new String[HEADERS_TABULAR_UNIQUE_INDEX.size()]));
+        setBindingItemTypes(new OpenType[3]);
+        getBindingItemTypes()[0] = SimpleType.INTEGER;
+        getBindingItemTypes()[1] = SimpleType.STRING;
+        getBindingItemTypes()[2] = new ArrayType(1, SimpleType.STRING);
+        setBindingDataType(new CompositeType("Exchange Binding", "Queue name and header bindings",
+                HEADERS_COMPOSITE_ITEM_NAMES.toArray(new String[HEADERS_COMPOSITE_ITEM_NAMES.size()]),
+                HEADERS_COMPOSITE_ITEM_DESC.toArray(new String[HEADERS_COMPOSITE_ITEM_DESC.size()]), getBindingItemTypes()));
+        setBindinglistDataType(new TabularType("Exchange Bindings", "List of exchange bindings for " + getName(),
+                getBindingDataType(), HEADERS_TABULAR_UNIQUE_INDEX.toArray(new String[HEADERS_TABULAR_UNIQUE_INDEX.size()])));
     }
 
     public TabularData bindings() throws OpenDataException
     {
-        TabularDataSupport bindingList = new TabularDataSupport(_bindinglistDataType);
+        TabularDataSupport bindingList = new TabularDataSupport(getBindinglistDataType());
         int count = 1;
         for (Binding binding : getExchange().getBindings())
         {
@@ -103,7 +103,7 @@ final class HeadersExchangeMBean extends AbstractExchangeMBean<HeadersExchange>
 
 
             Object[] bindingItemValues = {count++, queueName, mappingList.toArray(new String[0])};
-            CompositeData bindingData = new CompositeDataSupport(_bindingDataType, 
+            CompositeData bindingData = new CompositeDataSupport(getBindingDataType(),
                     HEADERS_COMPOSITE_ITEM_NAMES.toArray(new String[HEADERS_COMPOSITE_ITEM_NAMES.size()]), bindingItemValues);
             bindingList.put(bindingData);
         }
@@ -121,7 +121,7 @@ final class HeadersExchangeMBean extends AbstractExchangeMBean<HeadersExchange>
             throw new JMException("Queue \"" + queueName + "\" is not registered with the virtualhost.");
         }
 
-        CurrentActor.set(new ManagementActor(_logActor.getRootMessageLogger()));
+        CurrentActor.set(new ManagementActor(getLogActor().getRootMessageLogger()));
 
         final Map<String,Object> arguments = new HashMap<String, Object>();
         final String[] bindings = binding.split(",");
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/TopicExchangeMBean.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/TopicExchangeMBean.java
index 008876bd60..481a377fc4 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/TopicExchangeMBean.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/TopicExchangeMBean.java
@@ -51,7 +51,7 @@ final class TopicExchangeMBean extends AbstractExchangeMBean<TopicExchange>
     /** returns exchange bindings in tabular form */
     public TabularData bindings() throws OpenDataException
     {
-        TabularDataSupport bindingList = new TabularDataSupport(_bindinglistDataType);
+        TabularDataSupport bindingList = new TabularDataSupport(getBindinglistDataType());
         Map<String, List<String>> bindingData = new HashMap<String, List<String>>();
         for (Binding binding : getExchange().getBindings())
         {
@@ -69,7 +69,7 @@ final class TopicExchangeMBean extends AbstractExchangeMBean<TopicExchange>
         {
             Object[] bindingItemValues = {entry.getKey(), entry.getValue().toArray(new String[entry.getValue().size()]) };
             CompositeData bindingCompositeData =
-                    new CompositeDataSupport(_bindingDataType,
+                    new CompositeDataSupport(getBindingDataType(),
                             COMPOSITE_ITEM_NAMES.toArray(new String[COMPOSITE_ITEM_NAMES.size()]), 
                             bindingItemValues);
             bindingList.put(bindingCompositeData);
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/headers/HeadersParser.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/headers/HeadersParser.java
index 0cee139dfc..1341f77c72 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/headers/HeadersParser.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/headers/HeadersParser.java
@@ -286,8 +286,8 @@ public class HeadersParser
 
     public final static class KeyValuePair
     {
-        public final HeaderKey _key;
-        public final AMQTypedValue _value;
+        private final HeaderKey _key;
+        private final AMQTypedValue _value;
         private final int _hashCode;
 
         public KeyValuePair(final HeaderKey key, final AMQTypedValue value)
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/topic/TopicMatcherDFAState.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/topic/TopicMatcherDFAState.java
index 52d78dd01e..dfe4d85320 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/topic/TopicMatcherDFAState.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/topic/TopicMatcherDFAState.java
@@ -256,25 +256,25 @@ public class TopicMatcherDFAState
             transitions.append("[ ");
             transitions.append(entry.getKey());
             transitions.append("\t ->\t ");
-            transitions.append(entry.getValue()._id);
+            transitions.append(entry.getValue().getId());
             transitions.append(" ]\n");
         }
 
 
-        return "[ State " + _id + " ]\n" + transitions + "\n";
+        return "[ State " + getId() + " ]\n" + transitions + "\n";
 
     }
 
     public String reachableStates()
     {
-        StringBuilder result = new StringBuilder("Start state: " + _id + "\n");
+        StringBuilder result = new StringBuilder("Start state: " + getId() + "\n");
 
         SortedSet<TopicMatcherDFAState> reachableStates =
                 new TreeSet<TopicMatcherDFAState>(new Comparator<TopicMatcherDFAState>()
                                                         {
                                                             public int compare(final TopicMatcherDFAState o1, final TopicMatcherDFAState o2)
                                                             {
-                                                                return o1._id - o2._id;
+                                                                return o1.getId() - o2.getId();
                                                             }
                                                         });
         reachableStates.add(this);
@@ -302,4 +302,9 @@ public class TopicMatcherDFAState
         return result.toString();
     }
 
+
+    int getId()
+    {
+        return _id;
+    }
 }
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/topic/TopicParser.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/topic/TopicParser.java
index 3c8819cf6c..54fc4b3634 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/topic/TopicParser.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/topic/TopicParser.java
@@ -60,14 +60,43 @@ public class TopicParser
         }
 
 
+        public TopicWord getWord()
+        {
+            return _word;
+        }
+
+        public boolean isSelfTransition()
+        {
+            return _selfTransition;
+        }
+
+        public int getPosition()
+        {
+            return _position;
+        }
+
+        public boolean isEndState()
+        {
+            return _endState;
+        }
+
+        public boolean isFollowedByAnyLoop()
+        {
+            return _followedByAnyLoop;
+        }
+
+        public void setFollowedByAnyLoop(boolean followedByAnyLoop)
+        {
+            _followedByAnyLoop = followedByAnyLoop;
+        }
     }
 
     private static final Position ERROR_POSITION = new Position(Integer.MAX_VALUE,null, true, false);
 
     private static class SimpleState
     {
-        Set<Position> _positions;
-        Map<TopicWord, SimpleState> _nextState;
+        private Set<Position> _positions;
+        private Map<TopicWord, SimpleState> _nextState;
     }
 
 
@@ -188,11 +217,11 @@ public class TopicParser
             while(followedByWildcards && n<(positionCount+1))
             {
 
-                if(positions[n]._selfTransition)
+                if(positions[n].isSelfTransition())
                 {
                     break;
                 }
-                else if(positions[n]._word!=TopicWord.ANY_WORD)
+                else if(positions[n].getWord() !=TopicWord.ANY_WORD)
                 {
                     followedByWildcards = false;
                 }
@@ -200,7 +229,7 @@ public class TopicParser
             }
 
 
-            positions[p]._followedByAnyLoop = followedByWildcards && (n!= positionCount+1);
+            positions[p].setFollowedByAnyLoop(followedByWildcards && (n!= positionCount+1));
         }
 
 
@@ -229,7 +258,7 @@ public class TopicParser
 
             for(Position p : simpleStates[i]._positions)
             {
-                if(p._endState)
+                if(p.isEndState())
                 {
                     endState = true;
                     break;
@@ -275,7 +304,7 @@ public class TopicParser
 
         for(Position pos : state._positions)
         {
-            if(pos._selfTransition)
+            if(pos.isSelfTransition())
             {
                 Set<Position> dest = transitions.get(TopicWord.ANY_WORD);
                 if(dest == null)
@@ -286,14 +315,14 @@ public class TopicParser
                 dest.add(pos);
             }
 
-            final int nextPos = pos._position + 1;
+            final int nextPos = pos.getPosition() + 1;
             Position nextPosition = nextPos == positions.length ? ERROR_POSITION : positions[nextPos];
 
-            Set<Position> dest = transitions.get(pos._word);
+            Set<Position> dest = transitions.get(pos.getWord());
             if(dest == null)
             {
                 dest = new HashSet<Position>();
-                transitions.put(pos._word,dest);
+                transitions.put(pos.getWord(),dest);
             }
             dest.add(nextPosition);
 
@@ -320,7 +349,7 @@ public class TopicParser
             Position loopingTerminal = null;
             for(Position destPos : dest.getValue())
             {
-                if(destPos._selfTransition && destPos._endState)
+                if(destPos.isSelfTransition() && destPos.isEndState())
                 {
                     loopingTerminal = destPos;
                     break;
@@ -336,9 +365,9 @@ public class TopicParser
                 Position anyLoop = null;
                 for(Position destPos : dest.getValue())
                 {
-                    if(destPos._followedByAnyLoop)
+                    if(destPos.isFollowedByAnyLoop())
                     {
-                        if(anyLoop == null || anyLoop._position<destPos._position)
+                        if(anyLoop == null || anyLoop.getPosition() < destPos.getPosition())
                         {
                             anyLoop = destPos;
                         }
@@ -349,7 +378,7 @@ public class TopicParser
                     Collection<Position> removals = new ArrayList<Position>();
                     for(Position destPos : dest.getValue())
                     {
-                        if(destPos._position < anyLoop._position)
+                        if(destPos.getPosition() < anyLoop.getPosition())
                         {
                             removals.add(destPos);
                         }
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/federation/Bridge.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/federation/Bridge.java
index 8bd55614da..b58802e1ff 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/federation/Bridge.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/federation/Bridge.java
@@ -522,7 +522,7 @@ public class Bridge implements BridgeConfig
             _transaction.enqueue(queues,message, new ServerTransaction.Action()
                         {
 
-                            BaseQueue[] _queues = queues.toArray(new BaseQueue[queues.size()]);
+                            private BaseQueue[] _queues = queues.toArray(new BaseQueue[queues.size()]);
 
                             public void postCommit()
                             {
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/federation/BrokerLink.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/federation/BrokerLink.java
index 7b0f9563b3..032df8bb0d 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/federation/BrokerLink.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/federation/BrokerLink.java
@@ -376,8 +376,8 @@ public class BrokerLink implements LinkConfig, ConnectionListener
                             }
                         };
                         final SaslClient sc = Sasl.createSaslClient(new String[] {"PLAIN"}, null,
-                                                                    _conSettings.getSaslProtocol(),
-                                                                    _conSettings.getSaslServerName(),
+                                                                    getConnectionSettings().getSaslProtocol(),
+                                                                    getConnectionSettings().getSaslServerName(),
                                                                     saslProps, cbh);
 
                         return sc;
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/ComparisonExpression.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/ComparisonExpression.java
index eca9e925ee..d0d58004ab 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/ComparisonExpression.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/ComparisonExpression.java
@@ -74,7 +74,7 @@ public abstract class ComparisonExpression extends BinaryExpression implements B
     static class LikeExpression extends UnaryExpression implements BooleanExpression
     {
 
-        Pattern likePattern;
+        private Pattern likePattern;
 
         /**
          * @param right
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/flow/AbstractFlowCreditManager.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/flow/AbstractFlowCreditManager.java
index c403d109a0..124fb0d1d9 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/flow/AbstractFlowCreditManager.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/flow/AbstractFlowCreditManager.java
@@ -25,7 +25,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
 
 public abstract class AbstractFlowCreditManager implements FlowCreditManager
 {
-    protected final AtomicBoolean _suspended = new AtomicBoolean(false);
+    private final AtomicBoolean _suspended = new AtomicBoolean(false);
     private final ArrayList<FlowCreditManagerListener> _listeners = new ArrayList<FlowCreditManagerListener>();
 
     public final void addStateListener(FlowCreditManagerListener listener)
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/ManagementActor.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/ManagementActor.java
index 74017bc43e..9cd3c66629 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/ManagementActor.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/ManagementActor.java
@@ -51,7 +51,7 @@ public class ManagementActor extends AbstractActor
      */
     private static final String UNKNOWN_PRINCIPAL = "N/A";
 
-    String _lastThreadName = null;
+    private String _lastThreadName = null;
 
     /**
      * LOG FORMAT for the ManagementActor,
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/management/LoggingManagementMBean.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/management/LoggingManagementMBean.java
index 3b69b8e8cd..c699dff175 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/management/LoggingManagementMBean.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/management/LoggingManagementMBean.java
@@ -82,8 +82,8 @@ public class LoggingManagementMBean extends AMQManagedObject implements LoggingM
                                                         Level.WARN.toString(), Level.ERROR.toString(), 
                                                         Level.FATAL.toString(),Level.OFF.toString(),
                                                         INHERITED};   
-    static TabularType _loggerLevelTabularType;
-    static CompositeType _loggerLevelCompositeType;
+    private static TabularType _loggerLevelTabularType;
+    private static CompositeType _loggerLevelCompositeType;
 
     static
     {
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/AbstractLogSubject.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/AbstractLogSubject.java
index 779db01601..baccf240ff 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/AbstractLogSubject.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/AbstractLogSubject.java
@@ -33,10 +33,7 @@ import java.text.MessageFormat;
  */
 public abstract class AbstractLogSubject implements LogSubject
 {
-    /**
-     * The logString that will be returned via toLogString
-     */
-    protected String _logString;
+    private String _logString;
 
     /**
      * Set the toString logging of this LogSubject. Based on a format provided
@@ -60,4 +57,16 @@ public abstract class AbstractLogSubject implements LogSubject
         return _logString;
     }
 
+    /**
+     * The logString that will be returned via toLogString
+     */
+    public String getLogString()
+    {
+        return _logString;
+    }
+
+    public void setLogString(String logString)
+    {
+        _logString = logString;
+    }
 }
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubject.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubject.java
index c8e122ec05..3b08a172b6 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubject.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubject.java
@@ -70,31 +70,31 @@ public class ConnectionLogSubject extends AbstractLogSubject
                      * 
                      * 0 - Connection ID 1 - User ID 2 - IP 3 - Virtualhost
                      */
-                    _logString = "[" + MessageFormat.format(CONNECTION_FORMAT, 
-                                                            _session.getSessionID(), 
-                                                            _session.getAuthorizedPrincipal().getName(), 
+                    setLogString("[" + MessageFormat.format(CONNECTION_FORMAT,
+                                                            _session.getSessionID(),
+                                                            _session.getAuthorizedPrincipal().getName(),
                                                             _session.getRemoteAddress(),
-                                                            _session.getVirtualHost().getName()) 
-                                 + "] ";
+                                                            _session.getVirtualHost().getName())
+                                 + "] ");
 
                     _upToDate = true;
                 } 
                 else
                 {
-                    _logString = "[" + MessageFormat.format(USER_FORMAT, 
-                                                            _session.getSessionID(), 
-                                                            _session.getAuthorizedPrincipal().getName(), 
+                    setLogString("[" + MessageFormat.format(USER_FORMAT,
+                                                            _session.getSessionID(),
+                                                            _session.getAuthorizedPrincipal().getName(),
                                                             _session.getRemoteAddress())
-                                 + "] ";
+                                 + "] ");
 
                 }
             } 
             else
             {
-                    _logString = "[" + MessageFormat.format(SOCKET_FORMAT,
+                    setLogString("[" + MessageFormat.format(SOCKET_FORMAT,
                                                             _session.getSessionID(),
-                                                            _session.getRemoteAddress()) 
-                                 + "] ";
+                                                            _session.getRemoteAddress())
+                                 + "] ");
             }
         }
     }
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/SubscriptionLogSubject.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/SubscriptionLogSubject.java
index 56aef18574..9a23b733dc 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/SubscriptionLogSubject.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/SubscriptionLogSubject.java
@@ -42,14 +42,14 @@ public class SubscriptionLogSubject extends AbstractLogSubject
 
         String queueString = new QueueLogSubject(subscription.getQueue()).toLogString();
 
-        _logString = "[" + MessageFormat.format(SUBSCRIPTION_FORMAT,
+        setLogString("[" + MessageFormat.format(SUBSCRIPTION_FORMAT,
                                                 subscription.getSubscriptionID())
                      + "("
                      // queueString is [vh(/{0})/qu({1}) ] so need to trim
                      //                ^                ^^
                      + queueString.substring(1,queueString.length() - 3)
                      + ")"
-                     + "] ";
+                     + "] ");
 
     }
 }
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/management/AMQManagedObject.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/management/AMQManagedObject.java
index 2748e5a670..5c57c01f6e 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/management/AMQManagedObject.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/management/AMQManagedObject.java
@@ -40,17 +40,11 @@ import javax.management.NotificationListener;
 public abstract class AMQManagedObject extends DefaultManagedObject
                                        implements NotificationBroadcaster
 {
-    /**
-     * broadcaster support class
-     */
-    protected NotificationBroadcasterSupport _broadcaster = new NotificationBroadcasterSupport();
+    private NotificationBroadcasterSupport _broadcaster = new NotificationBroadcasterSupport();
 
-    /**
-     * sequence number for notifications
-     */
-    protected long _notificationSequenceNumber = 0;
+    private long _notificationSequenceNumber = 0;
 
-    protected LogActor _logActor;
+    private LogActor _logActor;
 
     protected AMQManagedObject(Class<?> managementInterface, String typeName)
         throws NotCompliantMBeanException
@@ -77,4 +71,35 @@ public abstract class AMQManagedObject extends DefaultManagedObject
     }
 
 
+    /**
+     * broadcaster support class
+     */
+    protected NotificationBroadcasterSupport getBroadcaster()
+    {
+        return _broadcaster;
+    }
+
+    /**
+     * sequence number for notifications
+     */
+    protected long getNotificationSequenceNumber()
+    {
+        return _notificationSequenceNumber;
+    }
+
+    protected void setNotificationSequenceNumber(long notificationSequenceNumber)
+    {
+        _notificationSequenceNumber = notificationSequenceNumber;
+    }
+
+    protected long incrementAndGetSequenceNumber()
+    {
+        return ++_notificationSequenceNumber;
+    }
+
+    protected LogActor getLogActor()
+    {
+        return _logActor;
+    }
+
 }
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/management/AbstractAMQManagedConnectionObject.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/management/AbstractAMQManagedConnectionObject.java
index 6faeb76baf..e7c07b6dd4 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/management/AbstractAMQManagedConnectionObject.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/management/AbstractAMQManagedConnectionObject.java
@@ -15,7 +15,7 @@ import javax.management.openmbean.TabularType;
 
 public abstract class AbstractAMQManagedConnectionObject extends AMQManagedObject implements ManagedConnection
 {
-    protected final String _name;
+    private final String _name;
 
     protected static final OpenType[] _channelAttributeTypes = { SimpleType.INTEGER, SimpleType.BOOLEAN, SimpleType.STRING, SimpleType.INTEGER, SimpleType.BOOLEAN };
     protected static final CompositeType _channelType;
@@ -45,7 +45,6 @@ public abstract class AbstractAMQManagedConnectionObject extends AMQManagedObjec
         _name = "anonymous".equals(remoteAddress) ? (remoteAddress + hashCode()) : remoteAddress;
     }
 
-    @Override
     public String getObjectInstanceName()
     {
         return ObjectName.quote(_name);
@@ -53,9 +52,9 @@ public abstract class AbstractAMQManagedConnectionObject extends AMQManagedObjec
 
     public void notifyClients(String notificationMsg)
     {
-        final Notification n = new Notification(MonitorNotification.THRESHOLD_VALUE_EXCEEDED, this, ++_notificationSequenceNumber,
+        final Notification n = new Notification(MonitorNotification.THRESHOLD_VALUE_EXCEEDED, this, incrementAndGetSequenceNumber(),
                                                 System.currentTimeMillis(), notificationMsg);
-        _broadcaster.sendNotification(n);
+        getBroadcaster().sendNotification(n);
     }
 
     @Override
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageMetaData.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageMetaData.java
index 0b4fac9d23..583f0c09a7 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageMetaData.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageMetaData.java
@@ -161,7 +161,7 @@ public class MessageMetaData implements StorableMessageMetaData
 
     public int getContentSize()
     {
-        return (int) _contentHeaderBody.bodySize;
+        return (int) _contentHeaderBody.getBodySize();
     }
 
     public boolean isPersistent()
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/output/amqp0_8/ProtocolOutputConverterImpl.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/output/amqp0_8/ProtocolOutputConverterImpl.java
index 3ec384f5a3..b2728be856 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/output/amqp0_8/ProtocolOutputConverterImpl.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/output/amqp0_8/ProtocolOutputConverterImpl.java
@@ -104,7 +104,7 @@ public class ProtocolOutputConverterImpl implements ProtocolOutputConverter
             final MessageTransferMessage message = (MessageTransferMessage) entry.getMessage();
             BasicContentHeaderProperties props = HeaderPropertiesConverter.convert(message, entry.getQueue().getVirtualHost());
             ContentHeaderBody chb = new ContentHeaderBody(props, org.apache.qpid.framing.amqp_8_0.BasicGetBodyImpl.CLASS_ID);
-            chb.bodySize = message.getSize();
+            chb.setBodySize(message.getSize());
             return chb;
         }
     }
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/output/amqp0_9/ProtocolOutputConverterImpl.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/output/amqp0_9/ProtocolOutputConverterImpl.java
index c1bb123fdc..054d8b98e8 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/output/amqp0_9/ProtocolOutputConverterImpl.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/output/amqp0_9/ProtocolOutputConverterImpl.java
@@ -99,7 +99,7 @@ public class ProtocolOutputConverterImpl implements ProtocolOutputConverter
             final MessageTransferMessage message = (MessageTransferMessage) entry.getMessage();
             BasicContentHeaderProperties props = HeaderPropertiesConverter.convert(message, entry.getQueue().getVirtualHost());
             ContentHeaderBody chb = new ContentHeaderBody(props, BasicGetBodyImpl.CLASS_ID);
-            chb.bodySize = message.getSize();
+            chb.setBodySize(message.getSize());
             return chb;
         }
     }
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/output/amqp0_9_1/ProtocolOutputConverterImpl.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/output/amqp0_9_1/ProtocolOutputConverterImpl.java
index 49479ec540..cf097fa923 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/output/amqp0_9_1/ProtocolOutputConverterImpl.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/output/amqp0_9_1/ProtocolOutputConverterImpl.java
@@ -98,7 +98,7 @@ public class ProtocolOutputConverterImpl implements ProtocolOutputConverter
             final MessageTransferMessage message = (MessageTransferMessage) entry.getMessage();
             BasicContentHeaderProperties props = HeaderPropertiesConverter.convert(message, entry.getQueue().getVirtualHost());
             ContentHeaderBody chb = new ContentHeaderBody(props, BasicGetBodyImpl.CLASS_ID);
-            chb.bodySize = message.getSize();
+            chb.setBodySize(message.getSize());
             return chb;
         }
     }
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java
index 771c436a89..251c3dd0cd 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java
@@ -369,7 +369,7 @@ public class AMQProtocolEngine implements ServerProtocolEngine, Managable, AMQPr
         try
         {
             // Log incomming protocol negotiation request
-            _actor.message(ConnectionMessages.OPEN(null, pi._protocolMajor + "-" + pi._protocolMinor, false, true));
+            _actor.message(ConnectionMessages.OPEN(null, pi.getProtocolMajor() + "-" + pi.getProtocolMinor(), false, true));
 
             ProtocolVersion pv = pi.checkVersion(); // Fails if not correct
 
@@ -1357,6 +1357,11 @@ public class AMQProtocolEngine implements ServerProtocolEngine, Managable, AMQPr
 		                (Throwable) null));
     }
 
+    public boolean isClosed()
+    {
+        return _closed;
+    }
+
     public List<AMQSessionModel> getSessionModels()
     {
 		List<AMQSessionModel> sessions = new ArrayList<AMQSessionModel>();
@@ -1503,8 +1508,8 @@ public class AMQProtocolEngine implements ServerProtocolEngine, Managable, AMQPr
 
     private static class BytesDataOutput implements DataOutput
     {
-        int _pos = 0;
-        byte[] _buf;
+        private int _pos = 0;
+        private byte[] _buf;
 
         public BytesDataOutput(byte[] buf)
         {
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBean.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBean.java
index 81d8bf8f5e..2f4becc129 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBean.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBean.java
@@ -133,7 +133,7 @@ public class AMQProtocolSessionMBean extends AbstractAMQManagedConnectionObject
      */
     public void commitTransactions(int channelId) throws JMException
     {
-        CurrentActor.set(new ManagementActor(_logActor.getRootMessageLogger()));
+        CurrentActor.set(new ManagementActor(getLogActor().getRootMessageLogger()));
         try
         {
             AMQChannel channel = _protocolSession.getChannel(channelId);
@@ -162,7 +162,7 @@ public class AMQProtocolSessionMBean extends AbstractAMQManagedConnectionObject
      */
     public void rollbackTransactions(int channelId) throws JMException
     {
-        CurrentActor.set(new ManagementActor(_logActor.getRootMessageLogger()));
+        CurrentActor.set(new ManagementActor(getLogActor().getRootMessageLogger()));
         try
         {
             AMQChannel channel = _protocolSession.getChannel(channelId);
@@ -241,7 +241,7 @@ public class AMQProtocolSessionMBean extends AbstractAMQManagedConnectionObject
         if (CurrentActor.get() == null)
         {
             removeActor = true;
-            CurrentActor.set(new ManagementActor(_logActor.getRootMessageLogger()));
+            CurrentActor.set(new ManagementActor(getLogActor().getRootMessageLogger()));
         }
 
         try
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueMBean.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueMBean.java
index cbd3471115..7c59097965 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueMBean.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueMBean.java
@@ -355,10 +355,10 @@ public class AMQQueueMBean extends AMQManagedObject implements ManagedQueue, Que
         notificationMsg = notification.name() + " " + notificationMsg;
 
         _lastNotification =
-            new Notification(MonitorNotification.THRESHOLD_VALUE_EXCEEDED, this, ++_notificationSequenceNumber,
+            new Notification(MonitorNotification.THRESHOLD_VALUE_EXCEEDED, this, incrementAndGetSequenceNumber(),
                 System.currentTimeMillis(), notificationMsg);
 
-        _broadcaster.sendNotification(_lastNotification);
+        getBroadcaster().sendNotification(_lastNotification);
     }
 
     public Notification getLastNotification()
@@ -495,7 +495,7 @@ public class AMQQueueMBean extends AMQManagedObject implements ManagedQueue, Que
                     ContentHeaderBody headerBody = msg.getContentHeaderBody();
                     // Create header attributes list
                     headerAttributes = getMessageHeaderProperties(headerBody);
-                    itemValues = new Object[]{msg.getMessageId(), headerAttributes, headerBody.bodySize, queueEntry.isRedelivered(), position, queueEntry.getDeliveryCount()};
+                    itemValues = new Object[]{msg.getMessageId(), headerAttributes, headerBody.getBodySize(), queueEntry.isRedelivered(), position, queueEntry.getDeliveryCount()};
                 }
                 else if(serverMsg instanceof MessageTransferMessage)
                 {
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/IncomingMessage.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/IncomingMessage.java
index d3792e68df..0162f1b738 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/IncomingMessage.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/IncomingMessage.java
@@ -157,7 +157,7 @@ public class IncomingMessage implements Filterable, InboundMessage, EnqueableMes
 
     public boolean allContentReceived()
     {
-        return (_bodyLengthReceived == getContentHeader().bodySize);
+        return (_bodyLengthReceived == getContentHeader().getBodySize());
     }
 
     public AMQShortString getExchange()
@@ -218,7 +218,7 @@ public class IncomingMessage implements Filterable, InboundMessage, EnqueableMes
 
     public long getSize()
     {
-        return getContentHeader().bodySize;
+        return getContentHeader().getBodySize();
     }
 
     public long getMessageNumber()
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/OutOfOrderQueue.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/OutOfOrderQueue.java
index 18c2906470..cb34f69ff8 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/OutOfOrderQueue.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/OutOfOrderQueue.java
@@ -29,7 +29,7 @@ public abstract class OutOfOrderQueue extends SimpleAMQQueue
                 QueueContext context = (QueueContext) subscription.getQueueContext();
                 if(context != null)
                 {
-                    QueueEntry released = context._releasedEntry;
+                    QueueEntry released = context.getReleasedEntry();
                     while(!entry.isAcquired() && (released == null || released.compareTo(entry) > 0))
                     {
                         if(QueueContext._releasedUpdater.compareAndSet(context,released,entry))
@@ -38,7 +38,7 @@ public abstract class OutOfOrderQueue extends SimpleAMQQueue
                         }
                         else
                         {
-                            released = context._releasedEntry;
+                            released = context.getReleasedEntry();
                         }
                     }
                 }
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueContext.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueContext.java
index 825a85a89c..c8f04c7b96 100755
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueContext.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueContext.java
@@ -25,8 +25,8 @@ import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
 
 final class QueueContext implements AMQQueue.Context
 {
-    volatile QueueEntry _lastSeenEntry;
-    volatile QueueEntry _releasedEntry;
+    private volatile QueueEntry _lastSeenEntry;
+    private volatile QueueEntry _releasedEntry;
 
     static final AtomicReferenceFieldUpdater<QueueContext, QueueEntry>
             _lastSeenUpdater =
@@ -46,4 +46,10 @@ final class QueueContext implements AMQQueue.Context
     {
         return _lastSeenEntry;
     }
+
+
+    QueueEntry getReleasedEntry()
+    {
+        return _releasedEntry;
+    }
 }
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
index 035645acc7..a6518e857f 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
@@ -834,7 +834,7 @@ public class SimpleAMQQueue implements AMQQueue, Subscription.StateListener, Mes
     private void setLastSeenEntry(final Subscription sub, final QueueEntry entry)
     {
         QueueContext subContext = (QueueContext) sub.getQueueContext();
-        QueueEntry releasedEntry = subContext._releasedEntry;
+        QueueEntry releasedEntry = subContext.getReleasedEntry();
 
         QueueContext._lastSeenUpdater.set(subContext, entry);
         if(releasedEntry == entry)
@@ -851,7 +851,7 @@ public class SimpleAMQQueue implements AMQQueue, Subscription.StateListener, Mes
         {
             QueueEntry oldEntry;
 
-            while((oldEntry  = subContext._releasedEntry) == null || oldEntry.compareTo(entry) > 0)
+            while((oldEntry  = subContext.getReleasedEntry()) == null || oldEntry.compareTo(entry) > 0)
             {
                 if(QueueContext._releasedUpdater.compareAndSet(subContext, oldEntry, entry))
                 {
@@ -1846,8 +1846,8 @@ public class SimpleAMQQueue implements AMQQueue, Subscription.StateListener, Mes
         QueueContext context = (QueueContext) sub.getQueueContext();
         if(context != null)
         {
-            QueueEntry lastSeen = context._lastSeenEntry;
-            QueueEntry releasedNode = context._releasedEntry;
+            QueueEntry lastSeen = context.getLastSeenEntry();
+            QueueEntry releasedNode = context.getReleasedEntry();
 
             QueueEntry node = (releasedNode != null && lastSeen.compareTo(releasedNode)>=0) ? releasedNode : _entries.next(lastSeen);
 
@@ -1869,8 +1869,8 @@ public class SimpleAMQQueue implements AMQQueue, Subscription.StateListener, Mes
                     QueueContext._releasedUpdater.compareAndSet(context, releasedNode, null);
                 }
 
-                lastSeen = context._lastSeenEntry;
-                releasedNode = context._releasedEntry;
+                lastSeen = context.getLastSeenEntry();
+                releasedNode = context.getReleasedEntry();
                 node = (releasedNode != null && lastSeen.compareTo(releasedNode)>0) ? releasedNode : _entries.next(lastSeen);
             }
             return node;
@@ -1886,7 +1886,7 @@ public class SimpleAMQQueue implements AMQQueue, Subscription.StateListener, Mes
         QueueContext context = (QueueContext) sub.getQueueContext();
         if(context != null)
         {
-            QueueEntry releasedNode = context._releasedEntry;
+            QueueEntry releasedNode = context.getReleasedEntry();
             return releasedNode == null || releasedNode.compareTo(entry) < 0;
         }
         else
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleQueueEntryImpl.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleQueueEntryImpl.java
index 0707dc045c..4a10d31d37 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleQueueEntryImpl.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleQueueEntryImpl.java
@@ -22,9 +22,16 @@ package org.apache.qpid.server.queue;
 
 import org.apache.qpid.server.message.ServerMessage;
 
+import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
+
 public class SimpleQueueEntryImpl extends QueueEntryImpl
 {
-    volatile SimpleQueueEntryImpl _next;
+    static final AtomicReferenceFieldUpdater<SimpleQueueEntryImpl, SimpleQueueEntryImpl>
+                _nextUpdater =
+            AtomicReferenceFieldUpdater.newUpdater
+            (SimpleQueueEntryImpl.class, SimpleQueueEntryImpl.class, "_next");
+
+    private volatile SimpleQueueEntryImpl _next;
 
     public SimpleQueueEntryImpl(SimpleQueueEntryList queueEntryList)
     {
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleQueueEntryList.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleQueueEntryList.java
index 828c8b4964..d74431aae7 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleQueueEntryList.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleQueueEntryList.java
@@ -42,9 +42,7 @@ public class SimpleQueueEntryList implements QueueEntryList<SimpleQueueEntryImpl
     private final AMQQueue _queue;
 
     static final AtomicReferenceFieldUpdater<SimpleQueueEntryImpl, SimpleQueueEntryImpl>
-                _nextUpdater =
-            AtomicReferenceFieldUpdater.newUpdater
-            (SimpleQueueEntryImpl.class, SimpleQueueEntryImpl.class, "_next");
+                _nextUpdater = SimpleQueueEntryImpl._nextUpdater;
 
     private AtomicLong _scavenges = new AtomicLong(0L);
     private final long _scavengeCount = Integer.getInteger("qpid.queue.scavenge_count", 50);
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java
index ddb122a08a..f6c766d73f 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java
@@ -77,33 +77,33 @@ import java.util.concurrent.atomic.AtomicReference;
  */
 public abstract class ApplicationRegistry implements IApplicationRegistry
 {
-    protected static final Logger _logger = Logger.getLogger(ApplicationRegistry.class);
+    private static final Logger _logger = Logger.getLogger(ApplicationRegistry.class);
 
     private static AtomicReference<IApplicationRegistry> _instance = new AtomicReference<IApplicationRegistry>(null);
 
-    protected final ServerConfiguration _configuration;
+    private final ServerConfiguration _configuration;
 
-    protected final Map<InetSocketAddress, QpidAcceptor> _acceptors = new HashMap<InetSocketAddress, QpidAcceptor>();
+    private final Map<InetSocketAddress, QpidAcceptor> _acceptors = new HashMap<InetSocketAddress, QpidAcceptor>();
 
-    protected ManagedObjectRegistry _managedObjectRegistry;
+    private ManagedObjectRegistry _managedObjectRegistry;
 
-    protected AuthenticationManager _authenticationManager;
+    private AuthenticationManager _authenticationManager;
 
-    protected VirtualHostRegistry _virtualHostRegistry;
+    private VirtualHostRegistry _virtualHostRegistry;
 
-    protected SecurityManager _securityManager;
+    private SecurityManager _securityManager;
 
-    protected PluginManager _pluginManager;
+    private PluginManager _pluginManager;
 
-    protected ConfigurationManager _configurationManager;
+    private ConfigurationManager _configurationManager;
 
-    protected RootMessageLogger _rootMessageLogger;
+    private RootMessageLogger _rootMessageLogger;
 
-    protected CompositeStartupMessageLogger _startupMessageLogger;
+    private CompositeStartupMessageLogger _startupMessageLogger;
 
-    protected UUID _brokerId = UUID.randomUUID();
+    private UUID _brokerId = UUID.randomUUID();
 
-    protected QMFService _qmfService;
+    private QMFService _qmfService;
 
     private BrokerConfig _broker;
 
@@ -115,6 +115,76 @@ public abstract class ApplicationRegistry implements IApplicationRegistry
 
     private BundleContext _bundleContext;
 
+    protected static Logger get_logger()
+    {
+        return _logger;
+    }
+
+    protected Map<InetSocketAddress, QpidAcceptor> getAcceptors()
+    {
+        return _acceptors;
+    }
+
+    protected void setManagedObjectRegistry(ManagedObjectRegistry managedObjectRegistry)
+    {
+        _managedObjectRegistry = managedObjectRegistry;
+    }
+
+    protected void setAuthenticationManager(AuthenticationManager authenticationManager)
+    {
+        _authenticationManager = authenticationManager;
+    }
+
+    protected void setVirtualHostRegistry(VirtualHostRegistry virtualHostRegistry)
+    {
+        _virtualHostRegistry = virtualHostRegistry;
+    }
+
+    protected void setSecurityManager(SecurityManager securityManager)
+    {
+        _securityManager = securityManager;
+    }
+
+    protected void setPluginManager(PluginManager pluginManager)
+    {
+        _pluginManager = pluginManager;
+    }
+
+    protected void setConfigurationManager(ConfigurationManager configurationManager)
+    {
+        _configurationManager = configurationManager;
+    }
+
+    protected void setRootMessageLogger(RootMessageLogger rootMessageLogger)
+    {
+        _rootMessageLogger = rootMessageLogger;
+    }
+
+    protected CompositeStartupMessageLogger getStartupMessageLogger()
+    {
+        return _startupMessageLogger;
+    }
+
+    protected void setStartupMessageLogger(CompositeStartupMessageLogger startupMessageLogger)
+    {
+        _startupMessageLogger = startupMessageLogger;
+    }
+
+    protected void setBrokerId(UUID brokerId)
+    {
+        _brokerId = brokerId;
+    }
+
+    protected QMFService getQmfService()
+    {
+        return _qmfService;
+    }
+
+    protected void setQmfService(QMFService qmfService)
+    {
+        _qmfService = qmfService;
+    }
+
     static
     {
         Runtime.getRuntime().addShutdownHook(new Thread(new ShutdownService()));
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ConfigurationFileApplicationRegistry.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ConfigurationFileApplicationRegistry.java
index 3e6df7b0e3..e9ba2764e5 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ConfigurationFileApplicationRegistry.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ConfigurationFileApplicationRegistry.java
@@ -48,7 +48,7 @@ public class ConfigurationFileApplicationRegistry extends ApplicationRegistry
     public void close()
     {
         //Set the Actor for Broker Shutdown
-        CurrentActor.set(new BrokerActor(_rootMessageLogger));
+        CurrentActor.set(new BrokerActor(getRootMessageLogger()));
         try
         {
             super.close();
@@ -63,13 +63,13 @@ public class ConfigurationFileApplicationRegistry extends ApplicationRegistry
     @Override
     protected void initialiseManagedObjectRegistry() throws AMQException
     {
-        if (_configuration.getManagementEnabled())
+        if (getConfiguration().getManagementEnabled())
         {
-            _managedObjectRegistry = new JMXManagedObjectRegistry();
+            setManagedObjectRegistry(new JMXManagedObjectRegistry());
         }
         else
         {
-            _managedObjectRegistry = new NoopManagedObjectRegistry();
+            setManagedObjectRegistry(new NoopManagedObjectRegistry());
         }
     }
 
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/AbstractPlugin.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/AbstractPlugin.java
index 671ac12f9d..704e50da5c 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/AbstractPlugin.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/AbstractPlugin.java
@@ -32,9 +32,9 @@ import org.apache.qpid.server.security.access.Operation;
  */
 public abstract class AbstractPlugin implements SecurityPlugin
 {
-	protected final Logger _logger = Logger.getLogger(getClass());
+	private final Logger _logger = Logger.getLogger(getClass());
     
-    protected ConfigurationPlugin _config;
+    private ConfigurationPlugin _config;
 	
 	public Result getDefault()
 	{
@@ -50,4 +50,8 @@ public abstract class AbstractPlugin implements SecurityPlugin
         _config = config;
     }
 
+    public ConfigurationPlugin getConfig()
+    {
+        return _config;
+    }
 }
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabase.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabase.java
index 02bd573eae..fcd64f3a23 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabase.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabase.java
@@ -62,7 +62,7 @@ public class Base64MD5PasswordFilePrincipalDatabase implements PrincipalDatabase
 
     private Map<String, AuthenticationProviderInitialiser> _saslServers;
 
-    AMQUserManagementMBean _mbean;
+    private AMQUserManagementMBean _mbean;
     public static final String DEFAULT_ENCODING = "utf-8";
     private Map<String, HashedUser> _users = new HashMap<String, HashedUser>();
     private ReentrantLock _userUpdate = new ReentrantLock();
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/HashedUser.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/HashedUser.java
index 3690e7f92a..de76e31280 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/HashedUser.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/HashedUser.java
@@ -33,9 +33,9 @@ public class HashedUser implements Principal
 {
     private static final Logger _logger = Logger.getLogger(HashedUser.class);
 
-    String _name;
-    char[] _password;
-    byte[] _encodedPassword = null;
+    private String _name;
+    private char[] _password;
+    private byte[] _encodedPassword = null;
     private boolean _modified = false;
     private boolean _deleted = false;
 
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/store/AbstractMessageStore.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/store/AbstractMessageStore.java
index 7e6083c60f..fc5d2a4e42 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/store/AbstractMessageStore.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/store/AbstractMessageStore.java
@@ -28,7 +28,7 @@ import org.apache.qpid.server.virtualhost.VirtualHost;
 
 public abstract class AbstractMessageStore implements MessageStore
 {
-    protected LogSubject _logSubject;
+    private LogSubject _logSubject;
 
     public void configure(VirtualHost virtualHost) throws Exception
     {
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/QpidAcceptor.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/QpidAcceptor.java
index abbc5a3805..637ea7dffc 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/QpidAcceptor.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/QpidAcceptor.java
@@ -24,8 +24,8 @@ import org.apache.qpid.transport.network.NetworkTransport;
 
 public class QpidAcceptor
 {
-    NetworkTransport _transport;
-    String _protocol;
+    private NetworkTransport _transport;
+    private String _protocol;
     public QpidAcceptor(NetworkTransport transport, String protocol)
     {
         _transport = transport;
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnectionMBean.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnectionMBean.java
index 7aa0387d0d..3bf799cba6 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnectionMBean.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnectionMBean.java
@@ -132,7 +132,7 @@ public class ServerConnectionMBean extends AbstractAMQManagedConnectionObject
         }
         else if (session.isTransactional())
         {
-            CurrentActor.set(new ManagementActor(_logActor.getRootMessageLogger()));
+            CurrentActor.set(new ManagementActor(getLogActor().getRootMessageLogger()));
             try
             {
                 session.commit();
@@ -154,7 +154,7 @@ public class ServerConnectionMBean extends AbstractAMQManagedConnectionObject
         }
         else if (session.isTransactional())
         {
-            CurrentActor.set(new ManagementActor(_logActor.getRootMessageLogger()));
+            CurrentActor.set(new ManagementActor(getLogActor().getRootMessageLogger()));
             try
             {
                 session.rollback();
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/HouseKeepingTask.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/HouseKeepingTask.java
index 760745f76a..68cb3bce9f 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/HouseKeepingTask.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/HouseKeepingTask.java
@@ -28,7 +28,7 @@ import org.apache.qpid.server.logging.actors.CurrentActor;
 
 public abstract class HouseKeepingTask implements Runnable
 {
-    Logger _logger = Logger.getLogger(this.getClass());
+    private Logger _logger = Logger.getLogger(this.getClass());
 
     private VirtualHost _virtualHost;
 
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/policies/TopicDeletePolicy.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/policies/TopicDeletePolicy.java
index c17d1b0497..f2f61f204e 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/policies/TopicDeletePolicy.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/policies/TopicDeletePolicy.java
@@ -37,7 +37,7 @@ import org.apache.qpid.slowconsumerdetection.policies.SlowConsumerPolicyPluginFa
 
 public class TopicDeletePolicy implements SlowConsumerPolicyPlugin
 {
-    Logger _logger = Logger.getLogger(TopicDeletePolicy.class);
+    private Logger _logger = Logger.getLogger(TopicDeletePolicy.class);
     private TopicDeletePolicyConfiguration _configuration;
 
     public static class TopicDeletePolicyFactory implements SlowConsumerPolicyPluginFactory
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/ExtractResendAndRequeueTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/ExtractResendAndRequeueTest.java
index 6cf5a02c13..616ee74b2d 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/ExtractResendAndRequeueTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/ExtractResendAndRequeueTest.java
@@ -60,7 +60,7 @@ import java.util.Map;
 public class ExtractResendAndRequeueTest extends TestCase
 {
 
-    UnacknowledgedMessageMapImpl _unacknowledgedMessageMap;
+    private UnacknowledgedMessageMapImpl _unacknowledgedMessageMap;
     private static final int INITIAL_MSG_COUNT = 10;
     private AMQQueue _queue = new MockAMQQueue(getName());
     private MessageStore _messageStore = new MemoryMessageStore();
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/plugins/ConfigurationPluginTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/plugins/ConfigurationPluginTest.java
index 746feea7a1..14c7b8cb20 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/plugins/ConfigurationPluginTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/plugins/ConfigurationPluginTest.java
@@ -68,7 +68,7 @@ public class ConfigurationPluginTest extends InternalBrokerBaseCase
 
     }
 
-    ConfigPlugin _plugin;
+    private ConfigPlugin _plugin;
 
     @Override
     public void setUp() throws Exception
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
index d2baa7009b..27a0462e09 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
@@ -76,7 +76,7 @@ public class AbstractHeadersExchangeTestBase extends InternalBrokerBaseCase
     private MemoryMessageStore _store = new MemoryMessageStore();
 
 
-    BindingFactory bindingFactory = new BindingFactory(new DurableConfigurationStore.Source()
+    private BindingFactory bindingFactory = new BindingFactory(new DurableConfigurationStore.Source()
                                                         {
 
                                                             public DurableConfigurationStore getDurableConfigurationStore()
@@ -288,7 +288,7 @@ public class AbstractHeadersExchangeTestBase extends InternalBrokerBaseCase
 
     static class TestQueue extends SimpleAMQQueue
     {
-        final List<HeadersExchangeTest.Message> messages = new ArrayList<HeadersExchangeTest.Message>();
+        private final List<HeadersExchangeTest.Message> messages = new ArrayList<HeadersExchangeTest.Message>();
 
         public String toString()
         {
@@ -492,18 +492,15 @@ public class AbstractHeadersExchangeTestBase extends InternalBrokerBaseCase
                     return null;
                 }
 
-                @Override
                 public int getDeliveryCount()
                 {
                     return 0;
                 }
 
-                @Override
                 public void incrementDeliveryCount()
                 {
                 }
 
-                @Override
                 public void decrementDeliveryCount()
                 {
                 }
@@ -590,8 +587,8 @@ public class AbstractHeadersExchangeTestBase extends InternalBrokerBaseCase
             int pos = 0;
             for(ContentBody body : bodies)
             {
-                storedMessage.addContent(pos, ByteBuffer.wrap(body._payload));
-                pos += body._payload.length;
+                storedMessage.addContent(pos, ByteBuffer.wrap(body.getPayload()));
+                pos += body.getPayload().length;
             }
 
             _incoming = new TestIncomingMessage(getMessageId(),publish, protocolsession);
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java
index 5df7784db8..326d36df05 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java
@@ -28,7 +28,7 @@ import org.apache.qpid.server.virtualhost.VirtualHost;
 
 public class HeadersExchangeTest extends AbstractHeadersExchangeTestBase
 {
-    AMQProtocolSession _protocolSession;
+    private AMQProtocolSession _protocolSession;
 
     @Override
     public void setUp() throws Exception
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java
index 227bdf089b..dfa31e131f 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java
@@ -44,12 +44,12 @@ import org.apache.qpid.server.virtualhost.VirtualHost;
 public class TopicExchangeTest extends InternalBrokerBaseCase
 {
 
-    TopicExchange _exchange;
+    private TopicExchange _exchange;
 
-    VirtualHost _vhost;
-    MessageStore _store;
+    private VirtualHost _vhost;
+    private MessageStore _store;
 
-    InternalTestProtocolSession _protocolSession;
+    private InternalTestProtocolSession _protocolSession;
 
 
     @Override
@@ -409,7 +409,7 @@ public class TopicExchangeTest extends InternalBrokerBaseCase
 
     class PublishInfo implements MessagePublishInfo
     {
-        AMQShortString _routingkey;
+        private AMQShortString _routingkey;
 
         PublishInfo(AMQShortString routingkey)
         {
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/flow/WindowCreditManagerTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/flow/WindowCreditManagerTest.java
index 2011dfbda6..bc651c9748 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/flow/WindowCreditManagerTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/flow/WindowCreditManagerTest.java
@@ -24,7 +24,7 @@ import org.apache.qpid.test.utils.QpidTestCase;
 
 public class WindowCreditManagerTest extends QpidTestCase
 {
-    WindowCreditManager _creditManager;
+    private WindowCreditManager _creditManager;
 
     protected void setUp() throws Exception
     {
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/Log4jMessageLoggerTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/Log4jMessageLoggerTest.java
index bc135ad582..e2a6a56ee2 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/Log4jMessageLoggerTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/Log4jMessageLoggerTest.java
@@ -35,8 +35,8 @@ import java.util.List;
 /** Test that the Log4jMessageLogger defaults behave as expected */
 public class Log4jMessageLoggerTest extends TestCase
 {
-    Level _rootLevel;
-    Log4jTestAppender _appender;
+    private Level _rootLevel;
+    private Log4jTestAppender _appender;
 
     @Override
     public void setUp() throws IOException
@@ -242,7 +242,7 @@ public class Log4jMessageLoggerTest extends TestCase
      */
     private class Log4jTestAppender extends AppenderSkeleton
     {
-        List<LoggingEvent> _log = new LinkedList<LoggingEvent>();
+        private List<LoggingEvent> _log = new LinkedList<LoggingEvent>();
 
         protected void append(LoggingEvent loggingEvent)
         {
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/CurrentActorTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/CurrentActorTest.java
index 8fc921822c..f73765f5aa 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/CurrentActorTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/CurrentActorTest.java
@@ -203,7 +203,7 @@ public class CurrentActorTest extends BaseConnectionActorTestCase
      */
     public class LogMessagesWithAConnectionActor extends Thread
     {
-        Throwable _exception;
+        private Throwable _exception;
 
         public LogMessagesWithAConnectionActor()
         {
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/ExchangeLogSubjectTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/ExchangeLogSubjectTest.java
index 7e16516fc6..cc06b05bf6 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/ExchangeLogSubjectTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/ExchangeLogSubjectTest.java
@@ -30,8 +30,8 @@ import org.apache.qpid.server.virtualhost.VirtualHost;
  */
 public class ExchangeLogSubjectTest extends AbstractTestLogSubject
 {
-    Exchange _exchange;
-    VirtualHost _testVhost;
+    private Exchange _exchange;
+    private VirtualHost _testVhost;
 
     public void setUp() throws Exception
     {
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/MessageStoreLogSubjectTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/MessageStoreLogSubjectTest.java
index 2467f62f24..158fb667a9 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/MessageStoreLogSubjectTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/MessageStoreLogSubjectTest.java
@@ -28,7 +28,7 @@ import org.apache.qpid.server.virtualhost.VirtualHost;
  */
 public class MessageStoreLogSubjectTest extends AbstractTestLogSubject
 {
-    VirtualHost _testVhost;
+    private VirtualHost _testVhost;
 
     public void setUp() throws Exception
     {
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/TestBlankSubject.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/TestBlankSubject.java
index 89688e13b3..7684db0b3d 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/TestBlankSubject.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/subjects/TestBlankSubject.java
@@ -27,7 +27,7 @@ public class TestBlankSubject extends AbstractLogSubject
 {
     public TestBlankSubject()
     {
-       _logString = "[TestBlankSubject]";
+       setLogString("[TestBlankSubject]");
     }
         
 }
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/InternalTestProtocolSession.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/InternalTestProtocolSession.java
index 623f758c8b..db37cc0965 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/InternalTestProtocolSession.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/InternalTestProtocolSession.java
@@ -50,7 +50,7 @@ import java.util.concurrent.atomic.AtomicLong;
 public class InternalTestProtocolSession extends AMQProtocolEngine implements ProtocolOutputConverter
 {
     // ChannelID(LIST)  -> LinkedList<Pair>
-    final Map<Integer, Map<AMQShortString, LinkedList<DeliveryPair>>> _channelDelivers;
+    private final Map<Integer, Map<AMQShortString, LinkedList<DeliveryPair>>> _channelDelivers;
     private AtomicInteger _deliveryCount = new AtomicInteger(0);
     private static final AtomicLong ID_GENERATOR = new AtomicLong(0);
 
@@ -197,11 +197,6 @@ public class InternalTestProtocolSession extends AMQProtocolEngine implements Pr
         }
     }
 
-    public boolean isClosed()
-    {
-        return _closed;
-    }
-
     public void closeProtocolSession()
     {
         // Override as we don't have a real IOSession to close.
@@ -230,7 +225,6 @@ public class InternalTestProtocolSession extends AMQProtocolEngine implements Pr
         }
 
 
-        @Override
         public void deliverToClient(Subscription sub, QueueEntry entry, long deliveryTag) throws AMQException
         {
             _deliveryCount.incrementAndGet();
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueAlertTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueAlertTest.java
index d3bfb3ab2e..91e35f07de 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueAlertTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueAlertTest.java
@@ -277,7 +277,7 @@ public class AMQQueueAlertTest extends InternalBrokerBaseCase
         ContentHeaderBody contentHeaderBody = new ContentHeaderBody();
         BasicContentHeaderProperties props = new BasicContentHeaderProperties();
         contentHeaderBody.setProperties(props);
-        contentHeaderBody.bodySize = size;   // in bytes
+        contentHeaderBody.setBodySize(size);   // in bytes
         IncomingMessage message = new IncomingMessage(publish);
         message.setContentHeaderBody(contentHeaderBody);
 
@@ -309,25 +309,27 @@ public class AMQQueueAlertTest extends InternalBrokerBaseCase
 
         for (int i = 0; i < messageCount; i++)
         {
-            messages[i].addContentBodyFrame(new ContentChunk(){
+            messages[i].addContentBodyFrame(
+                    new ContentChunk()
+                    {
 
-                byte[] _data = new byte[(int)size];
+                        private byte[] _data = new byte[(int)size];
 
-                public int getSize()
-                {
-                    return (int) size;
-                }
+                        public int getSize()
+                        {
+                            return (int) size;
+                        }
 
-                public byte[] getData()
-                {
-                    return _data;
-                }
+                        public byte[] getData()
+                        {
+                            return _data;
+                        }
 
-                public void reduceToFit()
-                {
+                        public void reduceToFit()
+                        {
 
-                }
-            });
+                        }
+                    });
 
             getQueue().enqueue(new AMQMessage(messages[i].getStoredMessage()));
 
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java
index 1b21304b72..337ff194c3 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java
@@ -41,8 +41,8 @@ import org.apache.qpid.test.utils.QpidTestCase;
 
 public class AMQQueueFactoryTest extends QpidTestCase
 {
-    QueueRegistry _queueRegistry;
-    VirtualHost _virtualHost;
+    private QueueRegistry _queueRegistry;
+    private VirtualHost _virtualHost;
 
     @Override
     public void setUp() throws Exception
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java
index abaf3dc9ce..933eb3b84f 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java
@@ -510,7 +510,7 @@ public class AMQQueueMBeanTest extends InternalBrokerBaseCase
         };
 
         ContentHeaderBody contentHeaderBody = new ContentHeaderBody();
-        contentHeaderBody.bodySize = MESSAGE_SIZE;   // in bytes
+        contentHeaderBody.setBodySize(MESSAGE_SIZE);   // in bytes
         final BasicContentHeaderProperties props = new BasicContentHeaderProperties();
         contentHeaderBody.setProperties(props);
         props.setDeliveryMode((byte) (persistent ? 2 : 1));
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java
index 7fe64f0b0c..c82cb9f429 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java
@@ -70,7 +70,7 @@ public class SimpleAMQQueueTest extends InternalBrokerBaseCase
     protected MockSubscription _subscription = new MockSubscription();
     protected FieldTable _arguments = null;
 
-    MessagePublishInfo info = new MessagePublishInfo()
+    private MessagePublishInfo info = new MessagePublishInfo()
     {
 
         public AMQShortString getExchange()
@@ -198,7 +198,7 @@ public class SimpleAMQQueueTest extends InternalBrokerBaseCase
         {
         }
         assertEquals(messageA, _subscription.getQueueContext().getLastSeenEntry().getMessage());
-        assertNull(((QueueContext)_subscription.getQueueContext())._releasedEntry);
+        assertNull(((QueueContext)_subscription.getQueueContext()).getReleasedEntry());
 
         // Check removing the subscription removes it's information from the queue
         _queue.unregisterSubscription(_subscription);
@@ -220,7 +220,7 @@ public class SimpleAMQQueueTest extends InternalBrokerBaseCase
         _queue.registerSubscription(_subscription, false);
         Thread.sleep(150);
         assertEquals(messageA, _subscription.getQueueContext().getLastSeenEntry().getMessage());
-        assertNull("There should be no releasedEntry after an enqueue", ((QueueContext)_subscription.getQueueContext())._releasedEntry);
+        assertNull("There should be no releasedEntry after an enqueue", ((QueueContext)_subscription.getQueueContext()).getReleasedEntry());
     }
 
     /**
@@ -235,7 +235,7 @@ public class SimpleAMQQueueTest extends InternalBrokerBaseCase
         _queue.registerSubscription(_subscription, false);
         Thread.sleep(150);
         assertEquals(messageB, _subscription.getQueueContext().getLastSeenEntry().getMessage());
-        assertNull("There should be no releasedEntry after enqueues", ((QueueContext)_subscription.getQueueContext())._releasedEntry);
+        assertNull("There should be no releasedEntry after enqueues", ((QueueContext)_subscription.getQueueContext()).getReleasedEntry());
     }
 
     /**
@@ -282,7 +282,7 @@ public class SimpleAMQQueueTest extends InternalBrokerBaseCase
         assertTrue("Redelivery flag should now be set", queueEntries.get(0).isRedelivered());
         assertFalse("Redelivery flag should remain be unset", queueEntries.get(1).isRedelivered());
         assertFalse("Redelivery flag should remain be unset",queueEntries.get(2).isRedelivered());
-        assertNull("releasedEntry should be cleared after requeue processed", ((QueueContext)_subscription.getQueueContext())._releasedEntry);
+        assertNull("releasedEntry should be cleared after requeue processed", ((QueueContext)_subscription.getQueueContext()).getReleasedEntry());
     }
 
     /**
@@ -326,7 +326,7 @@ public class SimpleAMQQueueTest extends InternalBrokerBaseCase
         assertTrue("Expecting the queue entry to be now expired", queueEntries.get(0).expired());
         assertEquals("Total number of messages sent should not have changed", 1, _subscription.getMessages().size());
         assertFalse("Redelivery flag should not be set", queueEntries.get(0).isRedelivered());
-        assertNull("releasedEntry should be cleared after requeue processed", ((QueueContext)_subscription.getQueueContext())._releasedEntry);
+        assertNull("releasedEntry should be cleared after requeue processed", ((QueueContext)_subscription.getQueueContext()).getReleasedEntry());
 
     }
 
@@ -377,7 +377,7 @@ public class SimpleAMQQueueTest extends InternalBrokerBaseCase
         assertTrue("Redelivery flag should now be set", queueEntries.get(0).isRedelivered());
         assertFalse("Redelivery flag should remain be unset", queueEntries.get(1).isRedelivered());
         assertTrue("Redelivery flag should now be set",queueEntries.get(2).isRedelivered());
-        assertNull("releasedEntry should be cleared after requeue processed", ((QueueContext)_subscription.getQueueContext())._releasedEntry);
+        assertNull("releasedEntry should be cleared after requeue processed", ((QueueContext)_subscription.getQueueContext()).getReleasedEntry());
     }
 
 
@@ -420,8 +420,8 @@ public class SimpleAMQQueueTest extends InternalBrokerBaseCase
         Thread.sleep(150); // Work done by SubFlushRunner/QueueRunner Threads
 
         assertEquals("Unexpected total number of messages sent to both subscriptions after release", 3, subscription1.getMessages().size() + subscription2.getMessages().size());
-        assertNull("releasedEntry should be cleared after requeue processed", ((QueueContext)subscription1.getQueueContext())._releasedEntry);
-        assertNull("releasedEntry should be cleared after requeue processed", ((QueueContext)subscription2.getQueueContext())._releasedEntry);
+        assertNull("releasedEntry should be cleared after requeue processed", ((QueueContext)subscription1.getQueueContext()).getReleasedEntry());
+        assertNull("releasedEntry should be cleared after requeue processed", ((QueueContext)subscription2.getQueueContext()).getReleasedEntry());
     }
 
     public void testExclusiveConsumer() throws AMQException
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleQueueEntryListTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleQueueEntryListTest.java
index d7ad82ff77..55c6143124 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleQueueEntryListTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleQueueEntryListTest.java
@@ -32,7 +32,7 @@ public class SimpleQueueEntryListTest extends QueueEntryListTestBase
     private SimpleQueueEntryList _sqel;
 
     private static final String SCAVENGE_PROP = "qpid.queue.scavenge_count";
-    String oldScavengeValue = null;
+    private String oldScavengeValue = null;
 
     @Override
     protected void setUp()
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/registry/ApplicationRegistryShutdownTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/registry/ApplicationRegistryShutdownTest.java
index abf292b66f..6a8a6dc2d0 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/registry/ApplicationRegistryShutdownTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/registry/ApplicationRegistryShutdownTest.java
@@ -36,7 +36,7 @@ import java.util.List;
 public class ApplicationRegistryShutdownTest extends InternalBrokerBaseCase
 {
 
-    Provider[] _defaultProviders;
+    private Provider[] _defaultProviders;
     @Override
     public void setUp() throws Exception
     {
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/database/HashedUserTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/database/HashedUserTest.java
index 3ff2e53ecb..f687cc4a09 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/database/HashedUserTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/database/HashedUserTest.java
@@ -30,9 +30,9 @@ import java.io.UnsupportedEncodingException;
 public class HashedUserTest extends TestCase
 {
 
-    String USERNAME = "username";
-    String PASSWORD = "password";
-    String B64_ENCODED_PASSWORD = "cGFzc3dvcmQ=";
+    private String USERNAME = "username";
+    private String PASSWORD = "password";
+    private String B64_ENCODED_PASSWORD = "cGFzc3dvcmQ=";
 
     public void testToLongArrayConstructor()
     {
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/database/PlainUserTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/database/PlainUserTest.java
index 7f0843d46e..a739f78958 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/database/PlainUserTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/database/PlainUserTest.java
@@ -28,8 +28,8 @@ import junit.framework.TestCase;
 public class PlainUserTest extends TestCase
 {
 
-    String USERNAME = "username";
-    String PASSWORD = "password";
+    private String USERNAME = "username";
+    private String PASSWORD = "password";
 
     public void testTooLongArrayConstructor()
     {
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java
index 8feff8215f..5fc074d877 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java
@@ -71,26 +71,26 @@ public class MessageStoreTest extends InternalBrokerBaseCase
     public static final String SELECTOR_VALUE = "Test = 'MST'";
     public static final String LVQ_KEY = "MST-LVQ-KEY";
 
-    AMQShortString nonDurableExchangeName = new AMQShortString("MST-NonDurableDirectExchange");
-    AMQShortString directExchangeName = new AMQShortString("MST-DirectExchange");
-    AMQShortString topicExchangeName = new AMQShortString("MST-TopicExchange");
+    private AMQShortString nonDurableExchangeName = new AMQShortString("MST-NonDurableDirectExchange");
+    private AMQShortString directExchangeName = new AMQShortString("MST-DirectExchange");
+    private AMQShortString topicExchangeName = new AMQShortString("MST-TopicExchange");
 
-    AMQShortString durablePriorityTopicQueueName = new AMQShortString("MST-PriorityTopicQueue-Durable");
-    AMQShortString durableTopicQueueName = new AMQShortString("MST-TopicQueue-Durable");
-    AMQShortString priorityTopicQueueName = new AMQShortString("MST-PriorityTopicQueue");
-    AMQShortString topicQueueName = new AMQShortString("MST-TopicQueue");
+    private AMQShortString durablePriorityTopicQueueName = new AMQShortString("MST-PriorityTopicQueue-Durable");
+    private AMQShortString durableTopicQueueName = new AMQShortString("MST-TopicQueue-Durable");
+    private AMQShortString priorityTopicQueueName = new AMQShortString("MST-PriorityTopicQueue");
+    private AMQShortString topicQueueName = new AMQShortString("MST-TopicQueue");
 
-    AMQShortString durableExclusiveQueueName = new AMQShortString("MST-Queue-Durable-Exclusive");
-    AMQShortString durablePriorityQueueName = new AMQShortString("MST-PriorityQueue-Durable");
-    AMQShortString durableLastValueQueueName = new AMQShortString("MST-LastValueQueue-Durable");
-    AMQShortString durableQueueName = new AMQShortString("MST-Queue-Durable");
-    AMQShortString priorityQueueName = new AMQShortString("MST-PriorityQueue");
-    AMQShortString queueName = new AMQShortString("MST-Queue");
+    private AMQShortString durableExclusiveQueueName = new AMQShortString("MST-Queue-Durable-Exclusive");
+    private AMQShortString durablePriorityQueueName = new AMQShortString("MST-PriorityQueue-Durable");
+    private AMQShortString durableLastValueQueueName = new AMQShortString("MST-LastValueQueue-Durable");
+    private AMQShortString durableQueueName = new AMQShortString("MST-Queue-Durable");
+    private AMQShortString priorityQueueName = new AMQShortString("MST-PriorityQueue");
+    private AMQShortString queueName = new AMQShortString("MST-Queue");
 
-    AMQShortString directRouting = new AMQShortString("MST-direct");
-    AMQShortString topicRouting = new AMQShortString("MST-topic");
+    private AMQShortString directRouting = new AMQShortString("MST-direct");
+    private AMQShortString topicRouting = new AMQShortString("MST-topic");
 
-    AMQShortString queueOwner = new AMQShortString("MST");
+    private AMQShortString queueOwner = new AMQShortString("MST");
 
     protected PropertiesConfiguration _config;
 
@@ -587,11 +587,7 @@ public class MessageStoreTest extends InternalBrokerBaseCase
 
         currentMessage.setExchange(exchange);
 
-        ContentHeaderBody headerBody = new ContentHeaderBody();
-        headerBody.classId = BasicConsumeBodyImpl.CLASS_ID;
-        headerBody.bodySize = 0;
-
-        headerBody.setProperties(properties);
+        ContentHeaderBody headerBody = new ContentHeaderBody(BasicConsumeBodyImpl.CLASS_ID,0,properties,0l);
 
         try
         {
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/store/TestableMemoryMessageStore.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/store/TestableMemoryMessageStore.java
index ad8c688f89..e409734a17 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/store/TestableMemoryMessageStore.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/store/TestableMemoryMessageStore.java
@@ -34,7 +34,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 public class TestableMemoryMessageStore extends MemoryMessageStore
 {
 
-    MemoryMessageStore _mms = null;
+    private MemoryMessageStore _mms = null;
     private HashMap<Long, AMQQueue> _messages = new HashMap<Long, AMQQueue>();
     private AtomicInteger _messageCount = new AtomicInteger(0);
 
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/util/InternalBrokerBaseCase.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/util/InternalBrokerBaseCase.java
index 463d1ace7d..9df0aec545 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/util/InternalBrokerBaseCase.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/util/InternalBrokerBaseCase.java
@@ -232,7 +232,7 @@ public class InternalBrokerBaseCase extends QpidTestCase
 
             //Set the body size
             ContentHeaderBody _headerBody = new ContentHeaderBody();
-            _headerBody.bodySize = 0;
+            _headerBody.setBodySize(0);
 
             //Set Minimum properties
             BasicContentHeaderProperties properties = new BasicContentHeaderProperties();
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/plugins/policies/TopicDeletePolicyTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/plugins/policies/TopicDeletePolicyTest.java
index aa13ba64b7..fdd163b323 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/plugins/policies/TopicDeletePolicyTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/plugins/policies/TopicDeletePolicyTest.java
@@ -39,10 +39,10 @@ import org.apache.qpid.server.virtualhost.VirtualHost;
 public class TopicDeletePolicyTest extends InternalBrokerBaseCase
 {
 
-    TopicDeletePolicyConfiguration _config;
+    private TopicDeletePolicyConfiguration _config;
 
-    VirtualHost _defaultVhost;
-    InternalTestProtocolSession _connection;
+    private VirtualHost _defaultVhost;
+    private InternalTestProtocolSession _connection;
 
     public void setUp() throws Exception
     {